From patchwork Fri Sep 4 19:24:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 7125561 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C0C6FBEEC1 for ; Fri, 4 Sep 2015 19:24:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DFB742081B for ; Fri, 4 Sep 2015 19:24:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0B7D2208B6 for ; Fri, 4 Sep 2015 19:24:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933001AbbIDTYM (ORCPT ); Fri, 4 Sep 2015 15:24:12 -0400 Received: from mail-qg0-f53.google.com ([209.85.192.53]:34169 "EHLO mail-qg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932992AbbIDTYM (ORCPT ); Fri, 4 Sep 2015 15:24:12 -0400 Received: by qgez77 with SMTP id z77so24132370qge.1 for ; Fri, 04 Sep 2015 12:24:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aYOgD2S/Q+j9WjZ/ImA5fUXij09gmRuQGUtVwClzOFA=; b=HfuhOyYnLoCBlttHhB4T8tG9mg494iy557afxaMjCCzLxGfbYnQB00pmy+nQ74Q98H 4sjJLA5bwbdUMDW+P0js6qwGvxWheqgq7trjPe+ArZwtnpaa8wZNXSc68gC52QVCdQuq xiD8VOa2nd4QZcG/4/RA0aziE8RRnGZi7hOv91A4+skxl5d/bHHLD5RfIhsNxD6+ao2o ARkJYJ1DJCmcu5coXzK+X52/2fnLG0m/MnGGOCwA59hbncGyl6L27VfD65kqSi0dvkFE q+zdSN65R/yUy4z9pSHbolD+0tBXYrnJlP9jTwFDgbreroA9YNaEzmwVTDCdCr6x8r19 6tcw== X-Gm-Message-State: ALoCoQkwfppSdrvYn1bC/IucFUTIVMNGRI9HJg+5r6eXOuVtKGQe8FMpQ8qLcIwV+/PwAh2qrFOh X-Received: by 10.140.19.36 with SMTP id 33mr7787790qgg.85.1441394651287; Fri, 04 Sep 2015 12:24:11 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-68-49-164-203.hsd1.mi.comcast.net. [68.49.164.203]) by smtp.gmail.com with ESMTPSA id 44sm1884703qgg.37.2015.09.04.12.24.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Sep 2015 12:24:10 -0700 (PDT) From: Trond Myklebust To: Olga Kornievskaia Cc: Chuck Lever , linux-nfs@vger.kernel.org Subject: [PATCH 2/2] Revert "NFS: Make close(2) asynchronous when closing NFS O_DIRECT files" Date: Fri, 4 Sep 2015 15:24:07 -0400 Message-Id: <1441394647-16412-2-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1441394647-16412-1-git-send-email-trond.myklebust@primarydata.com> References: <1441394647-16412-1-git-send-email-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit f895c53f8ace3c3e49ebf9def90e63fc6d46d2bf. This commit causes a NFSv4 regression in that close()+unlink() can end up failing. The reason is that we no longer have a guarantee that the CLOSE has completed on the server, meaning that the subsequent call to REMOVE may fail with NFS4ERR_FILE_OPEN if the server implements Windows unlink() semantics. Signed-off-by: Trond Myklebust --- fs/nfs/inode.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index ebaf991e4b02..54eb47799a41 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -852,6 +852,11 @@ void put_nfs_open_context(struct nfs_open_context *ctx) } EXPORT_SYMBOL_GPL(put_nfs_open_context); +static void put_nfs_open_context_sync(struct nfs_open_context *ctx) +{ + __put_nfs_open_context(ctx, 1); +} + /* * Ensure that mmap has a recent RPC credential for use when writing out * shared pages @@ -907,7 +912,7 @@ void nfs_file_clear_open_context(struct file *filp) spin_lock(&inode->i_lock); list_move_tail(&ctx->list, &NFS_I(inode)->open_files); spin_unlock(&inode->i_lock); - __put_nfs_open_context(ctx, filp->f_flags & O_DIRECT ? 0 : 1); + put_nfs_open_context_sync(ctx); } }