Re: [PATCH] Replace NFS4ERR_NOTEMPY with NFS4ERR_EXIST

[Ni Wenjuan <niwj@cn.fujitsu.com>]

Ni Wenjuan =D0=B4=B5=C0:
> Fix a test in rename operation. rename dir1 into existing,nonempty di=
r2 should
> return  NFS4ERR_EXIST instead got NFS4ERR_NOTEMPTY. RFC says if the t=
arget is a
> directory but not empty, the server will return the error, NFS4ERR_EX=
IST.
>=20
> Signed-off-by:Ni Wenjuan  <niwj@cn.fujitsu.com>
>=20
> ---
>  fs/nfsd/nfs4proc.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>=20
> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> index 9fa60a3..c1e2e22 100644
> --- a/fs/nfsd/nfs4proc.c
> +++ b/fs/nfsd/nfs4proc.c
> @@ -605,7 +605,7 @@ nfsd4_rename(struct svc_rqst *rqstp, struct
> nfsd4_compound_state *cstate,
>=20
>  	/* the underlying filesystem returns different error's than require=
d
>  	 * by NFSv4. both save_fh and current_fh have been verified.. */
> -	if (status =3D=3D nfserr_isdir)
> +	if (status =3D=3D nfserr_isdir || status =3D=3D nfserr_notempty)
>  		status =3D nfserr_exist;
>  	else if ((status =3D=3D nfserr_notdir) &&
>                    (S_ISDIR(cstate->save_fh.fh_dentry->d_inode->i_mod=
e) &&

Bruce ,do you think this patch is ok ?   Can it be accepted?