Commit 09d61fdb authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman

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: 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 e8b1844a
...@@ -121,15 +121,9 @@ ldlm_flock_destroy(struct ldlm_lock *lock, enum ldlm_mode mode, __u64 flags) ...@@ -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 * It is also responsible for splitting a lock if a portion of the lock
* is released. * 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, 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 list_head *work_list)
{ {
struct ldlm_resource *res = req->l_resource; struct ldlm_resource *res = req->l_resource;
...@@ -197,11 +191,6 @@ static int ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, ...@@ -197,11 +191,6 @@ static int ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags,
if (!ldlm_flocks_overlap(lock, req)) if (!ldlm_flocks_overlap(lock, req))
continue; continue;
if (!first_enq) {
reprocess_failed = 1;
continue;
}
if (*flags & LDLM_FL_BLOCK_NOWAIT) { if (*flags & LDLM_FL_BLOCK_NOWAIT) {
ldlm_flock_destroy(req, mode, *flags); ldlm_flock_destroy(req, mode, *flags);
*err = -EAGAIN; *err = -EAGAIN;
...@@ -607,7 +596,7 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data) ...@@ -607,7 +596,7 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data)
/* We need to reprocess the lock to do merges or splits /* We need to reprocess the lock to do merges or splits
* with existing locks owned by this process. * 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); unlock_res_and_lock(lock);
return rc; return rc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment