Commit 2adf6da8 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: move ext4_show_options() after parse_options() 



This commit is strictly a code movement so in preparation of changing
ext4_show_options to be table driven.

Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 26092bf5

fs/ext4/super.c

+175 −174
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ static struct ext4_features *ext4_feat; 


static int ext4_load_journal(struct super_block *, struct ext4_super_block *,

			     unsigned long journal_devnum);

static int ext4_show_options(struct seq_file *seq, struct dentry *root);

static int ext4_commit_super(struct super_block *sb, int sync);

static void ext4_mark_recovery_complete(struct super_block *sb,

					struct ext4_super_block *es);
@@ -1006,180 +1007,6 @@ void ext4_clear_inode(struct inode *inode) 
	}

}



static inline void ext4_show_quota_options(struct seq_file *seq,

					   struct super_block *sb)

{

#if defined(CONFIG_QUOTA)

	struct ext4_sb_info *sbi = EXT4_SB(sb);



	if (sbi->s_jquota_fmt) {

		char *fmtname = "";



		switch (sbi->s_jquota_fmt) {

		case QFMT_VFS_OLD:

			fmtname = "vfsold";

			break;

		case QFMT_VFS_V0:

			fmtname = "vfsv0";

			break;

		case QFMT_VFS_V1:

			fmtname = "vfsv1";

			break;

		}

		seq_printf(seq, ",jqfmt=%s", fmtname);

	}



	if (sbi->s_qf_names[USRQUOTA])

		seq_printf(seq, ",usrjquota=%s", sbi->s_qf_names[USRQUOTA]);



	if (sbi->s_qf_names[GRPQUOTA])

		seq_printf(seq, ",grpjquota=%s", sbi->s_qf_names[GRPQUOTA]);



	if (test_opt(sb, USRQUOTA))

		seq_puts(seq, ",usrquota");



	if (test_opt(sb, GRPQUOTA))

		seq_puts(seq, ",grpquota");

#endif

}



/*

 * Show an option if

 *  - it's set to a non-default value OR

 *  - if the per-sb default is different from the global default

 */

static int ext4_show_options(struct seq_file *seq, struct dentry *root)

