diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 22:51:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 22:51:18 -0400 |
commit | 2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (patch) | |
tree | 25b8fc041b4dce6c404ff01b462bc6b58fa7d372 /fs/xfs/xfs_trans_inode.c | |
parent | 990a8baf568ca1d0ae65e59783ff821794118d07 (diff) | |
parent | e1a40fa907498030b6e432c0dbcb06d7a9f14ee3 (diff) |
Merge rsync://oss.sgi.com/git/xfs-2.6
Diffstat (limited to 'fs/xfs/xfs_trans_inode.c')
-rw-r--r-- | fs/xfs/xfs_trans_inode.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/fs/xfs/xfs_trans_inode.c b/fs/xfs/xfs_trans_inode.c index e2c3706f453d..7e7631ca4979 100644 --- a/fs/xfs/xfs_trans_inode.c +++ b/fs/xfs/xfs_trans_inode.c | |||
@@ -253,24 +253,6 @@ xfs_trans_ihold( | |||
253 | ip->i_itemp->ili_flags |= XFS_ILI_HOLD; | 253 | ip->i_itemp->ili_flags |= XFS_ILI_HOLD; |
254 | } | 254 | } |
255 | 255 | ||
256 | /* | ||
257 | * Cancel the previous inode hold request made on this inode | ||
258 | * for this transaction. | ||
259 | */ | ||
260 | /*ARGSUSED*/ | ||
261 | void | ||
262 | xfs_trans_ihold_release( | ||
263 | xfs_trans_t *tp, | ||
264 | xfs_inode_t *ip) | ||
265 | { | ||
266 | ASSERT(ip->i_transp == tp); | ||
267 | ASSERT(ip->i_itemp != NULL); | ||
268 | ASSERT(ismrlocked(&ip->i_lock, MR_UPDATE)); | ||
269 | ASSERT(ip->i_itemp->ili_flags & XFS_ILI_HOLD); | ||
270 | |||
271 | ip->i_itemp->ili_flags &= ~XFS_ILI_HOLD; | ||
272 | } | ||
273 | |||
274 | 256 | ||
275 | /* | 257 | /* |
276 | * This is called to mark the fields indicated in fieldmask as needing | 258 | * This is called to mark the fields indicated in fieldmask as needing |