Linux NFS development
 help / color / mirror / Atom feed
From: Ni Wenjuan <niwj@cn.fujitsu.com>
To: linux-nfs@vger.kernel.org, bfields@fieldses.org
Subject: Re: [PATCH] Replace NFS4ERR_NOTEMPY with NFS4ERR_EXIST
Date: Wed, 18 Mar 2009 09:55:47 +0800	[thread overview]
Message-ID: <49C054A3.9010402@cn.fujitsu.com> (raw)
In-Reply-To: <49B8A224.6070803@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?


  reply	other threads:[~2009-03-18  1:56 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-12  5:48 [PATCH] Replace NFS4ERR_NOTEMPY with NFS4ERR_EXIST Ni Wenjuan
2009-03-18  1:55 ` Ni Wenjuan [this message]
2009-03-18 23:10   ` J. Bruce Fields
  -- strict thread matches above, loose matches on Subject: below --
2009-03-19  0:37 Ni Wenjuan
2009-03-19 19:47 ` J. Bruce Fields
2009-03-20  3:58   ` Ni Wenjuan
2009-03-10  8:20 Ni Wenjuan
2009-03-10  8:22 ` Yang Hongyang
2009-03-11 23:46   ` J. Bruce Fields
2009-04-03  5:24     ` Ni Wenjuan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=49C054A3.9010402@cn.fujitsu.com \
    --to=niwj@cn.fujitsu.com \
    --cc=bfields@fieldses.org \
    --cc=linux-nfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox