[XFS] Remove the BPCSHIFT and NB* based macros from XFS.

The BPCSHIFT based macros, btoc*, ctob*, offtoc* and ctooff are either not
used or don't need to be used. The NDPP, NDPP, NBBY macros don't need to
be used but instead are replaced directly by PAGE_SIZE and PAGE_CACHE_SIZE
where appropriate. Initial patch and motivation from Nicolas Kaiser.

SGI-PV: 971186
SGI-Modid: xfs-linux-melb:xfs-kern:30096a

Signed-off-by: Tim Shimmin <tes@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 7ed15bdc32bf..4c86a26330a0 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1552,7 +1552,7 @@ xlog_dealloc_log(xlog_t *log)
                 tic = log->l_unmount_free;
                 while (tic) {
                         next_tic = tic->t_next;
-                        kmem_free(tic, NBPP);
+                        kmem_free(tic, PAGE_SIZE);
                         tic = next_tic;
                 }
         }
@@ -3161,13 +3161,13 @@ xlog_state_ticket_alloc(xlog_t *log)
         xlog_ticket_t   *t_list;
         xlog_ticket_t   *next;
         xfs_caddr_t     buf;
-        uint            i = (NBPP / sizeof(xlog_ticket_t)) - 2;
+        uint            i = (PAGE_SIZE / sizeof(xlog_ticket_t)) - 2;
 
         /*
          * The kmem_zalloc may sleep, so we shouldn't be holding the
          * global lock.  XXXmiken: may want to use zone allocator.
          */
-        buf = (xfs_caddr_t) kmem_zalloc(NBPP, KM_SLEEP);
+        buf = (xfs_caddr_t) kmem_zalloc(PAGE_SIZE, KM_SLEEP);
 
         spin_lock(&log->l_icloglock);