Commit e1d3d218 authored by Ian Kent's avatar Ian Kent Committed by Darrick J. Wong
Browse files

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: default avatarIan Kent <raven@themaw.net>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent f676c750

fs/xfs/xfs_error.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

fs/xfs/xfs_log.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/xfs/xfs_message.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

fs/xfs/xfs_mount.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

fs/xfs/xfs_mount.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */