[XFS] remove shouting-indirection macros from xfs_sb.h

Remove macro-to-small-function indirection from xfs_sb.h, and remove some
which are completely unused.

SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30528a

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Signed-off-by: Donald Douwsma <donaldd@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index eadc1591c795..d3a0f538d6a6 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -77,36 +77,36 @@ xfs_fs_geometry(
         if (new_version >= 3) {
                 geo->version = XFS_FSOP_GEOM_VERSION;
                 geo->flags =
-                        (XFS_SB_VERSION_HASATTR(&mp->m_sb) ?
+                        (xfs_sb_version_hasattr(&mp->m_sb) ?
                                 XFS_FSOP_GEOM_FLAGS_ATTR : 0) |
-                        (XFS_SB_VERSION_HASNLINK(&mp->m_sb) ?
+                        (xfs_sb_version_hasnlink(&mp->m_sb) ?
                                 XFS_FSOP_GEOM_FLAGS_NLINK : 0) |
-                        (XFS_SB_VERSION_HASQUOTA(&mp->m_sb) ?
+                        (xfs_sb_version_hasquota(&mp->m_sb) ?
                                 XFS_FSOP_GEOM_FLAGS_QUOTA : 0) |
-                        (XFS_SB_VERSION_HASALIGN(&mp->m_sb) ?
+                        (xfs_sb_version_hasalign(&mp->m_sb) ?
                                 XFS_FSOP_GEOM_FLAGS_IALIGN : 0) |
-                        (XFS_SB_VERSION_HASDALIGN(&mp->m_sb) ?
+                        (xfs_sb_version_hasdalign(&mp->m_sb) ?
                                 XFS_FSOP_GEOM_FLAGS_DALIGN : 0) |
-                        (XFS_SB_VERSION_HASSHARED(&mp->m_sb) ?
+                        (xfs_sb_version_hasshared(&mp->m_sb) ?
                                 XFS_FSOP_GEOM_FLAGS_SHARED : 0) |
-                        (XFS_SB_VERSION_HASEXTFLGBIT(&mp->m_sb) ?
+                        (xfs_sb_version_hasextflgbit(&mp->m_sb) ?
                                 XFS_FSOP_GEOM_FLAGS_EXTFLG : 0) |
-                        (XFS_SB_VERSION_HASDIRV2(&mp->m_sb) ?
+                        (xfs_sb_version_hasdirv2(&mp->m_sb) ?
                                 XFS_FSOP_GEOM_FLAGS_DIRV2 : 0) |
-                        (XFS_SB_VERSION_HASSECTOR(&mp->m_sb) ?
+                        (xfs_sb_version_hassector(&mp->m_sb) ?
                                 XFS_FSOP_GEOM_FLAGS_SECTOR : 0) |
                         (xfs_sb_version_haslazysbcount(&mp->m_sb) ?
                                 XFS_FSOP_GEOM_FLAGS_LAZYSB : 0) |
-                        (XFS_SB_VERSION_HASATTR2(&mp->m_sb) ?
+                        (xfs_sb_version_hasattr2(&mp->m_sb) ?
                                 XFS_FSOP_GEOM_FLAGS_ATTR2 : 0);
-                geo->logsectsize = XFS_SB_VERSION_HASSECTOR(&mp->m_sb) ?
+                geo->logsectsize = xfs_sb_version_hassector(&mp->m_sb) ?
                                 mp->m_sb.sb_logsectsize : BBSIZE;
                 geo->rtsectsize = mp->m_sb.sb_blocksize;
                 geo->dirblocksize = mp->m_dirblksize;
         }
         if (new_version >= 4) {
                 geo->flags |=
-                        (XFS_SB_VERSION_HASLOGV2(&mp->m_sb) ?
+                        (xfs_sb_version_haslogv2(&mp->m_sb) ?
                                 XFS_FSOP_GEOM_FLAGS_LOGV2 : 0);
                 geo->logsunit = mp->m_sb.sb_logsunit;
         }