| From | Andi Kleen <> | Subject | [PATCH] [211/275] ext3: Always set dx_node's fake_dirent explicitly. | Date | Wed, 30 Mar 2011 14:07:35 -0700 (PDT) |
| |
2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Eric Sandeen <sandeen@redhat.com>
commit d7433142b63d727b5a217c37b1a1468b116a9771 upstream.
(crossport of 1f7bebb9e911d870fa8f997ddff838e82b5715ea by Andreas Schlick <schlick@lavabit.com>)
When ext3_dx_add_entry() has to split an index node, it has to ensure that name_len of dx_node's fake_dirent is also zero, because otherwise e2fsck won't recognise it as an intermediate htree node and consider the htree to be corrupted.
Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Andi Kleen <ak@linux.intel.com>
--- fs/ext3/namei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6.35.y/fs/ext3/namei.c =================================================================== --- linux-2.6.35.y.orig/fs/ext3/namei.c 2011-03-29 22:50:34.061386873 -0700 +++ linux-2.6.35.y/fs/ext3/namei.c 2011-03-29 23:03:02.652232306 -0700 @@ -1550,8 +1550,8 @@ goto cleanup; node2 = (struct dx_node *)(bh2->b_data); entries2 = node2->entries; + memset(&node2->fake, 0, sizeof(struct fake_dirent)); node2->fake.rec_len = ext3_rec_len_to_disk(sb->s_blocksize); - node2->fake.inode = 0; BUFFER_TRACE(frame->bh, "get_write_access"); err = ext3_journal_get_write_access(handle, frame->bh); if (err)
|