Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / fs / nfs / unlink.c

diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
index 8285de9..11d7894 100644 (file)
--- 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(%pd2, ct=%d)\n",
                dentry, d_count(dentry));
@@ -502,7 +502,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;