locks: change lm_get_owner and lm_put_owner prototypes

The current prototypes for these operations are somewhat awkward as they
deal with fl_owners but take struct file_lock arguments. In the future,
we'll want to be able to take references without necessarily dealing
with a struct file_lock.

Change them to take fl_owner_t arguments instead and have the callers
deal with assigning the values to the file_lock structs.

Signed-off-by: Jeff Layton <jlayton@primarydata.com>

diff --git a/fs/locks.c b/fs/locks.c
index 54a79883a7f97813cc282c11ab635533fa426ac2..3ebaafb4c5872470f7637602f0b9b23b58c27690 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -276,8 +276,10 @@ void locks_release_private(struct file_lock *fl)
        }
 
        if (fl->fl_lmops) {
-               if (fl->fl_lmops->lm_put_owner)
-                       fl->fl_lmops->lm_put_owner(fl);
+               if (fl->fl_lmops->lm_put_owner) {
+                       fl->fl_lmops->lm_put_owner(fl->fl_owner);
+                       fl->fl_owner = NULL;
+               }
                fl->fl_lmops = NULL;
        }
 }
@@ -333,7 +335,7 @@ void locks_copy_conflock(struct file_lock *new, struct file_lock *fl)
 
        if (fl->fl_lmops) {
                if (fl->fl_lmops->lm_get_owner)
-                       fl->fl_lmops->lm_get_owner(new, fl);
+                       fl->fl_lmops->lm_get_owner(fl->fl_owner);
        }
 }
 EXPORT_SYMBOL(locks_copy_conflock);

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 8ba1d888f1e624d672453bd1eea20c40e054f746..326a545ea7b2bb56277ee32a950e858410f33f1f 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4932,20 +4932,22 @@ nfs4_transform_lock_offset(struct file_lock *lock)
                lock->fl_end = OFFSET_MAX;
 }
 
-static void nfsd4_fl_get_owner(struct file_lock *dst, struct file_lock *src)
+static fl_owner_t
+nfsd4_fl_get_owner(fl_owner_t owner)
 {
-       struct nfs4_lockowner *lo = (struct nfs4_lockowner *)src->fl_owner;
-       dst->fl_owner = (fl_owner_t)lockowner(nfs4_get_stateowner(&lo->lo_owner));
+       struct nfs4_lockowner *lo = (struct nfs4_lockowner *)owner;
+
+       nfs4_get_stateowner(&lo->lo_owner);
+       return owner;
 }
 
-static void nfsd4_fl_put_owner(struct file_lock *fl)
+static void
+nfsd4_fl_put_owner(fl_owner_t owner)
 {
-       struct nfs4_lockowner *lo = (struct nfs4_lockowner *)fl->fl_owner;
+       struct nfs4_lockowner *lo = (struct nfs4_lockowner *)owner;
 
-       if (lo) {
+       if (lo)
                nfs4_put_stateowner(&lo->lo_owner);
-               fl->fl_owner = NULL;
-       }
 }
 
 static const struct lock_manager_operations nfsd_posix_mng_ops  = {

diff --git a/include/linux/fs.h b/include/linux/fs.h
index f4131e8ead74965a73272949b3a9eae8fa08b5c7..e4111a29697e1991d21f340ef0f14f3b97c28466 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -893,8 +893,8 @@ struct file_lock_operations {
 struct lock_manager_operations {
        int (*lm_compare_owner)(struct file_lock *, struct file_lock *);
        unsigned long (*lm_owner_key)(struct file_lock *);
-       void (*lm_get_owner)(struct file_lock *, struct file_lock *);
-       void (*lm_put_owner)(struct file_lock *);
+       fl_owner_t (*lm_get_owner)(fl_owner_t);
+       void (*lm_put_owner)(fl_owner_t);
        void (*lm_notify)(struct file_lock *);  /* unblock callback */
        int (*lm_grant)(struct file_lock *, int);
        bool (*lm_break)(struct file_lock *);