summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.com>2017-10-23 11:53:49 +1100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-03 14:55:21 +0100
commitf88faec4d403e5e2096072685e8cb36eeb43507d (patch)
tree632b34a2e90fa58e33a8dc8f552c42125b1263ab /drivers/staging
parent09d61fdb8684297897cadacdb627255f22f2291b (diff)
downloadlinux-stable-f88faec4d403e5e2096072685e8cb36eeb43507d.tar.gz
linux-stable-f88faec4d403e5e2096072685e8cb36eeb43507d.tar.bz2
linux-stable-f88faec4d403e5e2096072685e8cb36eeb43507d.zip
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: NeilBrown <neilb@suse.com> Reviewed-by: Andreas Dilger <andreas.dilger@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/lustre/lustre/ldlm/ldlm_flock.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
index 487d8d7294a7..c235e15a77f3 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
@@ -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;