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

Commit 4fda4003 authored by Dan Carpenter's avatar Dan Carpenter Committed by Theodore Ts'o
Browse files

ext4: remove an unneeded NULL check in __ext4_check_dir_entry() 



We dereference "bh" unconditionally a couple lines down to find
"by->b_size".  This function is never called with a NULL "bh" so I have
removed the check.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent f1b3a2a7

fs/ext4/dir.c

+4 −4
Original line number Diff line number Diff line
@@ -91,14 +91,14 @@ int __ext4_check_dir_entry(const char *function, unsigned int line, 
		return 0;



	if (filp)

		ext4_error_file(filp, function, line, bh ? bh->b_blocknr : 0,

		ext4_error_file(filp, function, line, bh->b_blocknr,

				"bad entry in directory: %s - offset=%u(%u), "

				"inode=%u, rec_len=%d, name_len=%d",

				error_msg, (unsigned) (offset % bh->b_size),

				offset, le32_to_cpu(de->inode),

				rlen, de->name_len);

	else

		ext4_error_inode(dir, function, line, bh ? bh->b_blocknr : 0,

		ext4_error_inode(dir, function, line, bh->b_blocknr,

				"bad entry in directory: %s - offset=%u(%u), "

				"inode=%u, rec_len=%d, name_len=%d",

				error_msg, (unsigned) (offset % bh->b_size),