From 9b78612094e6405293a215ee79d2142016da4b39 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Fri, 14 Dec 2007 12:56:58 -0500
Subject: [PATCH] --- yaml --- r: 128570 b: refs/heads/master c:
 e9906a98497c26a3c1a7532b51b81cc1fbdf9e1d h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/fs/btrfs/file.c  |  1 +
 trunk/fs/btrfs/inode.c | 15 +++++++++++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fe2911e204b9..2b01ee063af1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e3b96668eb34da6060a5189e6a73e9d62a3b178
+refs/heads/master: e9906a98497c26a3c1a7532b51b81cc1fbdf9e1d
diff --git a/trunk/fs/btrfs/file.c b/trunk/fs/btrfs/file.c
index a280b9562221..62fcd79d8ab3 100644
--- a/trunk/fs/btrfs/file.c
+++ b/trunk/fs/btrfs/file.c
@@ -861,6 +861,7 @@ struct file_operations btrfs_file_operations = {
 	.llseek		= generic_file_llseek,
 	.read		= do_sync_read,
 	.aio_read       = generic_file_aio_read,
+	.splice_read	= generic_file_splice_read,
 	.write		= btrfs_file_write,
 	.mmap		= btrfs_file_mmap,
 	.open		= generic_file_open,
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 41b0c7de7a59..e535c50e669b 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -1893,8 +1893,19 @@ static void btrfs_truncate(struct inode *inode)
 int btrfs_commit_write(struct file *file, struct page *page,
 		       unsigned from, unsigned to)
 {
-	return extent_commit_write(&BTRFS_I(page->mapping->host)->extent_tree,
-				   page->mapping->host, page, from, to);
+	loff_t pos = ((loff_t)page->index << PAGE_CACHE_SHIFT) + to;
+	struct inode *inode = page->mapping->host;
+
+	btrfs_cow_one_page(inode, page, PAGE_CACHE_SIZE);
+
+	set_page_extent_mapped(page);
+	set_page_dirty(page);
+
+	if (pos > inode->i_size) {
+		i_size_write(inode, pos);
+		mark_inode_dirty(inode);
+	}
+	return 0;
 }
 
 static int create_subvol(struct btrfs_root *root, char *name, int namelen)