Commit e0fcfe1f authored Aug 25, 2018 by Colin Ian King Committed by Linus Torvalds Aug 25, 2018

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>

parent 7634ccd2

fs/hpfs/namei.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message