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

staging: lustre: ldlm: remove unused field 'fwd_generation'

With this field gone, we don't need local variables 'imp' or 'obd'
any more.
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 4a8d3fb1
...@@ -311,7 +311,6 @@ static int ldlm_process_flock_lock(struct ldlm_lock *req) ...@@ -311,7 +311,6 @@ static int ldlm_process_flock_lock(struct ldlm_lock *req)
struct ldlm_flock_wait_data { struct ldlm_flock_wait_data {
struct ldlm_lock *fwd_lock; struct ldlm_lock *fwd_lock;
int fwd_generation;
}; };
static void static void
...@@ -342,8 +341,6 @@ int ...@@ -342,8 +341,6 @@ int
ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data) ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data)
{ {
struct file_lock *getlk = lock->l_ast_data; struct file_lock *getlk = lock->l_ast_data;
struct obd_device *obd;
struct obd_import *imp = NULL;
struct ldlm_flock_wait_data fwd; struct ldlm_flock_wait_data fwd;
struct l_wait_info lwi; struct l_wait_info lwi;
int rc = 0; int rc = 0;
...@@ -375,18 +372,6 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data) ...@@ -375,18 +372,6 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data)
LDLM_DEBUG(lock, LDLM_DEBUG(lock,
"client-side enqueue returned a blocked lock, sleeping"); "client-side enqueue returned a blocked lock, sleeping");
fwd.fwd_lock = lock; fwd.fwd_lock = lock;
obd = class_exp2obd(lock->l_conn_export);
/* if this is a local lock, there is no import */
if (obd)
imp = obd->u.cli.cl_import;
if (imp) {
spin_lock(&imp->imp_lock);
fwd.fwd_generation = imp->imp_generation;
spin_unlock(&imp->imp_lock);
}
lwi = LWI_TIMEOUT_INTR(0, NULL, ldlm_flock_interrupted_wait, &fwd); lwi = LWI_TIMEOUT_INTR(0, NULL, ldlm_flock_interrupted_wait, &fwd);
/* Go to sleep until the lock is granted. */ /* Go to sleep until the lock is granted. */
......
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