From: "Darrick J. Wong" <djwong@kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: zlang@redhat.com, fstests@vger.kernel.org, linux-xfs@vger.kernel.org
Subject: Re: [PATCH 1/4] xfs: check that the mountpoint is actually mounted in _supports_xfs_scrub
Date: Fri, 12 Jan 2024 08:41:11 -0800 [thread overview]
Message-ID: <20240112164111.GQ722975@frogsfrogsfrogs> (raw)
In-Reply-To: <20240112050833.2255899-2-hch@lst.de>
On Fri, Jan 12, 2024 at 06:08:30AM +0100, Christoph Hellwig wrote:
> Add a sanity check that the passed in mount point is actually mounted
> to guard against actually calling _supports_xfs_scrub before
> $SCRATCH_MNT is mounted.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> common/xfs | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/common/xfs b/common/xfs
> index f53b33fc5..4e54d75cc 100644
> --- a/common/xfs
> +++ b/common/xfs
> @@ -649,6 +649,9 @@ _supports_xfs_scrub()
> test "$FSTYP" = "xfs" || return 1
> test -x "$XFS_SCRUB_PROG" || return 1
>
> + mountpoint $mountpoint >/dev/null || \
> + _fail "$mountpoint is not mounted"
Looks good,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> +
> # Probe for kernel support...
> $XFS_IO_PROG -c 'help scrub' 2>&1 | grep -q 'types are:.*probe' || return 1
> $XFS_IO_PROG -c "scrub probe" "$mountpoint" 2>&1 | grep -q "Inappropriate ioctl" && return 1
> --
> 2.39.2
>
>
next prev parent reply other threads:[~2024-01-12 16:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-12 5:08 _supports_xfs_scrub cleanups v2 Christoph Hellwig
2024-01-12 5:08 ` [PATCH 1/4] xfs: check that the mountpoint is actually mounted in _supports_xfs_scrub Christoph Hellwig
2024-01-12 13:20 ` Zorro Lang
2024-01-12 16:41 ` Darrick J. Wong [this message]
2024-01-12 5:08 ` [PATCH 2/4] xfs: add a _scratch_require_xfs_scrub helper Christoph Hellwig
2024-01-12 13:32 ` Zorro Lang
2024-01-12 14:14 ` Christoph Hellwig
2024-01-12 16:42 ` Darrick J. Wong
2024-01-12 5:08 ` [PATCH 3/4] xfs/262: call _scratch_require_xfs_scrub Christoph Hellwig
2024-01-12 16:43 ` Darrick J. Wong
2024-01-12 5:08 ` [PATCH 4/4] xfs/506: " Christoph Hellwig
2024-01-12 16:43 ` Darrick J. Wong
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=20240112164111.GQ722975@frogsfrogsfrogs \
--to=djwong@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
--cc=zlang@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox