From: Yan <yanzheng@21cn.com>
Date: Mon, 17 Sep 2007 15:13:12 +0000 (-0400)
Subject: Btrfs: Fix double free and off by one in inode.c
X-Git-Tag: v2.6.29-rc1~27^2~9^2~55^2~56^2~30^2~476
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8e1cd766643f040fd88b9c4221353a3f6b77db1e;p=karo-tx-linux.git

Btrfs: Fix double free and off by one in inode.c

The first change removes  potential double free, the second fix a off
by one error.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
---

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 43bf4337859c..88b3ef20be69 100644
--- a/fs/btrfs/inode.c
+++ b/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 @@ again:
 		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);