From 138d4900830ea96571f67360b0ccc50c093b82d4 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 20 Feb 2012 17:53:05 -0500 Subject: [PATCH] --- yaml --- r: 296545 b: refs/heads/master c: 4fda400360e6c15b9dea4351f2ad85845cdfda7e h: refs/heads/master i: 296543: 8c8a9666dbef6909acf18280de4972781d6f8f02 v: v3 --- [refs] | 2 +- trunk/fs/ext4/dir.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6a488ce1945d..61a5c5e96052 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1b3a2a75356ce9fdcbedd79d2bb0d1ca8ed9cee +refs/heads/master: 4fda400360e6c15b9dea4351f2ad85845cdfda7e diff --git a/trunk/fs/ext4/dir.c b/trunk/fs/ext4/dir.c index 164c56092e58..a4a0234cb5cb 100644 --- a/trunk/fs/ext4/dir.c +++ b/trunk/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);