Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Chuck Lever III <chuck.lever@oracle.com>
To:     "cgel.zte@gmail.com" <cgel.zte@gmail.com>
CC:     Jeff Layton <jlayton@kernel.org>,
        Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Jinpeng Cui <cui.jinpeng2@zte.com.cn>,
        Zeal Robot <zealci@zte.com.cn>
Subject: Re: [PATCH linux-next] NFSD: remove redundant variable status
Thread-Topic: [PATCH linux-next] NFSD: remove redundant variable status
Thread-Index: AQHYvUTILtNEN+DAvUKXygdP6dpSma3JEwuA
Date:   Wed, 31 Aug 2022 14:34:36 +0000
Message-ID: <A854F8D3-3FB3-4B64-9CE0-16FCAE3A7D22@oracle.com>
References: <20220831142002.304176-1-cui.jinpeng2@zte.com.cn>
In-Reply-To: <20220831142002.304176-1-cui.jinpeng2@zte.com.cn>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?N000BiiRl7HJ25YlY2s2KNULtQ/StoxQafua7UqKvHW6Pyomi5gnkHvHr+M8?=
 =?us-ascii?Q?nr3rUODO3b2Lqh6B0I1CtvOswFpxIAM62k00MO4QJCBD2EFon+6yC+kUG0G8?=
 =?us-ascii?Q?87NTfAGGHT8HfgvXlITUDHO8lphWlJ+L6005Cw+tzWZzPJial5ZNWANdiUHD?=
 =?us-ascii?Q?slN0OgaVYC4f2OVGIYDqeJsaD4mm42JNFf9QqXxujTukyouDRma+vkQD2QsF?=
 =?us-ascii?Q?C07V6lgL+YBmtFNkJYGLj0Oe+mCKxXy1i+Hx7jmYzgycuDOYmFMhZvtqMOcn?=
 =?us-ascii?Q?l+dMTWG1YDsJdlE78MUcsrheK87OEC1810o0tACE1UQbC3YgjtUXBWbKYoCT?=
 =?us-ascii?Q?lWmIX3KsotYAStQHbdtUWv/Piky4dnfmlQCi12AW058fHuQb/3UI8G4fX4zP?=
 =?us-ascii?Q?1nNMZl+WLec5t4yjyA79ZwHz/oB55jWJbO5l7vj2SzYxeqftsQzK+jm7PIpV?=
 =?us-ascii?Q?TZbD3kEF6qbC4/YnUgPbUou3vlSZUbrFvirYgQAyfFdCW/phXJlTwCYZLjn6?=
 =?us-ascii?Q?7QnZyRXRioWELsYocSxX/3DVpDpuaZcnJxEEzG6koO/ME2he1Jxa8Iuv6m64?=
 =?us-ascii?Q?yANL62GMFw7Rvq+qGx7Xro9x9VpQepOHiUF0PfsuuNIKwUFzAWnbnATNZ89M?=
 =?us-ascii?Q?+GsCX5LBD0ZxIbGBE7wRfTyUEhE3OPJcflcY9NQAc8sPzofQC2zhK23vfbGr?=
 =?us-ascii?Q?rpjeDWv//osyuh6iHaIvUPtQ/vBT4bGHTEMRz8VhNvuIHP+IZoakt6kNZV88?=
 =?us-ascii?Q?NDOpQvY4Kzli6yWb9+06hykvDBeB5M1F1J7aSCh+WFZ1KrHea6vpuX8mVnma?=
 =?us-ascii?Q?bKm1cMVfUz3vO3aANTLZfRpUzPcbeXzJ4oOpqtVM6+CKXAoSV5uf8ohzNhn3?=
 =?us-ascii?Q?ucthQuTwlPsxvYg4AsOzsIc2Bs1y54XQLoWpLP1cezydjZmBb0az9K4+pyIH?=
 =?us-ascii?Q?JpYKy7FKiltstQNX0dDT1fGZLQX4nGCq3Bbg3HCFxuEe4E2+Or1ZblMY+C6y?=
 =?us-ascii?Q?sS4R5d53bm83jqbxhMtJ4eYAFvZ2ND4YbuV4DMWuQ/9NgvYMAs1bjaSHndSI?=
 =?us-ascii?Q?cyE+7yluAAmcQ0rvy/qZshZTYSRICfsw2ldOG+leweLlFdbC/nNL939qrbqZ?=
 =?us-ascii?Q?+CgnInStdtTwmGWQRhJG4UB6gFM7f6XzUKCJPk6UBkj7pFM1WVrnrAZrLooj?=
 =?us-ascii?Q?9erWdc0iGe1yffZKuv1B8wtcY5J3C+JJ2ya2JBpa0syccNuHPbsFgBw6JIIS?=
 =?us-ascii?Q?/agrCFe3ww+BFZM5xobAGmr1qyZHb0wo2rgbqxjvSQEaaUf3Kn9P4XKPx6qK?=
 =?us-ascii?Q?J24T8vrKhb2Krofe7snx8MJSTeRBDt3S3fGYSE9qe1WMaGVB9uJNhASoaP2d?=
 =?us-ascii?Q?tqZ3J3clcTzBTVzupVUMAvgIcZ3s+sIWH3FDvI04mqMURRuL/KDUtf+hDle0?=
 =?us-ascii?Q?Q2C//nyu1pPFSNHmSzSEudOCI/gAT2H4NftSSnNusQ+N3pJ6vIWE1bO2mG0Z?=
 =?us-ascii?Q?LhZMrGbgO+DLVjLCEWqdeAwH/qHou2CkeyKEn7QhnSPtrz7Uahn0BK2K/EzT?=
 =?us-ascii?Q?pcfbbjg5kaeMX4meD3oFdoJrmbKuNCNIx3ee+X/WLZ1Y635tcUdoX2eq9EhI?=
 =?us-ascii?Q?Nw=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <605D035F6F4250468BC7F344B3F3AF3C@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f4ff0da3-0b56-45e9-a126-08da8b5dedbe
X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Aug 2022 14:34:36.2634
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: zAHLO6A7eQjfkr24Hij3275SEQzeh2plJBN74QpVY+SXaWR790XMZKXfoQSQMNeO+fP2hpSha2UIftjON/HBAg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5570
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-08-31_09,2022-08-31_03,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 suspectscore=0
 mlxlogscore=999 adultscore=0 phishscore=0 spamscore=0 bulkscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2207270000 definitions=main-2208310073
X-Proofpoint-ORIG-GUID: NnfUDXJfmfUmW4iv4qpi5VItuVFKf3qY
X-Proofpoint-GUID: NnfUDXJfmfUmW4iv4qpi5VItuVFKf3qY
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org


> On Aug 31, 2022, at 10:20 AM, cgel.zte@gmail.com wrote:
>=20
> From: Jinpeng Cui <cui.jinpeng2@zte.com.cn>
>=20
> Return value directly from fh_verify() do_open_permission()
> exp_pseudoroot() instead of getting value from
> redundant variable status.
>=20
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Jinpeng Cui <cui.jinpeng2@zte.com.cn>

Applied for v6.1. Thanks!


> ---
> fs/nfsd/nfs4proc.c | 16 ++++------------
> 1 file changed, 4 insertions(+), 12 deletions(-)
>=20
> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> index 757d8959f992..7055e1c91d0e 100644
> --- a/fs/nfsd/nfs4proc.c
> +++ b/fs/nfsd/nfs4proc.c
> @@ -141,7 +141,6 @@ fh_dup2(struct svc_fh *dst, struct svc_fh *src)
> static __be32
> do_open_permission(struct svc_rqst *rqstp, struct svc_fh *current_fh, str=
uct nfsd4_open *open, int accmode)
> {
> -	__be32 status;
>=20
> 	if (open->op_truncate &&
> 		!(open->op_share_access & NFS4_SHARE_ACCESS_WRITE))
> @@ -156,9 +155,7 @@ do_open_permission(struct svc_rqst *rqstp, struct svc=
_fh *current_fh, struct nfs
> 	if (open->op_share_deny & NFS4_SHARE_DENY_READ)
> 		accmode |=3D NFSD_MAY_WRITE;
>=20
> -	status =3D fh_verify(rqstp, current_fh, S_IFREG, accmode);
> -
> -	return status;
> +	return fh_verify(rqstp, current_fh, S_IFREG, accmode);
> }
>=20
> static __be32 nfsd_check_obj_isreg(struct svc_fh *fh)
> @@ -454,7 +451,6 @@ static __be32
> do_open_fhandle(struct svc_rqst *rqstp, struct nfsd4_compound_state *csta=
te, struct nfsd4_open *open)
> {
> 	struct svc_fh *current_fh =3D &cstate->current_fh;
> -	__be32 status;
> 	int accmode =3D 0;
>=20
> 	/* We don't know the target directory, and therefore can not
> @@ -479,9 +475,7 @@ do_open_fhandle(struct svc_rqst *rqstp, struct nfsd4_=
compound_state *cstate, str
> 	if (open->op_claim_type =3D=3D NFS4_OPEN_CLAIM_DELEG_CUR_FH)
> 		accmode =3D NFSD_MAY_OWNER_OVERRIDE;
>=20
> -	status =3D do_open_permission(rqstp, current_fh, open, accmode);
> -
> -	return status;
> +	return do_open_permission(rqstp, current_fh, open, accmode);
> }
>=20
> static void
> @@ -668,11 +662,9 @@ static __be32
> nfsd4_putrootfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *csta=
te,
> 		union nfsd4_op_u *u)
> {
> -	__be32 status;
> -
> 	fh_put(&cstate->current_fh);
> -	status =3D exp_pseudoroot(rqstp, &cstate->current_fh);
> -	return status;
> +
> +	return exp_pseudoroot(rqstp, &cstate->current_fh);
> }
>=20
> static __be32
> --=20
> 2.25.1
>=20

--
Chuck Lever