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

2016-05-20 10:33:17 +10:00
parent a7792aad64 6e3e6d55e5
commit 2a4ad5894c
10 changed files with 32 additions and 29 deletions
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -1030,7 +1030,7 @@ xfs_dir_ialloc(
 			tp->t_flags &= ~(XFS_TRANS_DQ_DIRTY);
 		}

-		code = xfs_trans_roll(&tp, 0);
+		code = xfs_trans_roll(&tp, NULL);
 		if (committed != NULL)
 			*committed = 1;