diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-01-12 07:04:30 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-01-12 07:04:30 +1100 |
| commit | dde7f55bd000696acc38296c21241971e1840142 (patch) | |
| tree | 79fd17020de1ea6921107ad3dbabf5eb33a88838 /fs/xfs/xfs_rtalloc.c | |
| parent | 4922be51ef1a95ca6a38694cf0cde5dd0308a24e (diff) | |
| parent | 7d6a13f023567d573ac362502bb702eda716e654 (diff) | |
Merge branch 'xfs-misc-fixes-for-4.5-2' into for-next
Diffstat (limited to 'fs/xfs/xfs_rtalloc.c')
| -rw-r--r-- | fs/xfs/xfs_rtalloc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index ab1bac6a3a1c..be02a68b2fe2 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c @@ -766,7 +766,6 @@ xfs_growfs_rt_alloc( { xfs_fileoff_t bno; /* block number in file */ struct xfs_buf *bp; /* temporary buffer for zeroing */ - int committed; /* transaction committed flag */ xfs_daddr_t d; /* disk block address */ int error; /* error return value */ xfs_fsblock_t firstblock;/* first block allocated in xaction */ @@ -811,7 +810,7 @@ xfs_growfs_rt_alloc( /* * Free any blocks freed up in the transaction, then commit. */ - error = xfs_bmap_finish(&tp, &flist, &committed); + error = xfs_bmap_finish(&tp, &flist, NULL); if (error) goto out_bmap_cancel; error = xfs_trans_commit(tp); |