Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f4ff0e25c5093dd89e9cac4a8f71a57587ada787

Authored by Sage Weil
Committed by Al Viro
1 parent 45adfef7d0
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

fat: remove unnecessary dentry_unhash on rmdir, dir rename 

fat does not have problems with references to unlinked directories.

CC: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 2 changed files with 0 additions and 10 deletions Side-by-side Diff

fs/fat/namei_msdos.c
Diff comments   View file @ f4ff0e2
... ... @@ -326,8 +326,6 @@
326 326 struct fat_slot_info sinfo;
327 327 int err;
328 328  
329   - dentry_unhash(dentry);
330   -
331 329 lock_super(sb);
332 330 /*
333 331 * Check whether the directory is not in use, then check
... ... @@ -458,9 +456,6 @@
458 456 old_sinfo.bh = sinfo.bh = dotdot_bh = NULL;
459 457 old_inode = old_dentry->d_inode;
460 458 new_inode = new_dentry->d_inode;
461   -
462   - if (new_inode && S_ISDIR(new_inode->i_mode))
463   - dentry_unhash(new_dentry);
464 459  
465 460 err = fat_scan(old_dir, old_name, &old_sinfo);
466 461 if (err) {
... ... @@ -824,8 +824,6 @@
824 824 struct fat_slot_info sinfo;
825 825 int err;
826 826  
827   - dentry_unhash(dentry);
828   -
829 827 lock_super(sb);
830 828  
831 829 err = fat_dir_empty(inode);
... ... @@ -932,9 +930,6 @@
932 930 loff_t dotdot_i_pos, new_i_pos;
933 931 int err, is_dir, update_dotdot, corrupt = 0;
934 932 struct super_block *sb = old_dir->i_sb;
935   -
936   - if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
937   - dentry_unhash(new_dentry);
938 933  
939 934 old_sinfo.bh = sinfo.bh = dotdot_bh = NULL;
940 935 old_inode = old_dentry->d_inode;