* Boston, MA 021110-1307, USA.
*/
-#include <linux/buffer_head.h>
#include <linux/fs.h>
#include <linux/pagemap.h>
#include <linux/highmem.h>
static int insert_inline_extent(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct inode *inode,
- u64 offset, ssize_t size,
- struct page *page, size_t page_offset)
+ u64 offset, size_t size,
+ struct page **pages, size_t page_offset,
+ int num_pages)
{
struct btrfs_key key;
struct btrfs_path *path;
- char *ptr, *kaddr;
+ struct extent_buffer *leaf;
+ char *kaddr;
+ unsigned long ptr;
struct btrfs_file_extent_item *ei;
+ struct page *page;
u32 datasize;
int err = 0;
int ret;
+ int i;
+ ssize_t cur_size;
path = btrfs_alloc_path();
if (!path)
key.objectid = inode->i_ino;
key.offset = offset;
- key.flags = 0;
btrfs_set_key_type(&key, BTRFS_EXTENT_DATA_KEY);
- BUG_ON(size >= PAGE_CACHE_SIZE);
- datasize = btrfs_file_extent_calc_inline_size(size);
+ datasize = btrfs_file_extent_calc_inline_size(offset + size);
- ret = btrfs_insert_empty_item(trans, root, path, &key,
- datasize);
- if (ret) {
+ ret = btrfs_search_slot(trans, root, &key, path, 0, 1);
+ if (ret < 0) {
err = ret;
goto fail;
}
- ei = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
- path->slots[0], struct btrfs_file_extent_item);
- btrfs_set_file_extent_generation(ei, trans->transid);
- btrfs_set_file_extent_type(ei,
- BTRFS_FILE_EXTENT_INLINE);
- ptr = btrfs_file_extent_inline_start(ei);
-
- kaddr = kmap_atomic(page, KM_USER0);
- btrfs_memcpy(root, path->nodes[0]->b_data,
- ptr, kaddr + page_offset, size);
- kunmap_atomic(kaddr, KM_USER0);
- btrfs_mark_buffer_dirty(path->nodes[0]);
+ if (ret == 1) {
+ path->slots[0]--;
+ leaf = path->nodes[0];
+ ei = btrfs_item_ptr(leaf, path->slots[0],
+ struct btrfs_file_extent_item);
+
+ if (btrfs_file_extent_type(leaf, ei) !=
+ BTRFS_FILE_EXTENT_INLINE) {
+ goto insert;
+ }
+ btrfs_item_key_to_cpu(leaf, &key, path->slots[0]);
+ ret = 0;
+ }
+ if (ret == 0) {
+ u32 found_size;
+ u64 found_start;
+
+ leaf = path->nodes[0];
+ ei = btrfs_item_ptr(leaf, path->slots[0],
+ struct btrfs_file_extent_item);
+
+ if (btrfs_file_extent_type(leaf, ei) !=
+ BTRFS_FILE_EXTENT_INLINE) {
+ err = ret;
+ btrfs_print_leaf(root, leaf);
+ printk("found wasn't inline offset %Lu inode %lu\n",
+ offset, inode->i_ino);
+ goto fail;
+ }
+ found_start = key.offset;
+ found_size = btrfs_file_extent_inline_len(leaf,
+ btrfs_item_nr(leaf, path->slots[0]));
+
+ if (found_size < offset + size) {
+ btrfs_release_path(root, path);
+ ret = btrfs_search_slot(trans, root, &key, path,
+ offset + size - found_size -
+ found_start, 1);
+ BUG_ON(ret != 0);
+ ret = btrfs_extend_item(trans, root, path,
+ offset + size - found_size -
+ found_start);
+ if (ret) {
+ err = ret;
+ goto fail;
+ }
+ leaf = path->nodes[0];
+ ei = btrfs_item_ptr(leaf, path->slots[0],
+ struct btrfs_file_extent_item);
+ }
+ } else {
+insert:
+ btrfs_release_path(root, path);
+ ret = btrfs_insert_empty_item(trans, root, path, &key,
+ datasize);
+ if (ret) {
+ err = ret;
+ printk("got bad ret %d\n", ret);
+ goto fail;
+ }
+ leaf = path->nodes[0];
+ ei = btrfs_item_ptr(leaf, path->slots[0],
+ struct btrfs_file_extent_item);
+ btrfs_set_file_extent_generation(leaf, ei, trans->transid);
+ btrfs_set_file_extent_type(leaf, ei, BTRFS_FILE_EXTENT_INLINE);
+ }
+ ptr = btrfs_file_extent_inline_start(ei) + offset;
+
+ cur_size = size;
+ i = 0;
+ while (size > 0) {
+ page = pages[i];
+ kaddr = kmap_atomic(page, KM_USER0);
+ cur_size = min(PAGE_CACHE_SIZE - page_offset, size);
+ write_extent_buffer(leaf, kaddr + page_offset, ptr, cur_size);
+ kunmap_atomic(kaddr, KM_USER0);
+ page_offset = 0;
+ ptr += cur_size;
+ size -= cur_size;
+ if (i >= num_pages) {
+ printk("i %d num_pages %d\n", i, num_pages);
+ }
+ i++;
+ }
+ btrfs_mark_buffer_dirty(leaf);
fail:
btrfs_free_path(path);
return err;
struct inode *inode = file->f_path.dentry->d_inode;
struct extent_map *em;
struct extent_map_tree *em_tree = &BTRFS_I(inode)->extent_tree;
- u64 hint_block;
- u64 num_blocks;
+ u64 hint_byte;
+ u64 num_bytes;
u64 start_pos;
u64 end_of_last_block;
u64 end_pos = pos + write_bytes;
+ u32 inline_size;
loff_t isize = i_size_read(inode);
em = alloc_extent_map(GFP_NOFS);
em->bdev = inode->i_sb->s_bdev;
- start_pos = pos & ~((u64)root->blocksize - 1);
- num_blocks = (write_bytes + pos - start_pos + root->blocksize - 1) >>
- inode->i_blkbits;
+ start_pos = pos & ~((u64)root->sectorsize - 1);
+ num_bytes = (write_bytes + pos - start_pos +
+ root->sectorsize - 1) & ~((u64)root->sectorsize - 1);
down_read(&BTRFS_I(inode)->root->snap_sem);
- end_of_last_block = start_pos + (num_blocks << inode->i_blkbits) - 1;
+ end_of_last_block = start_pos + num_bytes - 1;
+
lock_extent(em_tree, start_pos, end_of_last_block, GFP_NOFS);
mutex_lock(&root->fs_info->fs_mutex);
trans = btrfs_start_transaction(root, 1);
goto out_unlock;
}
btrfs_set_trans_block_group(trans, inode);
- inode->i_blocks += num_blocks << 3;
- hint_block = 0;
+ inode->i_blocks += num_bytes >> 9;
+ hint_byte = 0;
if ((end_of_last_block & 4095) == 0) {
- printk("strange end of last %Lu %lu %Lu\n", start_pos, write_bytes, end_of_last_block);
+ printk("strange end of last %Lu %zu %Lu\n", start_pos, write_bytes, end_of_last_block);
}
set_extent_uptodate(em_tree, start_pos, end_of_last_block, GFP_NOFS);
if (inode->i_size < start_pos) {
u64 last_pos_in_file;
u64 hole_size;
- u64 mask = root->blocksize - 1;
+ u64 mask = root->sectorsize - 1;
last_pos_in_file = (isize + mask) & ~mask;
hole_size = (start_pos - last_pos_in_file + mask) & ~mask;
err = btrfs_drop_extents(trans, root, inode,
last_pos_in_file,
last_pos_in_file + hole_size,
- &hint_block);
+ last_pos_in_file,
+ &hint_byte);
if (err)
goto failed;
- hole_size >>= inode->i_blkbits;
err = btrfs_insert_file_extent(trans, root,
inode->i_ino,
last_pos_in_file,
* either allocate an extent for the new bytes or setup the key
* to show we are doing inline data in the extent
*/
- if (isize >= PAGE_CACHE_SIZE || pos + write_bytes < inode->i_size ||
- pos + write_bytes - start_pos > BTRFS_MAX_INLINE_DATA_SIZE(root)) {
+ inline_size = end_pos;
+ if (isize >= BTRFS_MAX_INLINE_DATA_SIZE(root) ||
+ inline_size >= BTRFS_MAX_INLINE_DATA_SIZE(root)) {
u64 last_end;
+
for (i = 0; i < num_pages; i++) {
struct page *p = pages[i];
SetPageUptodate(p);
set_extent_delalloc(em_tree, start_pos, end_of_last_block,
GFP_NOFS);
} else {
- struct page *p = pages[0];
+ u64 aligned_end;
/* step one, delete the existing extents in this range */
- /* FIXME blocksize != pagesize */
+ aligned_end = (pos + write_bytes + root->sectorsize - 1) &
+ ~((u64)root->sectorsize - 1);
err = btrfs_drop_extents(trans, root, inode, start_pos,
- (pos + write_bytes + root->blocksize -1) &
- ~((u64)root->blocksize - 1), &hint_block);
+ aligned_end, end_pos, &hint_byte);
if (err)
goto failed;
-
err = insert_inline_extent(trans, root, inode, start_pos,
- end_pos - start_pos, p, 0);
+ end_pos - start_pos, pages, 0,
+ num_pages);
BUG_ON(err);
- em->start = start_pos;
- em->end = end_pos;
- em->block_start = EXTENT_MAP_INLINE;
- em->block_end = EXTENT_MAP_INLINE;
- add_extent_mapping(em_tree, em);
}
if (end_pos > isize) {
i_size_write(inode, end_pos);
*/
int btrfs_drop_extents(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct inode *inode,
- u64 start, u64 end, u64 *hint_block)
+ u64 start, u64 end, u64 inline_end, u64 *hint_byte)
{
int ret;
struct btrfs_key key;
- struct btrfs_leaf *leaf;
+ struct extent_buffer *leaf;
int slot;
struct btrfs_file_extent_item *extent;
u64 extent_end = 0;
found_extent = 0;
found_inline = 0;
extent = NULL;
- leaf = btrfs_buffer_leaf(path->nodes[0]);
+ leaf = path->nodes[0];
slot = path->slots[0];
ret = 0;
- btrfs_disk_key_to_cpu(&key, &leaf->items[slot].key);
+ btrfs_item_key_to_cpu(leaf, &key, slot);
if (key.offset >= end || key.objectid != inode->i_ino) {
goto out;
}
if (btrfs_key_type(&key) == BTRFS_EXTENT_DATA_KEY) {
extent = btrfs_item_ptr(leaf, slot,
struct btrfs_file_extent_item);
- found_type = btrfs_file_extent_type(extent);
+ found_type = btrfs_file_extent_type(leaf, extent);
if (found_type == BTRFS_FILE_EXTENT_REG) {
extent_end = key.offset +
- (btrfs_file_extent_num_blocks(extent) <<
- inode->i_blkbits);
+ btrfs_file_extent_num_bytes(leaf, extent);
found_extent = 1;
} else if (found_type == BTRFS_FILE_EXTENT_INLINE) {
+ struct btrfs_item *item;
+ item = btrfs_item_nr(leaf, slot);
found_inline = 1;
extent_end = key.offset +
- btrfs_file_extent_inline_len(leaf->items +
- slot);
+ btrfs_file_extent_inline_len(leaf, item);
}
} else {
extent_end = search_start;
search_start >= extent_end) {
int nextret;
u32 nritems;
- nritems = btrfs_header_nritems(
- btrfs_buffer_header(path->nodes[0]));
+ nritems = btrfs_header_nritems(leaf);
if (slot >= nritems - 1) {
nextret = btrfs_next_leaf(root, path);
if (nextret)
/* FIXME, there's only one inline extent allowed right now */
if (found_inline) {
- u64 mask = root->blocksize - 1;
+ u64 mask = root->sectorsize - 1;
search_start = (extent_end + mask) & ~mask;
} else
search_start = extent_end;
if (end < extent_end && end >= key.offset) {
if (found_extent) {
- u64 disk_blocknr =
- btrfs_file_extent_disk_blocknr(extent);
- u64 disk_num_blocks =
- btrfs_file_extent_disk_num_blocks(extent);
- memcpy(&old, extent, sizeof(old));
- if (disk_blocknr != 0) {
+ u64 disk_bytenr =
+ btrfs_file_extent_disk_bytenr(leaf, extent);
+ u64 disk_num_bytes =
+ btrfs_file_extent_disk_num_bytes(leaf,
+ extent);
+ read_extent_buffer(leaf, &old,
+ (unsigned long)extent,
+ sizeof(old));
+ if (disk_bytenr != 0) {
ret = btrfs_inc_extent_ref(trans, root,
- disk_blocknr, disk_num_blocks);
+ disk_bytenr, disk_num_bytes);
BUG_ON(ret);
}
}
- WARN_ON(found_inline);
- bookend = 1;
+ if (!found_inline)
+ bookend = 1;
}
/* truncate existing extent */
if (start > key.offset) {
u64 new_num;
u64 old_num;
keep = 1;
- WARN_ON(start & (root->blocksize - 1));
+ WARN_ON(start & (root->sectorsize - 1));
if (found_extent) {
- new_num = (start - key.offset) >>
- inode->i_blkbits;
- old_num = btrfs_file_extent_num_blocks(extent);
- *hint_block =
- btrfs_file_extent_disk_blocknr(extent);
- if (btrfs_file_extent_disk_blocknr(extent)) {
+ new_num = start - key.offset;
+ old_num = btrfs_file_extent_num_bytes(leaf,
+ extent);
+ *hint_byte =
+ btrfs_file_extent_disk_bytenr(leaf,
+ extent);
+ if (btrfs_file_extent_disk_bytenr(leaf,
+ extent)) {
inode->i_blocks -=
- (old_num - new_num) << 3;
+ (old_num - new_num) >> 9;
}
- btrfs_set_file_extent_num_blocks(extent,
- new_num);
- btrfs_mark_buffer_dirty(path->nodes[0]);
- } else {
- WARN_ON(1);
+ btrfs_set_file_extent_num_bytes(leaf, extent,
+ new_num);
+ btrfs_mark_buffer_dirty(leaf);
+ } else if (end > extent_end &&
+ key.offset < inline_end &&
+ inline_end < extent_end) {
+ u32 new_size;
+ new_size = btrfs_file_extent_calc_inline_size(
+ inline_end - key.offset);
+ btrfs_truncate_item(trans, root, path,
+ new_size);
}
}
/* delete the entire extent */
if (!keep) {
- u64 disk_blocknr = 0;
- u64 disk_num_blocks = 0;
- u64 extent_num_blocks = 0;
+ u64 disk_bytenr = 0;
+ u64 disk_num_bytes = 0;
+ u64 extent_num_bytes = 0;
if (found_extent) {
- disk_blocknr =
- btrfs_file_extent_disk_blocknr(extent);
- disk_num_blocks =
- btrfs_file_extent_disk_num_blocks(extent);
- extent_num_blocks =
- btrfs_file_extent_num_blocks(extent);
- *hint_block =
- btrfs_file_extent_disk_blocknr(extent);
+ disk_bytenr =
+ btrfs_file_extent_disk_bytenr(leaf,
+ extent);
+ disk_num_bytes =
+ btrfs_file_extent_disk_num_bytes(leaf,
+ extent);
+ extent_num_bytes =
+ btrfs_file_extent_num_bytes(leaf, extent);
+ *hint_byte =
+ btrfs_file_extent_disk_bytenr(leaf,
+ extent);
}
ret = btrfs_del_item(trans, root, path);
/* TODO update progress marker and return */
BUG_ON(ret);
btrfs_release_path(root, path);
extent = NULL;
- if (found_extent && disk_blocknr != 0) {
- inode->i_blocks -= extent_num_blocks << 3;
+ if (found_extent && disk_bytenr != 0) {
+ inode->i_blocks -= extent_num_bytes >> 9;
ret = btrfs_free_extent(trans, root,
- disk_blocknr,
- disk_num_blocks, 0);
+ disk_bytenr,
+ disk_num_bytes, 0);
}
BUG_ON(ret);
struct btrfs_key ins;
ins.objectid = inode->i_ino;
ins.offset = end;
- ins.flags = 0;
btrfs_set_key_type(&ins, BTRFS_EXTENT_DATA_KEY);
btrfs_release_path(root, path);
ret = btrfs_insert_empty_item(trans, root, path, &ins,
sizeof(*extent));
+ leaf = path->nodes[0];
if (ret) {
- btrfs_print_leaf(root, btrfs_buffer_leaf(path->nodes[0]));
- printk("got %d on inserting %Lu %u %Lu start %Lu end %Lu found %Lu %Lu keep was %d\n", ret , ins.objectid, ins.flags, ins.offset, start, end, key.offset, extent_end, keep);
+ btrfs_print_leaf(root, leaf);
+ printk("got %d on inserting %Lu %u %Lu start %Lu end %Lu found %Lu %Lu keep was %d\n", ret , ins.objectid, ins.type, ins.offset, start, end, key.offset, extent_end, keep);
}
BUG_ON(ret);
- extent = btrfs_item_ptr(
- btrfs_buffer_leaf(path->nodes[0]),
- path->slots[0],
- struct btrfs_file_extent_item);
- btrfs_set_file_extent_disk_blocknr(extent,
- btrfs_file_extent_disk_blocknr(&old));
- btrfs_set_file_extent_disk_num_blocks(extent,
- btrfs_file_extent_disk_num_blocks(&old));
-
- btrfs_set_file_extent_offset(extent,
- btrfs_file_extent_offset(&old) +
- ((end - key.offset) >> inode->i_blkbits));
- WARN_ON(btrfs_file_extent_num_blocks(&old) <
- (extent_end - end) >> inode->i_blkbits);
- btrfs_set_file_extent_num_blocks(extent,
- (extent_end - end) >> inode->i_blkbits);
-
- btrfs_set_file_extent_type(extent,
+ extent = btrfs_item_ptr(leaf, path->slots[0],
+ struct btrfs_file_extent_item);
+ write_extent_buffer(leaf, &old,
+ (unsigned long)extent, sizeof(old));
+
+ btrfs_set_file_extent_offset(leaf, extent,
+ le64_to_cpu(old.offset) + end - key.offset);
+ WARN_ON(le64_to_cpu(old.num_bytes) <
+ (extent_end - end));
+ btrfs_set_file_extent_num_bytes(leaf, extent,
+ extent_end - end);
+ btrfs_set_file_extent_type(leaf, extent,
BTRFS_FILE_EXTENT_REG);
- btrfs_set_file_extent_generation(extent,
- btrfs_file_extent_generation(&old));
+
btrfs_mark_buffer_dirty(path->nodes[0]);
- if (btrfs_file_extent_disk_blocknr(&old) != 0) {
+ if (le64_to_cpu(old.disk_bytenr) != 0) {
inode->i_blocks +=
- btrfs_file_extent_num_blocks(extent) << 3;
+ btrfs_file_extent_num_bytes(leaf,
+ extent) >> 9;
}
ret = 0;
goto out;
unsigned long index = pos >> PAGE_CACHE_SHIFT;
struct inode *inode = file->f_path.dentry->d_inode;
int err = 0;
- u64 num_blocks;
u64 start_pos;
- start_pos = pos & ~((u64)root->blocksize - 1);
- num_blocks = (write_bytes + pos - start_pos + root->blocksize - 1) >>
- inode->i_blkbits;
+ start_pos = pos & ~((u64)root->sectorsize - 1);
memset(pages, 0, num_pages * sizeof(struct page *));
}
cancel_dirty_page(pages[i], PAGE_CACHE_SIZE);
wait_on_page_writeback(pages[i]);
- if (!PagePrivate(pages[i])) {
- SetPagePrivate(pages[i]);
- set_page_private(pages[i], 1);
- WARN_ON(!pages[i]->mapping->a_ops->invalidatepage);
- page_cache_get(pages[i]);
- }
+ set_page_extent_mapped(pages[i]);
WARN_ON(!PageLocked(pages[i]));
}
return 0;
num_written += write_bytes;
balance_dirty_pages_ratelimited_nr(inode->i_mapping, num_pages);
- btrfs_btree_balance_dirty(root);
+ btrfs_btree_balance_dirty(root, 1);
cond_resched();
}
mutex_unlock(&inode->i_mutex);
.write = btrfs_file_write,
.mmap = btrfs_file_mmap,
.open = generic_file_open,
- .ioctl = btrfs_ioctl,
.fsync = btrfs_sync_file,
+ .unlocked_ioctl = btrfs_ioctl,
#ifdef CONFIG_COMPAT
- .compat_ioctl = btrfs_compat_ioctl,
+ .compat_ioctl = btrfs_ioctl,
#endif
};