|
@@ -100,7 +100,8 @@ static noinline int cow_file_range(struct inode *inode,
|
|
static struct extent_map *create_pinned_em(struct inode *inode, u64 start,
|
|
static struct extent_map *create_pinned_em(struct inode *inode, u64 start,
|
|
u64 len, u64 orig_start,
|
|
u64 len, u64 orig_start,
|
|
u64 block_start, u64 block_len,
|
|
u64 block_start, u64 block_len,
|
|
- u64 orig_block_len, int type);
|
|
|
|
|
|
+ u64 orig_block_len, u64 ram_bytes,
|
|
|
|
+ int type);
|
|
|
|
|
|
static int btrfs_init_inode_security(struct btrfs_trans_handle *trans,
|
|
static int btrfs_init_inode_security(struct btrfs_trans_handle *trans,
|
|
struct inode *inode, struct inode *dir,
|
|
struct inode *inode, struct inode *dir,
|
|
@@ -722,6 +723,7 @@ retry:
|
|
em->block_start = ins.objectid;
|
|
em->block_start = ins.objectid;
|
|
em->block_len = ins.offset;
|
|
em->block_len = ins.offset;
|
|
em->orig_block_len = ins.offset;
|
|
em->orig_block_len = ins.offset;
|
|
|
|
+ em->ram_bytes = async_extent->ram_size;
|
|
em->bdev = root->fs_info->fs_devices->latest_bdev;
|
|
em->bdev = root->fs_info->fs_devices->latest_bdev;
|
|
em->compress_type = async_extent->compress_type;
|
|
em->compress_type = async_extent->compress_type;
|
|
set_bit(EXTENT_FLAG_PINNED, &em->flags);
|
|
set_bit(EXTENT_FLAG_PINNED, &em->flags);
|
|
@@ -932,6 +934,7 @@ static noinline int __cow_file_range(struct btrfs_trans_handle *trans,
|
|
em->block_start = ins.objectid;
|
|
em->block_start = ins.objectid;
|
|
em->block_len = ins.offset;
|
|
em->block_len = ins.offset;
|
|
em->orig_block_len = ins.offset;
|
|
em->orig_block_len = ins.offset;
|
|
|
|
+ em->ram_bytes = ram_size;
|
|
em->bdev = root->fs_info->fs_devices->latest_bdev;
|
|
em->bdev = root->fs_info->fs_devices->latest_bdev;
|
|
set_bit(EXTENT_FLAG_PINNED, &em->flags);
|
|
set_bit(EXTENT_FLAG_PINNED, &em->flags);
|
|
em->generation = -1;
|
|
em->generation = -1;
|
|
@@ -1194,6 +1197,7 @@ static noinline int run_delalloc_nocow(struct inode *inode,
|
|
u64 disk_bytenr;
|
|
u64 disk_bytenr;
|
|
u64 num_bytes;
|
|
u64 num_bytes;
|
|
u64 disk_num_bytes;
|
|
u64 disk_num_bytes;
|
|
|
|
+ u64 ram_bytes;
|
|
int extent_type;
|
|
int extent_type;
|
|
int ret, err;
|
|
int ret, err;
|
|
int type;
|
|
int type;
|
|
@@ -1290,6 +1294,7 @@ next_slot:
|
|
struct btrfs_file_extent_item);
|
|
struct btrfs_file_extent_item);
|
|
extent_type = btrfs_file_extent_type(leaf, fi);
|
|
extent_type = btrfs_file_extent_type(leaf, fi);
|
|
|
|
|
|
|
|
+ ram_bytes = btrfs_file_extent_ram_bytes(leaf, fi);
|
|
if (extent_type == BTRFS_FILE_EXTENT_REG ||
|
|
if (extent_type == BTRFS_FILE_EXTENT_REG ||
|
|
extent_type == BTRFS_FILE_EXTENT_PREALLOC) {
|
|
extent_type == BTRFS_FILE_EXTENT_PREALLOC) {
|
|
disk_bytenr = btrfs_file_extent_disk_bytenr(leaf, fi);
|
|
disk_bytenr = btrfs_file_extent_disk_bytenr(leaf, fi);
|
|
@@ -1373,6 +1378,7 @@ out_check:
|
|
em->block_len = num_bytes;
|
|
em->block_len = num_bytes;
|
|
em->block_start = disk_bytenr;
|
|
em->block_start = disk_bytenr;
|
|
em->orig_block_len = disk_num_bytes;
|
|
em->orig_block_len = disk_num_bytes;
|
|
|
|
+ em->ram_bytes = ram_bytes;
|
|
em->bdev = root->fs_info->fs_devices->latest_bdev;
|
|
em->bdev = root->fs_info->fs_devices->latest_bdev;
|
|
em->mod_start = em->start;
|
|
em->mod_start = em->start;
|
|
em->mod_len = em->len;
|
|
em->mod_len = em->len;
|
|
@@ -4454,6 +4460,7 @@ int btrfs_cont_expand(struct inode *inode, loff_t oldsize, loff_t size)
|
|
hole_em->block_start = EXTENT_MAP_HOLE;
|
|
hole_em->block_start = EXTENT_MAP_HOLE;
|
|
hole_em->block_len = 0;
|
|
hole_em->block_len = 0;
|
|
hole_em->orig_block_len = 0;
|
|
hole_em->orig_block_len = 0;
|
|
|
|
+ hole_em->ram_bytes = hole_size;
|
|
hole_em->bdev = root->fs_info->fs_devices->latest_bdev;
|
|
hole_em->bdev = root->fs_info->fs_devices->latest_bdev;
|
|
hole_em->compress_type = BTRFS_COMPRESS_NONE;
|
|
hole_em->compress_type = BTRFS_COMPRESS_NONE;
|
|
hole_em->generation = trans->transid;
|
|
hole_em->generation = trans->transid;
|
|
@@ -6156,6 +6163,7 @@ again:
|
|
goto not_found_em;
|
|
goto not_found_em;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ em->ram_bytes = btrfs_file_extent_ram_bytes(leaf, item);
|
|
if (found_type == BTRFS_FILE_EXTENT_REG ||
|
|
if (found_type == BTRFS_FILE_EXTENT_REG ||
|
|
found_type == BTRFS_FILE_EXTENT_PREALLOC) {
|
|
found_type == BTRFS_FILE_EXTENT_PREALLOC) {
|
|
em->start = extent_start;
|
|
em->start = extent_start;
|
|
@@ -6487,7 +6495,7 @@ static struct extent_map *btrfs_new_extent_direct(struct inode *inode,
|
|
}
|
|
}
|
|
|
|
|
|
em = create_pinned_em(inode, start, ins.offset, start, ins.objectid,
|
|
em = create_pinned_em(inode, start, ins.offset, start, ins.objectid,
|
|
- ins.offset, ins.offset, 0);
|
|
|
|
|
|
+ ins.offset, ins.offset, ins.offset, 0);
|
|
if (IS_ERR(em))
|
|
if (IS_ERR(em))
|
|
goto out;
|
|
goto out;
|
|
|
|
|
|
@@ -6666,7 +6674,8 @@ static int lock_extent_direct(struct inode *inode, u64 lockstart, u64 lockend,
|
|
static struct extent_map *create_pinned_em(struct inode *inode, u64 start,
|
|
static struct extent_map *create_pinned_em(struct inode *inode, u64 start,
|
|
u64 len, u64 orig_start,
|
|
u64 len, u64 orig_start,
|
|
u64 block_start, u64 block_len,
|
|
u64 block_start, u64 block_len,
|
|
- u64 orig_block_len, int type)
|
|
|
|
|
|
+ u64 orig_block_len, u64 ram_bytes,
|
|
|
|
+ int type)
|
|
{
|
|
{
|
|
struct extent_map_tree *em_tree;
|
|
struct extent_map_tree *em_tree;
|
|
struct extent_map *em;
|
|
struct extent_map *em;
|
|
@@ -6687,6 +6696,7 @@ static struct extent_map *create_pinned_em(struct inode *inode, u64 start,
|
|
em->block_start = block_start;
|
|
em->block_start = block_start;
|
|
em->bdev = root->fs_info->fs_devices->latest_bdev;
|
|
em->bdev = root->fs_info->fs_devices->latest_bdev;
|
|
em->orig_block_len = orig_block_len;
|
|
em->orig_block_len = orig_block_len;
|
|
|
|
+ em->ram_bytes = ram_bytes;
|
|
em->generation = -1;
|
|
em->generation = -1;
|
|
set_bit(EXTENT_FLAG_PINNED, &em->flags);
|
|
set_bit(EXTENT_FLAG_PINNED, &em->flags);
|
|
if (type == BTRFS_ORDERED_PREALLOC)
|
|
if (type == BTRFS_ORDERED_PREALLOC)
|
|
@@ -6815,13 +6825,15 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock,
|
|
if (can_nocow_odirect(trans, inode, start, len) == 1) {
|
|
if (can_nocow_odirect(trans, inode, start, len) == 1) {
|
|
u64 orig_start = em->orig_start;
|
|
u64 orig_start = em->orig_start;
|
|
u64 orig_block_len = em->orig_block_len;
|
|
u64 orig_block_len = em->orig_block_len;
|
|
|
|
+ u64 ram_bytes = em->ram_bytes;
|
|
|
|
|
|
if (type == BTRFS_ORDERED_PREALLOC) {
|
|
if (type == BTRFS_ORDERED_PREALLOC) {
|
|
free_extent_map(em);
|
|
free_extent_map(em);
|
|
em = create_pinned_em(inode, start, len,
|
|
em = create_pinned_em(inode, start, len,
|
|
orig_start,
|
|
orig_start,
|
|
block_start, len,
|
|
block_start, len,
|
|
- orig_block_len, type);
|
|
|
|
|
|
+ orig_block_len,
|
|
|
|
+ ram_bytes, type);
|
|
if (IS_ERR(em)) {
|
|
if (IS_ERR(em)) {
|
|
btrfs_end_transaction(trans, root);
|
|
btrfs_end_transaction(trans, root);
|
|
goto unlock_err;
|
|
goto unlock_err;
|
|
@@ -8574,6 +8586,7 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode,
|
|
em->block_start = ins.objectid;
|
|
em->block_start = ins.objectid;
|
|
em->block_len = ins.offset;
|
|
em->block_len = ins.offset;
|
|
em->orig_block_len = ins.offset;
|
|
em->orig_block_len = ins.offset;
|
|
|
|
+ em->ram_bytes = ins.offset;
|
|
em->bdev = root->fs_info->fs_devices->latest_bdev;
|
|
em->bdev = root->fs_info->fs_devices->latest_bdev;
|
|
set_bit(EXTENT_FLAG_PREALLOC, &em->flags);
|
|
set_bit(EXTENT_FLAG_PREALLOC, &em->flags);
|
|
em->generation = trans->transid;
|
|
em->generation = trans->transid;
|