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

f2fs: use d_inode(dentry) cleanup dentry->d_inode

no logic changes.

Signed-off-by: Zhiguo Niu <zhiguo.niu@unisoc.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

authored by

Zhiguo Niu and committed by
Jaegeuk Kim
a6c397a3 c836d3b8

+6 -6
+4 -4
fs/f2fs/namei.c
··· 414 414 415 415 if (is_inode_flag_set(dir, FI_PROJ_INHERIT) && 416 416 (!projid_eq(F2FS_I(dir)->i_projid, 417 - F2FS_I(old_dentry->d_inode)->i_projid))) 417 + F2FS_I(inode)->i_projid))) 418 418 return -EXDEV; 419 419 420 420 err = f2fs_dquot_initialize(dir); ··· 923 923 924 924 if (is_inode_flag_set(new_dir, FI_PROJ_INHERIT) && 925 925 (!projid_eq(F2FS_I(new_dir)->i_projid, 926 - F2FS_I(old_dentry->d_inode)->i_projid))) 926 + F2FS_I(old_inode)->i_projid))) 927 927 return -EXDEV; 928 928 929 929 /* ··· 1116 1116 1117 1117 if ((is_inode_flag_set(new_dir, FI_PROJ_INHERIT) && 1118 1118 !projid_eq(F2FS_I(new_dir)->i_projid, 1119 - F2FS_I(old_dentry->d_inode)->i_projid)) || 1119 + F2FS_I(old_inode)->i_projid)) || 1120 1120 (is_inode_flag_set(new_dir, FI_PROJ_INHERIT) && 1121 1121 !projid_eq(F2FS_I(old_dir)->i_projid, 1122 - F2FS_I(new_dentry->d_inode)->i_projid))) 1122 + F2FS_I(new_inode)->i_projid))) 1123 1123 return -EXDEV; 1124 1124 1125 1125 err = f2fs_dquot_initialize(old_dir);
+2 -2
fs/f2fs/super.c
··· 1893 1893 buf->f_fsid = u64_to_fsid(id); 1894 1894 1895 1895 #ifdef CONFIG_QUOTA 1896 - if (is_inode_flag_set(dentry->d_inode, FI_PROJ_INHERIT) && 1896 + if (is_inode_flag_set(d_inode(dentry), FI_PROJ_INHERIT) && 1897 1897 sb_has_quota_limits_enabled(sb, PRJQUOTA)) { 1898 - f2fs_statfs_project(sb, F2FS_I(dentry->d_inode)->i_projid, buf); 1898 + f2fs_statfs_project(sb, F2FS_I(d_inode(dentry))->i_projid, buf); 1899 1899 } 1900 1900 #endif 1901 1901 return 0;