From 7d68bfb9914c4c0dadb0aee2502f35a44dd638e3 Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Thu, 15 Oct 2020 15:10:50 +1100 Subject: [PATCH] LU-6142 llite: ll_lookup_finish_locks clean up The 'inode' var can be used rather than dereferencing dentry->d_inode a second time. Also re-indent the function. Signed-off-by: Mr NeilBrown Change-Id: I16fb5480f7e2a8192a82e0c821597e14aad00b40 Reviewed-on: https://review.whamcloud.com/40830 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Lai Siyao Reviewed-by: Aurelien Degremont Reviewed-by: Arshad Hussain Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- lustre/llite/dcache.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c index 8de420f..caaacbd 100644 --- a/lustre/llite/dcache.c +++ b/lustre/llite/dcache.c @@ -258,25 +258,21 @@ int ll_revalidate_it_finish(struct ptlrpc_request *request, void ll_lookup_finish_locks(struct lookup_intent *it, struct dentry *dentry) { - LASSERT(it != NULL); - LASSERT(dentry != NULL); + LASSERT(it != NULL); + LASSERT(dentry != NULL); if (it->it_lock_mode && dentry->d_inode != NULL) { - struct inode *inode = dentry->d_inode; - struct ll_sb_info *sbi = ll_i2sbi(dentry->d_inode); + struct inode *inode = dentry->d_inode; + struct ll_sb_info *sbi = ll_i2sbi(inode); CDEBUG(D_DLMTRACE, "setting l_data to inode "DFID"(%p)\n", PFID(ll_inode2fid(inode)), inode); - ll_set_lock_data(sbi->ll_md_exp, inode, it, NULL); - } - - /* drop lookup or getattr locks immediately */ - if (it->it_op == IT_LOOKUP || it->it_op == IT_GETATTR) { - /* on 2.6 there are situation when several lookups and - * revalidations may be requested during single operation. - * therefore, we don't release intent here -bzzz */ - ll_intent_drop_lock(it); - } + ll_set_lock_data(sbi->ll_md_exp, inode, it, NULL); + } + + /* drop lookup or getattr locks immediately */ + if (it->it_op == IT_LOOKUP || it->it_op == IT_GETATTR) + ll_intent_drop_lock(it); } static int ll_revalidate_dentry(struct dentry *dentry, -- 1.8.3.1