MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-08 10:25:20 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

UPSTREAM: exfat: move free cluster out of exfat_init_ext_entry()

Browse Source 
exfat_init_ext_entry() is an init function, it's a bit strange
to free cluster in it. And the argument 'inode' will be removed
from exfat_init_ext_entry(). So this commit changes to free the
cluster in exfat_remove_entries().

Code refinement, no functional changes.

Signed-off-by: Yuezhang Mo <Yuezhang.Mo@sony.com>
Reviewed-by: Andy Wu <Andy.Wu@sony.com>
Reviewed-by: Aoyama Wataru <wataru.aoyama@sony.com>
Reviewed-by: Sungjong Seo <sj1557.seo@samsung.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
(cherry picked from commit 4e1aa22fea)

Bug: 362138008

Change-Id: Idffd653eef8500f0d40f94c33adfb8194a8eb9ba
Signed-off-by: dongliang.cui <dongliang.cui@unisoc.com>
This commit is contained in:
dongliang.cui 2024-08-27 10:24:31 +08:00 committed by Treehugger Robot
parent 4e8cfeff96
commit 60f4c79d0c
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/exfat/dir.c
View File

@ -564,9 +564,6 @@ int exfat_init_ext_entry(struct inode *inode, struct exfat_chain *p_dir,
if (!ep)
return -EIO;
if (exfat_get_entry_type(ep) & TYPE_BENIGN_SEC)
exfat_free_benign_secondary_clusters(inode, ep);
exfat_init_name_entry(ep, uniname);
exfat_update_bh(bh, sync);
brelse(bh);

5
fs/exfat/namei.c
View File

@ -1082,12 +1082,13 @@ static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,
epold->dentry.file.attr |= cpu_to_le16(EXFAT_ATTR_ARCHIVE);
ei->attr |= EXFAT_ATTR_ARCHIVE;
}
exfat_remove_entries(inode, &old_es, ES_IDX_FIRST_FILENAME + 1);
ret = exfat_init_ext_entry(inode, p_dir, oldentry,
num_new_entries, p_uniname);
if (ret)
goto put_old_es;
exfat_remove_entries(inode, &old_es, num_new_entries);
}
return exfat_put_dentry_set(&old_es, sync);