2 files changed, 1 insertions, 4 deletions

diff --git a/fs/locks.c b/fs/locks.c
index 957775ba6468..b07e6e6f819b 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1665,8 +1665,6 @@ int fcntl_getlk(struct file *filp, struct flock __user *l)
 
         if (filp->f_op && filp->f_op->lock) {
                 error = filp->f_op->lock(filp, F_GETLK, &file_lock);
-                if (file_lock.fl_ops && file_lock.fl_ops->fl_release_private)
-                        file_lock.fl_ops->fl_release_private(&file_lock);
                 if (error < 0)
                         goto out;
                 else
@@ -1804,8 +1802,6 @@ int fcntl_getlk64(struct file *filp, struct flock64 __user *l)
 
         if (filp->f_op && filp->f_op->lock) {
                 error = filp->f_op->lock(filp, F_GETLK, &file_lock);
-                if (file_lock.fl_ops && file_lock.fl_ops->fl_release_private)
-                        file_lock.fl_ops->fl_release_private(&file_lock);
                 if (error < 0)
                         goto out;
                 else
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index f52cf5c33c6c..d9000ec52f72 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3018,6 +3018,7 @@ static int _nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock
                 case -NFS4ERR_DENIED:
                         status = 0;
         }
+        request->fl_ops->fl_release_private(request);
 out:
         up_read(&clp->cl_sem);
         return status;