Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
LU-9855 lustre: use with_imp_locked() more broadly.
[fs/lustre-release.git]
/
lustre
/
ldlm
/
ldlm_flock.c
diff --git
a/lustre/ldlm/ldlm_flock.c
b/lustre/ldlm/ldlm_flock.c
index
b76f0f1
..
089dec6
100644
(file)
--- a/
lustre/ldlm/ldlm_flock.c
+++ b/
lustre/ldlm/ldlm_flock.c
@@
-655,7
+655,6
@@
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;
enum ldlm_error err;
int rc = 0;
ENTRY;
@@
-688,10
+687,6
@@
ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data)
"client-side enqueue returned a blocked lock, sleeping");
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;
-
/* Go to sleep until the lock is granted. */
rc = l_wait_event_abortable(lock->l_waitq,
is_granted_or_cancelled(lock));