Merge branch 'for-6.0/dax' into libnvdimm-fixes

[people/ms/linux.git] / fs / lockd / svclock.c

diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index cb3658ab9b7aed37baaef3183590d52dbed91c10..9c1aa75441e1ccf94a46b78133ed5e230cdd3fb4 100644 (file)
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -340,7 +340,7 @@ nlmsvc_get_lockowner(struct nlm_lockowner *lockowner)
        return lockowner;
 }
 
-static void nlmsvc_put_lockowner(struct nlm_lockowner *lockowner)
+void nlmsvc_put_lockowner(struct nlm_lockowner *lockowner)
 {
        if (!refcount_dec_and_lock(&lockowner->count, &lockowner->host->h_lock))
                return;
@@ -590,7 +590,6 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file,
        int                     error;
        int                     mode;
        __be32                  ret;
-       struct nlm_lockowner    *test_owner;
 
        dprintk("lockd: nlmsvc_testlock(%s/%ld, ty=%d, %Ld-%Ld)\n",
                                nlmsvc_file_inode(file)->i_sb->s_id,
@@ -604,9 +603,6 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file,
                goto out;
        }
 
-       /* If there's a conflicting lock, remember to clean up the test lock */
-       test_owner = (struct nlm_lockowner *)lock->fl.fl_owner;
-
        mode = lock_to_openmode(&lock->fl);
        error = vfs_test_lock(file->f_file[mode], &lock->fl);
        if (error) {
@@ -635,10 +631,6 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file,
        conflock->fl.fl_end = lock->fl.fl_end;
        locks_release_private(&lock->fl);
 
-       /* Clean up the test lock */
-       lock->fl.fl_owner = NULL;
-       nlmsvc_put_lockowner(test_owner);
-
        ret = nlm_lck_denied;
 out:
        return ret;