summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeyslan G. Bem <geyslan@gmail.com>2013-10-11 17:15:54 -0300
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-10-28 18:16:55 -0400
commit4f5829d72636513e23a5f76355536776bf390a8a (patch)
treec7f0ad27a0890c6e7d1cd8a05ffbefa6f0c289c8
parente3bfab18483a26649ff9cb605aa1410386b1e498 (diff)
nfs: Remove useless 'error' assignment
the 'error' variable was been assigned twice in vain. Signed-off-by: Geyslan G. Bem <geyslan@gmail.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/unlink.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
index bb939edd4c99..0c29b1bb3936 100644
--- a/fs/nfs/unlink.c
+++ b/fs/nfs/unlink.c
@@ -493,7 +493,7 @@ nfs_sillyrename(struct inode *dir, struct dentry *dentry)
unsigned long long fileid;
struct dentry *sdentry;
struct rpc_task *task;
- int error = -EIO;
+ int error = -EBUSY;
dfprintk(VFS, "NFS: silly-rename(%s/%s, ct=%d)\n",
dentry->d_parent->d_name.name, dentry->d_name.name,
@@ -503,7 +503,6 @@ nfs_sillyrename(struct inode *dir, struct dentry *dentry)
/*
* We don't allow a dentry to be silly-renamed twice.
*/
- error = -EBUSY;
if (dentry->d_flags & DCACHE_NFSFS_RENAMED)
goto out;