xfs: include QUOTA, FATAL ASSERT build options in XFS_BUILD_OPTIONS (e5e63404) · Commits · 戴 / test

In commit ("xfs: include WARN, REPAIR build options in XFS_BUILD_OPTIONS"), Eric pointed out that the XFS_BUILD_OPTIONS string, shown at module init time and in modinfo output, does not currently include all available build options. So, he added in CONFIG_XFS_WARN and CONFIG_XFS_REPAIR. However, this is not enough, add in CONFIG_XFS_QUOTA and CONFIG_XFS_ASSERT_FATAL. Signed-off-by:

yu kuai <yukuai3@huawei.com> Reviewed-by:

Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by:

Darrick J. Wong <darrick.wong@oracle.com>

fs/xfs/xfs_super.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -11,9 +11,11 @@
		#ifdef CONFIG_XFS_QUOTA
		extern int xfs_qm_init(void);
		extern void xfs_qm_exit(void);
		# define XFS_QUOTA_STRING "quota, "
		#else
		# define xfs_qm_init() (0)
		# define xfs_qm_exit() do { } while (0)
		# define XFS_QUOTA_STRING
		#endif

		#ifdef CONFIG_XFS_POSIX_ACL
		@@ -50,6 +52,12 @@ extern void xfs_qm_exit(void);
		# define XFS_WARN_STRING
		#endif

		#ifdef CONFIG_XFS_ASSERT_FATAL
		# define XFS_ASSERT_FATAL_STRING "fatal assert, "
		#else
		# define XFS_ASSERT_FATAL_STRING
		#endif

		#ifdef DEBUG
		# define XFS_DBG_STRING "debug"
		#else
		@@ -63,6 +71,8 @@ extern void xfs_qm_exit(void);
		XFS_SCRUB_STRING \
		XFS_REPAIR_STRING \
		XFS_WARN_STRING \
		XFS_QUOTA_STRING \
		XFS_ASSERT_FATAL_STRING \
		XFS_DBG_STRING /* DBG must be last */

		struct xfs_inode;

Admin message