Linux NFS development
 help / color / mirror / Atom feed
From: Benjamin Coddington <bcodding@redhat.com>
To: "J. Bruce Fields" <bfields@fieldses.org>,
	Jeff Layton <jlayton@poochiereds.net>,
	Trond Myklebust <trond.myklebust@primarydata.com>,
	Anna Schumaker <anna.schumaker@netapp.com>,
	hch@infradead.org
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH v2 08/10] locks: Set FL_CLOSE when removing flock locks on close()
Date: Mon,  7 Dec 2015 11:26:07 -0500	[thread overview]
Message-ID: <065c82364ff6bcecdbbb05550ff7b61f02469428.1449503713.git.bcodding@redhat.com> (raw)
In-Reply-To: <cover.1449503713.git.bcodding@redhat.com>
In-Reply-To: <cover.1449503713.git.bcodding@redhat.com>

Use FL_CLOSE in fl_flags as in locks_remove_posix() when clearing locks.
NFS will depend on this flag to properly defer an unlock until IO under the
current lock has completed.

Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
---
 fs/locks.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/locks.c b/fs/locks.c
index 0d2b326..9aea07a 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -2423,7 +2423,7 @@ locks_remove_flock(struct file *filp, struct file_lock_context *flctx)
 		.fl_owner = filp,
 		.fl_pid = current->tgid,
 		.fl_file = filp,
-		.fl_flags = FL_FLOCK,
+		.fl_flags = FL_FLOCK | FL_CLOSE,
 		.fl_type = F_UNLCK,
 		.fl_end = OFFSET_MAX,
 	};
-- 
1.7.1


  parent reply	other threads:[~2015-12-07 16:26 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-07 16:25 [PATCH v2 00/10] locking fixups for NFS Benjamin Coddington
2015-12-07 16:26 ` [PATCH v2 01/10] NFS4: remove a redundant lock range check Benjamin Coddington
2015-12-07 16:26 ` [PATCH v2 02/10] NFS: Move the flock open mode check into nfs_flock() Benjamin Coddington
2015-12-07 18:40   ` Christoph Hellwig
2015-12-07 19:13     ` Benjamin Coddington
2015-12-07 19:22       ` Christoph Hellwig
2015-12-07 19:24         ` Benjamin Coddington
2015-12-27  3:13           ` Trond Myklebust
2015-12-28 15:53             ` Benjamin Coddington
2015-12-07 19:18     ` Jeff Layton
2015-12-07 16:26 ` [PATCH v2 03/10] NFS: Pass nfs_open_context instead of file to the lock procs Benjamin Coddington
2015-12-07 16:26 ` [PATCH v2 04/10] NFSv4: Pass nfs_open_context instead of nfs4_state to nfs4_proc_unlck() Benjamin Coddington
2015-12-07 16:26 ` [PATCH v2 05/10] lockd: Plumb nfs_open_context into nlm client unlock Benjamin Coddington
2015-12-07 16:26 ` [PATCH v2 06/10] lockd: Send the inode to nlmclnt_setlockargs() Benjamin Coddington
2015-12-07 16:26 ` [PATCH v2 07/10] lockd: do_vfs_lock() only needs the inode Benjamin Coddington
2015-12-07 16:26 ` Benjamin Coddington [this message]
2015-12-07 16:26 ` [PATCH v2 09/10] NFS: Deferred unlocks - always unlock on FL_CLOSE Benjamin Coddington
2015-12-07 16:26 ` [PATCH v2 10/10] NFS: cleanup do_vfs_lock() Benjamin Coddington

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=065c82364ff6bcecdbbb05550ff7b61f02469428.1449503713.git.bcodding@redhat.com \
    --to=bcodding@redhat.com \
    --cc=anna.schumaker@netapp.com \
    --cc=bfields@fieldses.org \
    --cc=hch@infradead.org \
    --cc=jlayton@poochiereds.net \
    --cc=linux-nfs@vger.kernel.org \
    --cc=trond.myklebust@primarydata.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox