ext3: Always set dx_node's fake_dirent explicitly.

PATCH In review Eric Sandeen 3 participants 5 messages Mar 4, 2011 – Mar 7, 2011

Share & tools

Eric Sandeen

author

2011-03-04 22:02 UTC #0 lore raw

(crossport of 1f7bebb9e911d870fa8f997ddff838e82b5715ea by Andreas Schlick <[email protected]>)

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 <[email protected]>

---

While it's a simple one liner, this took me forever to (re-)find.

kill_ext3_now++;

That is all. ;)

fs/ext3/namei.c +1 -1

index b27ba71..75c968e 100644
@@ -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)

Eric Sandeen

author

2011-03-04 22:04 UTC #1 lore raw

PATCH v2 1/1 ext3: Always set dx_node's fake_dirent explicitly.

(crossport of 1f7bebb9e911d870fa8f997ddff838e82b5715ea by Andreas Schlick <[email protected]>)

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 <[email protected]>

---

(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. ;)

fs/ext3/namei.c +1 -1

index b27ba71..75c968e 100644
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Andreas Dilger

2011-03-04 22:23 UTC #2 lore raw

Quoted 10 lines · Eric Sandeen

(crossport of 1f7bebb9e911d870fa8f997ddff838e82b5715ea by Andreas Schlick <[email protected]>)
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 <[email protected]>
---

Should also be sent to stable I think.

Quoted 27 lines

(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. ;)
fs/ext3/namei.c +1 -2
index b27ba71..75c968e 100644
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Quoted 4 lines

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Cheers, Andreas

Jan Kara

2011-03-07 16:26 UTC #3 lore raw

In reply to Eric Sandeen

Quoted 9 lines · Eric Sandeen

(crossport of 1f7bebb9e911d870fa8f997ddff838e82b5715ea by Andreas Schlick <[email protected]>)
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 <[email protected]>

Thanks. Merged - and added CC to [email protected] as Andreas suggested.

Quoted 1 line

While it's a simple one liner, this took me forever to (re-)find.

I feel with you :).

Honza

Quoted 15 lines

fs/ext3/namei.c +1 -1

index b27ba71..75c968e 100644
@@ -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)

Signature · 2 lines

Jan Kara <[email protected]>
SUSE Labs, CR

Eric Sandeen

author

2011-03-07 16:32 UTC #4 lore raw

Quoted 11 lines · Jan Kara

Quoted 9 lines · Eric Sandeen
(crossport of 1f7bebb9e911d870fa8f997ddff838e82b5715ea by Andreas Schlick <[email protected]>)
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 <[email protected]>
Thanks. Merged - and added CC to [email protected] as Andreas suggested.

Thanks!

-Eric

Quoted 19 lines

Quoted 1 line

While it's a simple one liner, this took me forever to (re-)find.

I feel with you :).

Honza

Quoted 15 lines

fs/ext3/namei.c +1 -1

index b27ba71..75c968e 100644
@@ -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)