Author: kib
Date: Wed Aug 10 12:36:54 2016
New Revision: 303907
URL: https://svnweb.freebsd.org/changeset/base/303907
Log:
MFC r303704:
Some style changes. Fix a typo in comment.
MFC r303705:
Remove Giant asserts. Update comment.
Modified:
stable/10/sys/fs/pseudofs/pseudofs.c
stable/10/sys/fs/pseudofs/pseudofs.h
stable/10/sys/fs/pseudofs/pseudofs_fileno.c
stable/10/sys/fs/pseudofs/pseudofs_vncache.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/fs/pseudofs/pseudofs.c
==============================================================================
--- stable/10/sys/fs/pseudofs/pseudofs.c Wed Aug 10 12:34:49 2016
(r303906)
+++ stable/10/sys/fs/pseudofs/pseudofs.c Wed Aug 10 12:36:54 2016
(r303907)
@@ -383,11 +383,9 @@ pfs_init(struct pfs_info *pi, struct vfs
struct pfs_node *root;
int error;
- mtx_assert(&Giant, MA_OWNED);
-
pfs_fileno_init(pi);
- /* set up the root diretory */
+ /* set up the root directory */
root = pfs_alloc_node(pi, "/", pfstype_root);
pi->pi_root = root;
pfs_fileno_alloc(root);
@@ -414,8 +412,6 @@ pfs_uninit(struct pfs_info *pi, struct v
{
int error;
- mtx_assert(&Giant, MA_OWNED);
-
pfs_destroy(pi->pi_root);
pi->pi_root = NULL;
pfs_fileno_uninit(pi);
Modified: stable/10/sys/fs/pseudofs/pseudofs.h
==============================================================================
--- stable/10/sys/fs/pseudofs/pseudofs.h Wed Aug 10 12:34:49 2016
(r303906)
+++ stable/10/sys/fs/pseudofs/pseudofs.h Wed Aug 10 12:36:54 2016
(r303907)
@@ -189,16 +189,16 @@ typedef int (*pfs_destroy_t)(PFS_DESTROY
/*
* pfs_info: describes a pseudofs instance
*
- * The pi_mutex is only used to avoid using the global subr_unit lock for
- * unrhdr. The rest of struct pfs_info is only modified while Giant is
- * held (during vfs_init() and vfs_uninit()).
+ * The pi_mutex is only used to avoid using the global subr_unit lock
+ * for unrhdr. The rest of struct pfs_info is only modified during
+ * vfs_init() and vfs_uninit() of the consumer filesystem.
*/
struct pfs_info {
char pi_name[PFS_FSNAMELEN];
pfs_init_t pi_init;
pfs_init_t pi_uninit;
- /* members below this line are initialized at run time*/
+ /* members below this line are initialized at run time */
struct pfs_node *pi_root;
struct mtx pi_mutex;
struct unrhdr *pi_unrhdr;
@@ -285,17 +285,17 @@ static int
\
_##name##_mount(struct mount *mp) { \
if (jflag && !prison_allow(curthread->td_ucred, jflag))
\
return (EPERM);
\
- return pfs_mount(&name##_info, mp); \
+ return (pfs_mount(&name##_info, mp)); \
} \
\
static int \
_##name##_init(struct vfsconf *vfc) { \
- return pfs_init(&name##_info, vfc); \
+ return (pfs_init(&name##_info, vfc)); \
} \
\
static int \
_##name##_uninit(struct vfsconf *vfc) {
\
- return pfs_uninit(&name##_info, vfc); \
+ return (pfs_uninit(&name##_info, vfc)); \
} \
\
static struct vfsops name##_vfsops = { \
Modified: stable/10/sys/fs/pseudofs/pseudofs_fileno.c
==============================================================================
--- stable/10/sys/fs/pseudofs/pseudofs_fileno.c Wed Aug 10 12:34:49 2016
(r303906)
+++ stable/10/sys/fs/pseudofs/pseudofs_fileno.c Wed Aug 10 12:36:54 2016
(r303907)
@@ -52,7 +52,6 @@ void
pfs_fileno_init(struct pfs_info *pi)
{
- mtx_assert(&Giant, MA_OWNED);
mtx_init(&pi->pi_mutex, "pfs_fileno", NULL, MTX_DEF);
pi->pi_unrhdr = new_unrhdr(3, INT_MAX / NO_PID, &pi->pi_mutex);
}
@@ -64,7 +63,6 @@ void
pfs_fileno_uninit(struct pfs_info *pi)
{
- mtx_assert(&Giant, MA_OWNED);
delete_unrhdr(pi->pi_unrhdr);
pi->pi_unrhdr = NULL;
mtx_destroy(&pi->pi_mutex);
Modified: stable/10/sys/fs/pseudofs/pseudofs_vncache.c
==============================================================================
--- stable/10/sys/fs/pseudofs/pseudofs_vncache.c Wed Aug 10 12:34:49
2016 (r303906)
+++ stable/10/sys/fs/pseudofs/pseudofs_vncache.c Wed Aug 10 12:36:54
2016 (r303907)
@@ -84,7 +84,6 @@ void
pfs_vncache_load(void)
{
- mtx_assert(&Giant, MA_OWNED);
mtx_init(&pfs_vncache_mutex, "pfs_vncache", NULL, MTX_DEF);
pfs_exit_tag = EVENTHANDLER_REGISTER(process_exit, pfs_exit, NULL,
EVENTHANDLER_PRI_ANY);
@@ -97,7 +96,6 @@ void
pfs_vncache_unload(void)
{
- mtx_assert(&Giant, MA_OWNED);
EVENTHANDLER_DEREGISTER(process_exit, pfs_exit_tag);
KASSERT(pfs_vncache_entries == 0,
("%d vncache entries remaining", pfs_vncache_entries));
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
