On Thu, Oct 03, 2019 at 06:26:48PM +0800, Ian Kent wrote:
> Now that the new mount api is being used the remaining old mount
> code can be removed.
>
> Signed-off-by: Ian Kent <raven@xxxxxxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/xfs_super.c | 48 +-----------------------------------------------
> 1 file changed, 1 insertion(+), 47 deletions(-)
>
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index 93f42160aa6f..4d65e6c7cfb2 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -61,53 +61,7 @@ enum {
> Opt_filestreams, Opt_quota, Opt_noquota, Opt_usrquota, Opt_grpquota,
> Opt_prjquota, Opt_uquota, Opt_gquota, Opt_pquota,
> Opt_uqnoenforce, Opt_gqnoenforce, Opt_pqnoenforce, Opt_qnoenforce,
> - Opt_discard, Opt_nodiscard, Opt_dax, Opt_err,
> -};
> -
> -static const match_table_t tokens = {
> - {Opt_logbufs, "logbufs=%u"}, /* number of XFS log buffers */
> - {Opt_logbsize, "logbsize=%s"}, /* size of XFS log buffers */
> - {Opt_logdev, "logdev=%s"}, /* log device */
> - {Opt_rtdev, "rtdev=%s"}, /* realtime I/O device */
> - {Opt_wsync, "wsync"}, /* safe-mode nfs compatible mount */
> - {Opt_noalign, "noalign"}, /* turn off stripe alignment */
> - {Opt_swalloc, "swalloc"}, /* turn on stripe width allocation */
> - {Opt_sunit, "sunit=%u"}, /* data volume stripe unit */
> - {Opt_swidth, "swidth=%u"}, /* data volume stripe width */
> - {Opt_nouuid, "nouuid"}, /* ignore filesystem UUID */
> - {Opt_grpid, "grpid"}, /* group-ID from parent directory */
> - {Opt_nogrpid, "nogrpid"}, /* group-ID from current process */
> - {Opt_bsdgroups, "bsdgroups"}, /* group-ID from parent directory */
> - {Opt_sysvgroups,"sysvgroups"}, /* group-ID from current process */
> - {Opt_allocsize, "allocsize=%s"},/* preferred allocation size */
> - {Opt_norecovery,"norecovery"}, /* don't run XFS recovery */
> - {Opt_inode64, "inode64"}, /* inodes can be allocated anywhere */
> - {Opt_inode32, "inode32"}, /* inode allocation limited to
> - * XFS_MAXINUMBER_32 */
> - {Opt_ikeep, "ikeep"}, /* do not free empty inode clusters */
> - {Opt_noikeep, "noikeep"}, /* free empty inode clusters */
> - {Opt_largeio, "largeio"}, /* report large I/O sizes in stat() */
> - {Opt_nolargeio, "nolargeio"}, /* do not report large I/O sizes
> - * in stat(). */
> - {Opt_attr2, "attr2"}, /* do use attr2 attribute format */
> - {Opt_noattr2, "noattr2"}, /* do not use attr2 attribute format */
> - {Opt_filestreams,"filestreams"},/* use filestreams allocator */
> - {Opt_quota, "quota"}, /* disk quotas (user) */
> - {Opt_noquota, "noquota"}, /* no quotas */
> - {Opt_usrquota, "usrquota"}, /* user quota enabled */
> - {Opt_grpquota, "grpquota"}, /* group quota enabled */
> - {Opt_prjquota, "prjquota"}, /* project quota enabled */
> - {Opt_uquota, "uquota"}, /* user quota (IRIX variant) */
> - {Opt_gquota, "gquota"}, /* group quota (IRIX variant) */
> - {Opt_pquota, "pquota"}, /* project quota (IRIX variant) */
> - {Opt_uqnoenforce,"uqnoenforce"},/* user quota limit enforcement */
> - {Opt_gqnoenforce,"gqnoenforce"},/* group quota limit enforcement */
> - {Opt_pqnoenforce,"pqnoenforce"},/* project quota limit enforcement */
> - {Opt_qnoenforce, "qnoenforce"}, /* same as uqnoenforce */
> - {Opt_discard, "discard"}, /* Discard unused blocks */
> - {Opt_nodiscard, "nodiscard"}, /* Do not discard unused blocks */
> - {Opt_dax, "dax"}, /* Enable direct access to bdev pages */
> - {Opt_err, NULL},
> + Opt_discard, Opt_nodiscard, Opt_dax,
> };
>
> static const struct fs_parameter_spec xfs_param_specs[] = {
>
