locks: change lm_get_owner and lm_put_owner prototypes

[mirror_ubuntu-artful-kernel.git] / fs / nfsd / nfs4state.c

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  = {