Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[net-next-2.6.git] / fs / xfs / xfs_trans.c

diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index 5fab0e6bf86e67f205b2c4577f604b4eb87585ac..f6d956b7711e878fac4d08ee31a095d22fd93327 100644 (file)
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -1411,15 +1411,12 @@ xfs_trans_item_committed(
  */
 STATIC void
 xfs_trans_committed(
-       struct xfs_trans        *tp,
+       void                    *arg,
        int                     abortflag)
 {
+       struct xfs_trans        *tp = arg;
        struct xfs_log_item_desc *lidp, *next;
 
-       /* Call the transaction's completion callback if there is one. */
-       if (tp->t_callback != NULL)
-               tp->t_callback(tp, tp->t_callarg);
-
        list_for_each_entry_safe(lidp, next, &tp->t_items, lid_trans) {
                xfs_trans_item_committed(lidp->lid_item, tp->t_lsn, abortflag);
                xfs_trans_free_item_desc(lidp);
@@ -1547,7 +1544,7 @@ xfs_trans_commit_iclog(
         * running in simulation mode (the log is explicitly turned
         * off).
         */
-       tp->t_logcb.cb_func = (void(*)(void*, int))xfs_trans_committed;
+       tp->t_logcb.cb_func = xfs_trans_committed;
        tp->t_logcb.cb_arg = tp;
 
        /*