From owner-svn-src-head@FreeBSD.ORG  Sun Nov  2 23:20:28 2008
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 48C76106568C;
	Sun,  2 Nov 2008 23:20:28 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 370D58FC22;
	Sun,  2 Nov 2008 23:20:28 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA2NKSSO050736;
	Sun, 2 Nov 2008 23:20:28 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA2NKSe7050734;
	Sun, 2 Nov 2008 23:20:28 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200811022320.mA2NKSe7050734@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 2 Nov 2008 23:20:28 +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: r184572 - in head/sys: fs/smbfs netsmb
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, 02 Nov 2008 23:20:28 -0000

Author: rwatson
Date: Sun Nov  2 23:20:27 2008
New Revision: 184572
URL: http://svn.freebsd.org/changeset/base/184572

Log:
  Catch up with netsmb locking: explicit thread arguments no longer required.

Modified:
  head/sys/fs/smbfs/smbfs_vfsops.c
  head/sys/netsmb/smb_dev.c

Modified: head/sys/fs/smbfs/smbfs_vfsops.c
==============================================================================
--- head/sys/fs/smbfs/smbfs_vfsops.c	Sun Nov  2 23:15:32 2008	(r184571)
+++ head/sys/fs/smbfs/smbfs_vfsops.c	Sun Nov  2 23:20:27 2008	(r184572)
@@ -173,7 +173,7 @@ smbfs_mount(struct mount *mp, struct thr
 		return error;
 	}
 	vcp = SSTOVC(ssp);
-	smb_share_unlock(ssp, 0, td);
+	smb_share_unlock(ssp, 0);
 	mp->mnt_stat.f_iosize = SSTOVC(ssp)->vc_txmax;
 
 #ifdef SMBFS_USEZONE
@@ -305,7 +305,7 @@ smbfs_unmount(struct mount *mp, int mntf
 	if (error)
 		return error;
 	smb_makescred(&scred, td, td->td_ucred);
-	error = smb_share_lock(smp->sm_share, LK_EXCLUSIVE, td);
+	error = smb_share_lock(smp->sm_share, LK_EXCLUSIVE);
 	if (error)
 		return error;
 	smb_share_put(smp->sm_share, &scred);

Modified: head/sys/netsmb/smb_dev.c
==============================================================================
--- head/sys/netsmb/smb_dev.c	Sun Nov  2 23:15:32 2008	(r184571)
+++ head/sys/netsmb/smb_dev.c	Sun Nov  2 23:20:27 2008	(r184572)
@@ -204,7 +204,7 @@ nsmb_dev_ioctl(struct cdev *dev, u_long 
 		if (error)
 			break;
 		sdp->sd_vc = vcp;
-		smb_vc_unlock(vcp, 0, td);
+		smb_vc_unlock(vcp, 0);
 		sdp->sd_level = SMBL_VC;
 		break;
 	    case SMBIOC_OPENSHARE:
@@ -217,7 +217,7 @@ nsmb_dev_ioctl(struct cdev *dev, u_long 
 		if (error)
 			break;
 		sdp->sd_share = ssp;
-		smb_share_unlock(ssp, 0, td);
+		smb_share_unlock(ssp, 0);
 		sdp->sd_level = SMBL_SHARE;
 		break;
 	    case SMBIOC_REQUEST:
@@ -287,12 +287,12 @@ nsmb_dev_ioctl(struct cdev *dev, u_long 
 			break;
 		if (vcp) {
 			sdp->sd_vc = vcp;
-			smb_vc_unlock(vcp, 0, td);
+			smb_vc_unlock(vcp, 0);
 			sdp->sd_level = SMBL_VC;
 		}
 		if (ssp) {
 			sdp->sd_share = ssp;
-			smb_share_unlock(ssp, 0, td);
+			smb_share_unlock(ssp, 0);
 			sdp->sd_level = SMBL_SHARE;
 		}
 		break;