diff options
Diffstat (limited to 'fs/xfs/xfs_iomap.c')
-rw-r--r-- | fs/xfs/xfs_iomap.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index 19655124da78..cc6a7b5a9912 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c | |||
@@ -43,8 +43,6 @@ | |||
43 | #include "xfs_itable.h" | 43 | #include "xfs_itable.h" |
44 | #include "xfs_rw.h" | 44 | #include "xfs_rw.h" |
45 | #include "xfs_acl.h" | 45 | #include "xfs_acl.h" |
46 | #include "xfs_cap.h" | ||
47 | #include "xfs_mac.h" | ||
48 | #include "xfs_attr.h" | 46 | #include "xfs_attr.h" |
49 | #include "xfs_buf_item.h" | 47 | #include "xfs_buf_item.h" |
50 | #include "xfs_trans_space.h" | 48 | #include "xfs_trans_space.h" |
@@ -542,7 +540,7 @@ xfs_iomap_write_direct( | |||
542 | /* | 540 | /* |
543 | * Complete the transaction | 541 | * Complete the transaction |
544 | */ | 542 | */ |
545 | error = xfs_bmap_finish(&tp, &free_list, firstfsb, &committed); | 543 | error = xfs_bmap_finish(&tp, &free_list, &committed); |
546 | if (error) | 544 | if (error) |
547 | goto error0; | 545 | goto error0; |
548 | error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL); | 546 | error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL); |
@@ -838,8 +836,7 @@ xfs_iomap_write_allocate( | |||
838 | if (error) | 836 | if (error) |
839 | goto trans_cancel; | 837 | goto trans_cancel; |
840 | 838 | ||
841 | error = xfs_bmap_finish(&tp, &free_list, | 839 | error = xfs_bmap_finish(&tp, &free_list, &committed); |
842 | first_block, &committed); | ||
843 | if (error) | 840 | if (error) |
844 | goto trans_cancel; | 841 | goto trans_cancel; |
845 | 842 | ||
@@ -947,8 +944,7 @@ xfs_iomap_write_unwritten( | |||
947 | if (error) | 944 | if (error) |
948 | goto error_on_bmapi_transaction; | 945 | goto error_on_bmapi_transaction; |
949 | 946 | ||
950 | error = xfs_bmap_finish(&(tp), &(free_list), | 947 | error = xfs_bmap_finish(&(tp), &(free_list), &committed); |
951 | firstfsb, &committed); | ||
952 | if (error) | 948 | if (error) |
953 | goto error_on_bmapi_transaction; | 949 | goto error_on_bmapi_transaction; |
954 | 950 | ||