* [PATCHSET 0/2] xfsprogs: random fixes for 5.12
@ 2021-04-13 21:00 Darrick J. Wong
2021-04-13 21:00 ` [PATCH 1/2] libfrog: report inobtcount in geometry Darrick J. Wong
2021-04-13 21:00 ` [PATCH 2/2] xfs_admin: pick up log arguments correctly Darrick J. Wong
0 siblings, 2 replies; 6+ messages in thread
From: Darrick J. Wong @ 2021-04-13 21:00 UTC (permalink / raw)
To: sandeen, djwong; +Cc: Brian Foster, linux-xfs
Hi all,
This patchset contains various minor fixes for the 5.12 release.
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
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=random-fixes
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=random-fixes
fstests git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=random-fixes
---
db/xfs_admin.sh | 9 ++++-----
libfrog/fsgeom.c | 6 ++++--
2 files changed, 8 insertions(+), 7 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] libfrog: report inobtcount in geometry
2021-04-13 21:00 [PATCHSET 0/2] xfsprogs: random fixes for 5.12 Darrick J. Wong
@ 2021-04-13 21:00 ` Darrick J. Wong
2021-04-14 6:10 ` Christoph Hellwig
2021-04-13 21:00 ` [PATCH 2/2] xfs_admin: pick up log arguments correctly Darrick J. Wong
1 sibling, 1 reply; 6+ messages in thread
From: Darrick J. Wong @ 2021-04-13 21:00 UTC (permalink / raw)
To: sandeen, djwong; +Cc: linux-xfs
From: Darrick J. Wong <djwong@kernel.org>
Report the inode btree counter feature in fs feature reports.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
libfrog/fsgeom.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libfrog/fsgeom.c b/libfrog/fsgeom.c
index 14507668..4f1a1842 100644
--- a/libfrog/fsgeom.c
+++ b/libfrog/fsgeom.c
@@ -29,6 +29,7 @@ xfs_report_geom(
int rmapbt_enabled;
int reflink_enabled;
int bigtime_enabled;
+ int inobtcount;
isint = geo->logstart > 0;
lazycount = geo->flags & XFS_FSOP_GEOM_FLAGS_LAZYSB ? 1 : 0;
@@ -45,12 +46,13 @@ xfs_report_geom(
rmapbt_enabled = geo->flags & XFS_FSOP_GEOM_FLAGS_RMAPBT ? 1 : 0;
reflink_enabled = geo->flags & XFS_FSOP_GEOM_FLAGS_REFLINK ? 1 : 0;
bigtime_enabled = geo->flags & XFS_FSOP_GEOM_FLAGS_BIGTIME ? 1 : 0;
+ inobtcount = geo->flags & XFS_FSOP_GEOM_FLAGS_INOBTCNT ? 1 : 0;
printf(_(
"meta-data=%-22s isize=%-6d agcount=%u, agsize=%u blks\n"
" =%-22s sectsz=%-5u attr=%u, projid32bit=%u\n"
" =%-22s crc=%-8u finobt=%u, sparse=%u, rmapbt=%u\n"
-" =%-22s reflink=%-4u bigtime=%u\n"
+" =%-22s reflink=%-4u bigtime=%u inobtcount=%u\n"
"data =%-22s bsize=%-6u blocks=%llu, imaxpct=%u\n"
" =%-22s sunit=%-6u swidth=%u blks\n"
"naming =version %-14u bsize=%-6u ascii-ci=%d, ftype=%d\n"
@@ -60,7 +62,7 @@ xfs_report_geom(
mntpoint, geo->inodesize, geo->agcount, geo->agblocks,
"", geo->sectsize, attrversion, projid32bit,
"", crcs_enabled, finobt_enabled, spinodes, rmapbt_enabled,
- "", reflink_enabled, bigtime_enabled,
+ "", reflink_enabled, bigtime_enabled, inobtcount,
"", geo->blocksize, (unsigned long long)geo->datablocks,
geo->imaxpct,
"", geo->sunit, geo->swidth,
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] xfs_admin: pick up log arguments correctly
2021-04-13 21:00 [PATCHSET 0/2] xfsprogs: random fixes for 5.12 Darrick J. Wong
2021-04-13 21:00 ` [PATCH 1/2] libfrog: report inobtcount in geometry Darrick J. Wong
@ 2021-04-13 21:00 ` Darrick J. Wong
2021-04-13 21:02 ` Darrick J. Wong
2021-04-14 6:10 ` Christoph Hellwig
1 sibling, 2 replies; 6+ messages in thread
From: Darrick J. Wong @ 2021-04-13 21:00 UTC (permalink / raw)
To: sandeen, djwong; +Cc: Brian Foster, linux-xfs
From: Darrick J. Wong <djwong@kernel.org>
In commit ab9d8d69, we added support to xfs_admin to pass an external
log to xfs_db and xfs_repair. Unfortunately, we didn't do this
correctly -- by appending the log arguments to DB_OPTS, we now guarantee
an invocation of xfs_db when we don't have any work for it to do.
Brian Foster noticed that this results in xfs/764 hanging fstests
because xfs_db (when not compiled with libeditline) will wait for input
on stdin. I didn't notice because my build includes libeditline and my
test runner script does silly things with pipes such that xfs_db would
exit immediately.
Reported-by: Brian Foster <bfoster@redhat.com>
Fixes: ab9d8d69 ("xfs_admin: support adding features to V5 filesystems")
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
db/xfs_admin.sh | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/db/xfs_admin.sh b/db/xfs_admin.sh
index 916050cb..409975b2 100755
--- a/db/xfs_admin.sh
+++ b/db/xfs_admin.sh
@@ -8,7 +8,7 @@ status=0
DB_OPTS=""
REPAIR_OPTS=""
REPAIR_DEV_OPTS=""
-DB_LOG_OPTS=""
+LOG_OPTS=""
USAGE="Usage: xfs_admin [-efjlpuV] [-c 0|1] [-L label] [-O v5_feature] [-r rtdev] [-U uuid] device [logdev]"
while getopts "c:efjlL:O:pr:uU:V" c
@@ -40,19 +40,18 @@ case $# in
1|2)
# Pick up the log device, if present
if [ -n "$2" ]; then
- DB_OPTS=$DB_OPTS" -l '$2'"
- REPAIR_DEV_OPTS=$REPAIR_DEV_OPTS" -l '$2'"
+ LOG_OPTS=" -l '$2'"
fi
if [ -n "$DB_OPTS" ]
then
- eval xfs_db -x -p xfs_admin $DB_OPTS "$1"
+ eval xfs_db -x -p xfs_admin $LOG_OPTS $DB_OPTS "$1"
status=$?
fi
if [ -n "$REPAIR_OPTS" ]
then
echo "Running xfs_repair to upgrade filesystem."
- eval xfs_repair $REPAIR_DEV_OPTS $REPAIR_OPTS "$1"
+ eval xfs_repair $LOG_OPTS $REPAIR_DEV_OPTS $REPAIR_OPTS "$1"
status=`expr $? + $status`
fi
;;
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] xfs_admin: pick up log arguments correctly
2021-04-13 21:00 ` [PATCH 2/2] xfs_admin: pick up log arguments correctly Darrick J. Wong
@ 2021-04-13 21:02 ` Darrick J. Wong
2021-04-14 6:10 ` Christoph Hellwig
1 sibling, 0 replies; 6+ messages in thread
From: Darrick J. Wong @ 2021-04-13 21:02 UTC (permalink / raw)
To: sandeen; +Cc: Brian Foster, linux-xfs
On Tue, Apr 13, 2021 at 02:00:59PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
>
> In commit ab9d8d69, we added support to xfs_admin to pass an external
> log to xfs_db and xfs_repair. Unfortunately, we didn't do this
> correctly -- by appending the log arguments to DB_OPTS, we now guarantee
> an invocation of xfs_db when we don't have any work for it to do.
>
> Brian Foster noticed that this results in xfs/764 hanging fstests
> because xfs_db (when not compiled with libeditline) will wait for input
> on stdin. I didn't notice because my build includes libeditline and my
> test runner script does silly things with pipes such that xfs_db would
> exit immediately.
>
> Reported-by: Brian Foster <bfoster@redhat.com>
> Fixes: ab9d8d69 ("xfs_admin: support adding features to V5 filesystems")
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Doh, forgot to pick up the:
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
from last time. :(
--D
> ---
> db/xfs_admin.sh | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
>
> diff --git a/db/xfs_admin.sh b/db/xfs_admin.sh
> index 916050cb..409975b2 100755
> --- a/db/xfs_admin.sh
> +++ b/db/xfs_admin.sh
> @@ -8,7 +8,7 @@ status=0
> DB_OPTS=""
> REPAIR_OPTS=""
> REPAIR_DEV_OPTS=""
> -DB_LOG_OPTS=""
> +LOG_OPTS=""
> USAGE="Usage: xfs_admin [-efjlpuV] [-c 0|1] [-L label] [-O v5_feature] [-r rtdev] [-U uuid] device [logdev]"
>
> while getopts "c:efjlL:O:pr:uU:V" c
> @@ -40,19 +40,18 @@ case $# in
> 1|2)
> # Pick up the log device, if present
> if [ -n "$2" ]; then
> - DB_OPTS=$DB_OPTS" -l '$2'"
> - REPAIR_DEV_OPTS=$REPAIR_DEV_OPTS" -l '$2'"
> + LOG_OPTS=" -l '$2'"
> fi
>
> if [ -n "$DB_OPTS" ]
> then
> - eval xfs_db -x -p xfs_admin $DB_OPTS "$1"
> + eval xfs_db -x -p xfs_admin $LOG_OPTS $DB_OPTS "$1"
> status=$?
> fi
> if [ -n "$REPAIR_OPTS" ]
> then
> echo "Running xfs_repair to upgrade filesystem."
> - eval xfs_repair $REPAIR_DEV_OPTS $REPAIR_OPTS "$1"
> + eval xfs_repair $LOG_OPTS $REPAIR_DEV_OPTS $REPAIR_OPTS "$1"
> status=`expr $? + $status`
> fi
> ;;
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] libfrog: report inobtcount in geometry
2021-04-13 21:00 ` [PATCH 1/2] libfrog: report inobtcount in geometry Darrick J. Wong
@ 2021-04-14 6:10 ` Christoph Hellwig
0 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2021-04-14 6:10 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: sandeen, linux-xfs
On Tue, Apr 13, 2021 at 02:00:53PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
>
> Report the inode btree counter feature in fs feature reports.
>
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] xfs_admin: pick up log arguments correctly
2021-04-13 21:00 ` [PATCH 2/2] xfs_admin: pick up log arguments correctly Darrick J. Wong
2021-04-13 21:02 ` Darrick J. Wong
@ 2021-04-14 6:10 ` Christoph Hellwig
1 sibling, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2021-04-14 6:10 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: sandeen, Brian Foster, linux-xfs
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-04-14 6:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-13 21:00 [PATCHSET 0/2] xfsprogs: random fixes for 5.12 Darrick J. Wong
2021-04-13 21:00 ` [PATCH 1/2] libfrog: report inobtcount in geometry Darrick J. Wong
2021-04-14 6:10 ` Christoph Hellwig
2021-04-13 21:00 ` [PATCH 2/2] xfs_admin: pick up log arguments correctly Darrick J. Wong
2021-04-13 21:02 ` Darrick J. Wong
2021-04-14 6:10 ` Christoph Hellwig
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.