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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
