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

[ Upstream commit a6c397a31f58a1d577c2c8d04b624e9baa31951c ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index 9da104c0743c41d32c91fe078e4866323b821448..77fa3c639ba38d48357873251961286314e2f941 100644 (file)
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -401,7 +401,7 @@ static int f2fs_link(struct dentry *old_dentry, struct inode *dir,
 
        if (is_inode_flag_set(dir, FI_PROJ_INHERIT) &&
                        (!projid_eq(F2FS_I(dir)->i_projid,
-                       F2FS_I(old_dentry->d_inode)->i_projid)))
+                       F2FS_I(inode)->i_projid)))
                return -EXDEV;
 
        err = f2fs_dquot_initialize(dir);
@@ -896,7 +896,7 @@ static int f2fs_rename(struct user_namespace *mnt_userns, struct inode *old_dir,
 
        if (is_inode_flag_set(new_dir, FI_PROJ_INHERIT) &&
                        (!projid_eq(F2FS_I(new_dir)->i_projid,
-                       F2FS_I(old_dentry->d_inode)->i_projid)))
+                       F2FS_I(old_inode)->i_projid)))
                return -EXDEV;
 
        /*
@@ -1085,10 +1085,10 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,
 
        if ((is_inode_flag_set(new_dir, FI_PROJ_INHERIT) &&
                        !projid_eq(F2FS_I(new_dir)->i_projid,
-                       F2FS_I(old_dentry->d_inode)->i_projid)) ||
+                       F2FS_I(old_inode)->i_projid)) ||
            (is_inode_flag_set(new_dir, FI_PROJ_INHERIT) &&
                        !projid_eq(F2FS_I(old_dir)->i_projid,
-                       F2FS_I(new_dentry->d_inode)->i_projid)))
+                       F2FS_I(new_inode)->i_projid)))
                return -EXDEV;
 
        err = f2fs_dquot_initialize(old_dir);

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 72160b906f4b3e0ddbd52d971262a0881b2d8e13..c1738820a8f0dc485f0d5e80e5fe78c0a11ca6cd 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1830,9 +1830,9 @@ static int f2fs_statfs(struct dentry *dentry, struct kstatfs *buf)
        buf->f_fsid    = u64_to_fsid(id);
 
 #ifdef CONFIG_QUOTA
-       if (is_inode_flag_set(dentry->d_inode, FI_PROJ_INHERIT) &&
+       if (is_inode_flag_set(d_inode(dentry), FI_PROJ_INHERIT) &&
                        sb_has_quota_limits_enabled(sb, PRJQUOTA)) {
-               f2fs_statfs_project(sb, F2FS_I(dentry->d_inode)->i_projid, buf);
+               f2fs_statfs_project(sb, F2FS_I(d_inode(dentry))->i_projid, buf);
        }
 #endif
        return 0;