From 3bcfb701099acf96b0e883bf5544f96af473aa1d Mon Sep 17 00:00:00 2001

From: Namjae Jeon <namjae.jeon@samsung.com>

Date: Wed, 17 Jun 2020 12:17:18 +0900

Subject: [Backport 3bcfb701099a] exfat: move setting VOL_DIRTY over

 exfat_remove_entries()

Move setting VOL_DIRTY over exfat_remove_entries() to avoid unneeded

leaving VOL_DIRTY on -ENOTEMPTY.

Fixes: 5f2aa075070c ("exfat: add inode operations")

Cc: stable@vger.kernel.org # v5.7

Reported-by: Tetsuhiro Kohada <kohada.t2@gmail.com>

Reviewed-by: Sungjong Seo <sj1557.seo@samsung.com>

Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>

---

 src/namei.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/namei.c b/src/namei.c

index edd8023865a0e50d0854856ab57afc75ce56dd46..2b9e21094a96dbb252f38e34db272e567d665665 100644

--- a/src/namei.c

+++ b/src/namei.c

@@ -975,7 +975,6 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry)

 		goto unlock;

 	}

-	exfat_set_vol_flags(sb, VOL_DIRTY);

 	exfat_chain_set(&clu_to_free, ei->start_clu,

 		EXFAT_B_TO_CLU_ROUND_UP(i_size_read(inode), sbi), ei->flags);

@@ -1002,6 +1001,7 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry)

 	num_entries++;

 	brelse(bh);

+	exfat_set_vol_flags(sb, VOL_DIRTY);

 	err = exfat_remove_entries(dir, &cdir, entry, 0, num_entries);

 	if (err) {

 		exfat_err(sb, "failed to exfat_remove_entries : err(%d)", err);

-- 

2.31.1