Commit 8d939f4b authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: constify the xfs_sb predicates 



Change the xfs_sb predicates to take a const struct xfs_sb pointer
because they do not change the superblock.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent e5e5cae0

fs/xfs/libxfs/xfs_format.h

+12 −12
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ struct xfs_dsb { 


#define	XFS_SB_VERSION_NUM(sbp)	((sbp)->sb_versionnum & XFS_SB_VERSION_NUMBITS)



static inline bool xfs_sb_is_v5(struct xfs_sb *sbp)

static inline bool xfs_sb_is_v5(const struct xfs_sb *sbp)

{

	return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5;

}
@@ -287,12 +287,12 @@ static inline bool xfs_sb_is_v5(struct xfs_sb *sbp) 
 * Detect a mismatched features2 field.  Older kernels read/wrote

 * this into the wrong slot, so to be safe we keep them in sync.

 */

static inline bool xfs_sb_has_mismatched_features2(struct xfs_sb *sbp)

static inline bool xfs_sb_has_mismatched_features2(const struct xfs_sb *sbp)

{

	return sbp->sb_bad_features2 != sbp->sb_features2;

}



static inline bool xfs_sb_version_hasmorebits(struct xfs_sb *sbp)

static inline bool xfs_sb_version_hasmorebits(const struct xfs_sb *sbp)

{

	return xfs_sb_is_v5(sbp) ||

	       (sbp->sb_versionnum & XFS_SB_VERSION_MOREBITSBIT);
@@ -342,7 +342,7 @@ static inline void xfs_sb_version_addprojid32(struct xfs_sb *sbp) 
#define XFS_SB_FEAT_COMPAT_UNKNOWN	~XFS_SB_FEAT_COMPAT_ALL

static inline bool

xfs_sb_has_compat_feature(

	struct xfs_sb	*sbp,

	const struct xfs_sb	*sbp,

	uint32_t		feature)

{

	return (sbp->sb_features_compat & feature) != 0;
@@ -360,7 +360,7 @@ xfs_sb_has_compat_feature( 
#define XFS_SB_FEAT_RO_COMPAT_UNKNOWN	~XFS_SB_FEAT_RO_COMPAT_ALL

static inline bool

xfs_sb_has_ro_compat_feature(

	struct xfs_sb	*sbp,

	const struct xfs_sb	*sbp,

	uint32_t		feature)

{

	return (sbp->sb_features_ro_compat & feature) != 0;
@@ -387,7 +387,7 @@ xfs_sb_has_ro_compat_feature( 
#define XFS_SB_FEAT_INCOMPAT_UNKNOWN	~XFS_SB_FEAT_INCOMPAT_ALL

static inline bool

xfs_sb_has_incompat_feature(

	struct xfs_sb	*sbp,

	const struct xfs_sb	*sbp,

	uint32_t		feature)

{

	return (sbp->sb_features_incompat & feature) != 0;
@@ -399,7 +399,7 @@ xfs_sb_has_incompat_feature( 
#define XFS_SB_FEAT_INCOMPAT_LOG_UNKNOWN	~XFS_SB_FEAT_INCOMPAT_LOG_ALL

static inline bool

xfs_sb_has_incompat_log_feature(

	struct xfs_sb	*sbp,

	const struct xfs_sb	*sbp,

	uint32_t		feature)

{

	return (sbp->sb_features_log_incompat & feature) != 0;
@@ -420,7 +420,7 @@ xfs_sb_add_incompat_log_features( 
	sbp->sb_features_log_incompat |= features;

}



static inline bool xfs_sb_version_haslogxattrs(struct xfs_sb *sbp)

static inline bool xfs_sb_version_haslogxattrs(const struct xfs_sb *sbp)

{

	return xfs_sb_is_v5(sbp) && (sbp->sb_features_log_incompat &

		 XFS_SB_FEAT_INCOMPAT_LOG_XATTRS);