diff options
Diffstat (limited to 'fs/xfs/xfs_vnodeops.c')
-rw-r--r-- | fs/xfs/xfs_vnodeops.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index 130343a5d22d..ad599ccc416b 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c | |||
@@ -492,7 +492,7 @@ xfs_readlink_bmap( | |||
492 | int error = 0; | 492 | int error = 0; |
493 | 493 | ||
494 | error = xfs_bmapi(NULL, ip, 0, XFS_B_TO_FSB(mp, pathlen), 0, NULL, 0, | 494 | error = xfs_bmapi(NULL, ip, 0, XFS_B_TO_FSB(mp, pathlen), 0, NULL, 0, |
495 | mval, &nmaps, NULL, NULL); | 495 | mval, &nmaps, NULL); |
496 | if (error) | 496 | if (error) |
497 | goto out; | 497 | goto out; |
498 | 498 | ||
@@ -596,7 +596,7 @@ xfs_free_eofblocks( | |||
596 | nimaps = 1; | 596 | nimaps = 1; |
597 | xfs_ilock(ip, XFS_ILOCK_SHARED); | 597 | xfs_ilock(ip, XFS_ILOCK_SHARED); |
598 | error = xfs_bmapi(NULL, ip, end_fsb, map_len, 0, | 598 | error = xfs_bmapi(NULL, ip, end_fsb, map_len, 0, |
599 | NULL, 0, &imap, &nimaps, NULL, NULL); | 599 | NULL, 0, &imap, &nimaps, NULL); |
600 | xfs_iunlock(ip, XFS_ILOCK_SHARED); | 600 | xfs_iunlock(ip, XFS_ILOCK_SHARED); |
601 | 601 | ||
602 | if (!error && (nimaps != 0) && | 602 | if (!error && (nimaps != 0) && |
@@ -733,7 +733,7 @@ xfs_inactive_symlink_rmt( | |||
733 | nmaps = ARRAY_SIZE(mval); | 733 | nmaps = ARRAY_SIZE(mval); |
734 | if ((error = xfs_bmapi(tp, ip, 0, XFS_B_TO_FSB(mp, size), | 734 | if ((error = xfs_bmapi(tp, ip, 0, XFS_B_TO_FSB(mp, size), |
735 | XFS_BMAPI_METADATA, &first_block, 0, mval, &nmaps, | 735 | XFS_BMAPI_METADATA, &first_block, 0, mval, &nmaps, |
736 | &free_list, NULL))) | 736 | &free_list))) |
737 | goto error0; | 737 | goto error0; |
738 | /* | 738 | /* |
739 | * Invalidate the block(s). | 739 | * Invalidate the block(s). |
@@ -748,7 +748,7 @@ xfs_inactive_symlink_rmt( | |||
748 | * Unmap the dead block(s) to the free_list. | 748 | * Unmap the dead block(s) to the free_list. |
749 | */ | 749 | */ |
750 | if ((error = xfs_bunmapi(tp, ip, 0, size, XFS_BMAPI_METADATA, nmaps, | 750 | if ((error = xfs_bunmapi(tp, ip, 0, size, XFS_BMAPI_METADATA, nmaps, |
751 | &first_block, &free_list, NULL, &done))) | 751 | &first_block, &free_list, &done))) |
752 | goto error1; | 752 | goto error1; |
753 | ASSERT(done); | 753 | ASSERT(done); |
754 | /* | 754 | /* |
@@ -2095,7 +2095,7 @@ xfs_symlink( | |||
2095 | error = xfs_bmapi(tp, ip, first_fsb, fs_blocks, | 2095 | error = xfs_bmapi(tp, ip, first_fsb, fs_blocks, |
2096 | XFS_BMAPI_WRITE | XFS_BMAPI_METADATA, | 2096 | XFS_BMAPI_WRITE | XFS_BMAPI_METADATA, |
2097 | &first_block, resblks, mval, &nmaps, | 2097 | &first_block, resblks, mval, &nmaps, |
2098 | &free_list, NULL); | 2098 | &free_list); |
2099 | if (error) { | 2099 | if (error) { |
2100 | goto error1; | 2100 | goto error1; |
2101 | } | 2101 | } |
@@ -2347,7 +2347,7 @@ xfs_alloc_file_space( | |||
2347 | error = xfs_bmapi(tp, ip, startoffset_fsb, | 2347 | error = xfs_bmapi(tp, ip, startoffset_fsb, |
2348 | allocatesize_fsb, bmapi_flag, | 2348 | allocatesize_fsb, bmapi_flag, |
2349 | &firstfsb, 0, imapp, &nimaps, | 2349 | &firstfsb, 0, imapp, &nimaps, |
2350 | &free_list, NULL); | 2350 | &free_list); |
2351 | if (error) { | 2351 | if (error) { |
2352 | goto error0; | 2352 | goto error0; |
2353 | } | 2353 | } |
@@ -2436,7 +2436,7 @@ xfs_zero_remaining_bytes( | |||
2436 | offset_fsb = XFS_B_TO_FSBT(mp, offset); | 2436 | offset_fsb = XFS_B_TO_FSBT(mp, offset); |
2437 | nimap = 1; | 2437 | nimap = 1; |
2438 | error = xfs_bmapi(NULL, ip, offset_fsb, 1, 0, | 2438 | error = xfs_bmapi(NULL, ip, offset_fsb, 1, 0, |
2439 | NULL, 0, &imap, &nimap, NULL, NULL); | 2439 | NULL, 0, &imap, &nimap, NULL); |
2440 | if (error || nimap < 1) | 2440 | if (error || nimap < 1) |
2441 | break; | 2441 | break; |
2442 | ASSERT(imap.br_blockcount >= 1); | 2442 | ASSERT(imap.br_blockcount >= 1); |
@@ -2556,7 +2556,7 @@ xfs_free_file_space( | |||
2556 | if (rt && !xfs_sb_version_hasextflgbit(&mp->m_sb)) { | 2556 | if (rt && !xfs_sb_version_hasextflgbit(&mp->m_sb)) { |
2557 | nimap = 1; | 2557 | nimap = 1; |
2558 | error = xfs_bmapi(NULL, ip, startoffset_fsb, | 2558 | error = xfs_bmapi(NULL, ip, startoffset_fsb, |
2559 | 1, 0, NULL, 0, &imap, &nimap, NULL, NULL); | 2559 | 1, 0, NULL, 0, &imap, &nimap, NULL); |
2560 | if (error) | 2560 | if (error) |
2561 | goto out_unlock_iolock; | 2561 | goto out_unlock_iolock; |
2562 | ASSERT(nimap == 0 || nimap == 1); | 2562 | ASSERT(nimap == 0 || nimap == 1); |
@@ -2571,7 +2571,7 @@ xfs_free_file_space( | |||
2571 | } | 2571 | } |
2572 | nimap = 1; | 2572 | nimap = 1; |
2573 | error = xfs_bmapi(NULL, ip, endoffset_fsb - 1, | 2573 | error = xfs_bmapi(NULL, ip, endoffset_fsb - 1, |
2574 | 1, 0, NULL, 0, &imap, &nimap, NULL, NULL); | 2574 | 1, 0, NULL, 0, &imap, &nimap, NULL); |
2575 | if (error) | 2575 | if (error) |
2576 | goto out_unlock_iolock; | 2576 | goto out_unlock_iolock; |
2577 | ASSERT(nimap == 0 || nimap == 1); | 2577 | ASSERT(nimap == 0 || nimap == 1); |
@@ -2647,7 +2647,7 @@ xfs_free_file_space( | |||
2647 | xfs_bmap_init(&free_list, &firstfsb); | 2647 | xfs_bmap_init(&free_list, &firstfsb); |
2648 | error = xfs_bunmapi(tp, ip, startoffset_fsb, | 2648 | error = xfs_bunmapi(tp, ip, startoffset_fsb, |
2649 | endoffset_fsb - startoffset_fsb, | 2649 | endoffset_fsb - startoffset_fsb, |
2650 | 0, 2, &firstfsb, &free_list, NULL, &done); | 2650 | 0, 2, &firstfsb, &free_list, &done); |
2651 | if (error) { | 2651 | if (error) { |
2652 | goto error0; | 2652 | goto error0; |
2653 | } | 2653 | } |