Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux.git] / fs / hpfs / namei.c

diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c
index 082b7c76dd0c91cc245f842b77becd520e1fb84c..1aee39160ac5b14d49c3cb604aafede94aa4e1ae 100644 (file)
--- a/fs/hpfs/namei.c
+++ b/fs/hpfs/namei.c
@@ -565,7 +565,7 @@ static int hpfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                        err = -EFSERROR;
                        goto end1;
                }
-               err = r == 2 ? -ENOSPC : r == 1 ? -EFSERROR : 0;
+               err = -ENOSPC;
                goto end1;
        }