Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

f2fs: introduce f2fs_i_links_write with mark_inode_dirty_sync

This patch introduces f2fs_i_links_write() to call mark_inode_dirty_sync() when
changing inode->i_links.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

+24 -26
+1
fs/f2fs/checkpoint.c
··· 535 535 } 536 536 537 537 clear_nlink(inode); 538 + mark_inode_dirty_sync(inode); 538 539 539 540 /* truncate all the data during iput */ 540 541 iput(inode);
+5 -5
fs/f2fs/dir.c
··· 437 437 */ 438 438 if (inode->i_nlink == 0) 439 439 remove_orphan_inode(F2FS_I_SB(dir), inode->i_ino); 440 - inc_nlink(inode); 440 + f2fs_i_links_write(inode, true); 441 441 } 442 442 return page; 443 443 ··· 456 456 { 457 457 if (inode && is_inode_flag_set(inode, FI_NEW_INODE)) { 458 458 if (S_ISDIR(inode->i_mode)) { 459 - inc_nlink(dir); 459 + f2fs_i_links_write(dir, true); 460 460 set_inode_flag(dir, FI_UPDATE_DIR); 461 461 } 462 462 clear_inode_flag(inode, FI_NEW_INODE); ··· 675 675 down_write(&F2FS_I(inode)->i_sem); 676 676 677 677 if (S_ISDIR(inode->i_mode)) { 678 - drop_nlink(dir); 678 + f2fs_i_links_write(dir, false); 679 679 if (page) 680 680 update_inode(dir, page); 681 681 else ··· 683 683 } 684 684 inode->i_ctime = CURRENT_TIME; 685 685 686 - drop_nlink(inode); 686 + f2fs_i_links_write(inode, false); 687 687 if (S_ISDIR(inode->i_mode)) { 688 - drop_nlink(inode); 688 + f2fs_i_links_write(inode, false); 689 689 f2fs_i_size_write(inode, 0); 690 690 } 691 691 up_write(&F2FS_I(inode)->i_sem);
+9
fs/f2fs/f2fs.h
··· 1557 1557 set_inode_flag(inode, FI_ACL_MODE); 1558 1558 } 1559 1559 1560 + static inline void f2fs_i_links_write(struct inode *inode, bool inc) 1561 + { 1562 + if (inc) 1563 + inc_nlink(inode); 1564 + else 1565 + drop_nlink(inode); 1566 + mark_inode_dirty_sync(inode); 1567 + } 1568 + 1560 1569 static inline void f2fs_i_blocks_write(struct inode *inode, 1561 1570 blkcnt_t diff, bool add) 1562 1571 {
+9 -21
fs/f2fs/namei.c
··· 349 349 f2fs_delete_entry(de, page, dir, inode); 350 350 f2fs_unlock_op(sbi); 351 351 352 - /* In order to evict this inode, we set it dirty */ 353 - mark_inode_dirty(inode); 354 - 355 352 if (IS_DIRSYNC(dir)) 356 353 f2fs_sync_fs(sbi->sb, 1); 357 354 fail: ··· 594 597 * remove all unused data of tmpfile after abnormal power-off. 595 598 */ 596 599 add_orphan_inode(sbi, inode->i_ino); 597 - f2fs_unlock_op(sbi); 598 - 599 600 alloc_nid_done(sbi, inode->i_ino); 600 601 601 602 if (whiteout) { 602 - inode_dec_link_count(inode); 603 + f2fs_i_links_write(inode, false); 603 604 *whiteout = inode; 604 605 } else { 605 606 d_tmpfile(dentry, inode); 606 607 } 608 + /* link_count was changed by d_tmpfile as well. */ 609 + f2fs_unlock_op(sbi); 607 610 unlock_new_inode(inode); 608 611 return 0; 609 612 ··· 701 704 new_inode->i_ctime = CURRENT_TIME; 702 705 down_write(&F2FS_I(new_inode)->i_sem); 703 706 if (old_dir_entry) 704 - drop_nlink(new_inode); 705 - drop_nlink(new_inode); 707 + f2fs_i_links_write(new_inode, false); 708 + f2fs_i_links_write(new_inode, false); 706 709 up_write(&F2FS_I(new_inode)->i_sem); 707 - 708 - mark_inode_dirty(new_inode); 709 710 710 711 if (!new_inode->i_nlink) 711 712 add_orphan_inode(sbi, new_inode->i_ino); ··· 724 729 } 725 730 726 731 if (old_dir_entry) { 727 - inc_nlink(new_dir); 732 + f2fs_i_links_write(new_dir, true); 728 733 update_inode_page(new_dir); 729 734 } 730 735 ··· 779 784 f2fs_dentry_kunmap(old_inode, old_dir_page); 780 785 f2fs_put_page(old_dir_page, 0); 781 786 } 782 - drop_nlink(old_dir); 783 - mark_inode_dirty(old_dir); 787 + f2fs_i_links_write(old_dir, false); 784 788 update_inode_page(old_dir); 785 789 } 786 790 ··· 907 913 old_dir->i_ctime = CURRENT_TIME; 908 914 if (old_nlink) { 909 915 down_write(&F2FS_I(old_dir)->i_sem); 910 - if (old_nlink < 0) 911 - drop_nlink(old_dir); 912 - else 913 - inc_nlink(old_dir); 916 + f2fs_i_links_write(old_dir, old_nlink > 0); 914 917 up_write(&F2FS_I(old_dir)->i_sem); 915 918 } 916 919 mark_inode_dirty(old_dir); ··· 925 934 new_dir->i_ctime = CURRENT_TIME; 926 935 if (new_nlink) { 927 936 down_write(&F2FS_I(new_dir)->i_sem); 928 - if (new_nlink < 0) 929 - drop_nlink(new_dir); 930 - else 931 - inc_nlink(new_dir); 937 + f2fs_i_links_write(new_dir, new_nlink > 0); 932 938 up_write(&F2FS_I(new_dir)->i_sem); 933 939 } 934 940 mark_inode_dirty(new_dir);