summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/file-item.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2008-12-16 19:51:01 +0100
committerChris Mason <chris.mason@oracle.com>2008-12-16 19:51:01 +0100
commitdcbdd4dcb9793b00b46ab023e9330922c8c7c54c (patch)
treeca599e975c92de75c98283756f80b2aa7a1879bb /fs/btrfs/file-item.c
parentBtrfs: Don't use spin*lock_irq for the delalloc lock (diff)
downloadlinux-dcbdd4dcb9793b00b46ab023e9330922c8c7c54c.tar.xz
linux-dcbdd4dcb9793b00b46ab023e9330922c8c7c54c.zip
Btrfs: delete checksum items before marking blocks free
Btrfs maintains a cache of blocks available for allocation in ram. The code that frees extents was marking the extents free and then deleting the checksum items. This meant it was possible the extent would be reallocated before the checksum item was actually deleted, leading to races and other problems as the checksums were updated for the newly allocated extent. The fix is to delete the checksum before marking the extent free. Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/file-item.c')
-rw-r--r--fs/btrfs/file-item.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index df0447632dbd..7acadf3b742a 100644
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -537,6 +537,8 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,
if (key.offset >= bytenr && csum_end <= end_byte) {
ret = btrfs_del_item(trans, root, path);
BUG_ON(ret);
+ if (key.offset == bytenr)
+ break;
} else if (key.offset < bytenr && csum_end > end_byte) {
unsigned long offset;
unsigned long shift_len;
@@ -583,6 +585,8 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,
ret = truncate_one_csum(trans, root, path,
&key, bytenr, len);
BUG_ON(ret);
+ if (key.offset < bytenr)
+ break;
}
btrfs_release_path(root, path);
}