Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 12 Oct 2022 13:54:18 +0200
From:   David Sterba <dsterba@suse.cz>
To:     Sasha Levin <sashal@kernel.org>
Cc:     linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        zhang songyi <zhang.songyi@zte.com.cn>,
        Zeal Robot <zealci@zte.com.cn>,
        Anand Jain <anand.jain@oracle.com>,
        David Sterba <dsterba@suse.com>, clm@fb.com,
        josef@toxicpanda.com, linux-btrfs@vger.kernel.org
Subject: Re: [PATCH AUTOSEL 6.0 37/46] btrfs: remove the unnecessary result
 variables
Message-ID: <20221012115418.GW13389@suse.cz>
Reply-To: dsterba@suse.cz
References: <20221011145015.1622882-1-sashal@kernel.org>
 <20221011145015.1622882-37-sashal@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20221011145015.1622882-37-sashal@kernel.org>
User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12)
Precedence: bulk

On Tue, Oct 11, 2022 at 10:50:05AM -0400, Sasha Levin wrote:
> From: zhang songyi <zhang.songyi@zte.com.cn>
> 
> [ Upstream commit bd64f6221a98fb1857485c63fd3d8da8d47406c6 ]
> 
> Return the sysfs_emit() and iterate_object_props() directly instead of
> using unnecessary variables.
> 
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Reviewed-by: Anand Jain <anand.jain@oracle.com>
> Signed-off-by: zhang songyi <zhang.songyi@zte.com.cn>
> Reviewed-by: David Sterba <dsterba@suse.com>
> Signed-off-by: David Sterba <dsterba@suse.com>
> Signed-off-by: Sasha Levin <sashal@kernel.org>
> ---
>  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.