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_dir2_block.c b/fs/xfs/xfs_dir2_block.c
index 58816ecdbba5..e59f5fc816fe 100644
--- a/fs/xfs/xfs_dir2_block.c
+++ b/fs/xfs/xfs_dir2_block.c
@@ -137,7 +137,7 @@ xfs_dir3_block_read(
         err = xfs_da_read_buf(tp, dp, mp->m_dirdatablk, -1, bpp,
                                 XFS_DATA_FORK, &xfs_dir3_block_buf_ops);
         if (!err && tp)
-                xfs_trans_buf_set_type(tp, *bpp, XFS_BLF_DIR_BLOCK_BUF);
+                xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_DIR_BLOCK_BUF);
         return err;
 }
 
@@ -151,7 +151,7 @@ xfs_dir3_block_init(
         struct xfs_dir3_blk_hdr *hdr3 = bp->b_addr;
 
         bp->b_ops = &xfs_dir3_block_buf_ops;
-        xfs_trans_buf_set_type(tp, bp, XFS_BLF_DIR_BLOCK_BUF);
+        xfs_trans_buf_set_type(tp, bp, XFS_BLFT_DIR_BLOCK_BUF);
 
         if (xfs_sb_version_hascrc(&mp->m_sb)) {
                 memset(hdr3, 0, sizeof(*hdr3));