{

	int def_errors;

	unsigned long def_mount_opts;

	struct super_block *sb = root->d_sb;

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	struct ext4_super_block *es = sbi->s_es;



	def_mount_opts = le32_to_cpu(es->s_default_mount_opts);

	def_errors     = le16_to_cpu(es->s_errors);



	if (sbi->s_sb_block != 1)

		seq_printf(seq, ",sb=%llu", sbi->s_sb_block);

	if (test_opt(sb, MINIX_DF))

		seq_puts(seq, ",minixdf");

	if (test_opt(sb, GRPID) && !(def_mount_opts & EXT4_DEFM_BSDGROUPS))

		seq_puts(seq, ",grpid");

	if (!test_opt(sb, GRPID) && (def_mount_opts & EXT4_DEFM_BSDGROUPS))

		seq_puts(seq, ",nogrpid");

	if (sbi->s_resuid != EXT4_DEF_RESUID ||

	    le16_to_cpu(es->s_def_resuid) != EXT4_DEF_RESUID) {

		seq_printf(seq, ",resuid=%u", sbi->s_resuid);

	}

	if (sbi->s_resgid != EXT4_DEF_RESGID ||

	    le16_to_cpu(es->s_def_resgid) != EXT4_DEF_RESGID) {

		seq_printf(seq, ",resgid=%u", sbi->s_resgid);

	}

	if (test_opt(sb, ERRORS_RO)) {

		if (def_errors == EXT4_ERRORS_PANIC ||

		    def_errors == EXT4_ERRORS_CONTINUE) {

			seq_puts(seq, ",errors=remount-ro");

		}

	}

	if (test_opt(sb, ERRORS_CONT) && def_errors != EXT4_ERRORS_CONTINUE)

		seq_puts(seq, ",errors=continue");

	if (test_opt(sb, ERRORS_PANIC) && def_errors != EXT4_ERRORS_PANIC)

		seq_puts(seq, ",errors=panic");

	if (test_opt(sb, NO_UID32) && !(def_mount_opts & EXT4_DEFM_UID16))

		seq_puts(seq, ",nouid32");

	if (test_opt(sb, DEBUG) && !(def_mount_opts & EXT4_DEFM_DEBUG))

		seq_puts(seq, ",debug");

#ifdef CONFIG_EXT4_FS_XATTR

	if (test_opt(sb, XATTR_USER))

		seq_puts(seq, ",user_xattr");

	if (!test_opt(sb, XATTR_USER))

		seq_puts(seq, ",nouser_xattr");

#endif

#ifdef CONFIG_EXT4_FS_POSIX_ACL

	if (test_opt(sb, POSIX_ACL) && !(def_mount_opts & EXT4_DEFM_ACL))

		seq_puts(seq, ",acl");

	if (!test_opt(sb, POSIX_ACL) && (def_mount_opts & EXT4_DEFM_ACL))

		seq_puts(seq, ",noacl");

#endif

	if (sbi->s_commit_interval != JBD2_DEFAULT_MAX_COMMIT_AGE*HZ) {

		seq_printf(seq, ",commit=%u",

			   (unsigned) (sbi->s_commit_interval / HZ));

	}

	if (sbi->s_min_batch_time != EXT4_DEF_MIN_BATCH_TIME) {

		seq_printf(seq, ",min_batch_time=%u",

			   (unsigned) sbi->s_min_batch_time);

	}

	if (sbi->s_max_batch_time != EXT4_DEF_MAX_BATCH_TIME) {

		seq_printf(seq, ",max_batch_time=%u",

			   (unsigned) sbi->s_max_batch_time);

	}



	/*

	 * We're changing the default of barrier mount option, so

	 * let's always display its mount state so it's clear what its

	 * status is.

	 */

	seq_puts(seq, ",barrier=");

	seq_puts(seq, test_opt(sb, BARRIER) ? "1" : "0");

	if (test_opt(sb, JOURNAL_ASYNC_COMMIT))

		seq_puts(seq, ",journal_async_commit");

	else if (test_opt(sb, JOURNAL_CHECKSUM))

		seq_puts(seq, ",journal_checksum");

	if (sb->s_flags & MS_I_VERSION)

		seq_puts(seq, ",i_version");

	if (!test_opt(sb, DELALLOC) &&

	    !(def_mount_opts & EXT4_DEFM_NODELALLOC))

		seq_puts(seq, ",nodelalloc");



	if (!test_opt(sb, MBLK_IO_SUBMIT))

		seq_puts(seq, ",nomblk_io_submit");

	if (sbi->s_stripe)

		seq_printf(seq, ",stripe=%lu", sbi->s_stripe);

	/*

	 * journal mode get enabled in different ways

	 * So just print the value even if we didn't specify it

	 */

	if (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA)

		seq_puts(seq, ",data=journal");

	else if (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_ORDERED_DATA)

		seq_puts(seq, ",data=ordered");

	else if (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_WRITEBACK_DATA)

		seq_puts(seq, ",data=writeback");



	if (sbi->s_inode_readahead_blks != EXT4_DEF_INODE_READAHEAD_BLKS)

		seq_printf(seq, ",inode_readahead_blks=%u",

			   sbi->s_inode_readahead_blks);



	if (test_opt(sb, DATA_ERR_ABORT))

		seq_puts(seq, ",data_err=abort");



	if (test_opt(sb, NO_AUTO_DA_ALLOC))

		seq_puts(seq, ",noauto_da_alloc");



	if (test_opt(sb, DISCARD) && !(def_mount_opts & EXT4_DEFM_DISCARD))

		seq_puts(seq, ",discard");



	if (test_opt(sb, NOLOAD))

		seq_puts(seq, ",norecovery");



	if (test_opt(sb, DIOREAD_NOLOCK))

		seq_puts(seq, ",dioread_nolock");



	if (test_opt(sb, BLOCK_VALIDITY) &&

	    !(def_mount_opts & EXT4_DEFM_BLOCK_VALIDITY))

		seq_puts(seq, ",block_validity");



	if (!test_opt(sb, INIT_INODE_TABLE))

		seq_puts(seq, ",noinit_itable");

	else if (sbi->s_li_wait_mult != EXT4_DEF_LI_WAIT_MULT)

		seq_printf(seq, ",init_itable=%u",

			   (unsigned) sbi->s_li_wait_mult);



	ext4_show_quota_options(seq, sb);



	return 0;

}



