diff mbox series

[40/45] libxfs: clean up remaining LIBXFS_MOUNT flags

Message ID 164263806365.860211.2349495659133555895.stgit@magnolia (mailing list archive)
State Accepted
Headers show
Series xfsprogs: sync libxfs with 5.15 | expand

Commit Message

Darrick J. Wong Jan. 20, 2022, 12:21 a.m. UTC
From: Darrick J. Wong <djwong@kernel.org>

Now that userspace libxfs also uses m_opstate to track operational
state, the LIBXFS_MOUNT_* flags are only used for the flags argument
passed to libxfs_mount().  Update the comment to reflect this, and clean
up the flags and function declaration whiel we're at it.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
 include/xfs_mount.h |    6 ++++--
 libxfs/init.c       |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

Comments

Eric Sandeen Jan. 28, 2022, 8:12 p.m. UTC | #1
On 1/19/22 6:21 PM, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
> 
> Now that userspace libxfs also uses m_opstate to track operational
> state, the LIBXFS_MOUNT_* flags are only used for the flags argument
> passed to libxfs_mount().  Update the comment to reflect this, and clean
> up the flags and function declaration whiel we're at it.
> 
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>

Reviewed-by: Eric Sandeen <sandeen@redhat.com>
diff mbox series

Patch

diff --git a/include/xfs_mount.h b/include/xfs_mount.h
index 37398fd3..dc2206de 100644
--- a/include/xfs_mount.h
+++ b/include/xfs_mount.h
@@ -248,8 +248,10 @@  static inline bool xfs_is_ ## name (struct xfs_mount *mp) \
 __XFS_UNSUPP_OPSTATE(readonly)
 __XFS_UNSUPP_OPSTATE(shutdown)
 
-#define LIBXFS_MOUNT_DEBUGGER		0x0001
-#define LIBXFS_MOUNT_WANT_CORRUPTED	0x0020
+/* don't fail on device size or AG count checks */
+#define LIBXFS_MOUNT_DEBUGGER		(1U << 0)
+/* report metadata corruption to stdout */
+#define LIBXFS_MOUNT_REPORT_CORRUPTION	(1U << 1)
 
 #define LIBXFS_BHASHSIZE(sbp) 		(1<<10)
 
diff --git a/libxfs/init.c b/libxfs/init.c
index 093ce878..f59444ab 100644
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -725,7 +725,7 @@  libxfs_mount(
 	mp->m_features = xfs_sb_version_to_features(sb);
 	if (flags & LIBXFS_MOUNT_DEBUGGER)
 		xfs_set_debugger(mp);
-	if (flags & LIBXFS_MOUNT_WANT_CORRUPTED)
+	if (flags & LIBXFS_MOUNT_REPORT_CORRUPTION)
 		xfs_set_reporting_corruption(mp);
 	libxfs_buftarg_init(mp, dev, logdev, rtdev);