summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-17 17:55:15 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-17 17:55:15 +0200
commitb5f00637784f09e524ca882e8d43d78e36da166b (patch)
treed0083f1785486088cea977fc8ac324c553110f90
parentstaging: comedi: cb_pcidas: rename handle_ao_interrupt() (diff)
downloadlinux-b5f00637784f09e524ca882e8d43d78e36da166b.tar.xz
linux-b5f00637784f09e524ca882e8d43d78e36da166b.zip
Staging: lustre: remove unneeded variable
ldlm_lock_enqueue() always returns ELDLM_OK, no matter what happens, so removed the unneeded variable that this value was being stored in and just return the value itself. Reported-by: kbuild test robot <fengguang.wu@intel.com> Cc: Oleg Drokin <oleg.drokin@intel.com> Cc: Andreas Dilger <andreas.dilger@intel.com> Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
-rw-r--r--drivers/staging/lustre/lustre/ldlm/ldlm_lock.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
index 658c878cacce..1600375f74b6 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
@@ -1520,7 +1520,6 @@ ldlm_error_t ldlm_lock_enqueue(struct ldlm_namespace *ns,
{
struct ldlm_lock *lock = *lockp;
struct ldlm_resource *res = lock->l_resource;
- ldlm_error_t rc = ELDLM_OK;
lock->l_last_activity = ktime_get_real_seconds();
@@ -1558,7 +1557,7 @@ ldlm_error_t ldlm_lock_enqueue(struct ldlm_namespace *ns,
out:
unlock_res_and_lock(lock);
- return rc;
+ return ELDLM_OK;
}
/**