X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Ffile.c;h=a2d74ed38f76bfb5800d697f83d1b9a33b32b5de;hb=be278f82efa736035c32ca61a3bfbfd0043d2ee3;hp=bc06c69c17b20190407542a523f0bdf246f957b9;hpb=3011aa564a8c682aafbc6071b9866e266d8a6232;p=fs%2Flustre-release.git

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index bc06c69..a2d74ed 100644
--- 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);