[XFS] Fix a trivial compiler warning, remove some no-longer-used macros.

SGI Modid: xfs-linux:xfs-kern:165155a

diff --git a/fs/xfs/support/ktrace.c b/fs/xfs/support/ktrace.c
index 0190ad2f86d3ecbf4b9771e34b0fe4fea7784fd2..852a92dc0a958b09ba991d3ed763d9a416a3d40c 100644 (file)
--- a/fs/xfs/support/ktrace.c
+++ b/fs/xfs/support/ktrace.c
@@ -34,8 +34,8 @@
 #include <linux/slab.h>
 
 #include <xfs_types.h>
-#include <kmem.h>
-#include <spin.h>
+#include "kmem.h"
+#include "spin.h"
 #include "debug.h"
 #include "ktrace.h"
 

diff --git a/fs/xfs/xfs_ag.h b/fs/xfs/xfs_ag.h
index 58893e32e7c4dea145ee85b6bb72553e9438ef9f..96b70f7fba397ba4d035767c4980934e9b50fa5a 100644 (file)
--- a/fs/xfs/xfs_ag.h
+++ b/fs/xfs/xfs_ag.h
@@ -230,39 +230,6 @@ typedef struct xfs_perag
        xfs_perag_busy_t *pagb_list;    /* unstable blocks */
 } xfs_perag_t;
 
-#define        XFS_AG_MIN_BYTES        (1LL << 24)     /* 16 MB */
-#define        XFS_AG_BEST_BYTES       (1LL << 30)     /*  1 GB */
-#define        XFS_AG_MAX_BYTES        (1LL << 32)     /*  4 GB */
-
-#if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AG_MIN_BLOCKS)
-xfs_extlen_t xfs_ag_min_blocks(int bl);
-#define        XFS_AG_MIN_BLOCKS(bl)           xfs_ag_min_blocks(bl)
-#else
-#define        XFS_AG_MIN_BLOCKS(bl)   ((xfs_extlen_t)(XFS_AG_MIN_BYTES >> bl))
-#endif
-#if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AG_BEST_BLOCKS)
-xfs_extlen_t xfs_ag_best_blocks(int bl, xfs_drfsbno_t blks);
-#define        XFS_AG_BEST_BLOCKS(bl,blks)     xfs_ag_best_blocks(bl,blks)
-#else
-/*--#define XFS_AG_BEST_BLOCKS(bl) ((xfs_extlen_t)(XFS_AG_BEST_BYTES >> bl))*/
-/*
- * Best is XFS_AG_BEST_BLOCKS at and below 64 Gigabyte filesystems, and
- * XFS_AG_MAX_BLOCKS above 64 Gigabytes.
- */
-#define XFS_AG_BEST_BLOCKS(bl,blks)    \
-       ((xfs_extlen_t)((1LL << (36 - bl)) >= blks) ? \
-               ((xfs_extlen_t)(XFS_AG_BEST_BYTES >> bl)) : \
-               XFS_AG_MAX_BLOCKS(bl))
-#endif
-#if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AG_MAX_BLOCKS)
-xfs_extlen_t xfs_ag_max_blocks(int bl);
-#define        XFS_AG_MAX_BLOCKS(bl)           xfs_ag_max_blocks(bl)
-#else
-#define        XFS_AG_MAX_BLOCKS(bl)   ((xfs_extlen_t)(XFS_AG_MAX_BYTES >> bl))
-#endif
-
-#define        XFS_MAX_AGNUMBER        ((xfs_agnumber_t)(NULLAGNUMBER - 1))
-
 #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AG_MAXLEVELS)
 int xfs_ag_maxlevels(struct xfs_mount *mp);
 #define        XFS_AG_MAXLEVELS(mp)            xfs_ag_maxlevels(mp)

