git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
fs
/
xfs
/
xfs_trans_inode.c
diff --git
a/fs/xfs/xfs_trans_inode.c
b/fs/xfs/xfs_trans_inode.c
index
c2f55e0
..
e2c3706
100644
(file)
--- 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,
xfs_mount_t *mp,
xfs_trans_t *tp,
xfs_ino_t ino,
+ uint flags,
uint lock_flags,
xfs_inode_t **ipp)
{
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 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
/*
* If we find the inode in core with this transaction
@@
-148,7
+148,7
@@
xfs_trans_iget(
}
ASSERT(lock_flags & XFS_ILOCK_EXCL);
}
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;
}
if (error) {
return error;
}
@@
-186,7
+186,6
@@
xfs_trans_iget(
return 0;
}
return 0;
}
-
/*
* Add the locked inode to the transaction.
* The inode must be locked, and it cannot be associated with any
/*
* Add the locked inode to the transaction.
* The inode must be locked, and it cannot be associated with any