← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to fs/xfs/xfs_trans.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/xfs/xfs_trans.c
608
608
xfs_trans_free(
609
609
        struct xfs_trans        *tp)
610
610
{
611
 
        struct xfs_busy_extent  *busyp, *n;
612
 
 
613
 
        list_for_each_entry_safe(busyp, n, &tp->t_busy, list)
614
 
                xfs_alloc_busy_clear(tp->t_mountp, busyp);
 
611
        xfs_alloc_busy_sort(&tp->t_busy);
 
612
        xfs_alloc_busy_clear(tp->t_mountp, &tp->t_busy, false);
615
613
 
616
614
        atomic_dec(&tp->t_mountp->m_active_trans);
617
615
        xfs_trans_free_dqinfo(tp);
1363
1361
                lip->li_flags |= XFS_LI_ABORTED;
1364
1362
        item_lsn = IOP_COMMITTED(lip, commit_lsn);
1365
1363
 
1366
 
        /* If the committed routine returns -1, item has been freed. */
 
1364
        /* item_lsn of -1 means the item needs no further processing */
1367
1365
        if (XFS_LSN_CMP(item_lsn, (xfs_lsn_t)-1) == 0)
1368
1366
                return;
1369
1367
 
1476
1474
                        lip->li_flags |= XFS_LI_ABORTED;
1477
1475
                item_lsn = IOP_COMMITTED(lip, commit_lsn);
1478
1476
 
1479
 
                /* item_lsn of -1 means the item was freed */
 
1477
                /* item_lsn of -1 means the item needs no further processing */
1480
1478
                if (XFS_LSN_CMP(item_lsn, (xfs_lsn_t)-1) == 0)
1481
1479
                        continue;
1482
1480