From: "Darrick J. Wong" <djwong@kernel.org>
To: sandeen@sandeen.net, djwong@kernel.org
Cc: Christoph Hellwig <hch@lst.de>, Brian Foster <bfoster@redhat.com>,
Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>,
linux-xfs@vger.kernel.org, bfoster@redhat.com
Subject: [PATCH 2/7] xfs_admin: support filesystems with realtime devices
Date: Mon, 22 Feb 2021 19:00:29 -0800 [thread overview]
Message-ID: <161404922974.425352.3747623410781587574.stgit@magnolia> (raw)
In-Reply-To: <161404921827.425352.18151735716678009691.stgit@magnolia>
From: Darrick J. Wong <djwong@kernel.org>
Add a -r option to xfs_admin so that we can pass the name of the
realtime device to xfs_repair.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
db/xfs_admin.sh | 11 ++++++-----
man/man8/xfs_admin.8 | 8 ++++++++
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/db/xfs_admin.sh b/db/xfs_admin.sh
index 71a9aa98..430872ef 100755
--- a/db/xfs_admin.sh
+++ b/db/xfs_admin.sh
@@ -7,9 +7,10 @@
status=0
DB_OPTS=""
REPAIR_OPTS=""
-USAGE="Usage: xfs_admin [-efjlpuV] [-c 0|1] [-L label] [-U uuid] device [logdev]"
+REPAIR_DEV_OPTS=""
+USAGE="Usage: xfs_admin [-efjlpuV] [-c 0|1] [-L label] [-r rtdev] [-U uuid] device [logdev]"
-while getopts "efjlpuc:L:U:V" c
+while getopts "c:efjlL:pr:uU:V" c
do
case $c in
c) REPAIR_OPTS=$REPAIR_OPTS" -c lazycount="$OPTARG;;
@@ -19,6 +20,7 @@ do
l) DB_OPTS=$DB_OPTS" -r -c label";;
L) DB_OPTS=$DB_OPTS" -c 'label "$OPTARG"'";;
p) DB_OPTS=$DB_OPTS" -c 'version projid32bit'";;
+ r) REPAIR_DEV_OPTS=" -r '$OPTARG'";;
u) DB_OPTS=$DB_OPTS" -r -c uuid";;
U) DB_OPTS=$DB_OPTS" -c 'uuid "$OPTARG"'";;
V) xfs_db -p xfs_admin -V
@@ -37,8 +39,7 @@ case $# in
# Pick up the log device, if present
if [ -n "$2" ]; then
DB_OPTS=$DB_OPTS" -l '$2'"
- test -n "$REPAIR_OPTS" && \
- REPAIR_OPTS=$REPAIR_OPTS" -l '$2'"
+ REPAIR_DEV_OPTS=$REPAIR_DEV_OPTS" -l '$2'"
fi
if [ -n "$DB_OPTS" ]
@@ -53,7 +54,7 @@ case $# in
# running xfs_admin.
# Ideally, we need to improve the output behaviour
# of repair for this purpose (say a "quiet" mode).
- eval xfs_repair $REPAIR_OPTS "$1" 2> /dev/null
+ eval xfs_repair $REPAIR_DEV_OPTS $REPAIR_OPTS "$1" 2> /dev/null
status=`expr $? + $status`
if [ $status -ne 0 ]
then
diff --git a/man/man8/xfs_admin.8 b/man/man8/xfs_admin.8
index 8afc873f..cccbb224 100644
--- a/man/man8/xfs_admin.8
+++ b/man/man8/xfs_admin.8
@@ -13,6 +13,9 @@ xfs_admin \- change parameters of an XFS filesystem
] [
.B \-U
.I uuid
+] [
+.B \-r
+.I rtdev
]
.I device
[
@@ -123,6 +126,11 @@ not be able to mount the filesystem. To remove this incompatible flag, use
which will restore the original UUID and remove the incompatible
feature flag as needed.
.TP
+.BI \-r " rtdev"
+Specifies the device special file where the filesystem's realtime section
+resides.
+Only for those filesystems which use a realtime section.
+.TP
.B \-V
Prints the version number and exits.
.PP
next prev parent reply other threads:[~2021-02-23 3:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-23 3:00 [PATCHSET v6 0/7] xfsprogs: add the ability to flag a fs for repair Darrick J. Wong
2021-02-23 3:00 ` [PATCH 1/7] xfs_admin: clean up string quoting Darrick J. Wong
2021-02-23 20:18 ` Allison Henderson
2021-02-23 3:00 ` Darrick J. Wong [this message]
2021-02-23 20:18 ` [PATCH 2/7] xfs_admin: support filesystems with realtime devices Allison Henderson
2021-02-23 3:00 ` [PATCH 3/7] xfs_db: report the needsrepair flag in check and version commands Darrick J. Wong
2021-02-23 20:18 ` Allison Henderson
2021-02-25 8:11 ` Christoph Hellwig
2021-02-23 3:00 ` [PATCH 4/7] xfs_db: don't allow label/uuid setting if the needsrepair flag is set Darrick J. Wong
2021-02-23 20:18 ` Allison Henderson
2021-02-25 8:13 ` Christoph Hellwig
2021-02-23 3:00 ` [PATCH 5/7] xfs_repair: fix unmount error message to have a newline Darrick J. Wong
2021-02-23 20:18 ` Allison Henderson
2021-02-23 3:00 ` [PATCH 6/7] xfs_repair: clear quota CHKD flags on the incore superblock too Darrick J. Wong
2021-02-23 20:18 ` Allison Henderson
2021-02-23 3:00 ` [PATCH 7/7] xfs_repair: clear the needsrepair flag Darrick J. Wong
2021-02-23 20:18 ` Allison Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=161404922974.425352.3747623410781587574.stgit@magnolia \
--to=djwong@kernel.org \
--cc=bfoster@redhat.com \
--cc=chaitanya.kulkarni@wdc.com \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.