xfs: buffer type overruns blf_flags field

The buffer type passed to log recvoery in the buffer log item
overruns the blf_flags field. I had assumed that flags field was a
32 bit value, and it turns out it is a unisgned short. Therefore
having 19 flags doesn't really work.

Convert the buffer type field to numeric value, and use the top 5
bits of the flags field for it. We currently have 17 types of
buffers, so using 5 bits gives us plenty of room for expansion in
future....

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c
index 40d3d576f473..5673bcfda2f0 100644
--- a/fs/xfs/xfs_alloc.c
+++ b/fs/xfs/xfs_alloc.c
@@ -2099,7 +2099,7 @@ xfs_alloc_log_agf(
 
         trace_xfs_agf(tp->t_mountp, XFS_BUF_TO_AGF(bp), fields, _RET_IP_);
 
-        xfs_trans_buf_set_type(tp, bp, XFS_BLF_AGF_BUF);
+        xfs_trans_buf_set_type(tp, bp, XFS_BLFT_AGF_BUF);
 
         xfs_btree_offsets(fields, offsets, XFS_AGF_NUM_BITS, &first, &last);
         xfs_trans_log_buf(tp, bp, (uint)first, (uint)last);
@@ -2179,7 +2179,7 @@ xfs_alloc_put_freelist(
 
         xfs_alloc_log_agf(tp, agbp, logflags);
 
-        xfs_trans_buf_set_type(tp, agflbp, XFS_BLF_AGFL_BUF);
+        xfs_trans_buf_set_type(tp, agflbp, XFS_BLFT_AGFL_BUF);
         xfs_trans_log_buf(tp, agflbp, startoff,
                           startoff + sizeof(xfs_agblock_t) - 1);
         return 0;