diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-10-12 18:37:58 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-10-12 18:37:58 +1100 |
| commit | 316433beda9433697109eb1cd256666f163c7c1f (patch) | |
| tree | 14dc948e98bf1d5a1bbbe86cffb7da9a2952325b /fs/xfs/xfs_iomap.c | |
| parent | 9e92054e8e049f8f4c64d2c6961b2a7e3e13977f (diff) | |
| parent | 91f9f5fe1e7350e872b3fbc3194e8183bddce514 (diff) | |
| download | op-kernel-dev-316433beda9433697109eb1cd256666f163c7c1f.zip op-kernel-dev-316433beda9433697109eb1cd256666f163c7c1f.tar.gz | |
Merge branch 'xfs-logging-fixes' into for-next
Diffstat (limited to 'fs/xfs/xfs_iomap.c')
| -rw-r--r-- | fs/xfs/xfs_iomap.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index dca69c6..4a988d7 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c @@ -202,8 +202,8 @@ xfs_iomap_write_direct( xfs_bmap_init(&free_list, &firstfsb); nimaps = 1; error = xfs_bmapi_write(tp, ip, offset_fsb, count_fsb, - XFS_BMAPI_PREALLOC, &firstfsb, 0, - imap, &nimaps, &free_list); + XFS_BMAPI_PREALLOC, &firstfsb, resblks, imap, + &nimaps, &free_list); if (error) goto out_bmap_cancel; @@ -750,9 +750,9 @@ xfs_iomap_write_allocate( * pointer that the caller gave to us. */ error = xfs_bmapi_write(tp, ip, map_start_fsb, - count_fsb, 0, - &first_block, 1, - imap, &nimaps, &free_list); + count_fsb, 0, &first_block, + nres, imap, &nimaps, + &free_list); if (error) goto trans_cancel; @@ -866,8 +866,8 @@ xfs_iomap_write_unwritten( xfs_bmap_init(&free_list, &firstfsb); nimaps = 1; error = xfs_bmapi_write(tp, ip, offset_fsb, count_fsb, - XFS_BMAPI_CONVERT, &firstfsb, - 1, &imap, &nimaps, &free_list); + XFS_BMAPI_CONVERT, &firstfsb, resblks, + &imap, &nimaps, &free_list); if (error) goto error_on_bmapi_transaction; |
