On Tue, Oct 11, 2022 at 10:50:05AM -0400, Sasha Levin wrote:
> From: zhang songyi <zhang.songyi@xxxxxxxxxx>
>
> [ Upstream commit bd64f6221a98fb1857485c63fd3d8da8d47406c6 ]
>
> Return the sysfs_emit() and iterate_object_props() directly instead of
> using unnecessary variables.
>
> Reported-by: Zeal Robot <zealci@xxxxxxxxxx>
> Reviewed-by: Anand Jain <anand.jain@xxxxxxxxxx>
> Signed-off-by: zhang songyi <zhang.songyi@xxxxxxxxxx>
> Reviewed-by: David Sterba <dsterba@xxxxxxxx>
> Signed-off-by: David Sterba <dsterba@xxxxxxxx>
> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> ---
> fs/btrfs/props.c | 5 +----
> fs/btrfs/sysfs.c | 10 ++--------
> 2 files changed, 3 insertions(+), 12 deletions(-)
>
> diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c
> index a2ec8ecae8de..055a631276ce 100644
> --- a/fs/btrfs/props.c
> +++ b/fs/btrfs/props.c
> @@ -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);
Please drop the patch from stable queues, it's an obvious cleanup.
