Merge branch 'xfs-misc-fixes-for-4.5' into for-next

2016-01-05 08:08:35 +11:00
parent 609adfc2ed a841b64df2
commit 7eeabbd4b6
28 changed files with 126 additions and 83 deletions
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -2068,12 +2068,14 @@ xlog_print_tic_res(
 	    "QM_DQCLUSTER",
 	    "QM_QINOCREATE",
 	    "QM_QUOTAOFF_END",
-	    "SB_UNIT",
 	    "FSYNC_TS",
 	    "GROWFSRT_ALLOC",
 	    "GROWFSRT_ZERO",
 	    "GROWFSRT_FREE",
-	    "SWAPEXT"
+	    "SWAPEXT",
+	    "CHECKPOINT",
+	    "ICREATE",
+	    "CREATE_TMPFILE"
 	};

 	xfs_warn(mp, "xlog_write: reservation summary:");