Commit b8b8afe2 authored Mar 02, 2010 by Toshiyuki Okajima Committed by Theodore Ts'o Mar 02, 2010

ext4: make "offset" consistent in ext4_check_dir_entry()

The callers of ext4_check_dir_entry() usually pass in the "file
offset" (ext4_readdir, htree_dirblock_to_tree, search_dirblock,
ext4_dx_find_entry, empty_dir), but a few callers (add_dirent_to_buf,
ext4_delete_entry) only pass in the buffer offset.

To accomodate those last two (which would be hard to fix otherwise),
this patch changes ext4_check_dir_entry() to print the physical block
number and the relative offset as well as the passed-in offset.

Signed-off-by: Toshiyuki Okajima <toshi.okajima@jp.fujitsu.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

parent 6e3617e5

fs/ext4/dir.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -84,9 +84,11 @@ int ext4_check_dir_entry(const char function, struct inode dir,

		if (error_msg != NULL)
		__ext4_error(dir->i_sb, function,
		"bad entry in directory #%lu: %s - "
		"offset=%u, inode=%u, rec_len=%d, name_len=%d",
		dir->i_ino, error_msg, offset,
		"bad entry in directory #%lu: %s - block=%llu"
		"offset=%u(%u), inode=%u, rec_len=%d, name_len=%d",
		dir->i_ino, error_msg,
		(unsigned long long) bh->b_blocknr,
		(unsigned) (offset%bh->b_size), offset,
		le32_to_cpu(de->inode),
		rlen, de->name_len);
		return error_msg == NULL ? 1 : 0;

Admin message