Merge branch 'for-4.1' of git://linux-nfs.org/~bfields/linux

[platform/kernel/linux-starfive.git] / fs / nfsd / nfs4state.c

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 6934955..d42786e 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4931,20 +4931,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  = {