aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_log.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/xfs/xfs_log.c')
-rw-r--r--fs/xfs/xfs_log.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 4bf44aef644c..8a5b05536a28 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -3569,7 +3569,8 @@ xfs_log_force_umount(
3569 if (!log || 3569 if (!log ||
3570 log->l_flags & XLOG_ACTIVE_RECOVERY) { 3570 log->l_flags & XLOG_ACTIVE_RECOVERY) {
3571 mp->m_flags |= XFS_MOUNT_FS_SHUTDOWN; 3571 mp->m_flags |= XFS_MOUNT_FS_SHUTDOWN;
3572 XFS_BUF_DONE(mp->m_sb_bp); 3572 if (mp->m_sb_bp)
3573 XFS_BUF_DONE(mp->m_sb_bp);
3573 return 0; 3574 return 0;
3574 } 3575 }
3575 3576
@@ -3590,7 +3591,9 @@ xfs_log_force_umount(
3590 spin_lock(&log->l_icloglock); 3591 spin_lock(&log->l_icloglock);
3591 spin_lock(&log->l_grant_lock); 3592 spin_lock(&log->l_grant_lock);
3592 mp->m_flags |= XFS_MOUNT_FS_SHUTDOWN; 3593 mp->m_flags |= XFS_MOUNT_FS_SHUTDOWN;
3593 XFS_BUF_DONE(mp->m_sb_bp); 3594 if (mp->m_sb_bp)
3595 XFS_BUF_DONE(mp->m_sb_bp);
3596
3594 /* 3597 /*
3595 * This flag is sort of redundant because of the mount flag, but 3598 * This flag is sort of redundant because of the mount flag, but
3596 * it's good to maintain the separation between the log and the rest 3599 * it's good to maintain the separation between the log and the rest