* 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_root *root, struct inode *inode,
- u64 offset, ssize_t size,
- struct buffer_head *bh)
+static int insert_inline_extent(struct btrfs_trans_handle *trans,
+ struct btrfs_root *root, struct inode *inode,
+ 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 btrfs_trans_handle *trans;
+ 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)
return -ENOMEM;
- mutex_lock(&root->fs_info->fs_mutex);
- trans = btrfs_start_transaction(root, 1);
btrfs_set_trans_block_group(trans, inode);
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);
- 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(bh->b_page, KM_USER0);
- btrfs_memcpy(root, path->nodes[0]->b_data,
- ptr, kaddr + bh_offset(bh),
- size);
- kunmap_atomic(kaddr, KM_USER0);
- btrfs_mark_buffer_dirty(path->nodes[0]);
+ if (ret == 1) {
+ struct btrfs_key found_key;
+
+ if (path->slots[0] == 0)
+ goto insert;
+
+ path->slots[0]--;
+ leaf = path->nodes[0];
+ btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]);
+
+ if (found_key.objectid != inode->i_ino)
+ goto insert;
+
+ if (found_key.type != BTRFS_EXTENT_DATA_KEY)
+ goto insert;
+ 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_end;
+
+ 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_size = btrfs_file_extent_inline_len(leaf,
+ btrfs_item_nr(leaf, path->slots[0]));
+ found_end = key.offset + found_size;
+
+ if (found_end < offset + size) {
+ btrfs_release_path(root, path);
+ ret = btrfs_search_slot(trans, root, &key, path,
+ offset + size - found_end, 1);
+ BUG_ON(ret != 0);
+
+ ret = btrfs_extend_item(trans, root, path,
+ offset + size - found_end);
+ if (ret) {
+ err = ret;
+ goto fail;
+ }
+ leaf = path->nodes[0];
+ ei = btrfs_item_ptr(leaf, path->slots[0],
+ struct btrfs_file_extent_item);
+ }
+ if (found_end < offset) {
+ ptr = btrfs_file_extent_inline_start(ei) + found_size;
+ memset_extent_buffer(leaf, 0, ptr, offset - found_end);
+ }
+ } else {
+insert:
+ btrfs_release_path(root, path);
+ datasize = offset + size - key.offset;
+ datasize = btrfs_file_extent_calc_inline_size(datasize);
+ 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 - key.offset;
+
+ cur_size = size;
+ i = 0;
+ while (size > 0) {
+ page = pages[i];
+ kaddr = kmap_atomic(page, KM_USER0);
+ cur_size = min_t(size_t, 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);
- ret = btrfs_end_transaction(trans, root);
- if (ret && !err)
- err = ret;
- mutex_unlock(&root->fs_info->fs_mutex);
return err;
}
loff_t pos,
size_t write_bytes)
{
- int i;
- int offset;
int err = 0;
- int ret;
- int this_write;
+ int i;
struct inode *inode = file->f_path.dentry->d_inode;
- struct buffer_head *bh;
+ struct extent_map *em;
+ struct extent_map_tree *em_tree = &BTRFS_I(inode)->extent_tree;
+ u64 hint_byte;
+ u64 num_bytes;
+ u64 start_pos;
+ u64 end_of_last_block;
+ u64 end_pos = pos + write_bytes;
+ u64 inline_size;
+ loff_t isize = i_size_read(inode);
+ em = alloc_extent_map(GFP_NOFS);
+ if (!em)
+ return -ENOMEM;
- for (i = 0; i < num_pages; i++) {
- offset = pos & (PAGE_CACHE_SIZE -1);
- this_write = min((size_t)PAGE_CACHE_SIZE - offset, write_bytes);
+ em->bdev = inode->i_sb->s_bdev;
- /* FIXME, one block at a time */
- bh = page_buffers(pages[i]);
+ start_pos = pos & ~((u64)root->sectorsize - 1);
+ num_bytes = (write_bytes + pos - start_pos +
+ root->sectorsize - 1) & ~((u64)root->sectorsize - 1);
- if (buffer_mapped(bh) && bh->b_blocknr == 0) {
- ret = insert_inline_extent(root, inode,
- pages[i]->index << PAGE_CACHE_SHIFT,
- offset + this_write, bh);
- if (ret) {
- err = ret;
+ down_read(&BTRFS_I(inode)->root->snap_sem);
+ 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);
+ if (!trans) {
+ err = -ENOMEM;
+ goto out_unlock;
+ }
+ btrfs_set_trans_block_group(trans, inode);
+ inode->i_blocks += num_bytes >> 9;
+ hint_byte = 0;
+
+ if ((end_of_last_block & 4095) == 0) {
+ 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);
+
+ /* FIXME...EIEIO, ENOSPC and more */
+
+ /* insert any holes we need to create */
+ if (inode->i_size < start_pos) {
+ u64 last_pos_in_file;
+ u64 hole_size;
+ u64 mask = root->sectorsize - 1;
+ last_pos_in_file = (isize + mask) & ~mask;
+ hole_size = (start_pos - last_pos_in_file + mask) & ~mask;
+
+ if (last_pos_in_file < start_pos) {
+ err = btrfs_drop_extents(trans, root, inode,
+ last_pos_in_file,
+ last_pos_in_file + hole_size,
+ last_pos_in_file,
+ &hint_byte);
+ if (err)
goto failed;
- }
- }
- ret = btrfs_commit_write(file, pages[i], offset,
- offset + this_write);
- pos += this_write;
- if (ret) {
- err = ret;
+ err = btrfs_insert_file_extent(trans, root,
+ inode->i_ino,
+ last_pos_in_file,
+ 0, 0, hole_size);
+ }
+ if (err)
goto failed;
+ }
+
+ /*
+ * either allocate an extent for the new bytes or setup the key
+ * to show we are doing inline data in the extent
+ */
+ inline_size = end_pos;
+ if (isize >= BTRFS_MAX_INLINE_DATA_SIZE(root) ||
+ inline_size > 32768 ||
+ 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_page_dirty(p);
}
- WARN_ON(this_write > write_bytes);
- write_bytes -= this_write;
+ last_end = (u64)(pages[num_pages -1]->index) <<
+ PAGE_CACHE_SHIFT;
+ last_end += PAGE_CACHE_SIZE - 1;
+ set_extent_delalloc(em_tree, start_pos, end_of_last_block,
+ GFP_NOFS);
+ } else {
+ u64 aligned_end;
+ /* step one, delete the existing extents in this range */
+ aligned_end = (pos + write_bytes + root->sectorsize - 1) &
+ ~((u64)root->sectorsize - 1);
+ err = btrfs_drop_extents(trans, root, inode, start_pos,
+ aligned_end, aligned_end, &hint_byte);
+ if (err)
+ goto failed;
+ if (isize > inline_size)
+ inline_size = min_t(u64, isize, aligned_end);
+ inline_size -= start_pos;
+ err = insert_inline_extent(trans, root, inode, start_pos,
+ inline_size, pages, 0, num_pages);
+ BUG_ON(err);
+ }
+ if (end_pos > isize) {
+ i_size_write(inode, end_pos);
+ btrfs_update_inode(trans, root, inode);
}
failed:
+ err = btrfs_end_transaction(trans, root);
+out_unlock:
+ mutex_unlock(&root->fs_info->fs_mutex);
+ unlock_extent(em_tree, start_pos, end_of_last_block, GFP_NOFS);
+ free_extent_map(em);
+ up_read(&BTRFS_I(inode)->root->snap_sem);
return err;
}
+int btrfs_drop_extent_cache(struct inode *inode, u64 start, u64 end)
+{
+ struct extent_map *em;
+ struct extent_map_tree *em_tree = &BTRFS_I(inode)->extent_tree;
+
+ while(1) {
+ em = lookup_extent_mapping(em_tree, start, end);
+ if (!em)
+ break;
+ remove_extent_mapping(em_tree, em);
+ /* once for us */
+ free_extent_map(em);
+ /* once for the tree*/
+ free_extent_map(em);
+ }
+ return 0;
+}
+
/*
* this is very complex, but the basic idea is to drop all extents
* in the range start - end. hint_block is filled in with a block number
*/
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_limit, u64 *hint_byte)
{
- int ret;
- struct btrfs_key key;
- struct btrfs_leaf *leaf;
- int slot;
- struct btrfs_file_extent_item *extent;
u64 extent_end = 0;
- int keep;
- struct btrfs_file_extent_item old;
- struct btrfs_path *path;
u64 search_start = start;
+ struct extent_buffer *leaf;
+ struct btrfs_file_extent_item *extent;
+ struct btrfs_path *path;
+ struct btrfs_key key;
+ struct btrfs_file_extent_item old;
+ int keep;
+ int slot;
int bookend;
int found_type;
int found_extent;
int found_inline;
int recow;
+ int ret;
+
+ btrfs_drop_extent_cache(inode, start, end - 1);
path = btrfs_alloc_path();
if (!path)
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 =
+ btrfs_file_extent_disk_bytenr(leaf,
+ extent);
+ if (extent_end)
+ *hint_byte = extent_end;
+
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)
goto next_slot;
}
- /* 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 && start > key.offset && found_inline) {
+ *hint_byte = EXTENT_MAP_INLINE;
+ }
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 && start <= key.offset &&
+ inline_limit < extent_end)
+ keep = 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 (key.offset < inline_limit &&
+ (end > extent_end) &&
+ (inline_limit < extent_end)) {
+ u32 new_size;
+ new_size = btrfs_file_extent_calc_inline_size(
+ inline_limit - key.offset);
+ btrfs_truncate_item(trans, root, path,
+ new_size, 1);
}
}
/* 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);
if (!bookend)
continue;
}
+ if (bookend && found_inline && start <= key.offset &&
+ inline_limit < extent_end && key.offset <= inline_limit) {
+ u32 new_size;
+ new_size = btrfs_file_extent_calc_inline_size(
+ extent_end - inline_limit);
+ btrfs_truncate_item(trans, root, path, new_size, 0);
+ }
/* create bookend, splitting the extent in two */
if (bookend && found_extent) {
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\n", ret , ins.objectid, ins.flags, ins.offset, start, end, key.offset, extent_end);
+ 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;
int i;
unsigned long index = pos >> PAGE_CACHE_SHIFT;
struct inode *inode = file->f_path.dentry->d_inode;
- int offset;
int err = 0;
- int this_write;
- struct buffer_head *bh;
- struct buffer_head *head;
- loff_t isize = i_size_read(inode);
- struct btrfs_trans_handle *trans;
- u64 hint_block;
- u64 num_blocks;
- u64 alloc_extent_start;
u64 start_pos;
- struct btrfs_key ins;
- start_pos = pos & ~((u64)PAGE_CACHE_SIZE - 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 *));
pages[i] = grab_cache_page(inode->i_mapping, index + i);
if (!pages[i]) {
err = -ENOMEM;
- goto failed_release;
+ BUG_ON(1);
}
cancel_dirty_page(pages[i], PAGE_CACHE_SIZE);
wait_on_page_writeback(pages[i]);
- }
-
- mutex_lock(&root->fs_info->fs_mutex);
- trans = btrfs_start_transaction(root, 1);
- if (!trans) {
- err = -ENOMEM;
- mutex_unlock(&root->fs_info->fs_mutex);
- goto out_unlock;
- }
- btrfs_set_trans_block_group(trans, inode);
- /* FIXME blocksize != 4096 */
- inode->i_blocks += num_blocks << 3;
- hint_block = 0;
-
- /* FIXME...EIEIO, ENOSPC and more */
-
- /* step one, delete the existing extents in this range */
- /* FIXME blocksize != pagesize */
- if (start_pos < inode->i_size) {
- err = btrfs_drop_extents(trans, root, inode,
- start_pos, (pos + write_bytes + root->blocksize -1) &
- ~((u64)root->blocksize - 1), &hint_block);
- if (err)
- goto failed_release;
- }
-
- /* insert any holes we need to create */
- if (inode->i_size < start_pos) {
- u64 last_pos_in_file;
- u64 hole_size;
- u64 mask = root->blocksize - 1;
- last_pos_in_file = (isize + mask) & ~mask;
- hole_size = (start_pos - last_pos_in_file + mask) & ~mask;
- hole_size >>= inode->i_blkbits;
- if (last_pos_in_file < start_pos) {
- err = btrfs_insert_file_extent(trans, root,
- inode->i_ino,
- last_pos_in_file,
- 0, 0, hole_size);
- }
- if (err)
- goto failed_release;
- }
-
- /*
- * 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)) {
- err = btrfs_alloc_extent(trans, root, inode->i_ino,
- num_blocks, hint_block, (u64)-1,
- &ins, 1);
- if (err)
- goto failed_truncate;
- err = btrfs_insert_file_extent(trans, root, inode->i_ino,
- start_pos, ins.objectid, ins.offset,
- ins.offset);
- if (err)
- goto failed_truncate;
- } else {
- ins.offset = 0;
- ins.objectid = 0;
- }
- BUG_ON(err);
- alloc_extent_start = ins.objectid;
- err = btrfs_end_transaction(trans, root);
- mutex_unlock(&root->fs_info->fs_mutex);
-
- for (i = 0; i < num_pages; i++) {
- offset = pos & (PAGE_CACHE_SIZE -1);
- this_write = min((size_t)PAGE_CACHE_SIZE - offset, write_bytes);
- if (!page_has_buffers(pages[i])) {
- create_empty_buffers(pages[i],
- root->fs_info->sb->s_blocksize,
- (1 << BH_Uptodate));
- }
- head = page_buffers(pages[i]);
- bh = head;
- do {
- err = btrfs_map_bh_to_logical(root, bh,
- alloc_extent_start);
- BUG_ON(err);
- if (err)
- goto failed_truncate;
- bh = bh->b_this_page;
- if (alloc_extent_start)
- alloc_extent_start++;
- } while (bh != head);
- pos += this_write;
- WARN_ON(this_write > write_bytes);
- write_bytes -= this_write;
+ set_page_extent_mapped(pages[i]);
+ WARN_ON(!PageLocked(pages[i]));
}
return 0;
-
-failed_release:
- btrfs_drop_pages(pages, num_pages);
- return err;
-
-failed_truncate:
- btrfs_drop_pages(pages, num_pages);
- if (pos > isize)
- vmtruncate(inode, isize);
- return err;
-
-out_unlock:
- mutex_unlock(&root->fs_info->fs_mutex);
- goto failed_release;
-
}
static ssize_t btrfs_file_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
{
loff_t pos;
- size_t num_written = 0;
- int err = 0;
+ loff_t start_pos;
+ ssize_t num_written = 0;
+ ssize_t err = 0;
int ret = 0;
struct inode *inode = file->f_path.dentry->d_inode;
struct btrfs_root *root = BTRFS_I(inode)->root;
pinned[1] = NULL;
if (file->f_flags & O_DIRECT)
return -EINVAL;
+
pos = *ppos;
+ start_pos = pos;
+
vfs_check_frozen(inode->i_sb, SB_FREEZE_WRITE);
current->backing_dev_info = inode->i_mapping->backing_dev_info;
err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode));
num_written += write_bytes;
balance_dirty_pages_ratelimited_nr(inode->i_mapping, num_pages);
- btrfs_btree_balance_dirty(root);
+ if (num_pages < (root->leafsize >> PAGE_CACHE_SHIFT) + 1)
+ btrfs_btree_balance_dirty(root, 1);
cond_resched();
}
mutex_unlock(&inode->i_mutex);
if (pinned[1])
page_cache_release(pinned[1]);
*ppos = pos;
+
+ if (num_written > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
+ err = sync_page_range(inode, inode->i_mapping,
+ start_pos, num_written);
+ if (err < 0)
+ num_written = err;
+ }
current->backing_dev_info = NULL;
- mark_inode_dirty(inode);
return num_written ? num_written : err;
}
{
struct inode *inode = dentry->d_inode;
struct btrfs_root *root = BTRFS_I(inode)->root;
- int ret;
+ int ret = 0;
struct btrfs_trans_handle *trans;
/*
- * FIXME, use inode generation number to check if we can skip the
- * commit
+ * check the transaction that last modified this inode
+ * and see if its already been committed
*/
mutex_lock(&root->fs_info->fs_mutex);
+ if (!BTRFS_I(inode)->last_trans)
+ goto out;
+ mutex_lock(&root->fs_info->trans_mutex);
+ if (BTRFS_I(inode)->last_trans <=
+ root->fs_info->last_trans_committed) {
+ BTRFS_I(inode)->last_trans = 0;
+ mutex_unlock(&root->fs_info->trans_mutex);
+ goto out;
+ }
+ mutex_unlock(&root->fs_info->trans_mutex);
+
+ /*
+ * ok we haven't committed the transaction yet, lets do a commit
+ */
trans = btrfs_start_transaction(root, 1);
if (!trans) {
ret = -ENOMEM;
goto out;
}
ret = btrfs_commit_transaction(trans, root);
- mutex_unlock(&root->fs_info->fs_mutex);
out:
+ mutex_unlock(&root->fs_info->fs_mutex);
return ret > 0 ? EIO : ret;
}
.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
};
projects / ~andy / linux / blobdiff