locks: Set FL_CLOSE when removing flock locks on close()

Set FL_CLOSE in fl_flags as in locks_remove_posix() when clearing locks.
NFS will check for this flag to ensure an unlock is sent in a following
patch.

Fuse handles flock and posix locks differently for FL_CLOSE, and so
requires a fixup to retain the existing behavior for flock.

Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Acked-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index ec238fb5a584b1c3cc5bc545806575160f78cde4..995da8957f6fd760dfca75105640c69a1292e537 100644 (file)
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -2168,7 +2168,7 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)
        }
 
        /* Unlock on close is handled by the flush method */
-       if (fl->fl_flags & FL_CLOSE)
+       if ((fl->fl_flags & FL_CLOSE_POSIX) == FL_CLOSE_POSIX)
                return 0;
 
        fuse_lk_fill(&args, file, fl, opcode, pid, flock, &inarg);

diff --git a/fs/locks.c b/fs/locks.c
index 26811321d39b8d404046100ac3dcc4b5e04f5cc7..af2031a1fcff14fcfb05e108b9d49bfc4a74685f 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -2504,7 +2504,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,
        };

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 7251f7bb45e8b80b44f28c2051c5bef8e947e6bb..72061aa65405792674f9e762eba902344a0e8682 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -909,6 +909,8 @@ static inline struct file *get_file(struct file *f)
 #define FL_OFDLCK      1024    /* lock is "owned" by struct file */
 #define FL_LAYOUT      2048    /* outstanding pNFS layout */
 
+#define FL_CLOSE_POSIX (FL_POSIX | FL_CLOSE)
+
 /*
  * Special return value from posix_lock_file() and vfs_lock_file() for
  * asynchronous locking.