X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=inode-map.c;h=9000e69b8d6fa5931840a6d793ced91baeb10a81;hb=4523dc2776783ecd2fb1e3c72997f23ac2c3b975;hp=3e138b530bb16c0c0bffb0487ff19256baec89e1;hpb=989ca65a11c4c537127207eaa019ac4149599017;p=platform%2Fupstream%2Fbtrfs-progs.git

diff --git a/inode-map.c b/inode-map.c
index 3e138b5..9000e69 100644
--- a/inode-map.c
+++ b/inode-map.c
@@ -19,6 +19,7 @@
 #include "ctree.h"
 #include "disk-io.h"
 #include "transaction.h"
+#include "internal.h"
 
 /*
  * walks the btree of allocated inodes and find a hole.
@@ -38,12 +39,15 @@ int btrfs_find_free_objectid(struct btrfs_trans_handle *trans,
 	u64 search_start = dirid;
 
 	path = btrfs_alloc_path();
-	BUG_ON(!path);
+	if (!path)
+		return -ENOMEM;
+
 	search_start = root->last_inode_alloc;
 	search_start = max((unsigned long long)search_start,
 				BTRFS_FIRST_FREE_OBJECTID);
 	search_key.objectid = search_start;
 	search_key.offset = 0;
+	search_key.type = 0;
 
 	btrfs_init_path(path);
 	start_found = 0;
@@ -90,12 +94,10 @@ int btrfs_find_free_objectid(struct btrfs_trans_handle *trans,
 	// FIXME -ENOSPC
 found:
 	root->last_inode_alloc = *objectid;
-	btrfs_release_path(path);
 	btrfs_free_path(path);
 	BUG_ON(*objectid < search_start);
 	return 0;
 error:
-	btrfs_release_path(path);
 	btrfs_free_path(path);
 	return ret;
 }