summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_inode.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2016-05-20 10:33:17 +1000
committerDave Chinner <david@fromorbit.com>2016-05-20 10:33:17 +1000
commit2a4ad5894c819978dca5595396d54d51c3aca694 (patch)
tree62fcfac878219b36da9156785d832184194fd98a /fs/xfs/xfs_inode.c
parenta7792aad644a259375002db8c9d9e03fd50bf509 (diff)
parent6e3e6d55e51774ec7cfc24975749bbddb28a9051 (diff)
downloadlinux-2a4ad5894c819978dca5595396d54d51c3aca694.tar.bz2
Merge branch 'xfs-4.7-misc-fixes' into for-next
Diffstat (limited to 'fs/xfs/xfs_inode.c')
-rw-r--r--fs/xfs/xfs_inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index ca270d9bbb90..f79ea594fbf2 100644
--- 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;