cleanup xfs_sb.h feature flag helpers
The various inlines in xfs_sb.h that deal with the superblock version and fature flags were converted from macros a while ago, and this show by the odd coding style full of useless braces and backslashes and the avoidance of conditionals. Clean these up to look like normal C code. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Donald Douwsma <donaldd@sgi.com> Signed-off-by: Niv Sardi <xaiki@sgi.com>
This commit is contained in:
parent
df6771bde1
commit
5efcbb853b
168
fs/xfs/xfs_sb.h
168
fs/xfs/xfs_sb.h
|
@ -296,30 +296,34 @@ typedef enum {
|
|||
|
||||
#define XFS_SB_VERSION_NUM(sbp) ((sbp)->sb_versionnum & XFS_SB_VERSION_NUMBITS)
|
||||
|
||||
static inline int xfs_sb_good_version(xfs_sb_t *sbp)
|
||||
{
|
||||
/* We always support version 1-3 */
|
||||
if (sbp->sb_versionnum >= XFS_SB_VERSION_1 &&
|
||||
sbp->sb_versionnum <= XFS_SB_VERSION_3)
|
||||
return 1;
|
||||
|
||||
/* We support version 4 if all feature bits are supported */
|
||||
if (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) {
|
||||
if ((sbp->sb_versionnum & ~XFS_SB_VERSION_OKREALBITS) ||
|
||||
((sbp->sb_versionnum & XFS_SB_VERSION_MOREBITSBIT) &&
|
||||
(sbp->sb_features2 & ~XFS_SB_VERSION2_OKREALBITS)))
|
||||
return 0;
|
||||
|
||||
#ifdef __KERNEL__
|
||||
static inline int xfs_sb_good_version(xfs_sb_t *sbp)
|
||||
{
|
||||
return (((sbp->sb_versionnum >= XFS_SB_VERSION_1) && \
|
||||
(sbp->sb_versionnum <= XFS_SB_VERSION_3)) || \
|
||||
((XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \
|
||||
!((sbp->sb_versionnum & ~XFS_SB_VERSION_OKREALBITS) || \
|
||||
((sbp->sb_versionnum & XFS_SB_VERSION_MOREBITSBIT) && \
|
||||
(sbp->sb_features2 & ~XFS_SB_VERSION2_OKREALBITS))) && \
|
||||
(sbp->sb_shared_vn <= XFS_SB_MAX_SHARED_VN)));
|
||||
}
|
||||
if (sbp->sb_shared_vn > XFS_SB_MAX_SHARED_VN)
|
||||
return 0;
|
||||
#else
|
||||
static inline int xfs_sb_good_version(xfs_sb_t *sbp)
|
||||
{
|
||||
return (((sbp->sb_versionnum >= XFS_SB_VERSION_1) && \
|
||||
(sbp->sb_versionnum <= XFS_SB_VERSION_3)) || \
|
||||
((XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \
|
||||
!((sbp->sb_versionnum & ~XFS_SB_VERSION_OKREALBITS) || \
|
||||
((sbp->sb_versionnum & XFS_SB_VERSION_MOREBITSBIT) && \
|
||||
(sbp->sb_features2 & ~XFS_SB_VERSION2_OKREALBITS))) && \
|
||||
(!(sbp->sb_versionnum & XFS_SB_VERSION_SHAREDBIT) || \
|
||||
(sbp->sb_shared_vn <= XFS_SB_MAX_SHARED_VN))));
|
||||
if ((sbp->sb_versionnum & XFS_SB_VERSION_SHAREDBIT) &&
|
||||
sbp->sb_shared_vn > XFS_SB_MAX_SHARED_VN)
|
||||
return 0;
|
||||
#endif
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
/*
|
||||
* Detect a mismatched features2 field. Older kernels read/wrote
|
||||
|
@ -332,123 +336,127 @@ static inline int xfs_sb_has_mismatched_features2(xfs_sb_t *sbp)
|
|||
|
||||
static inline unsigned xfs_sb_version_tonew(unsigned v)
|
||||
{
|
||||
return ((((v) == XFS_SB_VERSION_1) ? \
|
||||
0 : \
|
||||
(((v) == XFS_SB_VERSION_2) ? \
|
||||
XFS_SB_VERSION_ATTRBIT : \
|
||||
(XFS_SB_VERSION_ATTRBIT | XFS_SB_VERSION_NLINKBIT))) | \
|
||||
XFS_SB_VERSION_4);
|
||||
if (v == XFS_SB_VERSION_1)
|
||||
return XFS_SB_VERSION_4;
|
||||
|
||||
if (v == XFS_SB_VERSION_2)
|
||||
return XFS_SB_VERSION_4 | XFS_SB_VERSION_ATTRBIT;
|
||||
|
||||
return XFS_SB_VERSION_4 | XFS_SB_VERSION_ATTRBIT |
|
||||
XFS_SB_VERSION_NLINKBIT;
|
||||
}
|
||||
|
||||
static inline unsigned xfs_sb_version_toold(unsigned v)
|
||||
{
|
||||
return (((v) & (XFS_SB_VERSION_QUOTABIT | XFS_SB_VERSION_ALIGNBIT)) ? \
|
||||
0 : \
|
||||
(((v) & XFS_SB_VERSION_NLINKBIT) ? \
|
||||
XFS_SB_VERSION_3 : \
|
||||
(((v) & XFS_SB_VERSION_ATTRBIT) ? \
|
||||
XFS_SB_VERSION_2 : \
|
||||
XFS_SB_VERSION_1)));
|
||||
if (v & (XFS_SB_VERSION_QUOTABIT | XFS_SB_VERSION_ALIGNBIT))
|
||||
return 0;
|
||||
if (v & XFS_SB_VERSION_NLINKBIT)
|
||||
return XFS_SB_VERSION_3;
|
||||
if (v & XFS_SB_VERSION_ATTRBIT)
|
||||
return XFS_SB_VERSION_2;
|
||||
return XFS_SB_VERSION_1;
|
||||
}
|
||||
|
||||
static inline int xfs_sb_version_hasattr(xfs_sb_t *sbp)
|
||||
{
|
||||
return ((sbp)->sb_versionnum == XFS_SB_VERSION_2) || \
|
||||
((sbp)->sb_versionnum == XFS_SB_VERSION_3) || \
|
||||
((XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \
|
||||
((sbp)->sb_versionnum & XFS_SB_VERSION_ATTRBIT));
|
||||
return sbp->sb_versionnum == XFS_SB_VERSION_2 ||
|
||||
sbp->sb_versionnum == XFS_SB_VERSION_3 ||
|
||||
(XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4 &&
|
||||
(sbp->sb_versionnum & XFS_SB_VERSION_ATTRBIT));
|
||||
}
|
||||
|
||||
static inline void xfs_sb_version_addattr(xfs_sb_t *sbp)
|
||||
{
|
||||
(sbp)->sb_versionnum = (((sbp)->sb_versionnum == XFS_SB_VERSION_1) ? \
|
||||
XFS_SB_VERSION_2 : \
|
||||
((XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) ? \
|
||||
((sbp)->sb_versionnum | XFS_SB_VERSION_ATTRBIT) : \
|
||||
(XFS_SB_VERSION_4 | XFS_SB_VERSION_ATTRBIT)));
|
||||
if (sbp->sb_versionnum == XFS_SB_VERSION_1)
|
||||
sbp->sb_versionnum = XFS_SB_VERSION_2;
|
||||
else if (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4)
|
||||
sbp->sb_versionnum |= XFS_SB_VERSION_ATTRBIT;
|
||||
else
|
||||
sbp->sb_versionnum = XFS_SB_VERSION_4 | XFS_SB_VERSION_ATTRBIT;
|
||||
}
|
||||
|
||||
static inline int xfs_sb_version_hasnlink(xfs_sb_t *sbp)
|
||||
{
|
||||
return ((sbp)->sb_versionnum == XFS_SB_VERSION_3) || \
|
||||
((XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \
|
||||
((sbp)->sb_versionnum & XFS_SB_VERSION_NLINKBIT));
|
||||
return sbp->sb_versionnum == XFS_SB_VERSION_3 ||
|
||||
(XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4 &&
|
||||
(sbp->sb_versionnum & XFS_SB_VERSION_NLINKBIT));
|
||||
}
|
||||
|
||||
static inline void xfs_sb_version_addnlink(xfs_sb_t *sbp)
|
||||
{
|
||||
(sbp)->sb_versionnum = ((sbp)->sb_versionnum <= XFS_SB_VERSION_2 ? \
|
||||
XFS_SB_VERSION_3 : \
|
||||
((sbp)->sb_versionnum | XFS_SB_VERSION_NLINKBIT));
|
||||
if (sbp->sb_versionnum <= XFS_SB_VERSION_2)
|
||||
sbp->sb_versionnum = XFS_SB_VERSION_3;
|
||||
else
|
||||
sbp->sb_versionnum |= XFS_SB_VERSION_NLINKBIT;
|
||||
}
|
||||
|
||||
static inline int xfs_sb_version_hasquota(xfs_sb_t *sbp)
|
||||
{
|
||||
return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \
|
||||
((sbp)->sb_versionnum & XFS_SB_VERSION_QUOTABIT);
|
||||
return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4 &&
|
||||
(sbp->sb_versionnum & XFS_SB_VERSION_QUOTABIT);
|
||||
}
|
||||
|
||||
static inline void xfs_sb_version_addquota(xfs_sb_t *sbp)
|
||||
{
|
||||
(sbp)->sb_versionnum = \
|
||||
(XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4 ? \
|
||||
((sbp)->sb_versionnum | XFS_SB_VERSION_QUOTABIT) : \
|
||||
(xfs_sb_version_tonew((sbp)->sb_versionnum) | \
|
||||
XFS_SB_VERSION_QUOTABIT));
|
||||
if (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4)
|
||||
sbp->sb_versionnum |= XFS_SB_VERSION_QUOTABIT;
|
||||
else
|
||||
sbp->sb_versionnum = xfs_sb_version_tonew(sbp->sb_versionnum) |
|
||||
XFS_SB_VERSION_QUOTABIT;
|
||||
}
|
||||
|
||||
static inline int xfs_sb_version_hasalign(xfs_sb_t *sbp)
|
||||
{
|
||||
return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \
|
||||
((sbp)->sb_versionnum & XFS_SB_VERSION_ALIGNBIT);
|
||||
return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4 &&
|
||||
(sbp->sb_versionnum & XFS_SB_VERSION_ALIGNBIT);
|
||||
}
|
||||
|
||||
static inline int xfs_sb_version_hasdalign(xfs_sb_t *sbp)
|
||||
{
|
||||
return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \
|
||||
((sbp)->sb_versionnum & XFS_SB_VERSION_DALIGNBIT);
|
||||
return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4 &&
|
||||
(sbp->sb_versionnum & XFS_SB_VERSION_DALIGNBIT);
|
||||
}
|
||||
|
||||
static inline int xfs_sb_version_hasshared(xfs_sb_t *sbp)
|
||||
{
|
||||
return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \
|
||||
((sbp)->sb_versionnum & XFS_SB_VERSION_SHAREDBIT);
|
||||
return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4 &&
|
||||
(sbp->sb_versionnum & XFS_SB_VERSION_SHAREDBIT);
|
||||
}
|
||||
|
||||
static inline int xfs_sb_version_hasdirv2(xfs_sb_t *sbp)
|
||||
{
|
||||
return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \
|
||||
((sbp)->sb_versionnum & XFS_SB_VERSION_DIRV2BIT);
|
||||
return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4 &&
|
||||
(sbp->sb_versionnum & XFS_SB_VERSION_DIRV2BIT);
|
||||
}
|
||||
|
||||
static inline int xfs_sb_version_haslogv2(xfs_sb_t *sbp)
|
||||
{
|
||||
return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \
|
||||
((sbp)->sb_versionnum & XFS_SB_VERSION_LOGV2BIT);
|
||||
return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4 &&
|
||||
(sbp->sb_versionnum & XFS_SB_VERSION_LOGV2BIT);
|
||||
}
|
||||
|
||||
static inline int xfs_sb_version_hasextflgbit(xfs_sb_t *sbp)
|
||||
{
|
||||
return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \
|
||||
((sbp)->sb_versionnum & XFS_SB_VERSION_EXTFLGBIT);
|
||||
return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4 &&
|
||||
(sbp->sb_versionnum & XFS_SB_VERSION_EXTFLGBIT);
|
||||
}
|
||||
|
||||
static inline int xfs_sb_version_hassector(xfs_sb_t *sbp)
|
||||
{
|
||||
return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \
|
||||
((sbp)->sb_versionnum & XFS_SB_VERSION_SECTORBIT);
|
||||
return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4 &&
|
||||
(sbp->sb_versionnum & XFS_SB_VERSION_SECTORBIT);
|
||||
}
|
||||
|
||||
static inline int xfs_sb_version_hasasciici(xfs_sb_t *sbp)
|
||||
{
|
||||
return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \
|
||||
return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4 &&
|
||||
(sbp->sb_versionnum & XFS_SB_VERSION_BORGBIT);
|
||||
}
|
||||
|
||||
static inline int xfs_sb_version_hasmorebits(xfs_sb_t *sbp)
|
||||
{
|
||||
return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \
|
||||
((sbp)->sb_versionnum & XFS_SB_VERSION_MOREBITSBIT);
|
||||
return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4 &&
|
||||
(sbp->sb_versionnum & XFS_SB_VERSION_MOREBITSBIT);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -463,22 +471,20 @@ static inline int xfs_sb_version_hasmorebits(xfs_sb_t *sbp)
|
|||
|
||||
static inline int xfs_sb_version_haslazysbcount(xfs_sb_t *sbp)
|
||||
{
|
||||
return (xfs_sb_version_hasmorebits(sbp) && \
|
||||
((sbp)->sb_features2 & XFS_SB_VERSION2_LAZYSBCOUNTBIT));
|
||||
return xfs_sb_version_hasmorebits(sbp) &&
|
||||
(sbp->sb_features2 & XFS_SB_VERSION2_LAZYSBCOUNTBIT);
|
||||
}
|
||||
|
||||
static inline int xfs_sb_version_hasattr2(xfs_sb_t *sbp)
|
||||
{
|
||||
return (xfs_sb_version_hasmorebits(sbp)) && \
|
||||
((sbp)->sb_features2 & XFS_SB_VERSION2_ATTR2BIT);
|
||||
return xfs_sb_version_hasmorebits(sbp) &&
|
||||
(sbp->sb_features2 & XFS_SB_VERSION2_ATTR2BIT);
|
||||
}
|
||||
|
||||
static inline void xfs_sb_version_addattr2(xfs_sb_t *sbp)
|
||||
{
|
||||
((sbp)->sb_versionnum = \
|
||||
((sbp)->sb_versionnum | XFS_SB_VERSION_MOREBITSBIT), \
|
||||
((sbp)->sb_features2 = \
|
||||
((sbp)->sb_features2 | XFS_SB_VERSION2_ATTR2BIT)));
|
||||
sbp->sb_versionnum |= XFS_SB_VERSION_MOREBITSBIT;
|
||||
sbp->sb_features2 |= XFS_SB_VERSION2_ATTR2BIT;
|
||||
}
|
||||
|
||||
static inline void xfs_sb_version_removeattr2(xfs_sb_t *sbp)
|
||||
|
|
Loading…
Reference in a new issue