xfs: use blocks for counting length of buffers

Now that we pass block counts everywhere, and index buffers by block
number, track the length of the buffer in units of blocks rather
than bytes. Convert the code to use block counts, and those that
need byte counts get converted at the time of use.

Also, remove the XFS_BUF_{SET_}SIZE() macros that are just wrappers
around the buffer length. They only serve to make the code shouty
loud and don't actually add any real value.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index 2e41756e263a..900764c450a8 100644
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -281,7 +281,7 @@ DECLARE_EVENT_CLASS(xfs_buf_class,
         TP_STRUCT__entry(
                 __field(dev_t, dev)
                 __field(xfs_daddr_t, bno)
-                __field(size_t, buffer_length)
+                __field(int, nblks)
                 __field(int, hold)
                 __field(int, pincount)
                 __field(unsigned, lockval)
@@ -291,18 +291,18 @@ DECLARE_EVENT_CLASS(xfs_buf_class,
         TP_fast_assign(
                 __entry->dev = bp->b_target->bt_dev;
                 __entry->bno = bp->b_bn;
-                __entry->buffer_length = bp->b_buffer_length;
+                __entry->nblks = bp->b_length;
                 __entry->hold = atomic_read(&bp->b_hold);
                 __entry->pincount = atomic_read(&bp->b_pin_count);
                 __entry->lockval = bp->b_sema.count;
                 __entry->flags = bp->b_flags;
                 __entry->caller_ip = caller_ip;
         ),
-        TP_printk("dev %d:%d bno 0x%llx len 0x%zx hold %d pincount %d "
+        TP_printk("dev %d:%d bno 0x%llx nblks 0x%x hold %d pincount %d "
                   "lock %d flags %s caller %pf",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long long)__entry->bno,
-                  __entry->buffer_length,
+                  __entry->nblks,
                   __entry->hold,
                   __entry->pincount,
                   __entry->lockval,
@@ -362,7 +362,7 @@ DECLARE_EVENT_CLASS(xfs_buf_flags_class,
         TP_fast_assign(
                 __entry->dev = bp->b_target->bt_dev;
                 __entry->bno = bp->b_bn;
-                __entry->buffer_length = bp->b_buffer_length;
+                __entry->buffer_length = BBTOB(bp->b_length);
                 __entry->flags = flags;
                 __entry->hold = atomic_read(&bp->b_hold);
                 __entry->pincount = atomic_read(&bp->b_pin_count);
@@ -406,7 +406,7 @@ TRACE_EVENT(xfs_buf_ioerror,
         TP_fast_assign(
                 __entry->dev = bp->b_target->bt_dev;
                 __entry->bno = bp->b_bn;
-                __entry->buffer_length = bp->b_buffer_length;
+                __entry->buffer_length = BBTOB(bp->b_length);
                 __entry->hold = atomic_read(&bp->b_hold);
                 __entry->pincount = atomic_read(&bp->b_pin_count);
                 __entry->lockval = bp->b_sema.count;
@@ -450,7 +450,7 @@ DECLARE_EVENT_CLASS(xfs_buf_item_class,
                 __entry->bli_recur = bip->bli_recur;
                 __entry->bli_refcount = atomic_read(&bip->bli_refcount);
                 __entry->buf_bno = bip->bli_buf->b_bn;
-                __entry->buf_len = bip->bli_buf->b_buffer_length;
+                __entry->buf_len = BBTOB(bip->bli_buf->b_length);
                 __entry->buf_flags = bip->bli_buf->b_flags;
                 __entry->buf_hold = atomic_read(&bip->bli_buf->b_hold);
                 __entry->buf_pincount = atomic_read(&bip->bli_buf->b_pin_count);