From: Eric Sandeen Date: Fri, 21 Jul 2017 15:24:28 +0000 (-0500) Subject: xfs: write unmount record for ro mounts X-Git-Tag: v4.1.12-110.0.20170822_0730~31 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=59215929e9b12f43ef37b0863d0b42e05b4ab2ce;p=users%2Fjedix%2Flinux-maple.git xfs: write unmount record for ro mounts There are dueling comments in the xfs code about intent for log writes when unmounting a readonly filesystem. In xfs_mountfs, we see the intent: /* * Now the log is fully replayed, we can transition to full read-only * mode for read-only mounts. This will sync all the metadata and clean * the log so that the recovery we just performed does not have to be * replayed again on the next mount. */ and it calls xfs_quiesce_attr(), but by the time we get to xfs_log_unmount_write(), it returns early for a RDONLY mount: * Don't write out unmount record on read-only mounts. Because of this, sequential ro mounts of a filesystem with a dirty log will replay the log each time, which seems odd. Fix this by writing an unmount record even for RO mounts, as long as norecovery wasn't specified (don't write a clean log record if a dirty log may still be there!) and the log device is writable. Signed-off-by: Eric Sandeen Reviewed-by: Brian Foster Orabug: 26630113 Link: https://patchwork.kernel.org/patch/9857169 Signed-off-by: Shan Hai Reviewed-by: Jack Vogel --- diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index e16f51cd3bfef..39d91a9d0dda2 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -788,11 +788,14 @@ xfs_log_unmount_write(xfs_mount_t *mp) int error; /* - * Don't write out unmount record on read-only mounts. + * Don't write out unmount record on norecovery mounts or ro devices. * Or, if we are doing a forced umount (typically because of IO errors). */ - if (mp->m_flags & XFS_MOUNT_RDONLY) + if (mp->m_flags & XFS_MOUNT_NORECOVERY || + xfs_readonly_buftarg(log->l_mp->m_logdev_targp)) { + ASSERT(mp->m_flags & XFS_MOUNT_RDONLY); return 0; + } error = _xfs_log_force(mp, XFS_LOG_SYNC, NULL); ASSERT(error || !(XLOG_FORCED_SHUTDOWN(log)));