OSDN Git Service

staging: lustre: ldlm: remove unused 'work_list' arg from ldlm_process_flock_lock()
authorNeilBrown <neilb@suse.com>
Mon, 23 Oct 2017 00:53:49 +0000 (11:53 +1100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 Nov 2017 13:55:21 +0000 (14:55 +0100)
'work_list' is only set to NULL, and is never used.
So discard it.

Signed-off-by: NeilBrown <neilb@suse.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/ldlm/ldlm_flock.c

index 487d8d7..c235e15 100644 (file)
@@ -123,8 +123,7 @@ ldlm_flock_destroy(struct ldlm_lock *lock, enum ldlm_mode mode, __u64 flags)
  *
  */
 static int ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags,
-                                  enum ldlm_error *err,
-                                  struct list_head *work_list)
+                                  enum ldlm_error *err)
 {
        struct ldlm_resource *res = req->l_resource;
        struct ldlm_namespace *ns = ldlm_res_to_ns(res);
@@ -596,7 +595,7 @@ granted:
                /* We need to reprocess the lock to do merges or splits
                 * with existing locks owned by this process.
                 */
-               ldlm_process_flock_lock(lock, &noreproc, &err, NULL);
+               ldlm_process_flock_lock(lock, &noreproc, &err);
        }
        unlock_res_and_lock(lock);
        return rc;