From: Dan Carpenter Date: Mon, 20 Feb 2012 22:53:05 +0000 (-0500) Subject: ext4: remove an unneeded NULL check in __ext4_check_dir_entry() X-Git-Tag: upstream/snapshot3+hdmi~7852^2~51 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4fda400360e6c15b9dea4351f2ad85845cdfda7e;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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: Dan Carpenter Signed-off-by: "Theodore Ts'o" --- diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c index 164c560..a4a0234 100644 --- a/fs/ext4/dir.c +++ b/fs/ext4/dir.c @@ -91,17 +91,17 @@ 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), + 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), + error_msg, (unsigned) (offset % bh->b_size), offset, le32_to_cpu(de->inode), rlen, de->name_len);