xfs: merge iop_unpin_remove into iop_unpin

[deliverable/linux.git] / fs / xfs / xfs_inode_item.c

diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index 4b97d7754b83f540e4f2aab4a96f452ba566afd7..a01990dbb945e046d12df12d0da634735d07d1ad 100644 (file)
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -544,10 +544,10 @@ xfs_inode_item_pin(
  *
  * Also wake up anyone in xfs_iunpin_wait() if the count goes to 0.
  */
-/* ARGSUSED */
 STATIC void
 xfs_inode_item_unpin(
-       xfs_inode_log_item_t    *iip)
+       xfs_inode_log_item_t    *iip,
+       int                     remove)
 {
        struct xfs_inode        *ip = iip->ili_inode;
 
@@ -557,15 +557,6 @@ xfs_inode_item_unpin(
                wake_up(&ip->i_ipin_wait);
 }
 
-/* ARGSUSED */
-STATIC void
-xfs_inode_item_unpin_remove(
-       xfs_inode_log_item_t    *iip,
-       xfs_trans_t             *tp)
-{
-       xfs_inode_item_unpin(iip);
-}
-
 /*
  * This is called to attempt to lock the inode associated with this
  * inode log item, in preparation for the push routine which does the actual
@@ -829,9 +820,7 @@ static struct xfs_item_ops xfs_inode_item_ops = {
        .iop_format     = (void(*)(xfs_log_item_t*, xfs_log_iovec_t*))
                                        xfs_inode_item_format,
        .iop_pin        = (void(*)(xfs_log_item_t*))xfs_inode_item_pin,
-       .iop_unpin      = (void(*)(xfs_log_item_t*))xfs_inode_item_unpin,
-       .iop_unpin_remove = (void(*)(xfs_log_item_t*, xfs_trans_t*))
-                                       xfs_inode_item_unpin_remove,
+       .iop_unpin      = (void(*)(xfs_log_item_t*, int))xfs_inode_item_unpin,
        .iop_trylock    = (uint(*)(xfs_log_item_t*))xfs_inode_item_trylock,
        .iop_unlock     = (void(*)(xfs_log_item_t*))xfs_inode_item_unlock,
        .iop_committed  = (xfs_lsn_t(*)(xfs_log_item_t*, xfs_lsn_t))