Re: [PATCH v5 02/11] nfsd: discard NFSD4_FH_FOREIGN

[Jeff Layton <jlayton@kernel.org>]

On Wed, 2025-11-19 at 14:28 +1100, NeilBrown wrote:
> From: NeilBrown <neil@brown.name>
> 
> NFSD4_FH_FOREIGN is not needed as the same information is elsewhere.
> 
> If fh_handle.fh_len is 0 then there is no filehandle
> else if fh_dentry is NULL then the filehandle is foreign
> else the filehandle is local.
> 
> So we can discard NFSD4_FH_FOREIGN and the related struct field,
> and code.
> 
> Signed-off-by: NeilBrown <neil@brown.name>
> ---
>  fs/nfsd/nfs4proc.c | 7 ++-----
>  fs/nfsd/nfsfh.h    | 4 ----
>  2 files changed, 2 insertions(+), 9 deletions(-)
> 
> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> index e5871e861dce..3160e899a5da 100644
> --- a/fs/nfsd/nfs4proc.c
> +++ b/fs/nfsd/nfs4proc.c
> @@ -693,10 +693,8 @@ nfsd4_putfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
>  	       putfh->pf_fhlen);
>  	ret = fh_verify(rqstp, &cstate->current_fh, 0, NFSD_MAY_BYPASS_GSS);
>  #ifdef CONFIG_NFSD_V4_2_INTER_SSC
> -	if (ret == nfserr_stale && putfh->no_verify) {
> -		SET_FH_FLAG(&cstate->current_fh, NFSD4_FH_FOREIGN);
> +	if (ret == nfserr_stale && putfh->no_verify)
>  		ret = 0;
> -	}
>  #endif
>  	return ret;
>  }
> @@ -734,8 +732,7 @@ nfsd4_savefh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
>  	 * is not required, but fh_handle *is*.  Thus a foreign fh
>  	 * can be saved as needed for inter-server COPY.
>  	 */
> -	if (!current_fh->fh_dentry &&
> -	    !HAS_FH_FLAG(current_fh, NFSD4_FH_FOREIGN))
> +	if (cstate->current_fh.fh_handle.fh_size == 0)
>  		return nfserr_nofilehandle;
>  
>  	fh_dup2(&cstate->save_fh, &cstate->current_fh);
> diff --git a/fs/nfsd/nfsfh.h b/fs/nfsd/nfsfh.h
> index 5ef7191f8ad8..43fcc1dcf69a 100644
> --- a/fs/nfsd/nfsfh.h
> +++ b/fs/nfsd/nfsfh.h
> @@ -93,7 +93,6 @@ typedef struct svc_fh {
>  						 */
>  	bool			fh_use_wgather;	/* NFSv2 wgather option */
>  	bool			fh_64bit_cookies;/* readdir cookie size */
> -	int			fh_flags;	/* FH flags */
>  	bool			fh_post_saved;	/* post-op attrs saved */
>  	bool			fh_pre_saved;	/* pre-op attrs saved */
>  
> @@ -111,9 +110,6 @@ typedef struct svc_fh {
>  	struct kstat		fh_post_attr;	/* full attrs after operation */
>  	u64			fh_post_change; /* nfsv4 change; see above */
>  } svc_fh;
> -#define NFSD4_FH_FOREIGN (1<<0)
> -#define SET_FH_FLAG(c, f) ((c)->fh_flags |= (f))
> -#define HAS_FH_FLAG(c, f) ((c)->fh_flags & (f))
>  
>  enum nfsd_fsid {
>  	FSID_DEV = 0,

Nice.

Reviewed-by: Jeff Layton <jlayton@kernel.org>