summaryrefslogtreecommitdiffstats
path: root/fs/lockd
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-08-22 10:18:42 -0400
committerJeff Layton <jlayton@primarydata.com>2014-09-09 16:01:06 -0400
commitd0449b90f80f263e17e8b3ce31442e45121dc46c (patch)
treeccf93559ff2721b5d5ea702e49d8689e44ae13d0 /fs/lockd
parentf39b913cee67e401ad697578baca0ba34830209b (diff)
downloadlinux-stable-d0449b90f80f263e17e8b3ce31442e45121dc46c.tar.gz
linux-stable-d0449b90f80f263e17e8b3ce31442e45121dc46c.tar.bz2
linux-stable-d0449b90f80f263e17e8b3ce31442e45121dc46c.zip
locks: Remove unused conf argument from lm_grant
This argument is always NULL so don't pass it around. [jlayton: remove dependencies on previous patches in series] Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Diffstat (limited to 'fs/lockd')
-rw-r--r--fs/lockd/svclock.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index ab798a88ec1d..2a6170133c1d 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -667,22 +667,16 @@ nlmsvc_cancel_blocked(struct net *net, struct nlm_file *file, struct nlm_lock *l
* deferred rpc for GETLK and SETLK.
*/
static void
-nlmsvc_update_deferred_block(struct nlm_block *block, struct file_lock *conf,
- int result)
+nlmsvc_update_deferred_block(struct nlm_block *block, int result)
{
block->b_flags |= B_GOT_CALLBACK;
if (result == 0)
block->b_granted = 1;
else
block->b_flags |= B_TIMED_OUT;
- if (conf) {
- if (block->b_fl)
- __locks_copy_lock(block->b_fl, conf);
- }
}
-static int nlmsvc_grant_deferred(struct file_lock *fl, struct file_lock *conf,
- int result)
+static int nlmsvc_grant_deferred(struct file_lock *fl, int result)
{
struct nlm_block *block;
int rc = -ENOENT;
@@ -697,7 +691,7 @@ static int nlmsvc_grant_deferred(struct file_lock *fl, struct file_lock *conf,
rc = -ENOLCK;
break;
}
- nlmsvc_update_deferred_block(block, conf, result);
+ nlmsvc_update_deferred_block(block, result);
} else if (result == 0)
block->b_granted = 1;