Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 26 insertions, 17 deletions

diff --git a/upstream/opensuse-tumbleweed/man8/btrfs-subvolume.8 b/upstream/opensuse-tumbleweed/man8/btrfs-subvolume.8
index 1ac17e3e..4961d73e 100644
--- a/upstream/opensuse-tumbleweed/man8/btrfs-subvolume.8
+++ b/upstream/opensuse-tumbleweed/man8/btrfs-subvolume.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BTRFS-SUBVOLUME" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-SUBVOLUME" "8" "May 02, 2024" "6.8.1" "BTRFS"
 .SH NAME
 btrfs-subvolume \- manage btrfs subvolumes
 .SH SYNOPSIS
@@ -41,7 +41,8 @@ snapshots.
 A BTRFS subvolume is a part of filesystem with its own independent
 file/directory hierarchy and inode number namespace. Subvolumes can share file
 extents. A snapshot is also subvolume, but with a given initial content of the
-original subvolume. A subvolume has always inode number 256.
+original subvolume. A subvolume has always inode number 256 (see more in
+\fI\%Inode numbers (in Subvolumes)\fP).
 .sp
 \fBNOTE:\fP
 .INDENT 0.0
@@ -200,10 +201,28 @@ the 4th column:
 .UNINDENT
 .SH INODE NUMBERS
 .sp
-A proper subvolume has always inode number 256. If a subvolume is nested and
-then a snapshot is taken, then the cloned directory entry representing the
-subvolume becomes empty and the inode has number 2. All other files and
-directories in the target snapshot preserve their original inode numbers.
+A directory representing a subvolume has always inode number 256 (sometimes
+also called a root of the subvolume):
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+$ ls \-lis
+total 0
+389111 0 drwxr\-xr\-x 1 user users 0 Jan 20 12:13 dir
+389110 0 \-rw\-r\-\-r\-\- 1 user users 0 Jan 20 12:13 file
+   256 0 drwxr\-xr\-x 1 user users 0 Jan 20 12:13 snap1
+   256 0 drwxr\-xr\-x 1 user users 0 Jan 20 12:13 subv1
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+If a subvolume is nested and then a snapshot is taken, then the cloned
+directory entry representing the subvolume becomes empty and the inode has
+number 2. All other files and directories in the target snapshot preserve their
+original inode numbers.
 .sp
 \fBNOTE:\fP
 .INDENT 0.0
@@ -333,16 +352,6 @@ wait for transaction commit after deleting each subvolume.
 .B \-i|\-\-subvolid <subvolid>
 subvolume id to be removed instead of the <path> that should point to the
 filesystem with the subvolume
-.UNINDENT
-.INDENT 7.0
-.TP
-.B  \-\-delete\-qgroup
-also delete the qgroup 0/subvolid if it exists
-.TP
-.B  \-\-no\-delete\-qgroup
-do not delete the 0/subvolid qgroup (default)
-.UNINDENT
-.INDENT 7.0
 .TP
 .B \-v|\-\-verbose
 (deprecated) alias for global \fI\-v\fP option
@@ -568,6 +577,6 @@ returned in case of failure.
 \fI\%btrfs\-quota(8)\fP,
 \fI\%btrfs\-send(8)\fP,
 \fI\%mkfs.btrfs(8)\fP,
-\fBmount(8)\fP
+\fI\%mount(8)\fP
 .\" Generated by docutils manpage writer.
 .