UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Btrfs: byte offsets for file keys 

Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason 2007-03-27 11:26:26 -04:00 committed by David Woodhouse
parent f4b9aa8d3b
commit 9773a78868
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/ctree.h
View File

@ -899,5 +899,5 @@ int btrfs_alloc_file_extent(struct btrfs_trans_handle *trans,
int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans, int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct btrfs_root *root,
struct btrfs_path *path, u64 objectid, struct btrfs_path *path, u64 objectid,
u64 blocknr, u64 num_blocks, int mod); u64 blocknr, int mod);
#endif #endif

5
fs/btrfs/file-item.c
View File

@ -26,6 +26,7 @@ int btrfs_alloc_file_extent(struct btrfs_trans_handle *trans,
ret = btrfs_insert_empty_item(trans, root, &path, &file_key, ret = btrfs_insert_empty_item(trans, root, &path, &file_key,
sizeof(*item)); sizeof(*item));
BUG_ON(ret);
item = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]), path.slots[0], item = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]), path.slots[0],
struct btrfs_file_extent_item); struct btrfs_file_extent_item);
btrfs_set_file_extent_disk_blocknr(item, ins.objectid); btrfs_set_file_extent_disk_blocknr(item, ins.objectid);
@ -42,7 +43,7 @@ int btrfs_alloc_file_extent(struct btrfs_trans_handle *trans,
int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans, int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct btrfs_root *root,
struct btrfs_path *path, u64 objectid, struct btrfs_path *path, u64 objectid,
u64 blocknr, u64 num_blocks, int mod) u64 offset, int mod)
{ {
int ret; int ret;
struct btrfs_key file_key; struct btrfs_key file_key;
@ -50,7 +51,7 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,
int cow = mod != 0; int cow = mod != 0;
file_key.objectid = objectid; file_key.objectid = objectid;
file_key.offset = blocknr; file_key.offset = offset;
file_key.flags = 0; file_key.flags = 0;
btrfs_set_key_type(&file_key, BTRFS_EXTENT_DATA_KEY); btrfs_set_key_type(&file_key, BTRFS_EXTENT_DATA_KEY);
ret = btrfs_search_slot(trans, root, &file_key, path, ins_len, cow); ret = btrfs_search_slot(trans, root, &file_key, path, ins_len, cow);

7
fs/btrfs/super.c
View File

@ -697,7 +697,8 @@ static int btrfs_get_block(struct inode *inode, sector_t iblock,
ret = btrfs_lookup_file_extent(trans, root, &path, ret = btrfs_lookup_file_extent(trans, root, &path,
inode->i_ino, iblock, 1, 0); inode->i_ino,
iblock << inode->i_blkbits, 0);
if (ret < 0) { if (ret < 0) {
btrfs_release_path(root, &path); btrfs_release_path(root, &path);
err = ret; err = ret;
@ -737,6 +738,7 @@ static int btrfs_get_block(struct inode *inode, sector_t iblock,
} }
extent_start = btrfs_disk_key_offset(&leaf->items[path.slots[0]].key); extent_start = btrfs_disk_key_offset(&leaf->items[path.slots[0]].key);
extent_start = extent_start >> inode->i_blkbits;
extent_start += btrfs_file_extent_offset(item); extent_start += btrfs_file_extent_offset(item);
extent_end = extent_start + btrfs_file_extent_num_blocks(item); extent_end = extent_start + btrfs_file_extent_num_blocks(item);
btrfs_release_path(root, &path); btrfs_release_path(root, &path);
@ -751,7 +753,8 @@ allocate:
err = 0; err = 0;
goto out; goto out;
} }
ret = btrfs_alloc_file_extent(trans, root, objectid, iblock, ret = btrfs_alloc_file_extent(trans, root, objectid,
iblock << inode->i_blkbits,
1, extent_end, &blocknr); 1, extent_end, &blocknr);
if (ret) { if (ret) {
err = ret; err = ret;