]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
f2fs: use d_inode(dentry) cleanup dentry->d_inode
authorZhiguo Niu <zhiguo.niu@unisoc.com>
Wed, 14 May 2025 08:45:48 +0000 (16:45 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:04:04 +0000 (11:04 +0100)
[ 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>
fs/f2fs/namei.c
fs/f2fs/super.c

index 56d23bc2543535e2a4f61cfd9ec3f0a2822da48a..1e3e525be68bf4e88ea0817caea03db9768359f6 100644 (file)
@@ -396,7 +396,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 = dquot_initialize(dir);
@@ -932,7 +932,7 @@ static int f2fs_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)))
                return -EXDEV;
 
        /*
@@ -1122,10 +1122,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 = dquot_initialize(old_dir);
index 9afbb51bd67807cfde48ffbec1c74b50243e924b..d1a5c64963b6f082cb41c4b63a31f5a06e4e202a 100644 (file)
@@ -1507,9 +1507,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;