--- fs/xfs/xfs_inode.h

+++ fs/xfs/xfs_inode.h

@@ -468,7 +468,7 @@ static inline void xfs_ifunlock(xfs_inod

* xfs_iget.c prototypes.

*/

int xfs_iget(struct xfs_mount *, struct xfs_trans *, xfs_ino_t,

- uint, uint, xfs_inode_t **, xfs_daddr_t);

+ uint, uint, xfs_inode_t **);

void xfs_iput(xfs_inode_t *, uint);

void xfs_iput_new(xfs_inode_t *, uint);

void xfs_ilock(xfs_inode_t *, uint);

@@ -558,7 +558,7 @@ do { \

* Flags for xfs_iget()

*/

#define XFS_IGET_CREATE 0x1

-#define XFS_IGET_BULKSTAT 0x2

+#define XFS_IGET_UNTRUSTED 0x2

int xfs_inotobp(struct xfs_mount *, struct xfs_trans *,

xfs_ino_t, struct xfs_dinode **,

@@ -567,7 +567,7 @@ int xfs_itobp(struct xfs_mount *, struc

struct xfs_inode *, struct xfs_dinode **,

struct xfs_buf **, uint);

int xfs_iread(struct xfs_mount *, struct xfs_trans *,

- struct xfs_inode *, xfs_daddr_t, uint);

+ struct xfs_inode *, uint);

void xfs_dinode_to_disk(struct xfs_dinode *,

struct xfs_icdinode *);

void xfs_idestroy_fork(struct xfs_inode *, int);