X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fxfs%2Fxfs_trans_inode.c;h=e2c3706f453de78c9b9063a87733f7d3f87d8618;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=c2f55e0d6d21856be1bd771fa750b12b53c5501f;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/fs/xfs/xfs_trans_inode.c b/fs/xfs/xfs_trans_inode.c index c2f55e0d6..e2c3706f4 100644 --- a/fs/xfs/xfs_trans_inode.c +++ b/fs/xfs/xfs_trans_inode.c @@ -95,6 +95,7 @@ xfs_trans_iget( xfs_mount_t *mp, xfs_trans_t *tp, xfs_ino_t ino, + uint flags, uint lock_flags, xfs_inode_t **ipp) { @@ -106,9 +107,8 @@ xfs_trans_iget( * If the transaction pointer is NULL, just call the normal * xfs_iget(). */ - if (tp == NULL) { - return (xfs_iget(mp, NULL, ino, lock_flags, ipp, 0)); - } + if (tp == NULL) + return xfs_iget(mp, NULL, ino, flags, lock_flags, ipp, 0); /* * If we find the inode in core with this transaction @@ -148,7 +148,7 @@ xfs_trans_iget( } ASSERT(lock_flags & XFS_ILOCK_EXCL); - error = xfs_iget(tp->t_mountp, tp, ino, lock_flags, &ip, 0); + error = xfs_iget(tp->t_mountp, tp, ino, flags, lock_flags, &ip, 0); if (error) { return error; } @@ -186,7 +186,6 @@ xfs_trans_iget( return 0; } - /* * Add the locked inode to the transaction. * The inode must be locked, and it cannot be associated with any