From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Sandeen Subject: ext3: Always set dx_node's fake_dirent explicitly. Date: Fri, 04 Mar 2011 16:02:05 -0600 Message-ID: <4D71615D.30306@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Jan Kara , Lachlan McIlroy To: ext4 development Return-path: Received: from mx1.redhat.com ([209.132.183.28]:55871 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759820Ab1CDWCL (ORCPT ); Fri, 4 Mar 2011 17:02:11 -0500 Sender: linux-ext4-owner@vger.kernel.org List-ID: (crossport of 1f7bebb9e911d870fa8f997ddff838e82b5715ea by Andreas Schlick ) When ext4_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 --- While it's a simple one liner, this took me forever to (re-)find. kill_ext3_now++; That is all. ;) diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index b27ba71..75c968e 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c @@ -1540,8 +1540,8 @@ static int ext3_dx_add_entry(handle_t *handle, struct dentry *dentry, 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)