Commit bd64f622 authored by zhang songyi's avatar zhang songyi Committed by David Sterba
Browse files

btrfs: remove the unnecessary result variables 



Return the sysfs_emit() and iterate_object_props() directly instead of
using unnecessary variables.

Reported-by: default avatarZeal Robot <zealci@zte.com.cn>
Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarzhang songyi <zhang.songyi@zte.com.cn>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 1c56ab99

fs/btrfs/props.c

+1 −4
Original line number Diff line number Diff line
@@ -270,11 +270,8 @@ int btrfs_load_inode_props(struct inode *inode, struct btrfs_path *path) 
{

	struct btrfs_root *root = BTRFS_I(inode)->root;

	u64 ino = btrfs_ino(BTRFS_I(inode));

	int ret;



	ret = iterate_object_props(root, path, ino, inode_prop_iterator, inode);



	return ret;

	return iterate_object_props(root, path, ino, inode_prop_iterator, inode);

}



static int prop_compression_validate(const struct btrfs_inode *inode,

fs/btrfs/sysfs.c

+2 −8
Original line number Diff line number Diff line
@@ -839,11 +839,8 @@ static ssize_t btrfs_sinfo_bg_reclaim_threshold_show(struct kobject *kobj, 
						     char *buf)

{

	struct btrfs_space_info *space_info = to_space_info(kobj);

	ssize_t ret;



	ret = sysfs_emit(buf, "%d\n", READ_ONCE(space_info->bg_reclaim_threshold));



	return ret;

	return sysfs_emit(buf, "%d\n", READ_ONCE(space_info->bg_reclaim_threshold));

}



static ssize_t btrfs_sinfo_bg_reclaim_threshold_store(struct kobject *kobj,
@@ -1205,11 +1202,8 @@ static ssize_t btrfs_bg_reclaim_threshold_show(struct kobject *kobj, 
					       char *buf)

{

	struct btrfs_fs_info *fs_info = to_fs_info(kobj);

	ssize_t ret;



	ret = sysfs_emit(buf, "%d\n", READ_ONCE(fs_info->bg_reclaim_threshold));



	return ret;

	return sysfs_emit(buf, "%d\n", READ_ONCE(fs_info->bg_reclaim_threshold));

}



static ssize_t btrfs_bg_reclaim_threshold_store(struct kobject *kobj,