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
commit09d61fdb8684297897cadacdb627255f22f2291b (patch)
treeb3958f308dd4135d6b8ebffb880b00a78a52db2b /drivers/staging
parente8b1844a7e59fc35c086358021d9d42b4ce3ee22 (diff)
downloadlinux-09d61fdb8684297897cadacdb627255f22f2291b.tar.bz2
staging: lustre: ldlm: remove 'first_enq' arg from ldlm_process_flock_lock()
it is only ever set to '1', so we can just assume that and remove the code. 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.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
index 04e1d4c1f8c3..487d8d7294a7 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
@@ -121,15 +121,9 @@ ldlm_flock_destroy(struct ldlm_lock *lock, enum ldlm_mode mode, __u64 flags)
* It is also responsible for splitting a lock if a portion of the lock
* is released.
*
- * If \a first_enq is 0 (ie, called from ldlm_reprocess_queue):
- * - blocking ASTs have already been sent
- *
- * If \a first_enq is 1 (ie, called from ldlm_lock_enqueue):
- * - blocking ASTs have not been sent yet, so list of conflicting locks
- * would be collected and ASTs sent.
*/
static int ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags,
- int first_enq, enum ldlm_error *err,
+ enum ldlm_error *err,
struct list_head *work_list)
{
struct ldlm_resource *res = req->l_resource;
@@ -197,11 +191,6 @@ reprocess:
if (!ldlm_flocks_overlap(lock, req))
continue;
- if (!first_enq) {
- reprocess_failed = 1;
- continue;
- }
-
if (*flags & LDLM_FL_BLOCK_NOWAIT) {
ldlm_flock_destroy(req, mode, *flags);
*err = -EAGAIN;
@@ -607,7 +596,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, 1, &err, NULL);
+ ldlm_process_flock_lock(lock, &noreproc, &err, NULL);
}
unlock_res_and_lock(lock);
return rc;