diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-11-25 23:47:27 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-11-25 23:47:27 +0100 |
| commit | 6310f3a9362e8fa2e29c8f84aa603b5f86e98442 (patch) | |
| tree | b071c5e43cc2075f9fa7f07bcc0101a56b779c35 /fs/xfs/xfs_trans_ail.c | |
| parent | ARM: OMAP2+: Remove legacy omap4_twl6030_hsmmc_init (diff) | |
| parent | ARM: OMAP2+: Fix eMMC on n900 with device tree (diff) | |
| download | linux-6310f3a9362e8fa2e29c8f84aa603b5f86e98442.tar.xz linux-6310f3a9362e8fa2e29c8f84aa603b5f86e98442.zip | |
Merge branch 'dt-regressions' into omap-for-v3.13/fixes-take4
Diffstat (limited to 'fs/xfs/xfs_trans_ail.c')
| -rw-r--r-- | fs/xfs/xfs_trans_ail.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c index 21c6d7ddbc06..a7287354e535 100644 --- a/fs/xfs/xfs_trans_ail.c +++ b/fs/xfs/xfs_trans_ail.c @@ -18,15 +18,16 @@ */ #include "xfs.h" #include "xfs_fs.h" -#include "xfs_types.h" -#include "xfs_log.h" -#include "xfs_trans.h" +#include "xfs_log_format.h" +#include "xfs_trans_resv.h" #include "xfs_sb.h" #include "xfs_ag.h" #include "xfs_mount.h" +#include "xfs_trans.h" #include "xfs_trans_priv.h" #include "xfs_trace.h" #include "xfs_error.h" +#include "xfs_log.h" #ifdef DEBUG /* @@ -658,11 +659,13 @@ xfs_trans_ail_update_bulk( if (XFS_LSN_CMP(lsn, lip->li_lsn) <= 0) continue; + trace_xfs_ail_move(lip, lip->li_lsn, lsn); xfs_ail_delete(ailp, lip); if (mlip == lip) mlip_changed = 1; } else { lip->li_flags |= XFS_LI_IN_AIL; + trace_xfs_ail_insert(lip, 0, lsn); } lip->li_lsn = lsn; list_add(&lip->li_ail, &tmp); @@ -731,6 +734,7 @@ xfs_trans_ail_delete_bulk( return; } + trace_xfs_ail_delete(lip, mlip->li_lsn, lip->li_lsn); xfs_ail_delete(ailp, lip); lip->li_flags &= ~XFS_LI_IN_AIL; lip->li_lsn = 0; |