From owner-svn-src-head@FreeBSD.ORG  Sun Feb 28 17:16:44 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0573E1065670;
	Sun, 28 Feb 2010 17:16:44 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CF65C8FC25;
	Sun, 28 Feb 2010 17:16:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1SHGh27041644;
	Sun, 28 Feb 2010 17:16:43 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1SHGhiU041642;
	Sun, 28 Feb 2010 17:16:43 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201002281716.o1SHGhiU041642@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 28 Feb 2010 17:16:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204473 - head/sys/fs/msdosfs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Feb 2010 17:16:44 -0000

Author: kib
Date: Sun Feb 28 17:16:43 2010
New Revision: 204473
URL: http://svn.freebsd.org/changeset/base/204473

Log:
  Use pm_fatlock to protect per-filesystem rb tree used to allocate fileno
  on the large FAT volumes. Previously, a single global mutex was used.
  
  Tested by:	pho
  MFC after:	3 weeks

Modified:
  head/sys/fs/msdosfs/msdosfs_fileno.c

Modified: head/sys/fs/msdosfs/msdosfs_fileno.c
==============================================================================
--- head/sys/fs/msdosfs/msdosfs_fileno.c	Sun Feb 28 17:15:45 2010	(r204472)
+++ head/sys/fs/msdosfs/msdosfs_fileno.c	Sun Feb 28 17:16:43 2010	(r204473)
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
-#include <sys/mutex.h>
 
 #include <fs/msdosfs/bpb.h>
 #include <fs/msdosfs/direntry.h>
@@ -59,9 +58,6 @@ __FBSDID("$FreeBSD$");
 
 static MALLOC_DEFINE(M_MSDOSFSFILENO, "msdosfs_fileno", "MSDOSFS fileno mapping node");
 
-static struct mtx fileno_mtx;
-MTX_SYSINIT(fileno, &fileno_mtx, "MSDOSFS fileno", MTX_DEF);
-
 RB_PROTOTYPE(msdosfs_filenotree, msdosfs_fileno, mf_tree,
     msdosfs_fileno_compare)
 
@@ -117,30 +113,30 @@ msdosfs_fileno_map(mp, fileno)
 	}
 	if (fileno < FILENO_FIRST_DYN)
 		return ((uint32_t)fileno);
-	mtx_lock(&fileno_mtx);
+	MSDOSFS_LOCK_MP(pmp);
 	key.mf_fileno64 = fileno;
 	mf = RB_FIND(msdosfs_filenotree, &pmp->pm_filenos, &key);
 	if (mf != NULL) {
 		mapped = mf->mf_fileno32;
-		mtx_unlock(&fileno_mtx);
+		MSDOSFS_UNLOCK_MP(pmp);
 		return (mapped);
 	}
 	if (pmp->pm_nfileno < FILENO_FIRST_DYN)
 		panic("msdosfs_fileno_map: wraparound");
-	mtx_unlock(&fileno_mtx);
+	MSDOSFS_UNLOCK_MP(pmp);
 	mf = malloc(sizeof(*mf), M_MSDOSFSFILENO, M_WAITOK);
-	mtx_lock(&fileno_mtx);
+	MSDOSFS_LOCK_MP(pmp);
 	tmf = RB_FIND(msdosfs_filenotree, &pmp->pm_filenos, &key);
 	if (tmf != NULL) {
 		mapped = tmf->mf_fileno32;
-		mtx_unlock(&fileno_mtx);
+		MSDOSFS_UNLOCK_MP(pmp);
 		free(mf, M_MSDOSFSFILENO);
 		return (mapped);
 	}
 	mf->mf_fileno64 = fileno;
 	mapped = mf->mf_fileno32 = pmp->pm_nfileno++;
 	RB_INSERT(msdosfs_filenotree, &pmp->pm_filenos, mf);
-	mtx_unlock(&fileno_mtx);
+	MSDOSFS_UNLOCK_MP(pmp);
 	return (mapped);
 }