From 8319a066e620f28a8ea9d23dd7d2a1326162110f Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Tue, 30 Apr 2013 15:28:51 -0400 Subject: [PATCH] --- yaml --- r: 372215 b: refs/heads/master c: 2a6cf944c2f8ad5a7ef599ed275b85fa56eba3fc h: refs/heads/master i: 372213: cb51ffc180da5babbf61a3ea6f1081de896d4f29 372211: 3411289b7b5db31ed1f4454b98815c0801e71290 372207: 4990d1c8c36b9d4b85f4ff1e79f72ab160052923 v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4proc.c | 20 +++++--------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 1976b02fb7f4..79d65a48e7f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d28fcc830c2eadc526e43b0a5f6d2ed04e7421ef +refs/heads/master: 2a6cf944c2f8ad5a7ef599ed275b85fa56eba3fc diff --git a/trunk/fs/nfsd/nfs4proc.c b/trunk/fs/nfsd/nfs4proc.c index 5dee81141ab7..8ae5abfe6ba2 100644 --- a/trunk/fs/nfsd/nfs4proc.c +++ b/trunk/fs/nfsd/nfs4proc.c @@ -813,21 +813,11 @@ nfsd4_rename(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, status = nfsd_rename(rqstp, &cstate->save_fh, rename->rn_sname, rename->rn_snamelen, &cstate->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) - status = nfserr_exist; - else if ((status == nfserr_notdir) && - (S_ISDIR(cstate->save_fh.fh_dentry->d_inode->i_mode) && - S_ISDIR(cstate->current_fh.fh_dentry->d_inode->i_mode))) - status = nfserr_exist; - - if (!status) { - set_change_info(&rename->rn_sinfo, &cstate->current_fh); - set_change_info(&rename->rn_tinfo, &cstate->save_fh); - } - return status; + if (status) + return status; + set_change_info(&rename->rn_sinfo, &cstate->current_fh); + set_change_info(&rename->rn_tinfo, &cstate->save_fh); + return nfs_ok; } static __be32