aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorJosef Bacik <jbacik@fusionio.com>2013-10-14 12:08:38 -0400
committerChris Mason <chris.mason@fusionio.com>2013-11-11 21:58:05 -0500
commit25a50341b6269b0622434d9360f0c771d219681a (patch)
tree3ec594567b6c998ef8f489b7fd8a91febfff660b /fs/btrfs
parent96192499c27e8b58d71f4370f29ca86d4ca915d7 (diff)
Btrfs: handle a missing extent for the first file extent
While trying to kill our hole extents I noticed I was seeing problems where we seek into a file and then start writing and then try to fiemap that file later. This is because we search for offset 0, don't find anything and so back up one slot, which puts us at the inode ref or something like that, which means we goto not_found and create an extent map for our entire search area. This isn't quite what we want, we want to move forward one slot and see if there is an extent there so we can limit our hole extent. This patch fixes this problem, I will add a testcase for this as well. Thanks, Signed-off-by: Josef Bacik <jbacik@fusionio.com> Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/inode.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index b5c2ad8fe2ca..9d39d08a1555 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5982,7 +5982,14 @@ again:
5982 found_type = btrfs_key_type(&found_key); 5982 found_type = btrfs_key_type(&found_key);
5983 if (found_key.objectid != objectid || 5983 if (found_key.objectid != objectid ||
5984 found_type != BTRFS_EXTENT_DATA_KEY) { 5984 found_type != BTRFS_EXTENT_DATA_KEY) {
5985 goto not_found; 5985 /*
5986 * If we backup past the first extent we want to move forward
5987 * and see if there is an extent in front of us, otherwise we'll
5988 * say there is a hole for our whole search range which can
5989 * cause problems.
5990 */
5991 extent_end = start;
5992 goto next;
5986 } 5993 }
5987 5994
5988 found_type = btrfs_file_extent_type(leaf, item); 5995 found_type = btrfs_file_extent_type(leaf, item);
@@ -5997,7 +6004,7 @@ again:
5997 size = btrfs_file_extent_inline_len(leaf, item); 6004 size = btrfs_file_extent_inline_len(leaf, item);
5998 extent_end = ALIGN(extent_start + size, root->sectorsize); 6005 extent_end = ALIGN(extent_start + size, root->sectorsize);
5999 } 6006 }
6000 6007next:
6001 if (start >= extent_end) { 6008 if (start >= extent_end) {
6002 path->slots[0]++; 6009 path->slots[0]++;
6003 if (path->slots[0] >= btrfs_header_nritems(leaf)) { 6010 if (path->slots[0] >= btrfs_header_nritems(leaf)) {