Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/lustre/lustre/ldlm/ldlm_flock.c

+3 −18
Original line number Diff line number Diff line
@@ -311,7 +311,6 @@ static int ldlm_process_flock_lock(struct ldlm_lock *req) 


struct ldlm_flock_wait_data {

	struct ldlm_lock *fwd_lock;

	int	       fwd_generation;

};



static void
@@ -342,8 +341,6 @@ int 
ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *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 l_wait_info		lwi;

	int				rc = 0;
@@ -375,18 +372,6 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data) 
	LDLM_DEBUG(lock,

		   "client-side enqueue returned a blocked lock, sleeping");

	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);



	/* Go to sleep until the lock is granted. */