btrfs-progs: clarify unlinked and deleted terminology for subvolumes

kdave · kdave · commit c147aaa59b4d · 2024-05-17T18:13:18.000+02:00
Recent patches updated stale qgroup handling, using 'unlinked' and
'dropped' where we otherwise use 'deleted' and 'cleaned'.

Signed-off-by: David Sterba &lt;dsterba@suse.com&gt;
diff --git a/Documentation/btrfs-qgroup.rst b/Documentation/btrfs-qgroup.rst
@@ -162,7 +162,8 @@ strings:
 	The toplevel subvolume
 
 `<under deletion>`
-	The subvolume is unlinked, but not yet fully deleted.
+        The subvolume has been deleted (it's directory removed), but the
+        subvolume metadata not not yet fully cleaned.
 
 `<squota space holder>`
 	For simple quota mode only.
diff --git a/cmds/qgroup.c b/cmds/qgroup.c
@@ -83,10 +83,11 @@ struct btrfs_qgroup {
 	u64 qgroupid;
 
 	/*
-	 * NULL for qgroups with level > 0 or the subvolume is unlinked.
+	 * NULL for qgroups with level > 0 or the subvolume is deleted but not
+	 * yet fully cleaned.
 	 *
-	 * An unlinked subvolume doesn't mean it has been fully dropped, so
-	 * callers should not rely on this to determine if a qgroup is stale.
+	 * A deleted subvolume means it hasn't been fully cleaned, so callers
+	 * should not rely on this to determine if a qgroup is stale.
 	 *
 	 * This member is only to help locating the path of the corresponding
 	 * subvolume.

Original file line number	Diff line number	Diff line change
`@@ -83,10 +83,11 @@ struct btrfs_qgroup {`
`83`	`83`	`u64 qgroupid;`
`84`	`84`
`85`	`85`	`/*`
`86`		`- * NULL for qgroups with level > 0 or the subvolume is unlinked.`
	`86`	`+ * NULL for qgroups with level > 0 or the subvolume is deleted but not`
	`87`	`+ * yet fully cleaned.`
`87`	`88`	`*`
`88`		`- * An unlinked subvolume doesn't mean it has been fully dropped, so`
`89`		`- * callers should not rely on this to determine if a qgroup is stale.`
	`89`	`+ * A deleted subvolume means it hasn't been fully cleaned, so callers`
	`90`	`+ * should not rely on this to determine if a qgroup is stale.`
`90`	`91`	`*`
`91`	`92`	`* This member is only to help locating the path of the corresponding`
`92`	`93`	`* subvolume.`