Commit 9ebefb18 authored by Chris Mason's avatar Chris Mason Committed by David Woodhouse

Btrfs: patch queue: page_mkwrite

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent f1ace244
...@@ -1142,6 +1142,8 @@ int btrfs_csum_truncate(struct btrfs_trans_handle *trans, ...@@ -1142,6 +1142,8 @@ int btrfs_csum_truncate(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct btrfs_path *path, struct btrfs_root *root, struct btrfs_path *path,
u64 isize); u64 isize);
/* inode.c */ /* inode.c */
int btrfs_page_mkwrite(struct vm_area_struct *vma, struct page *page);
int btrfs_readpage(struct file *file, struct page *page);
void btrfs_delete_inode(struct inode *inode); void btrfs_delete_inode(struct inode *inode);
void btrfs_read_locked_inode(struct inode *inode); void btrfs_read_locked_inode(struct inode *inode);
int btrfs_write_inode(struct inode *inode, int wait); int btrfs_write_inode(struct inode *inode, int wait);
......
...@@ -155,9 +155,9 @@ int btrfs_csum_data(struct btrfs_root * root, char *data, size_t len, ...@@ -155,9 +155,9 @@ int btrfs_csum_data(struct btrfs_root * root, char *data, size_t len,
desc.tfm = tfm; desc.tfm = tfm;
desc.flags = 0; desc.flags = 0;
sg_init_one(&sg, data, len); sg_init_one(&sg, data, len);
spin_lock(&root->fs_info->hash_lock); spin_lock_irq(&root->fs_info->hash_lock);
ret = crypto_hash_digest(&desc, &sg, 1, result); ret = crypto_hash_digest(&desc, &sg, 1, result);
spin_unlock(&root->fs_info->hash_lock); spin_unlock_irq(&root->fs_info->hash_lock);
if (ret) { if (ret) {
printk("digest failed\n"); printk("digest failed\n");
} }
......
...@@ -228,6 +228,7 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans, ...@@ -228,6 +228,7 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
path->nodes[0]->b_data, path->nodes[0]->b_data,
root->fs_info->sb->s_blocksize); root->fs_info->sb->s_blocksize);
ret = btrfs_csum_data(root, data, len, &item->csum); ret = btrfs_csum_data(root, data, len, &item->csum);
// printk("file %lu offset %llu csum %X\n", objectid, (unsigned long long)offset, *(int *)(&item->csum));
btrfs_mark_buffer_dirty(path->nodes[0]); btrfs_mark_buffer_dirty(path->nodes[0]);
fail: fail:
btrfs_release_path(root, path); btrfs_release_path(root, path);
...@@ -298,4 +299,3 @@ int btrfs_csum_verify_file_block(struct btrfs_root *root, ...@@ -298,4 +299,3 @@ int btrfs_csum_verify_file_block(struct btrfs_root *root,
mutex_unlock(&root->fs_info->fs_mutex); mutex_unlock(&root->fs_info->fs_mutex);
return ret; return ret;
} }
...@@ -103,10 +103,6 @@ static int dirty_and_release_pages(struct btrfs_trans_handle *trans, ...@@ -103,10 +103,6 @@ static int dirty_and_release_pages(struct btrfs_trans_handle *trans,
this_write = min((size_t)PAGE_CACHE_SIZE - offset, write_bytes); this_write = min((size_t)PAGE_CACHE_SIZE - offset, write_bytes);
/* FIXME, one block at a time */ /* FIXME, one block at a time */
mutex_lock(&root->fs_info->fs_mutex);
trans = btrfs_start_transaction(root, 1);
btrfs_set_trans_block_group(trans, inode);
bh = page_buffers(pages[i]); bh = page_buffers(pages[i]);
if (buffer_mapped(bh) && bh->b_blocknr == 0) { if (buffer_mapped(bh) && bh->b_blocknr == 0) {
...@@ -115,6 +111,10 @@ static int dirty_and_release_pages(struct btrfs_trans_handle *trans, ...@@ -115,6 +111,10 @@ static int dirty_and_release_pages(struct btrfs_trans_handle *trans,
char *ptr, *kaddr; char *ptr, *kaddr;
u32 datasize; u32 datasize;
mutex_lock(&root->fs_info->fs_mutex);
trans = btrfs_start_transaction(root, 1);
btrfs_set_trans_block_group(trans, inode);
/* create an inline extent, and copy the data in */ /* create an inline extent, and copy the data in */
path = btrfs_alloc_path(); path = btrfs_alloc_path();
BUG_ON(!path); BUG_ON(!path);
...@@ -135,24 +135,19 @@ static int dirty_and_release_pages(struct btrfs_trans_handle *trans, ...@@ -135,24 +135,19 @@ static int dirty_and_release_pages(struct btrfs_trans_handle *trans,
btrfs_set_file_extent_type(ei, btrfs_set_file_extent_type(ei,
BTRFS_FILE_EXTENT_INLINE); BTRFS_FILE_EXTENT_INLINE);
ptr = btrfs_file_extent_inline_start(ei); ptr = btrfs_file_extent_inline_start(ei);
kaddr = kmap_atomic(bh->b_page, KM_USER0); kaddr = kmap_atomic(bh->b_page, KM_USER0);
btrfs_memcpy(root, path->nodes[0]->b_data, btrfs_memcpy(root, path->nodes[0]->b_data,
ptr, kaddr + bh_offset(bh), ptr, kaddr + bh_offset(bh),
offset + write_bytes); offset + write_bytes);
kunmap_atomic(kaddr, KM_USER0); kunmap_atomic(kaddr, KM_USER0);
mark_buffer_dirty(path->nodes[0]); mark_buffer_dirty(path->nodes[0]);
btrfs_free_path(path); btrfs_free_path(path);
} else if (buffer_mapped(bh)) { ret = btrfs_end_transaction(trans, root);
/* csum the file data */ BUG_ON(ret);
btrfs_csum_file_block(trans, root, inode->i_ino, mutex_unlock(&root->fs_info->fs_mutex);
pages[i]->index << PAGE_CACHE_SHIFT,
kmap(pages[i]), PAGE_CACHE_SIZE);
kunmap(pages[i]);
} }
SetPageChecked(pages[i]);
ret = btrfs_end_transaction(trans, root);
BUG_ON(ret);
mutex_unlock(&root->fs_info->fs_mutex);
ret = btrfs_commit_write(file, pages[i], offset, ret = btrfs_commit_write(file, pages[i], offset,
offset + this_write); offset + this_write);
...@@ -503,7 +498,7 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf, ...@@ -503,7 +498,7 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf,
if ((pos & (PAGE_CACHE_SIZE - 1))) { if ((pos & (PAGE_CACHE_SIZE - 1))) {
pinned[0] = grab_cache_page(inode->i_mapping, first_index); pinned[0] = grab_cache_page(inode->i_mapping, first_index);
if (!PageUptodate(pinned[0])) { if (!PageUptodate(pinned[0])) {
ret = mpage_readpage(pinned[0], btrfs_get_block); ret = btrfs_readpage(NULL, pinned[0]);
BUG_ON(ret); BUG_ON(ret);
wait_on_page_locked(pinned[0]); wait_on_page_locked(pinned[0]);
} else { } else {
...@@ -513,7 +508,7 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf, ...@@ -513,7 +508,7 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf,
if ((pos + count) & (PAGE_CACHE_SIZE - 1)) { if ((pos + count) & (PAGE_CACHE_SIZE - 1)) {
pinned[1] = grab_cache_page(inode->i_mapping, last_index); pinned[1] = grab_cache_page(inode->i_mapping, last_index);
if (!PageUptodate(pinned[1])) { if (!PageUptodate(pinned[1])) {
ret = mpage_readpage(pinned[1], btrfs_get_block); ret = btrfs_readpage(NULL, pinned[1]);
BUG_ON(ret); BUG_ON(ret);
wait_on_page_locked(pinned[1]); wait_on_page_locked(pinned[1]);
} else { } else {
...@@ -633,138 +628,6 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf, ...@@ -633,138 +628,6 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf,
return num_written ? num_written : err; return num_written ? num_written : err;
} }
/*
* FIXME, do this by stuffing the csum we want in the info hanging off
* page->private. For now, verify file csums on read
*/
static int btrfs_read_actor(read_descriptor_t *desc, struct page *page,
unsigned long offset, unsigned long size)
{
char *kaddr;
unsigned long left, count = desc->count;
struct inode *inode = page->mapping->host;
if (size > count)
size = count;
if (!PageChecked(page)) {
/* FIXME, do it per block */
struct btrfs_root *root = BTRFS_I(inode)->root;
int ret;
struct buffer_head *bh;
if (page_has_buffers(page)) {
bh = page_buffers(page);
if (!buffer_mapped(bh)) {
SetPageChecked(page);
goto checked;
}
}
ret = btrfs_csum_verify_file_block(root,
page->mapping->host->i_ino,
page->index << PAGE_CACHE_SHIFT,
kmap(page), PAGE_CACHE_SIZE);
if (ret) {
if (ret != -ENOENT) {
printk("failed to verify ino %lu page %lu ret %d\n",
page->mapping->host->i_ino,
page->index, ret);
memset(page_address(page), 1, PAGE_CACHE_SIZE);
flush_dcache_page(page);
}
}
SetPageChecked(page);
kunmap(page);
}
checked:
/*
* Faults on the destination of a read are common, so do it before
* taking the kmap.
*/
if (!fault_in_pages_writeable(desc->arg.buf, size)) {
kaddr = kmap_atomic(page, KM_USER0);
left = __copy_to_user_inatomic(desc->arg.buf,
kaddr + offset, size);
kunmap_atomic(kaddr, KM_USER0);
if (left == 0)
goto success;
}
/* Do it the slow way */
kaddr = kmap(page);
left = __copy_to_user(desc->arg.buf, kaddr + offset, size);
kunmap(page);
if (left) {
size -= left;
desc->error = -EFAULT;
}
success:
desc->count = count - size;
desc->written += size;
desc->arg.buf += size;
return size;
}
/**
* btrfs_file_aio_read - filesystem read routine, with a mod to csum verify
* @iocb: kernel I/O control block
* @iov: io vector request
* @nr_segs: number of segments in the iovec
* @pos: current file position
*/
static ssize_t btrfs_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
unsigned long nr_segs, loff_t pos)
{
struct file *filp = iocb->ki_filp;
ssize_t retval;
unsigned long seg;
size_t count;
loff_t *ppos = &iocb->ki_pos;
count = 0;
for (seg = 0; seg < nr_segs; seg++) {
const struct iovec *iv = &iov[seg];
/*
* If any segment has a negative length, or the cumulative
* length ever wraps negative then return -EINVAL.
*/
count += iv->iov_len;
if (unlikely((ssize_t)(count|iv->iov_len) < 0))
return -EINVAL;
if (access_ok(VERIFY_WRITE, iv->iov_base, iv->iov_len))
continue;
if (seg == 0)
return -EFAULT;
nr_segs = seg;
count -= iv->iov_len; /* This segment is no good */
break;
}
retval = 0;
if (count) {
for (seg = 0; seg < nr_segs; seg++) {
read_descriptor_t desc;
desc.written = 0;
desc.arg.buf = iov[seg].iov_base;
desc.count = iov[seg].iov_len;
if (desc.count == 0)
continue;
desc.error = 0;
do_generic_file_read(filp, ppos, &desc,
btrfs_read_actor);
retval += desc.written;
if (desc.error) {
retval = retval ?: desc.error;
break;
}
}
}
return retval;
}
static int btrfs_sync_file(struct file *file, static int btrfs_sync_file(struct file *file,
struct dentry *dentry, int datasync) struct dentry *dentry, int datasync)
{ {
...@@ -789,12 +652,25 @@ static int btrfs_sync_file(struct file *file, ...@@ -789,12 +652,25 @@ static int btrfs_sync_file(struct file *file,
return ret > 0 ? EIO : ret; return ret > 0 ? EIO : ret;
} }
static struct vm_operations_struct btrfs_file_vm_ops = {
.nopage = filemap_nopage,
.populate = filemap_populate,
.page_mkwrite = btrfs_page_mkwrite,
};
static int btrfs_file_mmap(struct file *filp, struct vm_area_struct *vma)
{
vma->vm_ops = &btrfs_file_vm_ops;
file_accessed(filp);
return 0;
}
struct file_operations btrfs_file_operations = { struct file_operations btrfs_file_operations = {
.llseek = generic_file_llseek, .llseek = generic_file_llseek,
.read = do_sync_read, .read = do_sync_read,
.aio_read = btrfs_file_aio_read, .aio_read = generic_file_aio_read,
.write = btrfs_file_write, .write = btrfs_file_write,
.mmap = generic_file_mmap, .mmap = btrfs_file_mmap,
.open = generic_file_open, .open = generic_file_open,
.ioctl = btrfs_ioctl, .ioctl = btrfs_ioctl,
.fsync = btrfs_sync_file, .fsync = btrfs_sync_file,
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment