* ext3: Always set dx_node's fake_dirent explicitly.
@ 2011-03-04 22:02 Eric Sandeen
2011-03-04 22:04 ` [PATCH V2] " Eric Sandeen
0 siblings, 1 reply; 5+ messages in thread
From: Eric Sandeen @ 2011-03-04 22:02 UTC (permalink / raw)
To: ext4 development; +Cc: Jan Kara, Lachlan McIlroy
(crossport of 1f7bebb9e911d870fa8f997ddff838e82b5715ea
by Andreas Schlick <schlick@lavabit.com>)
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 <sandeen@redhat.com>
---
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)
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH V2] ext3: Always set dx_node's fake_dirent explicitly.
2011-03-04 22:02 ext3: Always set dx_node's fake_dirent explicitly Eric Sandeen
@ 2011-03-04 22:04 ` Eric Sandeen
2011-03-04 22:23 ` Andreas Dilger
2011-03-07 16:26 ` Jan Kara
0 siblings, 2 replies; 5+ messages in thread
From: Eric Sandeen @ 2011-03-04 22:04 UTC (permalink / raw)
To: ext4 development; +Cc: Jan Kara, Lachlan McIlroy
(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>
---
(V2: fix subject and commit and formatting)
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)
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH V2] ext3: Always set dx_node's fake_dirent explicitly.
2011-03-04 22:04 ` [PATCH V2] " Eric Sandeen
@ 2011-03-04 22:23 ` Andreas Dilger
2011-03-07 16:26 ` Jan Kara
1 sibling, 0 replies; 5+ messages in thread
From: Andreas Dilger @ 2011-03-04 22:23 UTC (permalink / raw)
To: Eric Sandeen; +Cc: ext4 development, Jan Kara, Lachlan McIlroy
On 2011-03-04, at 3:04 PM, Eric Sandeen wrote:
> (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>
> ---
Should also be sent to stable I think.
> (V2: fix subject and commit and formatting)
>
> 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)
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Cheers, Andreas
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH V2] ext3: Always set dx_node's fake_dirent explicitly.
2011-03-04 22:04 ` [PATCH V2] " Eric Sandeen
2011-03-04 22:23 ` Andreas Dilger
@ 2011-03-07 16:26 ` Jan Kara
2011-03-07 16:32 ` Eric Sandeen
1 sibling, 1 reply; 5+ messages in thread
From: Jan Kara @ 2011-03-07 16:26 UTC (permalink / raw)
To: Eric Sandeen; +Cc: ext4 development, Jan Kara, Lachlan McIlroy
On Fri 04-03-11 16:04:08, Eric Sandeen wrote:
> (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>
Thanks. Merged - and added CC to stable@kernel.org as Andreas suggested.
> While it's a simple one liner, this took me forever to (re-)find.
I feel with you :).
Honza
>
> 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)
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH V2] ext3: Always set dx_node's fake_dirent explicitly.
2011-03-07 16:26 ` Jan Kara
@ 2011-03-07 16:32 ` Eric Sandeen
0 siblings, 0 replies; 5+ messages in thread
From: Eric Sandeen @ 2011-03-07 16:32 UTC (permalink / raw)
To: Jan Kara; +Cc: ext4 development, Lachlan McIlroy
On 3/7/11 10:26 AM, Jan Kara wrote:
> On Fri 04-03-11 16:04:08, Eric Sandeen wrote:
>> (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>
> Thanks. Merged - and added CC to stable@kernel.org as Andreas suggested.
Thanks!
-Eric
>> While it's a simple one liner, this took me forever to (re-)find.
> I feel with you :).
>
> Honza
>>
>> 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)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-03-07 16:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-04 22:02 ext3: Always set dx_node's fake_dirent explicitly Eric Sandeen
2011-03-04 22:04 ` [PATCH V2] " Eric Sandeen
2011-03-04 22:23 ` Andreas Dilger
2011-03-07 16:26 ` Jan Kara
2011-03-07 16:32 ` Eric Sandeen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).