xfs: Print XFS UUID on mount and umount events.

As of now only device names are printed out over __xfs_printk().
The device names are not persistent across reboots which in case
of searching for origin of corruption brings another task to properly
identify the devices. This patch add XFS UUID upon every mount/umount
event which will make the identification much easier.

Signed-off-by: Lukas Herbolt <lukas@herbolt.com>
[sandeen: rebase onto current upstream kernel]
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index f02a0dd522b3df1316df282e168c6d429792e5d2..0141d9907d31b7beaa05b88550a6e49d10187d83 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -644,12 +644,14 @@ xfs_log_mount(
        int             min_logfsbs;
 
        if (!xfs_has_norecovery(mp)) {
-               xfs_notice(mp, "Mounting V%d Filesystem",
-                          XFS_SB_VERSION_NUM(&mp->m_sb));
+               xfs_notice(mp, "Mounting V%d Filesystem %pU",
+                          XFS_SB_VERSION_NUM(&mp->m_sb),
+                          &mp->m_sb.sb_uuid);
        } else {
                xfs_notice(mp,
-"Mounting V%d filesystem in no-recovery mode. Filesystem will be inconsistent.",
-                          XFS_SB_VERSION_NUM(&mp->m_sb));
+"Mounting V%d filesystem %pU in no-recovery mode. Filesystem will be inconsistent.",
+                          XFS_SB_VERSION_NUM(&mp->m_sb),
+                          &mp->m_sb.sb_uuid);
                ASSERT(xfs_is_readonly(mp));
        }
 

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index ee4b429a2f2c962cb1a6b22746d5d1913fded4ac..0c4b73e9b29d2925063017399fb40bc317e89e0f 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1110,7 +1110,7 @@ xfs_fs_put_super(
        if (!sb->s_fs_info)
                return;
 
-       xfs_notice(mp, "Unmounting Filesystem");
+       xfs_notice(mp, "Unmounting Filesystem %pU", &mp->m_sb.sb_uuid);
        xfs_filestream_unmount(mp);
        xfs_unmountfs(mp);