Re: [PATCH v5 6/6] NFSD: Ignore vfs_getattr() failure in nfsd_file_get_dio_attrs()

[Jeff Layton <jlayton@kernel.org>]

On Mon, 2025-09-29 at 11:56 -0400, Chuck Lever wrote:
> From: Chuck Lever <chuck.lever@oracle.com>
> 
> A vfs_getattr() failure is rare but not totally impossible.
> 
> There's no recovery logic in that case; nfsd_do_file_acquire()'s
> caller will fail but the wonky nfsd_file is left in the file cache.
> 
> It doesn't seem necessary for nfsd_file_do_acquire() to fail
> outright if it successfully opened the file but some problem
> prevented the collection of the dio alignment parameters.
> 

Agreed

> Fixes: bc70aaeba7df ("NFSD: filecache: add STATX_DIOALIGN and STATX_DIO_READ_ALIGN support")
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> ---
>  fs/nfsd/filecache.c | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
> index 78cca0d751ac..b34cc8d2cb5e 100644
> --- a/fs/nfsd/filecache.c
> +++ b/fs/nfsd/filecache.c
> @@ -1051,7 +1051,7 @@ nfsd_file_is_cached(struct inode *inode)
>  	return ret;
>  }
>  
> -static __be32
> +static void
>  nfsd_file_get_dio_attrs(const struct svc_fh *fhp, struct nfsd_file *nf)
>  {
>  	struct inode *inode = file_inode(nf->nf_file);
> @@ -1060,11 +1060,12 @@ nfsd_file_get_dio_attrs(const struct svc_fh *fhp, struct nfsd_file *nf)
>  
>  	/* Currently only need to get DIO alignment info for regular files */
>  	if (!S_ISREG(inode->i_mode))
> -		return nfs_ok;
> +		return;
>  
>  	status = fh_getattr(fhp, &stat);
>  	if (status != nfs_ok)
> -		return status;
> +		/* Use default dio alignment parameters (all zero) */
> +		return;
>  
>  	trace_nfsd_file_get_dio_attrs(inode, &stat);
>  
> @@ -1076,8 +1077,6 @@ nfsd_file_get_dio_attrs(const struct svc_fh *fhp, struct nfsd_file *nf)
>  		nf->nf_dio_read_offset_align = stat.dio_read_offset_align;
>  	else
>  		nf->nf_dio_read_offset_align = nf->nf_dio_offset_align;
> -
> -	return nfs_ok;
>  }
>  
>  static __be32
> @@ -1199,7 +1198,7 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struct net *net,
>  			status = nfserrno(ret);
>  			trace_nfsd_file_open(nf, status);
>  			if (status == nfs_ok)
> -				status = nfsd_file_get_dio_attrs(fhp, nf);
> +				nfsd_file_get_dio_attrs(fhp, nf);
>  		}
>  	} else
>  		status = nfserr_jukebox;

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