diff --git a/[refs] b/[refs]
index dfd869b0e71d..69cba588d7b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bab9fb035faa5119991b64cfee1b14c1d6f6a31b
+refs/heads/master: 8e1cd766643f040fd88b9c4221353a3f6b77db1e
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 43bf4337859c..88b3ef20be69 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -206,7 +206,6 @@ void btrfs_read_locked_inode(struct inode *inode)
 	memcpy(&location, &BTRFS_I(inode)->location, sizeof(location));
 	ret = btrfs_lookup_inode(NULL, root, path, &location, 0);
 	if (ret) {
-		btrfs_free_path(path);
 		goto make_bad;
 	}
 	inode_item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
@@ -1536,7 +1535,7 @@ struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page,
 		flush_dcache_page(result->b_page);
 		kunmap(page);
 		set_extent_uptodate(em_tree, extent_start,
-				    extent_end, GFP_NOFS);
+				    extent_end - 1, GFP_NOFS);
 		goto insert;
 	} else {
 		printk("unkknown found_type %d\n", found_type);