---

yaml --- r: 128853 b: refs/heads/master c: 4546726 h: refs/heads/master i: 128851: d5afe99 v: v3
git-mirror · Sep 25, 2008 · 43c9175 · 43c9175
1 parent 12d704e
commit 43c9175
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e8a1e31f2780b7865d40a8c5142a04f2bcdcb86
+refs/heads/master: 45467261edb590fd5a2d676d9686edb82762fb3f
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
@@ -1805,17 +1805,13 @@ static int fixup_tree_root_location(struct btrfs_root *root,
 			     struct btrfs_root **sub_root,
 			     struct dentry *dentry)
 {
-	struct btrfs_path *path;
 	struct btrfs_root_item *ri;
 
 	if (btrfs_key_type(location) != BTRFS_ROOT_ITEM_KEY)
 		return 0;
 	if (location->objectid == BTRFS_ROOT_TREE_OBJECTID)
 		return 0;
 
-	path = btrfs_alloc_path();
-	BUG_ON(!path);
-
 	*sub_root = btrfs_read_fs_root(root->fs_info, location,
 					dentry->d_name.name,
 					dentry->d_name.len);
@@ -1827,7 +1823,6 @@ static int fixup_tree_root_location(struct btrfs_root *root,
 	btrfs_set_key_type(location, BTRFS_INODE_ITEM_KEY);
 	location->offset = 0;
 
-	btrfs_free_path(path);
 	return 0;
 }