diff --git a/fs/xfs/xfs_dir2_node.c b/fs/xfs/xfs_dir2_node.c
index 5e566aace73006cee56e6779a0011426470ae405..c8243145e9eab66f69ced2870e3a129534a93c83 100644 (file)
--- a/fs/xfs/xfs_dir2_node.c
+++ b/fs/xfs/xfs_dir2_node.c
@@ -1573,15 +1573,16 @@ xfs_dir2_node_addname_int(
                                        "%llu needed freesp block %lld for\n"
                                        "  data block %lld, got %lld\n"
                                        "  ifbno %llu lastfbno %d\n",
-                                       dp->i_ino,
-                                       XFS_DIR2_DB_TO_FDB(mp, dbno),
-                                       dbno, fbno,
-                                       ifbno, lastfbno);
+                                       (unsigned long long)dp->i_ino,
+                                       (long long)XFS_DIR2_DB_TO_FDB(mp, dbno),
+                                       (long long)dbno, (long long)fbno,
+                                       (unsigned long long)ifbno, lastfbno);
                                if (fblk) {
                                        cmn_err(CE_ALERT,
-                                               " fblk 0x%llu blkno %llu "
+                                               " fblk 0x%p blkno %llu "
                                                "index %d magic 0x%x\n",
-                                               fblk, fblk->blkno,
+                                               fblk,
+                                               (unsigned long long)fblk->blkno,
                                                fblk->index,
                                                fblk->magic);
                                } else {

diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index ae4818adb23e8374aa9be0578c703525edcb8bab..c8bc49d3deb48863f49232696d3c7b8c0f5d7552 100644 (file)
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -232,7 +232,7 @@ phase2:
 
        if (nimaps) {
                *niomaps = xfs_imap_to_bmap(io, offset, &imap,
-                                       iomapp, nimaps, *niomaps, iomap_flags);
+                                           iomapp, nimaps, *niomaps, iomap_flags);
        } else if (niomaps) {
                *niomaps = 0;
        }

diff --git a/fs/xfs/xfs_macros.c b/fs/xfs/xfs_macros.c
index 8b439a80e58826cfe6ef3d3679b630a0047c4845..8d2660b1b2500b290af0f79f85ea812f6a4cea8a 100644 (file)
--- a/fs/xfs/xfs_macros.c
+++ b/fs/xfs/xfs_macros.c
@@ -115,22 +115,6 @@ xfs_ag_daddr(xfs_mount_t *mp, xfs_agnumber_t agno, xfs_daddr_t d)
 }
 #endif
 
-#if XFS_WANT_FUNCS_C || (XFS_WANT_SPACE_C && XFSSO_XFS_AG_BEST_BLOCKS)
-xfs_extlen_t
-xfs_ag_best_blocks(int bl, xfs_drfsbno_t blks)
-{
-       return XFS_AG_BEST_BLOCKS(bl, blks);
-}
-#endif
-
-#if XFS_WANT_FUNCS_C || (XFS_WANT_SPACE_C && XFSSO_XFS_AG_MAX_BLOCKS)
-xfs_extlen_t
-xfs_ag_max_blocks(int bl)
-{
-       return XFS_AG_MAX_BLOCKS(bl);
-}
-#endif
-
 #if XFS_WANT_FUNCS_C || (XFS_WANT_SPACE_C && XFSSO_XFS_AG_MAXLEVELS)
 int
 xfs_ag_maxlevels(xfs_mount_t *mp)
@@ -139,14 +123,6 @@ xfs_ag_maxlevels(xfs_mount_t *mp)
 }
 #endif
 
-#if XFS_WANT_FUNCS_C || (XFS_WANT_SPACE_C && XFSSO_XFS_AG_MIN_BLOCKS)
-xfs_extlen_t
-xfs_ag_min_blocks(int bl)
-{
-       return XFS_AG_MIN_BLOCKS(bl);
-}
-#endif
-
 #if XFS_WANT_FUNCS_C || (XFS_WANT_SPACE_C && XFSSO_XFS_AGB_TO_DADDR)
 xfs_daddr_t
 xfs_agb_to_daddr(xfs_mount_t *mp, xfs_agnumber_t agno, xfs_agblock_t agbno)