[595/622] lustre: llite: eviction during ll_open_cleanup()

Commit Message

James Simmons Feb. 27, 2020, 9:17 p.m. UTC

From: Andriy Skulysh <[e-mail]>

On error ll_open_cleanup() is called while
intent lock remains pinned. So eviction can
happen while close request waits for a mod rpc slot.

Release intent lock before ll_open_cleanup()

Cray-bug-id: LUS-8055
WC-bug-id: https://jira.whamcloud.com/browse/LU-13101
Lustre-commit: 6d5d7c6bdb4f ("LU-13101 llite: eviction during ll_open_cleanup()")
Signed-off-by: Andriy Skulysh <[e-mail]>
Reviewed-by: Alexander Boyko <[e-mail]>
Reviewed-by: Andrew Perepechko <[e-mail]>
Reviewed-by: Vitaly Fertman <[e-mail]>
Reviewed-on: https://review.whamcloud.com/37096
Reviewed-by: Alexandr Boyko <[e-mail]>
Reviewed-by: Oleg Drokin <[e-mail]>
Signed-off-by: James Simmons <[e-mail]>
---
 fs/lustre/llite/llite_lib.c | 4 +++-
 fs/lustre/llite/namei.c     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

Patch

diff --git a/fs/lustre/llite/llite_lib.c b/fs/lustre/llite/llite_lib.c
index 1a8a5ec..33ab3f7 100644
--- a/fs/lustre/llite/llite_lib.c
+++ b/fs/lustre/llite/llite_lib.c
@@ -2507,8 +2507,10 @@  int ll_prep_inode(struct inode **inode, struct ptlrpc_request *req,
 	/* cleanup will be done if necessary */
 	md_free_lustre_md(sbi->ll_md_exp, &md);
 
-	if (rc != 0 && it && it->it_op & IT_OPEN)
+	if (rc != 0 && it && it->it_op & IT_OPEN) {
+		ll_intent_drop_lock(it);
 		ll_open_cleanup(sb ? sb : (*inode)->i_sb, req);
+	}
 
 	return rc;
 }
diff --git a/fs/lustre/llite/namei.c b/fs/lustre/llite/namei.c
index 13c1cf9..89317db 100644
--- a/fs/lustre/llite/namei.c
+++ b/fs/lustre/llite/namei.c
@@ -709,8 +709,10 @@  static int ll_lookup_it_finish(struct ptlrpc_request *request,
 	}
 
 out:
-	if (rc != 0 && it->it_op & IT_OPEN)
+	if (rc != 0 && it->it_op & IT_OPEN) {
+		ll_intent_drop_lock(it);
 		ll_open_cleanup((*de)->d_sb, request);
+	}
 
 	return rc;
 }