diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-02-20 23:53:05 +0100 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2012-02-20 23:53:05 +0100 |
| commit | 4fda400360e6c15b9dea4351f2ad85845cdfda7e (patch) | |
| tree | e8759a08bd2bd0947477a22b6550477ca9c03932 /fs/ext4/dir.c | |
| parent | ext4: remove unneeded variable in ext4_xattr_check_block() (diff) | |
| download | linux-4fda400360e6c15b9dea4351f2ad85845cdfda7e.tar.xz linux-4fda400360e6c15b9dea4351f2ad85845cdfda7e.zip | |
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 <dan.carpenter@oracle.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to '')
| -rw-r--r-- | fs/ext4/dir.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c index 164c56092e58..a4a0234cb5cb 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); |