libxfs: rename bli_format to avoid confusion with bli_formats

Rename the bli_format structure to __bli_format to avoid
accidently confusing them with the bli_formats pointer.

(nb: userspace currently has no bli_formats pointer)

Source kernel commit: b94381737e9c4d014a4003e8ece9ba88670a2dd4

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Allison Collins <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/include/xfs_trans.h b/include/xfs_trans.h
index 10b745381c13398406fed7e87b1e9b4d9839fc47..118fa0bf8fb25b15ca3ae33d25e52b11f5d3197f 100644 (file)
--- a/include/xfs_trans.h
+++ b/include/xfs_trans.h
@@ -39,7 +39,7 @@ typedef struct xfs_buf_log_item {
        struct xfs_buf          *bli_buf;       /* real buffer pointer */
        unsigned int            bli_flags;      /* misc flags */
        unsigned int            bli_recur;      /* recursion count */
-       xfs_buf_log_format_t    bli_format;     /* in-log header */
+       xfs_buf_log_format_t    __bli_format;   /* in-log header */
 } xfs_buf_log_item_t;
 
 #define XFS_BLI_DIRTY                  (1<<0)

diff --git a/libxfs/logitem.c b/libxfs/logitem.c
index 4da9bc1babd9c9ac57d9886d56392203019d3709..e862ab4f26fd1ab2b54936ac2a154481deee5054 100644 (file)
--- a/libxfs/logitem.c
+++ b/libxfs/logitem.c
@@ -107,9 +107,9 @@ xfs_buf_item_init(
        bip->bli_item.li_mountp = mp;
        INIT_LIST_HEAD(&bip->bli_item.li_trans);
        bip->bli_buf = bp;
-       bip->bli_format.blf_type = XFS_LI_BUF;
-       bip->bli_format.blf_blkno = (int64_t)XFS_BUF_ADDR(bp);
-       bip->bli_format.blf_len = (unsigned short)BTOBB(bp->b_bcount);
+       bip->__bli_format.blf_type = XFS_LI_BUF;
+       bip->__bli_format.blf_blkno = (int64_t)XFS_BUF_ADDR(bp);
+       bip->__bli_format.blf_len = (unsigned short)BTOBB(bp->b_bcount);
        bp->b_log_item = bip;
 }
 

diff --git a/libxfs/trans.c b/libxfs/trans.c
index f50a9b2cac03a6600d1e70f50a844dc926d5a341..763daa08998d1c7483638c706db7546c032136bf 100644 (file)
--- a/libxfs/trans.c
+++ b/libxfs/trans.c
@@ -531,8 +531,8 @@ libxfs_trans_binval(
        xfs_buf_stale(bp);
        bip->bli_flags |= XFS_BLI_STALE;
        bip->bli_flags &= ~XFS_BLI_DIRTY;
-       bip->bli_format.blf_flags &= ~XFS_BLF_INODE_BUF;
-       bip->bli_format.blf_flags |= XFS_BLF_CANCEL;
+       bip->__bli_format.blf_flags &= ~XFS_BLF_INODE_BUF;
+       bip->__bli_format.blf_flags |= XFS_BLF_CANCEL;
        set_bit(XFS_LI_DIRTY, &bip->bli_item.li_flags);
        tp->t_flags |= XFS_TRANS_DIRTY;
 }