Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0fcfe1f authored by Colin Ian King's avatar Colin Ian King Committed by Linus Torvalds
Browse files

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: default avatarColin Ian King <colin.king@canonical.com>
Reviewed-by: default avatarMikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: default avatarLinus 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;

	}