diff options
author | Chris Mason <chris.mason@oracle.com> | 2007-03-27 11:26:26 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@hera.kernel.org> | 2007-03-27 11:26:26 -0400 |
commit | 9773a788681db1f5c2701b7433737fdca61a14ba (patch) | |
tree | 9d5f79f7a0e3b0f5e89509b42a3d8134364bed32 /fs/btrfs/file-item.c | |
parent | f4b9aa8d3b877d0a6044a6d6d9a44b29cab9e265 (diff) |
Btrfs: byte offsets for file keys
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/file-item.c')
-rw-r--r-- | fs/btrfs/file-item.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c index 09de270c5a52..5230a44cb19b 100644 --- a/fs/btrfs/file-item.c +++ b/fs/btrfs/file-item.c | |||
@@ -26,6 +26,7 @@ int btrfs_alloc_file_extent(struct btrfs_trans_handle *trans, | |||
26 | 26 | ||
27 | ret = btrfs_insert_empty_item(trans, root, &path, &file_key, | 27 | ret = btrfs_insert_empty_item(trans, root, &path, &file_key, |
28 | sizeof(*item)); | 28 | sizeof(*item)); |
29 | BUG_ON(ret); | ||
29 | item = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]), path.slots[0], | 30 | item = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]), path.slots[0], |
30 | struct btrfs_file_extent_item); | 31 | struct btrfs_file_extent_item); |
31 | btrfs_set_file_extent_disk_blocknr(item, ins.objectid); | 32 | btrfs_set_file_extent_disk_blocknr(item, ins.objectid); |
@@ -42,7 +43,7 @@ int btrfs_alloc_file_extent(struct btrfs_trans_handle *trans, | |||
42 | int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans, | 43 | int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans, |
43 | struct btrfs_root *root, | 44 | struct btrfs_root *root, |
44 | struct btrfs_path *path, u64 objectid, | 45 | struct btrfs_path *path, u64 objectid, |
45 | u64 blocknr, u64 num_blocks, int mod) | 46 | u64 offset, int mod) |
46 | { | 47 | { |
47 | int ret; | 48 | int ret; |
48 | struct btrfs_key file_key; | 49 | struct btrfs_key file_key; |
@@ -50,7 +51,7 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans, | |||
50 | int cow = mod != 0; | 51 | int cow = mod != 0; |
51 | 52 | ||
52 | file_key.objectid = objectid; | 53 | file_key.objectid = objectid; |
53 | file_key.offset = blocknr; | 54 | file_key.offset = offset; |
54 | file_key.flags = 0; | 55 | file_key.flags = 0; |
55 | btrfs_set_key_type(&file_key, BTRFS_EXTENT_DATA_KEY); | 56 | btrfs_set_key_type(&file_key, BTRFS_EXTENT_DATA_KEY); |
56 | ret = btrfs_search_slot(trans, root, &file_key, path, ins_len, cow); | 57 | ret = btrfs_search_slot(trans, root, &file_key, path, ins_len, cow); |