diff options
author | Patrick Farrell <paf@cray.com> | 2017-01-28 19:05:14 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-03 07:01:38 -0500 |
commit | 26d2bf1e71525f4c0f644820c30d1344633159e2 (patch) | |
tree | 08048e32e209b5f1b0ffc2614a713bbf513d643b | |
parent | acd8f3e4e85a0ea22f2d63a03ec04d621152f2d9 (diff) |
staging: lustre: mdc: Make IT_OPEN take lookup bits lock
An earlier commit accidentally changed handling of IT_OPEN,
making it take the MDS_INODELOCK_UPDATE bits lock instead of
MDS_INODELOCK_LOOKUP. This does not cause any known bugs.
Signed-off-by: Patrick Farrell <paf@cray.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-8842
Reviewed-on: https://review.whamcloud.com/23797
Fixes: 70a251f68dea ("staging: lustre: obd: decruft md_enqueue() and md_intent_lock()"
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Lai Siyao <lai.siyao@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/lustre/lustre/mdc/mdc_locks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_locks.c b/drivers/staging/lustre/lustre/mdc/mdc_locks.c index 4c8f20a0c37d..392b0e38a91e 100644 --- a/drivers/staging/lustre/lustre/mdc/mdc_locks.c +++ b/drivers/staging/lustre/lustre/mdc/mdc_locks.c | |||
@@ -721,7 +721,7 @@ int mdc_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo, | |||
721 | LASSERT(!policy); | 721 | LASSERT(!policy); |
722 | 722 | ||
723 | saved_flags |= LDLM_FL_HAS_INTENT; | 723 | saved_flags |= LDLM_FL_HAS_INTENT; |
724 | if (it->it_op & (IT_OPEN | IT_UNLINK | IT_GETATTR | IT_READDIR)) | 724 | if (it->it_op & (IT_UNLINK | IT_GETATTR | IT_READDIR)) |
725 | policy = &update_policy; | 725 | policy = &update_policy; |
726 | else if (it->it_op & IT_LAYOUT) | 726 | else if (it->it_op & IT_LAYOUT) |
727 | policy = &layout_policy; | 727 | policy = &layout_policy; |