diff options
Diffstat (limited to 'fs/xfs/xfs_fsops.c')
-rw-r--r-- | fs/xfs/xfs_fsops.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c index d3a0f538d6a6..381ebda4f7bc 100644 --- a/fs/xfs/xfs_fsops.c +++ b/fs/xfs/xfs_fsops.c | |||
@@ -462,7 +462,7 @@ xfs_fs_counts( | |||
462 | xfs_mount_t *mp, | 462 | xfs_mount_t *mp, |
463 | xfs_fsop_counts_t *cnt) | 463 | xfs_fsop_counts_t *cnt) |
464 | { | 464 | { |
465 | xfs_icsb_sync_counters_flags(mp, XFS_ICSB_LAZY_COUNT); | 465 | xfs_icsb_sync_counters(mp, XFS_ICSB_LAZY_COUNT); |
466 | spin_lock(&mp->m_sb_lock); | 466 | spin_lock(&mp->m_sb_lock); |
467 | cnt->freedata = mp->m_sb.sb_fdblocks - XFS_ALLOC_SET_ASIDE(mp); | 467 | cnt->freedata = mp->m_sb.sb_fdblocks - XFS_ALLOC_SET_ASIDE(mp); |
468 | cnt->freertx = mp->m_sb.sb_frextents; | 468 | cnt->freertx = mp->m_sb.sb_frextents; |
@@ -524,7 +524,7 @@ xfs_reserve_blocks( | |||
524 | */ | 524 | */ |
525 | retry: | 525 | retry: |
526 | spin_lock(&mp->m_sb_lock); | 526 | spin_lock(&mp->m_sb_lock); |
527 | xfs_icsb_sync_counters_flags(mp, XFS_ICSB_SB_LOCKED); | 527 | xfs_icsb_sync_counters_locked(mp, 0); |
528 | 528 | ||
529 | /* | 529 | /* |
530 | * If our previous reservation was larger than the current value, | 530 | * If our previous reservation was larger than the current value, |
@@ -552,11 +552,8 @@ retry: | |||
552 | mp->m_resblks += free; | 552 | mp->m_resblks += free; |
553 | mp->m_resblks_avail += free; | 553 | mp->m_resblks_avail += free; |
554 | fdblks_delta = -free; | 554 | fdblks_delta = -free; |
555 | mp->m_sb.sb_fdblocks = XFS_ALLOC_SET_ASIDE(mp); | ||
556 | } else { | 555 | } else { |
557 | fdblks_delta = -delta; | 556 | fdblks_delta = -delta; |
558 | mp->m_sb.sb_fdblocks = | ||
559 | lcounter + XFS_ALLOC_SET_ASIDE(mp); | ||
560 | mp->m_resblks = request; | 557 | mp->m_resblks = request; |
561 | mp->m_resblks_avail += delta; | 558 | mp->m_resblks_avail += delta; |
562 | } | 559 | } |
@@ -587,7 +584,6 @@ out: | |||
587 | if (error == ENOSPC) | 584 | if (error == ENOSPC) |
588 | goto retry; | 585 | goto retry; |
589 | } | 586 | } |
590 | |||
591 | return 0; | 587 | return 0; |
592 | } | 588 | } |
593 | 589 | ||