btrfs: pass struct btrfs_inode to btrfs_sync_inode_flags_to_i_flags()

Pass a struct btrfs_inode to btrfs_sync_inode_flags_to_i_flags() as it's
an internal interface.

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 0740a42d393baf7308a21f47a666253fc13eaa88..01fbaae47d7c73e2b23cd343242721e53a8c36c1 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4039,7 +4039,7 @@ cache_acl:
                break;
        }
 
-       btrfs_sync_inode_flags_to_i_flags(vfs_inode);
+       btrfs_sync_inode_flags_to_i_flags(inode);
 
        ret = btrfs_add_inode_to_root(inode, true);
        if (ret)
@@ -6262,7 +6262,7 @@ static void btrfs_inherit_iflags(struct btrfs_inode *inode, struct btrfs_inode *
                        inode->flags |= BTRFS_INODE_NODATASUM;
        }
 
-       btrfs_sync_inode_flags_to_i_flags(&inode->vfs_inode);
+       btrfs_sync_inode_flags_to_i_flags(inode);
 }
 
 int btrfs_create_new_inode(struct btrfs_trans_handle *trans,

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 74de458b649666569eeb933e1845b341cea52b54..b05b81a95fc1a35fdec3e70789fbbbf1415bfc64 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -167,25 +167,24 @@ static unsigned int btrfs_inode_flags_to_fsflags(const struct btrfs_inode *binod
 /*
  * Update inode->i_flags based on the btrfs internal flags.
  */
-void btrfs_sync_inode_flags_to_i_flags(struct inode *inode)
+void btrfs_sync_inode_flags_to_i_flags(struct btrfs_inode *inode)
 {
-       struct btrfs_inode *binode = BTRFS_I(inode);
        unsigned int new_fl = 0;
 
-       if (binode->flags & BTRFS_INODE_SYNC)
+       if (inode->flags & BTRFS_INODE_SYNC)
                new_fl |= S_SYNC;
-       if (binode->flags & BTRFS_INODE_IMMUTABLE)
+       if (inode->flags & BTRFS_INODE_IMMUTABLE)
                new_fl |= S_IMMUTABLE;
-       if (binode->flags & BTRFS_INODE_APPEND)
+       if (inode->flags & BTRFS_INODE_APPEND)
                new_fl |= S_APPEND;
-       if (binode->flags & BTRFS_INODE_NOATIME)
+       if (inode->flags & BTRFS_INODE_NOATIME)
                new_fl |= S_NOATIME;
-       if (binode->flags & BTRFS_INODE_DIRSYNC)
+       if (inode->flags & BTRFS_INODE_DIRSYNC)
                new_fl |= S_DIRSYNC;
-       if (binode->ro_flags & BTRFS_INODE_RO_VERITY)
+       if (inode->ro_flags & BTRFS_INODE_RO_VERITY)
                new_fl |= S_VERITY;
 
-       set_mask_bits(&inode->i_flags,
+       set_mask_bits(&inode->vfs_inode.i_flags,
                      S_SYNC | S_APPEND | S_IMMUTABLE | S_NOATIME | S_DIRSYNC |
                      S_VERITY, new_fl);
 }
@@ -394,7 +393,7 @@ int btrfs_fileattr_set(struct mnt_idmap *idmap,
 update_flags:
        binode->flags = binode_flags;
        btrfs_update_inode_mapping_flags(binode);
-       btrfs_sync_inode_flags_to_i_flags(inode);
+       btrfs_sync_inode_flags_to_i_flags(binode);
        inode_inc_iversion(inode);
        inode_set_ctime_current(inode);
        ret = btrfs_update_inode(trans, BTRFS_I(inode));

diff --git a/fs/btrfs/ioctl.h b/fs/btrfs/ioctl.h
index 18c45851e0b63132ae879439dfa572ce8a3bcf7b..e08ea446cf48acbb4cd72a4ca35e1fb7c504891b 100644 (file)
--- a/fs/btrfs/ioctl.h
+++ b/fs/btrfs/ioctl.h
@@ -9,8 +9,8 @@ struct file;
 struct dentry;
 struct mnt_idmap;
 struct fileattr;
-struct inode;
 struct io_uring_cmd;
+struct btrfs_inode;
 struct btrfs_fs_info;
 struct btrfs_ioctl_balance_args;
 
@@ -20,7 +20,7 @@ int btrfs_fileattr_get(struct dentry *dentry, struct fileattr *fa);
 int btrfs_fileattr_set(struct mnt_idmap *idmap,
                       struct dentry *dentry, struct fileattr *fa);
 int btrfs_ioctl_get_supported_features(void __user *arg);
-void btrfs_sync_inode_flags_to_i_flags(struct inode *inode);
+void btrfs_sync_inode_flags_to_i_flags(struct btrfs_inode *inode);
 void btrfs_update_ioctl_balance_args(struct btrfs_fs_info *fs_info,
                                     struct btrfs_ioctl_balance_args *bargs);
 int btrfs_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags);

diff --git a/fs/btrfs/verity.c b/fs/btrfs/verity.c
index e97ad824ae16d9c6c2950b26634b58236a9531e8..b7a96a005487e179fb34f0df5e43f2dcc19843e6 100644 (file)
--- a/fs/btrfs/verity.c
+++ b/fs/btrfs/verity.c
@@ -485,7 +485,7 @@ static int rollback_verity(struct btrfs_inode *inode)
                goto out;
        }
        inode->ro_flags &= ~BTRFS_INODE_RO_VERITY;
-       btrfs_sync_inode_flags_to_i_flags(&inode->vfs_inode);
+       btrfs_sync_inode_flags_to_i_flags(inode);
        ret = btrfs_update_inode(trans, inode);
        if (ret) {
                btrfs_abort_transaction(trans, ret);
@@ -552,7 +552,7 @@ static int finish_verity(struct btrfs_inode *inode, const void *desc,
                goto out;
        }
        inode->ro_flags |= BTRFS_INODE_RO_VERITY;
-       btrfs_sync_inode_flags_to_i_flags(&inode->vfs_inode);
+       btrfs_sync_inode_flags_to_i_flags(inode);
        ret = btrfs_update_inode(trans, inode);
        if (ret)
                goto end_trans;