All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ni Wenjuan <niwj@cn.fujitsu.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH] Replace NFS4ERR_NOTEMPY with NFS4ERR_EXIST
Date: Tue, 10 Mar 2009 16:20:33 +0800	[thread overview]
Message-ID: <49B622D1.6060602@cn.fujitsu.com> (raw)


Fix a test in rename operation. rename dir1 into existing,nonempty dir2 should
return  NFS4ERR_EXIST instead got NFS4ERR_NOTEMPY. RFC says if the target is a
directory but not empty, the server will return the error, NFS4ERR_EXIST.

------
fs/nfsd/nfs4proc.c | 2 +-
1 files changed, 1 insertion(+) ,1 deletion (-)

diff -Nurp fs/nfsd/nfs4proc_orig.c fs/nfsd/nfs4proc.c
--- fs/nfsd/nfs4proc_orig.c	2009-02-23 20:28:56.000000000 +0800
+++ fs/nfsd/nfs4proc.c	2009-03-05 16:56:56.000000000 +0800

@@ -585,10 +586,11 @@ nfsd4_rename(struct svc_rqst *rqstp, str
   	status = nfsd_rename(rqstp, save_fh, rename->rn_sname,
  			     rename->rn_snamelen, current_fh,
  			     rename->rn_tname, rename->rn_tnamelen);

  	/* the underlying filesystem returns different error's than required
  	 * by NFSv4. both save_fh and current_fh have been verified.. */
    -	if (status == nfserr_isdir)
    +	if (status == nfserr_isdir || status == nfserr_notempty)
  		status = nfserr_exist;
  	else if ((status == nfserr_notdir) &&
                    (S_ISDIR(save_fh->fh_dentry->d_inode->i_mode) &&



             reply	other threads:[~2009-03-10  8:21 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-10  8:20 Ni Wenjuan [this message]
2009-03-10  8:22 ` [PATCH] Replace NFS4ERR_NOTEMPY with NFS4ERR_EXIST Yang Hongyang
2009-03-11 23:46   ` J. Bruce Fields
2009-04-03  5:24     ` Ni Wenjuan
  -- strict thread matches above, loose matches on Subject: below --
2009-03-12  5:48 Ni Wenjuan
2009-03-18  1:55 ` Ni Wenjuan
2009-03-18 23:10   ` J. Bruce Fields
2009-03-19  0:37 Ni Wenjuan
2009-03-19 19:47 ` J. Bruce Fields
2009-03-20  3:58   ` 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=49B622D1.6060602@cn.fujitsu.com \
    --to=niwj@cn.fujitsu.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.