Reviewed patch 1-8.
J. Bruce Fields wrote:
> From: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
>
> Remove a couple redundant comments, adjust style; no change in behavior.
>
> Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
> ---
> fs/nfsd/nfs4state.c | 14 ++++++++------
> 1 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 7f616e9..b7e2f25 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -2072,21 +2072,21 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl
> if (ZERO_STATEID(stateid) || ONE_STATEID(stateid))
> return check_special_stateids(current_fh, stateid, flags);
>
> - /* STALE STATEID */
> status = nfserr_stale_stateid;
> if (STALE_STATEID(stateid))
> goto out;
>
> - /* BAD STATEID */
> status = nfserr_bad_stateid;
> if (!stateid->si_fileid) { /* delegation stateid */
> - if(!(dp = find_delegation_stateid(ino, stateid))) {
> + dp = find_delegation_stateid(ino, stateid);
> + if (!dp) {
> dprintk("NFSD: delegation stateid not found\n");
> goto out;
> }
> stidp = &dp->dl_stateid;
> } else { /* open or lock stateid */
> - if (!(stp = find_stateid(stateid, flags))) {
> + stp = find_stateid(stateid, flags);
> + if (!stp) {
> dprintk("NFSD: open or lock stateid not found\n");
> goto out;
> }
> @@ -2100,13 +2100,15 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl
> if (status)
> goto out;
> if (stp) {
> - if ((status = nfs4_check_openmode(stp,flags)))
> + status = nfs4_check_openmode(stp, flags);
> + if (status)
> goto out;
> renew_client(stp->st_stateowner->so_client);
> if (filpp)
> *filpp = stp->st_vfs_file;
> } else {
> - if ((status = nfs4_check_delegmode(dp, flags)))
> + status = nfs4_check_delegmode(dp, flags);
> + if (status)
> goto out;
> renew_client(dp->dl_client);
> if (flags & DELEG_RET)
--
Regards
Yang Hongyang
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
