xfs: use super s_id instead of struct xfs_mount m_fsname

Eliminate struct xfs_mount field m_fsname by using the super block s_id
field directly.

Signed-off-by: Ian Kent <raven@themaw.net>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index d8cdb27fe6ed33d773c3c1c898f16f3a2360a8fe..51dd1f43d12f6726e3151ddeac9d83baf2b6a4d5 100644 (file)
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -257,7 +257,7 @@ xfs_errortag_test(
 
        xfs_warn_ratelimited(mp,
 "Injecting error (%s) at file %s, line %d, on filesystem \"%s\"",
-                       expression, file, line, mp->m_fsname);
+                       expression, file, line, mp->m_super->s_id);
        return true;
 }
 

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 33fb38864207f43eb2515d3aba6a866ad770b131..d7d3bfd6a920088702bba8d2416ca7a209e155d6 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1526,7 +1526,7 @@ xlog_alloc_log(
 
        log->l_ioend_workqueue = alloc_workqueue("xfs-log/%s",
                        WQ_MEM_RECLAIM | WQ_FREEZABLE | WQ_HIGHPRI, 0,
-                       mp->m_fsname);
+                       mp->m_super->s_id);
        if (!log->l_ioend_workqueue)
                goto out_free_iclog;
 

diff --git a/fs/xfs/xfs_message.c b/fs/xfs/xfs_message.c
index c57e8ad397125cc53737ea65665e4d1e19b11937..21451c62cd1afa353fd53d93b05ce5204b005b28 100644 (file)
--- a/fs/xfs/xfs_message.c
+++ b/fs/xfs/xfs_message.c
@@ -20,8 +20,8 @@ __xfs_printk(
        const struct xfs_mount  *mp,
        struct va_format        *vaf)
 {
-       if (mp && mp->m_fsname) {
-               printk("%sXFS (%s): %pV\n", level, mp->m_fsname, vaf);
+       if (mp && mp->m_super) {
+               printk("%sXFS (%s): %pV\n", level, mp->m_super->s_id, vaf);
                return;
        }
        printk("%sXFS: %pV\n", level, vaf);

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 3e8eedf01eb2aa937f7d599fddc344fd40c4b2a8..5ea95247a37f486e310eb41364c8ad92515ad06c 100644 (file)
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -667,7 +667,8 @@ xfs_mountfs(
        /* enable fail_at_unmount as default */
        mp->m_fail_unmount = true;
 
-       error = xfs_sysfs_init(&mp->m_kobj, &xfs_mp_ktype, NULL, mp->m_fsname);
+       error = xfs_sysfs_init(&mp->m_kobj, &xfs_mp_ktype,
+                              NULL, mp->m_super->s_id);
        if (error)
                goto out;
 
@@ -1241,7 +1242,7 @@ xfs_mod_fdblocks(
        printk_once(KERN_WARNING
                "Filesystem \"%s\": reserve blocks depleted! "
                "Consider increasing reserve pool size.",
-               mp->m_fsname);
+               mp->m_super->s_id);
 fdblocks_enospc:
        spin_unlock(&mp->m_sb_lock);
        return -ENOSPC;

diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index 6e7d746b41bc320af0cffb07215d25ed8100c35d..0481e6d086a71e6f5707dfe6930d391e2449659a 100644 (file)
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -89,7 +89,6 @@ typedef struct xfs_mount {
        struct percpu_counter   m_delalloc_blks;
 
        struct xfs_buf          *m_sb_bp;       /* buffer for superblock */
-       char                    *m_fsname;      /* filesystem name */
        char                    *m_rtname;      /* realtime device name */
        char                    *m_logname;     /* external log device name */
        int                     m_bsize;        /* fs logical block size */

diff --git a/fs/xfs/xfs_pnfs.c b/fs/xfs/xfs_pnfs.c
index ae3f00cb6a438743b541ce3ac68d1f68d5ad087e..bb3008d390aa9c95cd8c5c6ed74817a21279524a 100644 (file)
--- a/fs/xfs/xfs_pnfs.c
+++ b/fs/xfs/xfs_pnfs.c
@@ -60,7 +60,7 @@ xfs_fs_get_uuid(
 
        printk_once(KERN_NOTICE
 "XFS (%s): using experimental pNFS feature, use at your own risk!\n",
-               mp->m_fsname);
+               mp->m_super->s_id);
 
        if (*len < sizeof(uuid_t))
                return -EINVAL;

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index f3ecd696180d9ece74bd646792ff7923fd490a1f..6438738a204af281b4220ba12df148d91cb6ceda 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -161,14 +161,6 @@ xfs_parseargs(
        substring_t             args[MAX_OPT_ARGS];
        int                     size = 0;
 
-       /*
-        * set up the mount name first so all the errors will refer to the
-        * correct device.
-        */
-       mp->m_fsname = kstrndup(sb->s_id, MAXNAMELEN, GFP_KERNEL);
-       if (!mp->m_fsname)
-               return -ENOMEM;
-
        /*
         * Copy binary VFS mount flags we are interested in.
         */
@@ -778,33 +770,33 @@ xfs_init_mount_workqueues(
        struct xfs_mount        *mp)
 {
        mp->m_buf_workqueue = alloc_workqueue("xfs-buf/%s",
-                       WQ_MEM_RECLAIM|WQ_FREEZABLE, 1, mp->m_fsname);
+                       WQ_MEM_RECLAIM|WQ_FREEZABLE, 1, mp->m_super->s_id);
        if (!mp->m_buf_workqueue)
                goto out;
 
        mp->m_unwritten_workqueue = alloc_workqueue("xfs-conv/%s",
-                       WQ_MEM_RECLAIM|WQ_FREEZABLE, 0, mp->m_fsname);
+                       WQ_MEM_RECLAIM|WQ_FREEZABLE, 0, mp->m_super->s_id);
        if (!mp->m_unwritten_workqueue)
                goto out_destroy_buf;
 
        mp->m_cil_workqueue = alloc_workqueue("xfs-cil/%s",
                        WQ_MEM_RECLAIM | WQ_FREEZABLE | WQ_UNBOUND,
-                       0, mp->m_fsname);
+                       0, mp->m_super->s_id);
        if (!mp->m_cil_workqueue)
                goto out_destroy_unwritten;
 
        mp->m_reclaim_workqueue = alloc_workqueue("xfs-reclaim/%s",
-                       WQ_MEM_RECLAIM|WQ_FREEZABLE, 0, mp->m_fsname);
+                       WQ_MEM_RECLAIM|WQ_FREEZABLE, 0, mp->m_super->s_id);
        if (!mp->m_reclaim_workqueue)
                goto out_destroy_cil;
 
        mp->m_eofblocks_workqueue = alloc_workqueue("xfs-eofblocks/%s",
-                       WQ_MEM_RECLAIM|WQ_FREEZABLE, 0, mp->m_fsname);
+                       WQ_MEM_RECLAIM|WQ_FREEZABLE, 0, mp->m_super->s_id);
        if (!mp->m_eofblocks_workqueue)
                goto out_destroy_reclaim;
 
        mp->m_sync_workqueue = alloc_workqueue("xfs-sync/%s", WQ_FREEZABLE, 0,
-                                              mp->m_fsname);
+                                              mp->m_super->s_id);
        if (!mp->m_sync_workqueue)
                goto out_destroy_eofb;
 
