Skip to contentSkip to conversation

Update find free objectid function for orphan cleanup code

PATCH New Zheng Yan 1 participant 1 message Sep 1, 2008 Btrfs file system

lore
Share & tools
lore

Zheng Yan

author
#0 lore raw

PATCH 1/1 Update find free objectid function for orphan cleanup code

Hello,

Orphan items use BTRFS_ORPHAN_OBJECTID (-5UUL) as key objectid. This affects the find free objectid functions, inode objectid can easily overflow after orphan file cleanup.

---

ctree.h +0 -0
diff -r 8fe9e10847fa ctree.h
@@ -78,9 +78,10 @@

#define BTRFS_ORPHAN_OBJECTID -5ULL

/*
- * All files have objectids higher than this.
+ * All files have objectids in this range.
*/
#define BTRFS_FIRST_FREE_OBJECTID 256ULL
+#define BTRFS_LAST_FREE_OBJECTID -256ULL
#define BTRFS_FIRST_CHUNK_TREE_OBJECTID 256ULL

inode-map.c +0 -0
diff -r 8fe9e10847fa inode-map.c
@@ -32,7 +32,8 @@
	path = btrfs_alloc_path();
	BUG_ON(!path);

- search_key.objectid = (u64)-1;
+ search_key.objectid = BTRFS_LAST_FREE_OBJECTID;

+	search_key.type = -1;
	search_key.offset = (u64)-1;
	ret = btrfs_search_slot(NULL, root, &search_key, path, 0, 0);
	if (ret < 0)
@@ -70,16 +71,17 @@
	u64 search_start = dirid;

	mutex_lock(&root->objectid_mutex);
-	if (root->last_inode_alloc) {
+	if (root->last_inode_alloc >= BTRFS_FIRST_FREE_OBJECTID &&
+	    root->last_inode_alloc < BTRFS_LAST_FREE_OBJECTID) {
		*objectid = ++root->last_inode_alloc;
		mutex_unlock(&root->objectid_mutex);
		return 0;
	}
	path = btrfs_alloc_path();
	BUG_ON(!path);
-	search_start = root->last_inode_alloc;
	search_start = max(search_start, BTRFS_FIRST_FREE_OBJECTID);
	search_key.objectid = search_start;
+	search_key.type = 0;
	search_key.offset = 0;

	btrfs_init_path(path);
@@ -87,9 +89,6 @@
	ret = btrfs_search_slot(trans, root, &search_key, path, 0, 0);
	if (ret < 0)
		goto error;

-
- if (path->slots[0] > 0)
- path->slots[0]--;

	while (1) {
		l = path->nodes[0];
@@ -120,13 +119,15 @@
				}
			}
		}
+		if (key.objectid >= BTRFS_LAST_FREE_OBJECTID)
+			break;
		start_found = 1;
		last_ino = key.objectid + 1;
		path->slots[0]++;
	}
	// FIXME -ENOSPC
+	BUG_ON(1);
found:
-	root->last_inode_alloc = *objectid;
	btrfs_release_path(root, path);
	btrfs_free_path(path);
	BUG_ON(*objectid < search_start);