diff options
Diffstat (limited to 'fs/xfs/xfs_mount.c')
-rw-r--r-- | fs/xfs/xfs_mount.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 2be5e5cf897a..a19e92381f90 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c | |||
@@ -1559,9 +1559,15 @@ xfs_fs_writable(xfs_mount_t *mp) | |||
1559 | } | 1559 | } |
1560 | 1560 | ||
1561 | /* | 1561 | /* |
1562 | * xfs_log_sbcount | ||
1563 | * | ||
1562 | * Called either periodically to keep the on disk superblock values | 1564 | * Called either periodically to keep the on disk superblock values |
1563 | * roughly up to date or from unmount to make sure the values are | 1565 | * roughly up to date or from unmount to make sure the values are |
1564 | * correct on a clean unmount. | 1566 | * correct on a clean unmount. |
1567 | * | ||
1568 | * Note this code can be called during the process of freezing, so | ||
1569 | * we may need to use the transaction allocator which does not not | ||
1570 | * block when the transaction subsystem is in its frozen state. | ||
1565 | */ | 1571 | */ |
1566 | int | 1572 | int |
1567 | xfs_log_sbcount( | 1573 | xfs_log_sbcount( |
@@ -1583,13 +1589,7 @@ xfs_log_sbcount( | |||
1583 | if (!xfs_sb_version_haslazysbcount(&mp->m_sb)) | 1589 | if (!xfs_sb_version_haslazysbcount(&mp->m_sb)) |
1584 | return 0; | 1590 | return 0; |
1585 | 1591 | ||
1586 | /* | 1592 | tp = _xfs_trans_alloc(mp, XFS_TRANS_SB_COUNT, KM_SLEEP); |
1587 | * We can be called during the process of freezing, so make sure | ||
1588 | * we go ahead even if the frozen for new transactions. We will | ||
1589 | * always use a sync transaction in the freeze path to make sure | ||
1590 | * the transaction has completed by the time we return. | ||
1591 | */ | ||
1592 | tp = _xfs_trans_alloc(mp, XFS_TRANS_SB_COUNT, KM_SLEEP, false); | ||
1593 | error = xfs_trans_reserve(tp, 0, mp->m_sb.sb_sectsize + 128, 0, 0, | 1593 | error = xfs_trans_reserve(tp, 0, mp->m_sb.sb_sectsize + 128, 0, 0, |
1594 | XFS_DEFAULT_LOG_COUNT); | 1594 | XFS_DEFAULT_LOG_COUNT); |
1595 | if (error) { | 1595 | if (error) { |