]> git.karo-electronics.de Git - karo-tx-linux.git/commit
ext4: make "offset" consistent in ext4_check_dir_entry()
authorToshiyuki Okajima <toshi.okajima@jp.fujitsu.com>
Mon, 31 May 2010 02:49:34 +0000 (22:49 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 2 Aug 2010 17:21:14 +0000 (10:21 -0700)
commit2b8aa5edf84a8e7cc432cbfda2be7cefa0a46347
tree167ce8a81a407cfd1c451ce566e026c836631a63
parent449147576c7045a183fc2283b103c9a4f290b3de
ext4: make "offset" consistent in ext4_check_dir_entry()

commit b8b8afe236e97b6359d46d3a3f8c46455e192271 upstream (as of v2.6.33-git11)

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/ext4/dir.c