summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schlick <schlick@lavabit.com>2009-09-10 23:16:07 -0400
committerTheodore Ts'o <tytso@mit.edu>2009-09-10 23:16:07 -0400
commit1f7bebb9e911d870fa8f997ddff838e82b5715ea (patch)
treebe0efe4467b3f7f079e7f20d7580677580947017
parent0e3d2a6313d03413d93327202a60256d1d726fdc (diff)
downloadlinux-stable-1f7bebb9e911d870fa8f997ddff838e82b5715ea.tar.gz
linux-stable-1f7bebb9e911d870fa8f997ddff838e82b5715ea.tar.bz2
linux-stable-1f7bebb9e911d870fa8f997ddff838e82b5715ea.zip
ext4: Always set dx_node's fake_dirent explicitly.
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: Andreas Schlick <schlick@lavabit.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rw-r--r--fs/ext4/namei.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index f27c8164c1fe..42f81d285cd5 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1597,9 +1597,9 @@ static int ext4_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 = ext4_rec_len_to_disk(sb->s_blocksize,
sb->s_blocksize);
- node2->fake.inode = 0;
BUFFER_TRACE(frame->bh, "get_write_access");
err = ext4_journal_get_write_access(handle, frame->bh);
if (err)