locks: introduce new FL_DELEG lock flag

For now FL_DELEG is just a synonym for FL_LEASE.  So this patch doesn't
change behavior.

Next we'll modify break_lease to treat FL_DELEG leases differently, to
account for the fact that NFSv4 delegations should be broken in more
situations than Windows oplocks.

Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/locks.c b/fs/locks.c
index f155ffd648bb413428cc705dcec369e67a34997c..079abcd8a8361cb71a10f3cc413f4d6b6032b760 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -134,7 +134,7 @@
 
 #define IS_POSIX(fl)   (fl->fl_flags & FL_POSIX)
 #define IS_FLOCK(fl)   (fl->fl_flags & FL_FLOCK)
-#define IS_LEASE(fl)   (fl->fl_flags & FL_LEASE)
+#define IS_LEASE(fl)   (fl->fl_flags & (FL_LEASE|FL_DELEG))
 
 static bool lease_breaking(struct file_lock *fl)
 {

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index a601fd49f997bc441397cb432f2fe0d41dacf8ec..f36a30a9f2d15c5d3500002e87b4afa3e80d951a 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -3008,7 +3008,7 @@ static struct file_lock *nfs4_alloc_init_lease(struct nfs4_delegation *dp, int f
                return NULL;
        locks_init_lock(fl);
        fl->fl_lmops = &nfsd_lease_mng_ops;
-       fl->fl_flags = FL_LEASE;
+       fl->fl_flags = FL_DELEG;
        fl->fl_type = flag == NFS4_OPEN_DELEGATE_READ? F_RDLCK: F_WRLCK;
        fl->fl_end = OFFSET_MAX;
        fl->fl_owner = (fl_owner_t)(dp->dl_file);

diff --git a/include/linux/fs.h b/include/linux/fs.h
index ed7f94af1ab2a867dddd1dc0fc9e9e91f5afa040..129e150f9e9485f76b3889e1d18a21b027d050a8 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -880,6 +880,7 @@ static inline int file_check_writeable(struct file *filp)
 
 #define FL_POSIX       1
 #define FL_FLOCK       2
+#define FL_DELEG       4       /* NFSv4 delegation */
 #define FL_ACCESS      8       /* not trying to lock, just looking */
 #define FL_EXISTS      16      /* when unlocking, test for existence */
 #define FL_LEASE       32      /* lease held on this file */