From 54a7f62fc97f34e343892a29e30ae96d3093f859 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Fri, 11 Sep 2009 12:33:12 -0400
Subject: [PATCH] --- yaml --- r: 165894 b: refs/heads/master c:
 50a9b214bc6c052caa05a210ebfc1bdf0d7085b2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3e36f7068786..496e570a8f27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1ed835e1ab5795f91b198d08c43e2f56848dcf3
+refs/heads/master: 50a9b214bc6c052caa05a210ebfc1bdf0d7085b2
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 233fe6f26120..c846482e7985 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -4552,11 +4552,14 @@ int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
 	}
 	ClearPageChecked(page);
 	set_page_dirty(page);
+	SetPageUptodate(page);
 
 	BTRFS_I(inode)->last_trans = root->fs_info->generation + 1;
 	unlock_extent(io_tree, page_start, page_end, GFP_NOFS);
 
 out_unlock:
+	if (!ret)
+		return VM_FAULT_LOCKED;
 	unlock_page(page);
 out:
 	return ret;