Staging: lustre: remove unneeded variable
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Oct 2015 15:55:15 +0000 (08:55 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Oct 2015 15:55:15 +0000 (08:55 -0700)
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
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c

index 658c878cacced8e5005d5554a350522affe78fb4..1600375f74b6f534cde346e144377d6ce6533c2e 100644 (file)
@@ -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;
 }
 
 /**