* [PATCHSET 0/1] xfs_admin: support online fs label queries
@ 2021-07-03 2:58 Darrick J. Wong
2021-07-03 2:58 ` [PATCH 1/1] xfs_admin: support label queries for mounted filesystems Darrick J. Wong
0 siblings, 1 reply; 4+ messages in thread
From: Darrick J. Wong @ 2021-07-03 2:58 UTC (permalink / raw)
To: sandeen, djwong; +Cc: linux-xfs
Hi all,
Upgrade xfs_admin to support label queries of mounted filesystems.
If you're going to start using this mess, you probably ought to just
pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy!
Comments and questions are, as always, welcome.
--D
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=online-labelling
fstests git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=online-labelling
---
db/xfs_admin.sh | 41 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 39 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] xfs_admin: support label queries for mounted filesystems
2021-07-03 2:58 [PATCHSET 0/1] xfs_admin: support online fs label queries Darrick J. Wong
@ 2021-07-03 2:58 ` Darrick J. Wong
2021-07-05 15:27 ` Christoph Hellwig
2021-07-08 21:59 ` Eric Sandeen
0 siblings, 2 replies; 4+ messages in thread
From: Darrick J. Wong @ 2021-07-03 2:58 UTC (permalink / raw)
To: sandeen, djwong; +Cc: linux-xfs
From: Darrick J. Wong <djwong@kernel.org>
Adapt this tool to call xfs_io if the block device in question is
mounted.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
db/xfs_admin.sh | 41 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 39 insertions(+), 2 deletions(-)
diff --git a/db/xfs_admin.sh b/db/xfs_admin.sh
index 409975b2..21c9d71b 100755
--- a/db/xfs_admin.sh
+++ b/db/xfs_admin.sh
@@ -8,9 +8,34 @@ status=0
DB_OPTS=""
REPAIR_OPTS=""
REPAIR_DEV_OPTS=""
+IO_OPTS=""
LOG_OPTS=""
USAGE="Usage: xfs_admin [-efjlpuV] [-c 0|1] [-L label] [-O v5_feature] [-r rtdev] [-U uuid] device [logdev]"
+# Try to find a loop device associated with a file. We only want to return
+# one loopdev (multiple loop devices can attach to a single file) so we grab
+# the last line and return it if it's actually a block device.
+try_find_loop_dev_for_file() {
+ local x="$(losetup -O NAME -j "$1" 2> /dev/null | tail -n 1)"
+ test -b "$x" && echo "$x"
+}
+
+try_find_mount_point_for_bdev() {
+ local arg="$1"
+
+ # See if we can map the arg to a loop device
+ loopdev="$(try_find_loop_dev_for_file "${arg}")"
+ test -n "${loopdev}" && arg="${loopdev}"
+
+ if [ ! -b "${arg}" ]; then
+ return 1
+ fi
+
+ # If we find a mountpoint for the device, do a live query;
+ # otherwise try reading the fs with xfs_db.
+ findmnt -t xfs -f -n -o TARGET "${arg}" 2> /dev/null
+}
+
while getopts "c:efjlL:O:pr:uU:V" c
do
case $c in
@@ -18,8 +43,10 @@ do
e) DB_OPTS=$DB_OPTS" -c 'version extflg'";;
f) DB_OPTS=$DB_OPTS" -f";;
j) DB_OPTS=$DB_OPTS" -c 'version log2'";;
- l) DB_OPTS=$DB_OPTS" -r -c label";;
- L) DB_OPTS=$DB_OPTS" -c 'label "$OPTARG"'";;
+ l) DB_OPTS=$DB_OPTS" -r -c label";
+ IO_OPTS=$IO_OPTS" -r -c label";;
+ L) DB_OPTS=$DB_OPTS" -c 'label "$OPTARG"'";
+ IO_OPTS=$IO_OPTS" -c 'label -s "$OPTARG"'";;
O) REPAIR_OPTS=$REPAIR_OPTS" -c $OPTARG";;
p) DB_OPTS=$DB_OPTS" -c 'version projid32bit'";;
r) REPAIR_DEV_OPTS=" -r '$OPTARG'";;
@@ -43,6 +70,16 @@ case $# in
LOG_OPTS=" -l '$2'"
fi
+ if [ -n "$IO_OPTS" ]; then
+ mntpt="$(try_find_mount_point_for_bdev "$1")"
+ if [ $? -eq 0 ]; then
+ eval xfs_io -x -p xfs_admin $IO_OPTS "$mntpt"
+ status=$?
+ DB_OPTS=""
+ REPAIR_OPTS=""
+ fi
+ fi
+
if [ -n "$DB_OPTS" ]
then
eval xfs_db -x -p xfs_admin $LOG_OPTS $DB_OPTS "$1"
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/1] xfs_admin: support label queries for mounted filesystems
2021-07-03 2:58 ` [PATCH 1/1] xfs_admin: support label queries for mounted filesystems Darrick J. Wong
@ 2021-07-05 15:27 ` Christoph Hellwig
2021-07-08 21:59 ` Eric Sandeen
1 sibling, 0 replies; 4+ messages in thread
From: Christoph Hellwig @ 2021-07-05 15:27 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: sandeen, linux-xfs
On Fri, Jul 02, 2021 at 07:58:34PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
>
> Adapt this tool to call xfs_io if the block device in question is
> mounted.
>
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] xfs_admin: support label queries for mounted filesystems
2021-07-03 2:58 ` [PATCH 1/1] xfs_admin: support label queries for mounted filesystems Darrick J. Wong
2021-07-05 15:27 ` Christoph Hellwig
@ 2021-07-08 21:59 ` Eric Sandeen
1 sibling, 0 replies; 4+ messages in thread
From: Eric Sandeen @ 2021-07-08 21:59 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: linux-xfs
On 7/2/21 9:58 PM, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
>
> Adapt this tool to call xfs_io if the block device in question is
> mounted.
>
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> ---
> db/xfs_admin.sh | 41 +++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 39 insertions(+), 2 deletions(-)
>
>
> diff --git a/db/xfs_admin.sh b/db/xfs_admin.sh
> index 409975b2..21c9d71b 100755
> --- a/db/xfs_admin.sh
> +++ b/db/xfs_admin.sh
> @@ -8,9 +8,34 @@ status=0
> DB_OPTS=""
> REPAIR_OPTS=""
> REPAIR_DEV_OPTS=""
> +IO_OPTS=""
> LOG_OPTS=""
> USAGE="Usage: xfs_admin [-efjlpuV] [-c 0|1] [-L label] [-O v5_feature] [-r rtdev] [-U uuid] device [logdev]"
>
> +# Try to find a loop device associated with a file. We only want to return
> +# one loopdev (multiple loop devices can attach to a single file) so we grab
> +# the last line and return it if it's actually a block device.
Not thrilled about the C&P here from spaceman, but I guess by choosing to
use bash long ago, that ship has kinda sailed. (Sourcing another file
would be possible I guess but ... meh, oh well)
> +try_find_loop_dev_for_file() {
> + local x="$(losetup -O NAME -j "$1" 2> /dev/null | tail -n 1)"
> + test -b "$x" && echo "$x"
> +}
> +
> +try_find_mount_point_for_bdev() {
> + local arg="$1"
> +
> + # See if we can map the arg to a loop device
> + loopdev="$(try_find_loop_dev_for_file "${arg}")"
> + test -n "${loopdev}" && arg="${loopdev}"
> +
> + if [ ! -b "${arg}" ]; then
> + return 1
> + fi
> +
> + # If we find a mountpoint for the device, do a live query;
> + # otherwise try reading the fs with xfs_db.
> + findmnt -t xfs -f -n -o TARGET "${arg}" 2> /dev/null
> +}
> +
> while getopts "c:efjlL:O:pr:uU:V" c
> do
> case $c in
> @@ -18,8 +43,10 @@ do
> e) DB_OPTS=$DB_OPTS" -c 'version extflg'";;
> f) DB_OPTS=$DB_OPTS" -f";;
> j) DB_OPTS=$DB_OPTS" -c 'version log2'";;
> - l) DB_OPTS=$DB_OPTS" -r -c label";;
> - L) DB_OPTS=$DB_OPTS" -c 'label "$OPTARG"'";;
> + l) DB_OPTS=$DB_OPTS" -r -c label";
> + IO_OPTS=$IO_OPTS" -r -c label";;
> + L) DB_OPTS=$DB_OPTS" -c 'label "$OPTARG"'";
> + IO_OPTS=$IO_OPTS" -c 'label -s "$OPTARG"'";;
> O) REPAIR_OPTS=$REPAIR_OPTS" -c $OPTARG";;
> p) DB_OPTS=$DB_OPTS" -c 'version projid32bit'";;
> r) REPAIR_DEV_OPTS=" -r '$OPTARG'";;
> @@ -43,6 +70,16 @@ case $# in
> LOG_OPTS=" -l '$2'"
> fi
>
> + if [ -n "$IO_OPTS" ]; then
> + mntpt="$(try_find_mount_point_for_bdev "$1")"
> + if [ $? -eq 0 ]; then
> + eval xfs_io -x -p xfs_admin $IO_OPTS "$mntpt"
> + status=$?
> + DB_OPTS=""
> + REPAIR_OPTS=""
> + fi
> + fi
If I read this correctly, specifying either of "-l" or "-L" will now cause
the command to stop executing after the label... but only if it's mounted.
hm yup.
before, when mounted:
# sh db/xfs_admin.sh -lu /dev/pmem0p1
label = ""
UUID = 392591da-ca09-4d4d-8c17-eb8e97ec9f9a
after this patch:
# sh db/xfs_admin.sh -lu /dev/pmem0p1
label = ""
Also, I'm not sure this:
# mount /dev/pmem0p1 /mnt/test
# sh db/xfs_admin.sh -lU generate /dev/pmem0p1
label = ""
#
is really desirable; -U is just silently ignored if it's mounted?
Before the patch, this would have failed with an error.
I wonder if we need to error out on any non-mounted-compliant options, or
simply go ahead and pass non-label db opts to the next stage so it'll
error out as it did before.
Also this is fun behavior that exists today :(
# xfs_admin -l -U generate /dev/pmem0p1
label = "foo"
xfs_admin: not in expert mode, writing disabled
#
('-l' adds -r, overrides the -x and puts it into readonly mode)
> if [ -n "$DB_OPTS" ]
> then
> eval xfs_db -x -p xfs_admin $LOG_OPTS $DB_OPTS "$1"
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-07-08 21:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-03 2:58 [PATCHSET 0/1] xfs_admin: support online fs label queries Darrick J. Wong
2021-07-03 2:58 ` [PATCH 1/1] xfs_admin: support label queries for mounted filesystems Darrick J. Wong
2021-07-05 15:27 ` Christoph Hellwig
2021-07-08 21:59 ` Eric Sandeen
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.