Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f88faec4 authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman
Browse files

staging: lustre: ldlm: remove unused 'work_list' arg from ldlm_process_flock_lock() 



'work_list' is only set to NULL, and is never used.
So discard it.

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 09d61fdb

drivers/staging/lustre/lustre/ldlm/ldlm_flock.c

+2 −3
Original line number Diff line number Diff line
@@ -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 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data) 
		/* 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;