On Thu, Oct 03, 2019 at 06:26:01PM +0800, Ian Kent wrote:
> Move the validation code of xfs_parseargs() into a helper for later
> use within the mount context methods.
>
> Signed-off-by: Ian Kent <raven@xxxxxxxxxx>
> ---
> fs/xfs/xfs_super.c | 147 +++++++++++++++++++++++++++++++++-------------------
> 1 file changed, 94 insertions(+), 53 deletions(-)
>
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index 7fd3975d5523..7008355df065 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
...
> @@ -441,15 +533,6 @@ xfs_parseargs(
> return ret;
> }
>
> - /*
> - * no recovery flag requires a read-only mount
> - */
> - if ((mp->m_flags & XFS_MOUNT_NORECOVERY) &&
> - !(mp->m_flags & XFS_MOUNT_RDONLY)) {
> - xfs_warn(mp, "no-recovery mounts must be read-only.");
> - return -EINVAL;
> - }
> -
Is there a reason that various checks above this one are replicated in
the helper and not removed from xfs_parseargs()? Either way, it looks
like this code goes away anyways:
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> if ((mp->m_flags & XFS_MOUNT_NOALIGN) &&
> (ctx->dsunit || ctx->dswidth)) {
> xfs_warn(mp,
> @@ -477,51 +560,9 @@ xfs_parseargs(
> }
>
> done:
> - if (ctx->dsunit && !(mp->m_flags & XFS_MOUNT_NOALIGN)) {
> - /*
> - * At this point the superblock has not been read
> - * in, therefore we do not know the block size.
> - * Before the mount call ends we will convert
> - * these to FSBs.
> - */
> - mp->m_dalign = ctx->dsunit;
> - mp->m_swidth = ctx->dswidth;
> - }
> + ret = xfs_validate_params(mp, &context, false);
>
> - if (mp->m_logbufs != -1 &&
> - mp->m_logbufs != 0 &&
> - (mp->m_logbufs < XLOG_MIN_ICLOGS ||
> - mp->m_logbufs > XLOG_MAX_ICLOGS)) {
> - xfs_warn(mp, "invalid logbufs value: %d [not %d-%d]",
> - mp->m_logbufs, XLOG_MIN_ICLOGS, XLOG_MAX_ICLOGS);
> - return -EINVAL;
> - }
> - if (mp->m_logbsize != -1 &&
> - mp->m_logbsize != 0 &&
> - (mp->m_logbsize < XLOG_MIN_RECORD_BSIZE ||
> - mp->m_logbsize > XLOG_MAX_RECORD_BSIZE ||
> - !is_power_of_2(mp->m_logbsize))) {
> - xfs_warn(mp,
> - "invalid logbufsize: %d [not 16k,32k,64k,128k or 256k]",
> - mp->m_logbsize);
> - return -EINVAL;
> - }
> -
> - if (ctx->iosizelog) {
> - if (ctx->iosizelog > XFS_MAX_IO_LOG ||
> - ctx->iosizelog < XFS_MIN_IO_LOG) {
> - xfs_warn(mp, "invalid log iosize: %d [not %d-%d]",
> - ctx->iosizelog, XFS_MIN_IO_LOG,
> - XFS_MAX_IO_LOG);
> - return -EINVAL;
> - }
> -
> - mp->m_flags |= XFS_MOUNT_DFLT_IOSIZE;
> - mp->m_readio_log = ctx->iosizelog;
> - mp->m_writeio_log = ctx->iosizelog;
> - }
> -
> - return 0;
> + return ret;
> }
>
> struct proc_xfs_info {
>
