From 52019fa1fd66b17a3140e284ccf836f299fb5c1d Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Thu, 22 Feb 2007 18:48:53 -0500 Subject: [PATCH] --- yaml --- r: 54485 b: refs/heads/master c: 70cc6487a4e08b8698c0e2ec935fb48d10490162 h: refs/heads/master i: 54483: ca2aa1770af94255417a4eab5a21e0380c84a8d8 v: v3 --- [refs] | 2 +- trunk/fs/locks.c | 4 ---- trunk/fs/nfs/nfs4proc.c | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 11f4fd4e2bde..ab0939e827b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2fa1b8a6c059dd08a802545fed3badc8df2adc1 +refs/heads/master: 70cc6487a4e08b8698c0e2ec935fb48d10490162 diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c index 957775ba6468..b07e6e6f819b 100644 --- a/trunk/fs/locks.c +++ b/trunk/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/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c index f52cf5c33c6c..d9000ec52f72 100644 --- a/trunk/fs/nfs/nfs4proc.c +++ b/trunk/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;