sync with kernel

diff --git a/include/xfs_inode.h b/include/xfs_inode.h
index 7908680b093426cd37f105dc9bbd68ac6de55117..497cd686745045ebd37f3536088600f5ff9433dc 100644 (file)
--- a/include/xfs_inode.h
+++ b/include/xfs_inode.h
@@ -512,8 +512,7 @@ xfs_inode_t *xfs_inode_incore(struct xfs_mount *, xfs_ino_t,
 void            xfs_inode_lock_init(xfs_inode_t *, struct vnode *);
 int            xfs_iget(struct xfs_mount *, struct xfs_trans *, xfs_ino_t,
                         uint, xfs_inode_t **, xfs_daddr_t);
-int            xfs_vn_iget(struct vnode    *, struct xfs_mount *,
-                        xfs_ino_t, xfs_inode_t **);
+int            xfs_vn_iget(vfs_t *, struct vnode *, xfs_ino_t);
 void           xfs_iput(xfs_inode_t *, uint);
 void           xfs_ilock(xfs_inode_t *, uint);
 int            xfs_ilock_nowait(xfs_inode_t *, uint);

diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
index 6f654b2238014095133f1b1af5f7113667205aa2..d3a1b707dba437f7c888fc1173f516997d5273ce 100644 (file)
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -772,7 +772,7 @@ xfs_btree_read_bufs(
                return error;
        }
        ASSERT(!bp || !XFS_BUF_GETERROR(bp));
-       if (bp != NULL)
+       if (bp != NULL) {
                switch (refval) {
                case XFS_ALLOC_BTREE_REF:
                        XFS_BUF_SET_VTYPE_REF(bp, B_FS_MAP, refval);
@@ -781,6 +781,7 @@ xfs_btree_read_bufs(
                        XFS_BUF_SET_VTYPE_REF(bp, B_FS_INOMAP, refval);
                        break;
                }
+       }
        *bpp = bp;
        return 0;
 }