 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_trans.c,v 1.29 2013/11/23 13:35:36 christos Exp $	*/
+/*	$NetBSD: vfs_trans.c,v 1.30 2014/04/15 09:50:45 hannken Exp $	*/
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Juergen Hannken-Illjes.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_trans.c,v 1.29 2013/11/23 13:35:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_trans.c,v 1.30 2014/04/15 09:50:45 hannken Exp $");
 /*
  * File system transaction operations.
  */
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/buf.h>
 #include <sys/kmem.h>
 #include <sys/mount.h>
 @@ -72,27 +72,26 @@ struct fstrans_mount_info {
 	unsigned int fmi_ref_cnt;
 	bool fmi_cow_change;
 	LIST_HEAD(, fscow_handler) fmi_cow_handler;
 };
 static specificdata_key_t lwp_data_key;	/* Our specific data key. */
 static kmutex_t vfs_suspend_lock;	/* Serialize suspensions. */
 static kmutex_t fstrans_lock;		/* Fstrans big lock. */
 static kcondvar_t fstrans_state_cv;	/* Fstrans or cow state changed. */
 static kcondvar_t fstrans_count_cv;	/* Fstrans or cow count changed. */
 static pserialize_t fstrans_psz;	/* Pserialize state. */
 static LIST_HEAD(fstrans_lwp_head, fstrans_lwp_info) fstrans_fli_head;
 					/* List of all fstrans_lwp_info. */
 static pool_cache_t fstrans_cache;	/* Pool of struct fstrans_lwp_info. */
 static void fstrans_lwp_dtor(void *);
 static void fstrans_mount_dtor(struct mount *);
 static struct fstrans_lwp_info *fstrans_get_lwp_info(struct mount *, bool);
 static bool grant_lock(const enum fstrans_state, const enum fstrans_lock_type);
 static bool state_change_done(const struct mount *);
 static bool cow_state_change_done(const struct mount *);
 static void cow_change_enter(const struct mount *);
 static void cow_change_done(const struct mount *);
 /*
  * Initialize.
  */
 @@ -100,49 +99,46 @@ void
 fstrans_init(void)
+{
 	int error __diagused;
 	error = lwp_specific_key_create(&lwp_data_key, fstrans_lwp_dtor);
 	KASSERT(error == 0);
 	mutex_init(&vfs_suspend_lock, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&fstrans_lock, MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&fstrans_state_cv, "fstchg");
 	cv_init(&fstrans_count_cv, "fstcnt");
 	fstrans_psz = pserialize_create();
 	LIST_INIT(&fstrans_fli_head);
 	fstrans_cache = pool_cache_init(sizeof(struct fstrans_lwp_info), 0, 0,
 , "fstrans", NULL, IPL_NONE, NULL, NULL, NULL);
+}
 /*
  * Deallocate lwp state.
  */
 static void
 fstrans_lwp_dtor(void *arg)
+{
 	struct fstrans_lwp_info *fli, *fli_next;
 	mutex_enter(&fstrans_lock);
 	for (fli = arg; fli; fli = fli_next) {
 		KASSERT(fli->fli_trans_cnt == 0);
 		KASSERT(fli->fli_cow_cnt == 0);
 		if (fli->fli_mount != NULL)
 			fstrans_mount_dtor(fli->fli_mount);
 		fli_next = fli->fli_succ;
-		LIST_REMOVE(fli, fli_list);
+		fli->fli_mount = NULL;
-		pool_cache_put(fstrans_cache, fli);
+		membar_sync();
 		fli->fli_self = NULL;
+	}
 	mutex_exit(&fstrans_lock);
+}
 /*
  * Dereference mount state.
  */
 static void
 fstrans_mount_dtor(struct mount *mp)
+{
 	struct fstrans_mount_info *fmi;
 	fmi = mp->mnt_transinfo;
 	if (atomic_dec_uint_nv(&fmi->fmi_ref_cnt) > 0)
 		return;
 @@ -227,27 +223,41 @@ fstrans_get_lwp_info(struct mount *mp, b
 		return NULL;
 	/*
 	 * Try to reuse a cleared entry or allocate a new one.
 	 */
 	for (fli = lwp_getspecific(lwp_data_key); fli; fli = fli->fli_succ) {
 		if (fli->fli_mount == NULL) {
 			KASSERT(fli->fli_trans_cnt == 0);
 			KASSERT(fli->fli_cow_cnt == 0);
 			break;
+		}
+	}
 	if (fli == NULL) {
-		fli = pool_cache_get(fstrans_cache, PR_WAITOK);
+		mutex_enter(&fstrans_lock);
 		LIST_FOREACH(fli, &fstrans_fli_head, fli_list) {
 			if (fli->fli_self == NULL) {
 				KASSERT(fli->fli_trans_cnt == 0);
 				KASSERT(fli->fli_cow_cnt == 0);
 				fli->fli_self = curlwp;
 				fli->fli_succ = lwp_getspecific(lwp_data_key);
 				lwp_setspecific(lwp_data_key, fli);
 				break;
+			}
+		}
 		mutex_exit(&fstrans_lock);
+	}
 	if (fli == NULL) {
 		fli = kmem_alloc(sizeof(*fli), KM_SLEEP);
 		mutex_enter(&fstrans_lock);
 		memset(fli, 0, sizeof(*fli));
 		fli->fli_self = curlwp;
 		LIST_INSERT_HEAD(&fstrans_fli_head, fli, fli_list);
 		mutex_exit(&fstrans_lock);
 		fli->fli_succ = lwp_getspecific(lwp_data_key);
 		lwp_setspecific(lwp_data_key, fli);
+	}
 	/*
 	 * Attach the entry to the mount.
 	 */
 	fmi = mp->mnt_transinfo;