@@ -1009,10 +1001,9 @@ xfs_fs_drop_inode(
 }
 
 STATIC void
-xfs_free_fsname(
+xfs_free_names(
        struct xfs_mount        *mp)
 {
-       kfree(mp->m_fsname);
        kfree(mp->m_rtname);
        kfree(mp->m_logname);
 }
@@ -1189,7 +1180,7 @@ xfs_test_remount_options(
 
        tmp_mp->m_super = sb;
        error = xfs_parseargs(tmp_mp, options);
-       xfs_free_fsname(tmp_mp);
+       xfs_free_names(tmp_mp);
        kmem_free(tmp_mp);
 
        return error;
@@ -1555,7 +1546,7 @@ xfs_fs_fill_super(
 
        error = xfs_parseargs(mp, (char *)data);
        if (error)
-               goto out_free_fsname;
+               goto out_free_names;
 
        sb_min_blocksize(sb, BBSIZE);
        sb->s_xattr = xfs_xattr_handlers;
@@ -1582,7 +1573,7 @@ xfs_fs_fill_super(
 
        error = xfs_open_devices(mp);
        if (error)
-               goto out_free_fsname;
+               goto out_free_names;
 
        error = xfs_init_mount_workqueues(mp);
        if (error)
@@ -1719,9 +1710,9 @@ xfs_fs_fill_super(
        xfs_destroy_mount_workqueues(mp);
  out_close_devices:
        xfs_close_devices(mp);
- out_free_fsname:
+ out_free_names:
        sb->s_fs_info = NULL;
-       xfs_free_fsname(mp);
+       xfs_free_names(mp);
        kfree(mp);
  out:
        return error;
@@ -1753,7 +1744,7 @@ xfs_fs_put_super(
        xfs_close_devices(mp);
 
        sb->s_fs_info = NULL;
-       xfs_free_fsname(mp);
+       xfs_free_names(mp);
        kfree(mp);
 }
 

diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c
index 6ccfd75d3c24ce7207e336b5c3b714c18bdcb69a..aea71ee189f5ca5862206f139f9b172ad6b8bcdc 100644 (file)
--- a/fs/xfs/xfs_trans_ail.c
+++ b/fs/xfs/xfs_trans_ail.c
@@ -836,7 +836,7 @@ xfs_trans_ail_init(
        init_waitqueue_head(&ailp->ail_empty);
 
        ailp->ail_task = kthread_run(xfsaild, ailp, "xfsaild/%s",
-                       ailp->ail_mount->m_fsname);
+                       ailp->ail_mount->m_super->s_id);
        if (IS_ERR(ailp->ail_task))
                goto out_free_ailp;