svn commit: r312807 - stable/10/sys/fs/tmpfs

[Konstantin Belousov]

Author: kib
Date: Thu Jan 26 11:00:57 2017
New Revision: 312807
URL: https://svnweb.freebsd.org/changeset/base/312807

Log:
  MFC r312414:
  Rename tmpfs_mount member allnode_lock to include namespace prefix.

Modified:
  stable/10/sys/fs/tmpfs/tmpfs.h
  stable/10/sys/fs/tmpfs/tmpfs_vfsops.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/fs/tmpfs/tmpfs.h
==============================================================================
--- stable/10/sys/fs/tmpfs/tmpfs.h	Thu Jan 26 10:58:12 2017	(r312806)
+++ stable/10/sys/fs/tmpfs/tmpfs.h	Thu Jan 26 11:00:57 2017	(r312807)
@@ -150,7 +150,7 @@ RB_HEAD(tmpfs_dir, tmpfs_dirent);
  * (vi) vnode lock in exclusive mode, or vnode lock in shared vnode and
  *	tn_interlock
  * (i)  tn_interlock
- * (m)  tmpfs_mount allnode_lock
+ * (m)  tmpfs_mount tm_allnode_lock
  * (c)  stable after creation
  */
 struct tmpfs_node {
@@ -368,7 +368,7 @@ struct tmpfs_mount {
 	struct tmpfs_node_list	tm_nodes_used;
 
 	/* All node lock to protect the node list and tmp_pages_used. */
-	struct mtx allnode_lock;
+	struct mtx		tm_allnode_lock;
 
 	/* Zones used to store file system meta data, per tmpfs mount. */
 	uma_zone_t		tm_dirent_pool;
@@ -377,8 +377,9 @@ struct tmpfs_mount {
 	/* Read-only status. */
 	int			tm_ronly;
 };
-#define TMPFS_LOCK(tm) mtx_lock(&(tm)->allnode_lock)
-#define TMPFS_UNLOCK(tm) mtx_unlock(&(tm)->allnode_lock)
+#define	TMPFS_LOCK(tm) mtx_lock(&(tm)->tm_allnode_lock)
+#define	TMPFS_UNLOCK(tm) mtx_unlock(&(tm)->tm_allnode_lock)
+#define	TMPFS_MP_ASSERT_LOCKED(tm) mtx_assert(&(tm)->tm_allnode_lock, MA_OWNED)
 
 /*
  * This structure maps a file identifier to a tmpfs node.  Used by the

Modified: stable/10/sys/fs/tmpfs/tmpfs_vfsops.c
==============================================================================
--- stable/10/sys/fs/tmpfs/tmpfs_vfsops.c	Thu Jan 26 10:58:12 2017	(r312806)
+++ stable/10/sys/fs/tmpfs/tmpfs_vfsops.c	Thu Jan 26 11:00:57 2017	(r312807)
@@ -218,7 +218,7 @@ tmpfs_mount(struct mount *mp)
 	tmp = (struct tmpfs_mount *)malloc(sizeof(struct tmpfs_mount),
 	    M_TMPFSMNT, M_WAITOK | M_ZERO);
 
-	mtx_init(&tmp->allnode_lock, "tmpfs allnode lock", NULL, MTX_DEF);
+	mtx_init(&tmp->tm_allnode_lock, "tmpfs allnode lock", NULL, MTX_DEF);
 	tmp->tm_nodes_max = nodes_max;
 	tmp->tm_nodes_inuse = 0;
 	tmp->tm_maxfilesize = maxfilesize > 0 ? maxfilesize : OFF_MAX;
@@ -226,7 +226,7 @@ tmpfs_mount(struct mount *mp)
 
 	tmp->tm_pages_max = pages;
 	tmp->tm_pages_used = 0;
-	tmp->tm_ino_unr = new_unrhdr(2, INT_MAX, &tmp->allnode_lock);
+	tmp->tm_ino_unr = new_unrhdr(2, INT_MAX, &tmp->tm_allnode_lock);
 	tmp->tm_dirent_pool = uma_zcreate("TMPFS dirent",
 	    sizeof(struct tmpfs_dirent), NULL, NULL, NULL, NULL,
 	    UMA_ALIGN_PTR, 0);
@@ -314,7 +314,7 @@ tmpfs_unmount(struct mount *mp, int mntf
 	uma_zdestroy(tmp->tm_node_pool);
 	delete_unrhdr(tmp->tm_ino_unr);
 
-	mtx_destroy(&tmp->allnode_lock);
+	mtx_destroy(&tmp->tm_allnode_lock);
 	MPASS(tmp->tm_pages_used == 0);
 	MPASS(tmp->tm_nodes_inuse == 0);