diff mbox

Btrfs: MOD_LOG_KEY_REMOVE_WHILE_MOVING never change node's nritems

Message ID 1350545573-2544-1-git-send-email-bo.li.liu@oracle.com (mailing list archive)
State New, archived
Headers show

Commit Message

Liu Bo Oct. 18, 2012, 7:32 a.m. UTC
Key MOD_LOG_KEY_REMOVE_WHILE_MOVING means that we're doing memmove inside
an extent buffer node, and the node's number of items remains unchanged,
so we don't need to increment node's number of items during rewinding,
otherwise we may get an node larger than leafsize and cause general protection
errors later.

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
---
 fs/btrfs/ctree.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Comments

Jan Schmidt Oct. 19, 2012, 5:13 a.m. UTC | #1
On Thu, October 18, 2012 at 09:32 (+0200), Liu Bo wrote:
> Key MOD_LOG_KEY_REMOVE_WHILE_MOVING means that we're doing memmove inside
> an extent buffer node, and the node's number of items remains unchanged,
> so we don't need to increment node's number of items during rewinding,
> otherwise we may get an node larger than leafsize and cause general protection
> errors later.

This patch triggers the following bug on when running fsmark on a quota enabled
file system:

1153                 case MOD_LOG_KEY_REPLACE:
1154                         BUG_ON(tm->slot >= n);

MOD_LOG_KEY_REMOVE_WHILE_MOVING elements are added by tree_mod_log_insert_move
when dst_slot < src_slot, thus we're reducing the number of elements in the
buffer, thus replaying adds those elements.

-Jan
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index b334362..2858c2f 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -1142,13 +1142,13 @@  __tree_mod_log_rewind(struct extent_buffer *eb, u64 time_seq,
 		switch (tm->op) {
 		case MOD_LOG_KEY_REMOVE_WHILE_FREEING:
 			BUG_ON(tm->slot < n);
-		case MOD_LOG_KEY_REMOVE_WHILE_MOVING:
 		case MOD_LOG_KEY_REMOVE:
+			n++;
+		case MOD_LOG_KEY_REMOVE_WHILE_MOVING:
 			btrfs_set_node_key(eb, &tm->key, tm->slot);
 			btrfs_set_node_blockptr(eb, tm->slot, tm->blockptr);
 			btrfs_set_node_ptr_generation(eb, tm->slot,
 						      tm->generation);
-			n++;
 			break;
 		case MOD_LOG_KEY_REPLACE:
 			BUG_ON(tm->slot >= n);