Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / fs / xfs / xfs_buf.h

diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h
index 1c2e52b2d926140b27e7a0e75f568165b7a07534..8a9d3a9599f00f410fe9b6e922b62242dfd8ab81 100644 (file)
--- a/fs/xfs/xfs_buf.h
+++ b/fs/xfs/xfs_buf.h
@@ -71,6 +71,7 @@ typedef unsigned int xfs_buf_flags_t;
        { XBF_READ,             "READ" }, \
        { XBF_WRITE,            "WRITE" }, \
        { XBF_READ_AHEAD,       "READ_AHEAD" }, \
+       { XBF_NO_IOACCT,        "NO_IOACCT" }, \
        { XBF_ASYNC,            "ASYNC" }, \
        { XBF_DONE,             "DONE" }, \
        { XBF_STALE,            "STALE" }, \
@@ -150,7 +151,7 @@ typedef struct xfs_buf {
         * which is the only bit that is touched if we hit the semaphore
         * fast-path on locking.
         */
-       struct rb_node          b_rbnode;       /* rbtree node */
+       struct rhash_head       b_rhash_head;   /* pag buffer hash node */
        xfs_daddr_t             b_bn;           /* block number of buffer */
        int                     b_length;       /* size of buffer in BBs */
        atomic_t                b_hold;         /* reference count */