Merging upstream version 4.23.0.

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

1 files changed, 20 insertions, 34 deletions

diff --git a/upstream/archlinux/man8/btrfs-device.8 b/upstream/archlinux/man8/btrfs-device.8
index 5789f4fa..2041770a 100644
--- a/upstream/archlinux/man8/btrfs-device.8
+++ b/upstream/archlinux/man8/btrfs-device.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-DEVICE" "8" "Feb 14, 2024" "6.7.1" "BTRFS"
+.TH "BTRFS-DEVICE" "8" "May 03, 2024" "6.8.1" "BTRFS"
 .SH NAME
 btrfs-device \- manage devices of btrfs filesystems
 .SH SYNOPSIS
@@ -83,11 +83,9 @@ size of the new device \fB/dev/sdb\fP is 100GiB.
 .INDENT 0.0
 .INDENT 3.5
 .sp
-.nf
-.ft C
+.EX
 $ btrfs device add /dev/sdb /mnt
-.ft P
-.fi
+.EE
 .UNINDENT
 .UNINDENT
 .sp
@@ -107,11 +105,9 @@ there\(aqs enough workspace for the conversion process, we can do:
 .INDENT 0.0
 .INDENT 3.5
 .sp
-.nf
-.ft C
+.EX
 $ btrfs balance start \-mconvert=raid1 /mnt
-.ft P
-.fi
+.EE
 .UNINDENT
 .UNINDENT
 .sp
@@ -137,11 +133,9 @@ we\(aqre going to lose 50GiB of the second device for obvious reasons.
 .INDENT 0.0
 .INDENT 3.5
 .sp
-.nf
-.ft C
+.EX
 $ btrfs balance start \-dconvert=raid1 /mnt
-.ft P
-.fi
+.EE
 .UNINDENT
 .UNINDENT
 .sp
@@ -158,12 +152,10 @@ fails. For example:
 .INDENT 0.0
 .INDENT 3.5
 .sp
-.nf
-.ft C
+.EX
 $ btrfs device remove /dev/sda /mnt
 ERROR: error removing device \(aq/dev/sda\(aq: unable to go below two devices on raid1
-.ft P
-.fi
+.EE
 .UNINDENT
 .UNINDENT
 .sp
@@ -171,12 +163,10 @@ In order to remove a device, you need to convert the profile in this case:
 .INDENT 0.0
 .INDENT 3.5
 .sp
-.nf
-.ft C
+.EX
 $ btrfs balance start \-mconvert=dup \-dconvert=single /mnt
 $ btrfs device remove /dev/sda /mnt
-.ft P
-.fi
+.EE
 .UNINDENT
 .UNINDENT
 .SH SUBCOMMAND
@@ -186,9 +176,9 @@ $ btrfs device remove /dev/sda /mnt
 Add device(s) to the filesystem identified by \fIpath\fP\&.
 .sp
 If applicable, a whole device discard (TRIM) operation is performed prior to
-adding the device. A device with existing filesystem detected by \fBblkid(8)\fP
+adding the device. A device with existing filesystem detected by \X'tty: link https://man7.org/linux/man-pages/man8/blkid.8.html'\fI\%blkid(8)\fP\X'tty: link'
 will prevent device addition and has to be forced. Alternatively the filesystem
-can be wiped from the device using e.g. the \fBwipefs(8)\fP tool.
+can be wiped from the device using e.g. the \X'tty: link https://man7.org/linux/man-pages/man8/wipefs.8.html'\fI\%wipefs(8)\fP\X'tty: link' tool.
 .sp
 The operation is instant and does not affect existing data. The operation merely
 adds the device to the filesystem structures and creates some block groups
@@ -216,7 +206,7 @@ Device removal must satisfy the profile constraints, otherwise the command
 fails and cannot be enforced. The filesystem must be converted to
 profile(s) that would allow the removal. This can for example happen when
 going down from 2 devices to 1 and using the RAID1 profile. See the
-section \fI\%Typical use cases\fP\&.
+section \X'tty: link btrfs-device//#man-device-typical-use-cases'\fI\%Typical use cases\fP\X'tty: link'\&.
 .sp
 The operation can take long as it needs to move all data from the device.
 .sp
@@ -291,7 +281,7 @@ The command can be run repeatedly. Devices that have been already registered
 remain as such. Reloading the kernel module will drop this information. There\(aqs
 an alternative way of mounting multiple\-device filesystem without the need for
 prior scanning. See the mount option
-\fI\%device (in btrfs\-man5)\fP\&.
+\X'tty: link btrfs-man5//#mount-option-device'\fI\%device (in btrfs\-man5)\fP\X'tty: link'\&.
 .sp
 \fBOptions\fP
 .INDENT 7.0
@@ -338,8 +328,7 @@ filesystem:
 .INDENT 7.0
 .INDENT 3.5
 .sp
-.nf
-.ft C
+.EX
 WARNING: cannot read detailed chunk info, per\-device usage will not be shown, run as root
 /dev/sdc1, ID: 1
    Device size:           931.51GiB
@@ -354,8 +343,7 @@ WARNING: cannot read detailed chunk info, per\-device usage will not be shown, r
    Metadata,single:        19.00GiB
    System,single:          32.00MiB
    Unallocated:           271.48GiB
-.ft P
-.fi
+.EE
 .UNINDENT
 .UNINDENT
 .INDENT 7.0
@@ -426,16 +414,14 @@ filesystem lifetime or from a scrub run.
 .INDENT 0.0
 .INDENT 3.5
 .sp
-.nf
-.ft C
+.EX
 $ btrfs device stats /dev/sda3
 [/dev/sda3].write_io_errs   0
 [/dev/sda3].read_io_errs    0
 [/dev/sda3].flush_io_errs   0
 [/dev/sda3].corruption_errs 0
 [/dev/sda3].generation_errs 0
-.ft P
-.fi
+.EE
 .UNINDENT
 .UNINDENT
 .INDENT 0.0
@@ -473,7 +459,7 @@ exit status if any of the error counters is non\-zero.
 .SH AVAILABILITY
 .sp
 \fBbtrfs\fP is part of btrfs\-progs.  Please refer to the documentation at
-\fI\%https://btrfs.readthedocs.io\fP\&.
+\X'tty: link https://btrfs.readthedocs.io'\fI\%https://btrfs.readthedocs.io\fP\X'tty: link'\&.
 .SH SEE ALSO
 .sp
 \fI\%btrfs\-balance(8)\fP