hpfs: remove unnecessary checks on the value of r when assigning error code

At the point where r is being checked for different values, r is always
going to be equal to 2 as the previous if statements jump to end or end1
if r is not 2.  Hence the assignment to err can be simplified to just
err an assignment without any checks on the value or r.

Detected by CoverityScan, CID#1226737 ("Logically dead code")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

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;
        }