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>

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;