LU-15535 revert: "LU-15284 llite: access lli_lsm_md with lock in all places"

[fs/lustre-release.git] / lustre / llite / file.c

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index bc06c69..a2d74ed 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -5427,14 +5427,12 @@ static int ll_merge_md_attr(struct inode *inode)
        struct cl_attr attr = { 0 };
        int rc;
 
-       if (!lli->lli_lsm_md)
+       LASSERT(lli->lli_lsm_md != NULL);
+
+       if (!lmv_dir_striped(lli->lli_lsm_md))
                RETURN(0);
 
        down_read(&lli->lli_lsm_sem);
-       if (!lmv_dir_striped(lli->lli_lsm_md)) {
-               up_read(&lli->lli_lsm_sem);
-               RETURN(0);
-       }
        rc = md_merge_attr(ll_i2mdexp(inode), ll_i2info(inode)->lli_lsm_md,
                           &attr, ll_md_blocking_ast);
        up_read(&lli->lli_lsm_sem);