Merge tag 'v5.11-rc1' into asoc-5.11

[linux-2.6-microblaze.git] / fs / xfs / xfs_trans_buf.c

diff --git a/fs/xfs/xfs_trans_buf.c b/fs/xfs/xfs_trans_buf.c
index 42d63b8..9aced0a 100644 (file)
--- a/fs/xfs/xfs_trans_buf.c
+++ b/fs/xfs/xfs_trans_buf.c
@@ -121,7 +121,7 @@ xfs_trans_get_buf_map(
        xfs_buf_flags_t         flags,
        struct xfs_buf          **bpp)
 {
-       xfs_buf_t               *bp;
+       struct xfs_buf          *bp;
        struct xfs_buf_log_item *bip;
        int                     error;
 
@@ -401,7 +401,7 @@ xfs_trans_brelse(
 void
 xfs_trans_bhold(
        xfs_trans_t             *tp,
-       xfs_buf_t               *bp)
+       struct xfs_buf          *bp)
 {
        struct xfs_buf_log_item *bip = bp->b_log_item;
 
@@ -422,7 +422,7 @@ xfs_trans_bhold(
 void
 xfs_trans_bhold_release(
        xfs_trans_t             *tp,
-       xfs_buf_t               *bp)
+       struct xfs_buf          *bp)
 {
        struct xfs_buf_log_item *bip = bp->b_log_item;
 
@@ -538,7 +538,7 @@ xfs_trans_log_buf(
 void
 xfs_trans_binval(
        xfs_trans_t             *tp,
-       xfs_buf_t               *bp)
+       struct xfs_buf          *bp)
 {
        struct xfs_buf_log_item *bip = bp->b_log_item;
        int                     i;
@@ -593,7 +593,7 @@ xfs_trans_binval(
 void
 xfs_trans_inode_buf(
        xfs_trans_t             *tp,
-       xfs_buf_t               *bp)
+       struct xfs_buf          *bp)
 {
        struct xfs_buf_log_item *bip = bp->b_log_item;
 
@@ -618,7 +618,7 @@ xfs_trans_inode_buf(
 void
 xfs_trans_stale_inode_buf(
        xfs_trans_t             *tp,
-       xfs_buf_t               *bp)
+       struct xfs_buf          *bp)
 {
        struct xfs_buf_log_item *bip = bp->b_log_item;
 
@@ -643,7 +643,7 @@ xfs_trans_stale_inode_buf(
 void
 xfs_trans_inode_alloc_buf(
        xfs_trans_t             *tp,
-       xfs_buf_t               *bp)
+       struct xfs_buf          *bp)
 {
        struct xfs_buf_log_item *bip = bp->b_log_item;
 
@@ -737,7 +737,7 @@ xfs_trans_buf_copy_type(
 void
 xfs_trans_dquot_buf(
        xfs_trans_t             *tp,
-       xfs_buf_t               *bp,
+       struct xfs_buf          *bp,
        uint                    type)
 {
        struct xfs_buf_log_item *bip = bp->b_log_item;