sync with recent change to kernel xfs_inode change - doesn't affect

userspace at all, but keep files in sync.

diff --git a/include/xfs_inode.h b/include/xfs_inode.h
index ff5987d6df7a3e3c9818b18f447f63398a9127d9..cb0b0ac139a639750f8065af390c1229f10db44c 100644 (file)
--- a/include/xfs_inode.h
+++ b/include/xfs_inode.h
@@ -320,6 +320,7 @@ typedef struct xfs_inode {
        unsigned int            i_pincount;     /* inode pin count */
        sv_t                    i_pinsema;      /* inode pin sema */
        lock_t                  i_ipinlock;     /* inode pinning mutex */
+       struct xfs_inode        **i_refcache;   /* ptr to entry in ref cache */
        struct xfs_inode        *i_release;     /* inode to unref */
 
        /* I/O state */

diff --git a/libxfs/xfs_rtalloc.c b/libxfs/xfs_rtalloc.c
index 8f0a447f9e7c501b7e711c68198d264bae19368d..18b2e7bb43d35523c0512ccb8668e69d42ee4a81 100644 (file)
--- a/libxfs/xfs_rtalloc.c
+++ b/libxfs/xfs_rtalloc.c
@@ -515,7 +515,7 @@ xfs_rtmodify_range(
        xfs_rtword_t    *b;             /* current word in buffer */
        int             bit;            /* bit number in the word */
        xfs_rtblock_t   block;          /* bitmap block number */
-       xfs_buf_t               *bp;            /* buf for the block */
+       xfs_buf_t       *bp;            /* buf for the block */
        xfs_rtword_t    *bufp;          /* starting word in buffer */
        int             error;          /* error value */
        xfs_rtword_t    *first;         /* first used word in the buffer */