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-3200 mdc: layout lock rpc must not take rpc_lock
[fs/lustre-release.git]
/
lustre
/
include
/
lustre_mdc.h
diff --git
a/lustre/include/lustre_mdc.h
b/lustre/include/lustre_mdc.h
index
880df96
..
6cb5f01
100644
(file)
--- a/
lustre/include/lustre_mdc.h
+++ b/
lustre/include/lustre_mdc.h
@@
-88,7
+88,8
@@
static inline void mdc_get_rpc_lock(struct mdc_rpc_lock *lck,
{
ENTRY;
- if (it != NULL && (it->it_op == IT_GETATTR || it->it_op == IT_LOOKUP))
+ if (it != NULL && (it->it_op == IT_GETATTR || it->it_op == IT_LOOKUP ||
+ it->it_op == IT_LAYOUT))
return;
/* This would normally block until the existing request finishes.
@@
-125,7
+126,8
@@
static inline void mdc_get_rpc_lock(struct mdc_rpc_lock *lck,
static inline void mdc_put_rpc_lock(struct mdc_rpc_lock *lck,
struct lookup_intent *it)
{
- if (it != NULL && (it->it_op == IT_GETATTR || it->it_op == IT_LOOKUP))
+ if (it != NULL && (it->it_op == IT_GETATTR || it->it_op == IT_LOOKUP ||
+ it->it_op == IT_LAYOUT))
goto out;
if (lck->rpcl_it == MDC_FAKE_RPCL_IT) { /* OBD_FAIL_MDC_RPCS_SEM */