diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-01-22 09:20:53 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-01-22 09:20:53 +1100 |
| commit | 465e2def7cb45864da1f82afb973a6acd1046ed8 (patch) | |
| tree | d085a45f4575a8ea31d128626c4f1f650cf9d54a /fs/xfs/xfs_super.c | |
| parent | 6bcf0939ff12464c7ea24c056826b8a26def9b06 (diff) | |
| parent | 074e427ba7f7398427e4f8e2aec071edcc509673 (diff) | |
| download | op-kernel-dev-465e2def7cb45864da1f82afb973a6acd1046ed8.zip op-kernel-dev-465e2def7cb45864da1f82afb973a6acd1046ed8.tar.gz | |
Merge branch 'xfs-sb-logging-rework' into for-next
Conflicts:
fs/xfs/xfs_mount.c
Diffstat (limited to 'fs/xfs/xfs_super.c')
| -rw-r--r-- | fs/xfs/xfs_super.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 22e6aca..5ce76d0 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -1257,13 +1257,13 @@ xfs_fs_remount( * If this is the first remount to writeable state we * might have some superblock changes to update. */ - if (mp->m_update_flags) { - error = xfs_mount_log_sb(mp, mp->m_update_flags); + if (mp->m_update_sb) { + error = xfs_sync_sb(mp, false); if (error) { xfs_warn(mp, "failed to write sb changes"); return error; } - mp->m_update_flags = 0; + mp->m_update_sb = false; } /* @@ -1293,8 +1293,9 @@ xfs_fs_remount( /* * Second stage of a freeze. The data is already frozen so we only - * need to take care of the metadata. Once that's done write a dummy - * record to dirty the log in case of a crash while frozen. + * need to take care of the metadata. Once that's done sync the superblock + * to the log to dirty it in case of a crash while frozen. This ensures that we + * will recover the unlinked inode lists on the next mount. */ STATIC int xfs_fs_freeze( @@ -1304,7 +1305,7 @@ xfs_fs_freeze( xfs_save_resvblks(mp); xfs_quiesce_attr(mp); - return xfs_fs_log_dummy(mp); + return xfs_sync_sb(mp, true); } STATIC int |
