More parameter cleanups
David Sterba
maintainercover More parameter cleanups
More const, renames and type switches.
David Sterba (7):
btrfs: parameter constification in ioctl.c
btrfs: pass btrfs_root pointers to send ioctl parameters
btrfs: pass root pointers to search tree ioctl helpers
btrfs: pass struct btrfs_inode to btrfs_sync_inode_flags_to_i_flags()
btrfs: simplify local variables in btrfs_ioctl_resize()
btrfs: pass struct to btrfs_ioctl_subvol_getflags()
btrfs: unify inode variable naming
fs/btrfs/inode.c | 32 ++++---- fs/btrfs/ioctl.c | 188 +++++++++++++++++++++++----------------------- fs/btrfs/ioctl.h | 4 +- fs/btrfs/send.c | 3 +- fs/btrfs/send.h | 4 +- fs/btrfs/verity.c | 4 +- 6 files changed, 115 insertions(+), 120 deletions(-)
Signature · 1 line
2.47.1
David Sterba
maintainerPATCH 1/7 btrfs: parameter constification in ioctl.c
--- fs/btrfs/ioctl.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
fs/btrfs/ioctl.c +14 -14
@@ -118,8 +118,8 @@ struct btrfs_ioctl_encoded_io_args_32 {#endif /* Mask out flags that are inappropriate for the given type of inode. */ -static unsigned int btrfs_mask_fsflags_for_type (struct inode *inode, -unsigned int flags) +static unsigned int btrfs_mask_fsflags_for_type (const struct inode *inode, +unsigned int flags) {if (S_ISDIR (inode->i_mode))return flags;
@@ -133,7 +133,7 @@ static unsigned int btrfs_mask_fsflags_for_type(struct inode *inode,* Export internal inode flags to the format expected by the FS_IOC_GETFLAGS * ioctl. */ -static unsigned int btrfs_inode_flags_to_fsflags (struct btrfs_inode *binode) +static unsigned int btrfs_inode_flags_to_fsflags (const struct btrfs_inode *binode) {unsigned int iflags =0 ;u32 flags = binode->flags;
@@ -219,7 +219,7 @@ static int check_fsflags(unsigned int old_flags, unsigned int flags)return 0 ; } -static int check_fsflags_compatible (struct btrfs_fs_info *fs_info, +static int check_fsflags_compatible (const struct btrfs_fs_info *fs_info,unsigned int flags) {if (btrfs_is_zoned (fs_info) && (flags &FS_NOCOW_FL ))
@@ -248,7 +248,7 @@ static int btrfs_check_ioctl_vol_args2_subvol_name(const struct btrfs_ioctl_vol_*/ int btrfs_fileattr_get (struct dentry *dentry,struct fileattr *fa) { -struct btrfs_inode *binode =BTRFS_I (d_inode (dentry)); +const struct btrfs_inode *binode =BTRFS_I (d_inode (dentry));fileattr_fill_flags (fa,btrfs_inode_flags_to_fsflags (binode));return 0 ;
@@ -404,7 +404,7 @@ int btrfs_fileattr_set(struct mnt_idmap *idmap,return ret; } -static int btrfs_ioctl_getversion (struct inode *inode,int __user *arg) +static int btrfs_ioctl_getversion (const struct inode *inode,int __user *arg) {return put_user (inode->i_generation, arg); }
@@ -476,7 +476,7 @@ static noinline int btrfs_ioctl_fitrim(struct btrfs_fs_info *fs_info,* Calculate the number of transaction items to reserve for creating a subvolume * or snapshot, not including the inode, directory entries, or parent directory. */ -static unsigned int create_subvol_num_items (struct btrfs_qgroup_inherit *inherit) +static unsigned int create_subvol_num_items (const struct btrfs_qgroup_inherit *inherit) {/* * 1 to add root block
@@ -879,7 +879,7 @@ static int btrfs_may_delete(struct mnt_idmap *idmap,/* copy of may_create in fs/namei.c() */ static inline int btrfs_may_create (struct mnt_idmap *idmap, -struct inode *dir,struct dentry *child) +struct inode *dir,const struct dentry *child) {if (d_really_is_positive (child))return -EEXIST ;
@@ -1448,8 +1448,8 @@ static noinline int btrfs_ioctl_subvol_setflags(struct file *file,return ret; } -static noinline int key_in_sk(struct btrfs_key *key, -struct btrfs_ioctl_search_key *sk) +static noinline int key_in_sk(const struct btrfs_key *key, +const struct btrfs_ioctl_search_key *sk) {struct btrfs_key test;int ret;
@@ -1474,7 +1474,7 @@ static noinline int key_in_sk(struct btrfs_key *key, static noinline int copy_to_sk(struct btrfs_path *path, struct btrfs_key *key, - struct btrfs_ioctl_search_key *sk, + const struct btrfs_ioctl_search_key *sk, u64 *buf_size, char __user *ubuf, unsigned long *sk_offset,
@@ -2764,7 +2764,7 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg)return ret; } -static long btrfs_ioctl_fs_info (struct btrfs_fs_info *fs_info, +static long btrfs_ioctl_fs_info (const struct btrfs_fs_info *fs_info,void __user *arg) {struct btrfs_ioctl_fs_info_args *fi_args;
@@ -2818,7 +2818,7 @@ static long btrfs_ioctl_fs_info(struct btrfs_fs_info *fs_info,return ret; } -static long btrfs_ioctl_dev_info (struct btrfs_fs_info *fs_info, +static long btrfs_ioctl_dev_info (const struct btrfs_fs_info *fs_info,void __user *arg) {BTRFS_DEV_LOOKUP_ARGS (args);
@@ -4249,7 +4249,7 @@ static int btrfs_ioctl_get_features(struct btrfs_fs_info *fs_info,return 0 ; } -static int check_feature_bits (struct btrfs_fs_info *fs_info, +static int check_feature_bits (const struct btrfs_fs_info *fs_info,enum btrfs_feature_set set,u64 change_mask,u64 flags,u64 supported_flags,u64 safe_set,u64 safe_clear)
Signature · 1 line
2.47.1
David Sterba
maintainerPATCH 2/7 btrfs: pass btrfs_root pointers to send ioctl parameters
In reply to David SterbaThe ioctl switch btrfs_ioctl() provides several parameter types for convenience so we don't have to do the conversion in the callbacks. Pass root pointers to the send related functions.
--- fs/btrfs/ioctl.c | 8 ++++---- fs/btrfs/send.c | 3 +-- fs/btrfs/send.h | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-)
fs/btrfs/ioctl.c +4 -4
@@ -4385,7 +4385,7 @@ static int btrfs_ioctl_set_features(struct file *file, void __user *arg)return ret; } -static int _btrfs_ioctl_send (struct btrfs_inode *inode,void __user *argp,bool compat) +static int _btrfs_ioctl_send (struct btrfs_root *root,void __user *argp,bool compat) {struct btrfs_ioctl_send_args *arg;int ret;
@@ -4416,7 +4416,7 @@ static int _btrfs_ioctl_send(struct btrfs_inode *inode, void __user *argp, boolif (IS_ERR (arg))return PTR_ERR (arg); } - ret =btrfs_ioctl_send (inode, arg); + ret =btrfs_ioctl_send (root, arg);kfree (arg);return ret; }
@@ -5315,10 +5315,10 @@ long btrfs_ioctl(struct file *file, unsigned intreturn btrfs_ioctl_set_received_subvol_32 (file, argp);#endif case BTRFS_IOC_SEND : -return _btrfs_ioctl_send (BTRFS_I (inode), argp, false); +return _btrfs_ioctl_send (root, argp, false);#if defined(CONFIG_64BIT ) && defined(CONFIG_COMPAT )case BTRFS_IOC_SEND_32 : -return _btrfs_ioctl_send (BTRFS_I (inode), argp, true); +return _btrfs_ioctl_send (root, argp, true);#endif case BTRFS_IOC_GET_DEV_STATS :return btrfs_ioctl_get_dev_stats (fs_info, argp);
fs/btrfs/send.c +1 -2
@@ -8077,10 +8077,9 @@ static void dedupe_in_progress_warn(const struct btrfs_root *root) btrfs_root_id(root), root->dedupe_in_progress); } -long btrfs_ioctl_send (struct btrfs_inode *inode,const struct btrfs_ioctl_send_args *arg) +long btrfs_ioctl_send (struct btrfs_root *send_root,const struct btrfs_ioctl_send_args *arg) {int ret =0 ; -struct btrfs_root *send_root = inode->root;struct btrfs_fs_info *fs_info = send_root->fs_info;struct btrfs_root *clone_root;struct send_ctx *sctx =NULL ;
fs/btrfs/send.h +2 -2
@@ -11,7 +11,7 @@#include <linux/sizes.h> #include <linux/align.h> -struct btrfs_inode ; +struct btrfs_root ;struct btrfs_ioctl_send_args ;#define BTRFS_SEND_STREAM_MAGIC "btrfs-stream"
@@ -182,6 +182,6 @@ enum { __BTRFS_SEND_A_MAX = 35, }; -long btrfs_ioctl_send (struct btrfs_inode *inode,const struct btrfs_ioctl_send_args *arg); +long btrfs_ioctl_send (struct btrfs_root *send_root,const struct btrfs_ioctl_send_args *arg);#endif
Signature · 1 line
2.47.1
David Sterba
maintainerPATCH 3/7 btrfs: pass root pointers to search tree ioctl helpers
In reply to David SterbaThe search tree ioctl use btrfs_root so change that from btrfs_inode pointers so we don't have to do the conversion.
--- fs/btrfs/ioctl.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
fs/btrfs/ioctl.c +11 -11
@@ -1605,13 +1605,12 @@ static noinline int copy_to_sk(struct btrfs_path *path,return ret; } -static noinline int search_ioctl(struct inode *inode, +static noinline int search_ioctl(struct btrfs_root *root,struct btrfs_ioctl_search_key *sk,u64 *buf_size,char __user *ubuf) { -struct btrfs_fs_info *info =inode_to_fs_info (inode); -struct btrfs_root *root; +struct btrfs_fs_info *info = root->fs_info;struct btrfs_key key;struct btrfs_path *path;int ret;
@@ -1628,9 +1627,10 @@ static noinline int search_ioctl(struct inode *inode,return -ENOMEM ;if (sk->tree_id ==0 ) { -/* search the root of the inode that was passed */ - root =btrfs_grab_root (BTRFS_I (inode)->root); +/* Search the root that we got passed. */ + root =btrfs_grab_root (root); }else { +/* Look up the root from the arguments. */ root =btrfs_get_fs_root (info, sk->tree_id, true);if (IS_ERR (root)) {btrfs_free_path (path);
@@ -1674,7 +1674,7 @@ static noinline int search_ioctl(struct inode *inode,return ret; } -static noinline int btrfs_ioctl_tree_search(struct inode *inode, +static noinline int btrfs_ioctl_tree_search(struct btrfs_root *root,void __user *argp) {struct btrfs_ioctl_search_args __user *uargs = argp;
@@ -1690,7 +1690,7 @@ static noinline int btrfs_ioctl_tree_search(struct inode *inode, buf_size =sizeof (uargs->buf); - ret =search_ioctl (inode, &sk, &buf_size, uargs->buf); + ret =search_ioctl (root, &sk, &buf_size, uargs->buf);/* * In the origin implementation an overflow is handled by returning a
@@ -1704,7 +1704,7 @@ static noinline int btrfs_ioctl_tree_search(struct inode *inode,return ret; } -static noinline int btrfs_ioctl_tree_search_v2(struct inode *inode, +static noinline int btrfs_ioctl_tree_search_v2(struct btrfs_root *root,void __user *argp) {struct btrfs_ioctl_search_args_v2 __user *uarg = argp;
@@ -1726,7 +1726,7 @@ static noinline int btrfs_ioctl_tree_search_v2(struct inode *inode,if (buf_size > buf_limit) buf_size = buf_limit; - ret =search_ioctl (inode, &args.key, &buf_size, + ret =search_ioctl (root, &args.key, &buf_size, (char __user *)(&uarg->buf[0 ]));if (ret ==0 &©_to_user (&uarg->key, &args.key,sizeof (args.key))) ret = -EFAULT ;
@@ -5265,9 +5265,9 @@ long btrfs_ioctl(struct file *file, unsigned intcase BTRFS_IOC_DEV_INFO :return btrfs_ioctl_dev_info (fs_info, argp);case BTRFS_IOC_TREE_SEARCH : -return btrfs_ioctl_tree_search (inode, argp); +return btrfs_ioctl_tree_search (root, argp);case BTRFS_IOC_TREE_SEARCH_V2 : -return btrfs_ioctl_tree_search_v2 (inode, argp); +return btrfs_ioctl_tree_search_v2 (root, argp);case BTRFS_IOC_INO_LOOKUP :return btrfs_ioctl_ino_lookup (root, argp);case BTRFS_IOC_INO_PATHS :
Signature · 1 line
2.47.1
David Sterba
maintainerPATCH 4/7 btrfs: pass struct btrfs_inode to btrfs_sync_inode_flags_to_i_flags()
In reply to David SterbaPass a struct btrfs_inode to btrfs_sync_inode_flags_to_i_flags() as it's an internal interface.
--- fs/btrfs/inode.c | 4 ++-- fs/btrfs/ioctl.c | 19 +++++++++---------- fs/btrfs/ioctl.h | 4 ++-- fs/btrfs/verity.c | 4 ++-- 4 files changed, 15 insertions(+), 16 deletions(-)
fs/btrfs/inode.c +2 -2
@@ -4056,7 +4056,7 @@ static int btrfs_read_locked_inode(struct btrfs_inode *inode, struct btrfs_pathbreak ; } -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)
@@ -6279,7 +6279,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,
fs/btrfs/ioctl.c +9 -10
@@ -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));
fs/btrfs/ioctl.h +2 -2
@@ -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);
fs/btrfs/verity.c +2 -2
@@ -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;
Signature · 1 line
2.47.1
David Sterba
maintainerPATCH 5/7 btrfs: simplify local variables in btrfs_ioctl_resize()
In reply to David SterbaRemove some redundant variables and assignments, move variable declarations to their closest scope.
--- fs/btrfs/ioctl.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
fs/btrfs/ioctl.c +6 -5
@@ -1033,17 +1033,14 @@ static noinline int btrfs_ioctl_resize(struct file *file, void __user *arg) {BTRFS_DEV_LOOKUP_ARGS (args); -struct inode *inode =file_inode (file); -struct btrfs_fs_info *fs_info =inode_to_fs_info (inode); +struct btrfs_root *root =BTRFS_I (file_inode (file))->root; +struct btrfs_fs_info *fs_info = root->fs_info;u64 new_size;u64 old_size;u64 devid =1 ; -struct btrfs_root *root =BTRFS_I (inode)->root;struct btrfs_ioctl_vol_args *vol_args; -struct btrfs_trans_handle *trans;struct btrfs_device *device =NULL ;char *sizestr; -char *retptr;char *devstr =NULL ;int ret =0 ;int mod =0 ;
@@ -1111,6 +1108,8 @@ static noinline int btrfs_ioctl_resize(struct file *file,if (!strcmp (sizestr,"max" )) new_size =bdev_nr_bytes (device->bdev);else { +char *retptr; +if (sizestr[0 ] =='-' ) { mod =-1 ; sizestr++;
@@ -1158,6 +1157,8 @@ static noinline int btrfs_ioctl_resize(struct file *file, new_size =round_down (new_size, fs_info->sectorsize);if (new_size > old_size) { +struct btrfs_trans_handle *trans; + trans =btrfs_start_transaction (root,0 );if (IS_ERR (trans)) { ret =PTR_ERR (trans);
Signature · 1 line
2.47.1
David Sterba
maintainerPATCH 6/7 btrfs: pass struct to btrfs_ioctl_subvol_getflags()
In reply to David SterbaPass a struct btrfs_inode to btrfs_ioctl_subvol_getflags() as it's an internal interface, allowing to remove some use of BTRFS_I.
--- fs/btrfs/ioctl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/btrfs/ioctl.c +5 -5
@@ -1337,15 +1337,15 @@ static noinline int btrfs_ioctl_snap_create_v2(struct file *file,return ret; } -static noinline int btrfs_ioctl_subvol_getflags(struct inode *inode, +static noinline int btrfs_ioctl_subvol_getflags(struct btrfs_inode *inode,void __user *arg) { -struct btrfs_fs_info *fs_info =inode_to_fs_info (inode); -struct btrfs_root *root =BTRFS_I (inode)->root; +struct btrfs_root *root = inode->root; +struct btrfs_fs_info *fs_info = root->fs_info;int ret =0 ;u64 flags =0 ; -if (btrfs_ino (BTRFS_I (inode)) !=BTRFS_FIRST_FREE_OBJECTID ) +if (btrfs_ino (inode) !=BTRFS_FIRST_FREE_OBJECTID )return -EINVAL ;down_read (&fs_info->subvol_sem);
@@ -5243,7 +5243,7 @@ long btrfs_ioctl(struct file *file, unsigned intcase BTRFS_IOC_SNAP_DESTROY_V2 :return btrfs_ioctl_snap_destroy (file, argp, true);case BTRFS_IOC_SUBVOL_GETFLAGS : -return btrfs_ioctl_subvol_getflags (inode, argp); +return btrfs_ioctl_subvol_getflags (BTRFS_I (inode), argp);case BTRFS_IOC_SUBVOL_SETFLAGS :return btrfs_ioctl_subvol_setflags (file, argp);case BTRFS_IOC_DEFAULT_SUBVOL :
Signature · 1 line
2.47.1
David Sterba
maintainerPATCH 7/7 btrfs: unify inode variable naming
In reply to David SterbaRename binode to inode in local variables or parameters so it's more unified with the rest of the code.
--- fs/btrfs/inode.c | 28 +++++++------- fs/btrfs/ioctl.c | 98 ++++++++++++++++++++++++------------------------ 2 files changed, 61 insertions(+), 65 deletions(-)
fs/btrfs/inode.c +13 -15
@@ -8528,8 +8528,6 @@ static int start_delalloc_inodes(struct btrfs_root *root, struct writeback_control *wbc, bool snapshot, bool in_reclaim_context) { - struct btrfs_inode *binode; -struct inode *inode; struct btrfs_delalloc_work *work, *next;LIST_HEAD (works);LIST_HEAD (splice);
@@ -8540,30 +8538,30 @@ static int start_delalloc_inodes(struct btrfs_root *root,spin_lock (&root->delalloc_lock);list_splice_init (&root->delalloc_inodes, &splice);while (!list_empty (&splice)) { - binode = list_entry(splice.next, struct btrfs_inode, - delalloc_inodes); +struct btrfs_inode *inode; +struct inode *tmp_inode; -list_move_tail (&binode->delalloc_inodes, - &root->delalloc_inodes); + inode = list_entry(splice.next, struct btrfs_inode, delalloc_inodes); + +list_move_tail (&inode->delalloc_inodes, &root->delalloc_inodes);if (in_reclaim_context && -test_bit (BTRFS_INODE_NO_DELALLOC_FLUSH , &binode->runtime_flags)) +test_bit (BTRFS_INODE_NO_DELALLOC_FLUSH , &inode->runtime_flags))continue ; - inode =igrab (&binode->vfs_inode); -if (!inode) { + tmp_inode =igrab (&inode->vfs_inode); +if (!tmp_inode) {cond_resched_lock (&root->delalloc_lock);continue ; }spin_unlock (&root->delalloc_lock);if (snapshot) -set_bit (BTRFS_INODE_SNAPSHOT_FLUSH , - &binode->runtime_flags); +set_bit (BTRFS_INODE_SNAPSHOT_FLUSH , &inode->runtime_flags);if (full_flush) { - work =btrfs_alloc_delalloc_work (inode); + work =btrfs_alloc_delalloc_work (&inode->vfs_inode);if (!work) { -iput (inode); +iput (&inode->vfs_inode); ret = -ENOMEM ; goto out; }
@@ -8571,8 +8569,8 @@ static int start_delalloc_inodes(struct btrfs_root *root,btrfs_queue_work (root->fs_info->flush_workers, &work->work); }else { - ret =filemap_fdatawrite_wbc (inode->i_mapping, wbc); -btrfs_add_delayed_iput (BTRFS_I (inode)); + ret =filemap_fdatawrite_wbc (inode->vfs_inode.i_mapping, wbc); +btrfs_add_delayed_iput (inode);if (ret || wbc->nr_to_write <=0 ) goto out; }
fs/btrfs/ioctl.c +48 -50
198 lines not on this page · raw message
Signature · 1 line
2.47.1