exfat: write moved entry before removing source
PATCH 1/1 exfat: write moved entry before removing source
exfat_move_file() removes the old directory entry before the new entry has been written. If writing the new entry fails, rename returns an error after the source entry has already been marked deleted.
Write the new entry first, then remove the old entry and update the cached inode location. This keeps the source entry intact if creating the destination entry fails.
--- fs/exfat/namei.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/exfat/namei.c +5 -5
@@ -1116,11 +1116,6 @@ static int exfat_move_file(struct inode *parent_inode,exfat_init_ext_entry (&new_es, num_new_entries, p_uniname, &mov_es, num_extra_entries); -exfat_remove_entries (parent_inode, &mov_es,ES_IDX_FILE , false); - - ei->dir = newdir; - ei->entry = newentry; - ret =exfat_put_dentry_set (&new_es,IS_DIRSYNC (parent_inode));if (ret) {/* Best-effort delete to avoid duplicate entries */
@@ -1134,6 +1129,11 @@ static int exfat_move_file(struct inode *parent_inode, goto put_mov_es; } +exfat_remove_entries (parent_inode, &mov_es,ES_IDX_FILE , false); + + ei->dir = newdir; + ei->entry = newentry; +return exfat_put_dentry_set (&mov_es,IS_DIRSYNC (parent_inode)); put_mov_es:
Signature · 1 line
2.51.0
Quoted 10 lines · Yichong Chen
exfat_move_file()removes the old directory entry before the new entry has been written. If writing the new entry fails, rename returns an error after the source entry has already been marked deleted.Write the new entry first, then remove the old entry and update the cached inode location. This keeps the source entry intact if creating the destination entry fails.
Signed-off-by Yichong Chen <[email protected]>
Applied it to #dev.
Thanks!