aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2018-08-25 12:24:31 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2018-08-25 12:42:33 -0700
commite0fcfe1f1acf2f129e0809ea89b9187e89e84246 (patch)
tree1f2a04b0351a580d15cfe5d686e02f0a076a96e8
parent7634ccd2da9734975cf7ce25139a7d4e8575b048 (diff)
download96b-common-e0fcfe1f1acf2f129e0809ea89b9187e89e84246.tar.gz
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>
-rw-r--r--fs/hpfs/namei.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c
index 082b7c76dd0c..1aee39160ac5 100644
--- 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;
}