static struct inode *ext4_nfs_get_inode(struct super_block *sb,

					u64 ino, u32 generation)

{
@@ -1804,6 +1631,180 @@ static int parse_options(char *options, struct super_block *sb, 
	return 1;

}



static inline void ext4_show_quota_options(struct seq_file *seq,

					   struct super_block *sb)

{

#if defined(CONFIG_QUOTA)

	struct ext4_sb_info *sbi = EXT4_SB(sb);



	if (sbi->s_jquota_fmt) {

		char *fmtname = "";



		switch (sbi->s_jquota_fmt) {

		case QFMT_VFS_OLD:

			fmtname = "vfsold";

			break;

		case QFMT_VFS_V0:

			fmtname = "vfsv0";

			break;

		case QFMT_VFS_V1:

			fmtname = "vfsv1";

			break;

		}

		seq_printf(seq, ",jqfmt=%s", fmtname);

	}



	if (sbi->s_qf_names[USRQUOTA])

		seq_printf(seq, ",usrjquota=%s", sbi->s_qf_names[USRQUOTA]);



	if (sbi->s_qf_names[GRPQUOTA])

		seq_printf(seq, ",grpjquota=%s", sbi->s_qf_names[GRPQUOTA]);



	if (test_opt(sb, USRQUOTA))

		seq_puts(seq, ",usrquota");



	if (test_opt(sb, GRPQUOTA))

		seq_puts(seq, ",grpquota");

#endif

}



/*

 * Show an option if

 *  - it's set to a non-default value OR

 *  - if the per-sb default is different from the global default

 */

static int ext4_show_options(struct seq_file *seq, struct dentry *root)

{

	int def_errors;

	unsigned long def_mount_opts;

	struct super_block *sb = root->d_sb;

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	struct ext4_super_block *es = sbi->s_es;



	def_mount_opts = le32_to_cpu(es->s_default_mount_opts);

	def_errors     = le16_to_cpu(es->s_errors);



	if (sbi->s_sb_block != 1)

		seq_printf(seq, ",sb=%llu", sbi->s_sb_block);

	if (test_opt(sb, MINIX_DF))

		seq_puts(seq, ",minixdf");

	if (test_opt(sb, GRPID) && !(def_mount_opts & EXT4_DEFM_BSDGROUPS))

		seq_puts(seq, ",grpid");

	if (!test_opt(sb, GRPID) && (def_mount_opts & EXT4_DEFM_BSDGROUPS))

		seq_puts(seq, ",nogrpid");

	if (sbi->s_resuid != EXT4_DEF_RESUID ||

	    le16_to_cpu(es->s_def_resuid) != EXT4_DEF_RESUID) {

		seq_printf(seq, ",resuid=%u", sbi->s_resuid);

	}

	if (sbi->s_resgid != EXT4_DEF_RESGID ||

	    le16_to_cpu(es->s_def_resgid) != EXT4_DEF_RESGID) {

		seq_printf(seq, ",resgid=%u", sbi->s_resgid);

	}

	if (test_opt(sb, ERRORS_RO)) {

		if (def_errors == EXT4_ERRORS_PANIC ||

		    def_errors == EXT4_ERRORS_CONTINUE) {

			seq_puts(seq, ",errors=remount-ro");

		}

	}

	if (test_opt(sb, ERRORS_CONT) && def_errors != EXT4_ERRORS_CONTINUE)

		seq_puts(seq, ",errors=continue");

	if (test_opt(sb, ERRORS_PANIC) && def_errors != EXT4_ERRORS_PANIC)

		seq_puts(seq, ",errors=panic");

	if (test_opt(sb, NO_UID32) && !(def_mount_opts & EXT4_DEFM_UID16))

		seq_puts(seq, ",nouid32");

	if (test_opt(sb, DEBUG) && !(def_mount_opts & EXT4_DEFM_DEBUG))

		seq_puts(seq, ",debug");

#ifdef CONFIG_EXT4_FS_XATTR

	if (test_opt(sb, XATTR_USER))

		seq_puts(seq, ",user_xattr");

	if (!test_opt(sb, XATTR_USER))

		seq_puts(seq, ",nouser_xattr");

#endif

#ifdef CONFIG_EXT4_FS_POSIX_ACL

	if (test_opt(sb, POSIX_ACL) && !(def_mount_opts & EXT4_DEFM_ACL))

		seq_puts(seq, ",acl");

	if (!test_opt(sb, POSIX_ACL) && (def_mount_opts & EXT4_DEFM_ACL))

		seq_puts(seq, ",noacl");

#endif

	if (sbi->s_commit_interval != JBD2_DEFAULT_MAX_COMMIT_AGE*HZ) {

		seq_printf(seq, ",commit=%u",

			   (unsigned) (sbi->s_commit_interval / HZ));

	}

	if (sbi->s_min_batch_time != EXT4_DEF_MIN_BATCH_TIME) {

		seq_printf(seq, ",min_batch_time=%u",

			   (unsigned) sbi->s_min_batch_time);

	}

	if (sbi->s_max_batch_time != EXT4_DEF_MAX_BATCH_TIME) {

		seq_printf(seq, ",max_batch_time=%u",

			   (unsigned) sbi->s_max_batch_time);

	}



	/*

	 * We're changing the default of barrier mount option, so

	 * let's always display its mount state so it's clear what its

	 * status is.

	 */

	seq_puts(seq, ",barrier=");

	seq_puts(seq, test_opt(sb, BARRIER) ? "1" : "0");

	if (test_opt(sb, JOURNAL_ASYNC_COMMIT))

		seq_puts(seq, ",journal_async_commit");

	else if (test_opt(sb, JOURNAL_CHECKSUM))

		seq_puts(seq, ",journal_checksum");

	if (sb->s_flags & MS_I_VERSION)

		seq_puts(seq, ",i_version");

	if (!test_opt(sb, DELALLOC) &&

	    !(def_mount_opts & EXT4_DEFM_NODELALLOC))

		seq_puts(seq, ",nodelalloc");



	if (!test_opt(sb, MBLK_IO_SUBMIT))

		seq_puts(seq, ",nomblk_io_submit");

	if (sbi->s_stripe)

		seq_printf(seq, ",stripe=%lu", sbi->s_stripe);

	/*

	 * journal mode get enabled in different ways

	 * So just print the value even if we didn't specify it

	 */

	if (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA)

		seq_puts(seq, ",data=journal");

	else if (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_ORDERED_DATA)

		seq_puts(seq, ",data=ordered");

	else if (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_WRITEBACK_DATA)

		seq_puts(seq, ",data=writeback");



	if (sbi->s_inode_readahead_blks != EXT4_DEF_INODE_READAHEAD_BLKS)

		seq_printf(seq, ",inode_readahead_blks=%u",

			   sbi->s_inode_readahead_blks);



	if (test_opt(sb, DATA_ERR_ABORT))

		seq_puts(seq, ",data_err=abort");



	if (test_opt(sb, NO_AUTO_DA_ALLOC))

		seq_puts(seq, ",noauto_da_alloc");



	if (test_opt(sb, DISCARD) && !(def_mount_opts & EXT4_DEFM_DISCARD))

		seq_puts(seq, ",discard");



	if (test_opt(sb, NOLOAD))

		seq_puts(seq, ",norecovery");



	if (test_opt(sb, DIOREAD_NOLOCK))

		seq_puts(seq, ",dioread_nolock");



	if (test_opt(sb, BLOCK_VALIDITY) &&

	    !(def_mount_opts & EXT4_DEFM_BLOCK_VALIDITY))

		seq_puts(seq, ",block_validity");



	if (!test_opt(sb, INIT_INODE_TABLE))

		seq_puts(seq, ",noinit_itable");

	else if (sbi->s_li_wait_mult != EXT4_DEF_LI_WAIT_MULT)

		seq_printf(seq, ",init_itable=%u",

			   (unsigned) sbi->s_li_wait_mult);



	ext4_show_quota_options(seq, sb);



	return 0;

}



static int ext4_setup_super(struct super_block *sb, struct ext4_super_block *es,

			    int read_only)

{