mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-11 09:50:12 +00:00
Catch up with netsmb locking: explicit thread arguments no longer required.
This commit is contained in:
parent
e3b3762b32
commit
2b7da2dbf1
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=184572
@ -173,7 +173,7 @@ smbfs_mount(struct mount *mp, struct thread *td)
|
|||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
vcp = SSTOVC(ssp);
|
vcp = SSTOVC(ssp);
|
||||||
smb_share_unlock(ssp, 0, td);
|
smb_share_unlock(ssp, 0);
|
||||||
mp->mnt_stat.f_iosize = SSTOVC(ssp)->vc_txmax;
|
mp->mnt_stat.f_iosize = SSTOVC(ssp)->vc_txmax;
|
||||||
|
|
||||||
#ifdef SMBFS_USEZONE
|
#ifdef SMBFS_USEZONE
|
||||||
@ -305,7 +305,7 @@ smbfs_unmount(struct mount *mp, int mntflags, struct thread *td)
|
|||||||
if (error)
|
if (error)
|
||||||
return error;
|
return error;
|
||||||
smb_makescred(&scred, td, td->td_ucred);
|
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)
|
if (error)
|
||||||
return error;
|
return error;
|
||||||
smb_share_put(smp->sm_share, &scred);
|
smb_share_put(smp->sm_share, &scred);
|
||||||
|
@ -204,7 +204,7 @@ nsmb_dev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thre
|
|||||||
if (error)
|
if (error)
|
||||||
break;
|
break;
|
||||||
sdp->sd_vc = vcp;
|
sdp->sd_vc = vcp;
|
||||||
smb_vc_unlock(vcp, 0, td);
|
smb_vc_unlock(vcp, 0);
|
||||||
sdp->sd_level = SMBL_VC;
|
sdp->sd_level = SMBL_VC;
|
||||||
break;
|
break;
|
||||||
case SMBIOC_OPENSHARE:
|
case SMBIOC_OPENSHARE:
|
||||||
@ -217,7 +217,7 @@ nsmb_dev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thre
|
|||||||
if (error)
|
if (error)
|
||||||
break;
|
break;
|
||||||
sdp->sd_share = ssp;
|
sdp->sd_share = ssp;
|
||||||
smb_share_unlock(ssp, 0, td);
|
smb_share_unlock(ssp, 0);
|
||||||
sdp->sd_level = SMBL_SHARE;
|
sdp->sd_level = SMBL_SHARE;
|
||||||
break;
|
break;
|
||||||
case SMBIOC_REQUEST:
|
case SMBIOC_REQUEST:
|
||||||
@ -287,12 +287,12 @@ nsmb_dev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thre
|
|||||||
break;
|
break;
|
||||||
if (vcp) {
|
if (vcp) {
|
||||||
sdp->sd_vc = vcp;
|
sdp->sd_vc = vcp;
|
||||||
smb_vc_unlock(vcp, 0, td);
|
smb_vc_unlock(vcp, 0);
|
||||||
sdp->sd_level = SMBL_VC;
|
sdp->sd_level = SMBL_VC;
|
||||||
}
|
}
|
||||||
if (ssp) {
|
if (ssp) {
|
||||||
sdp->sd_share = ssp;
|
sdp->sd_share = ssp;
|
||||||
smb_share_unlock(ssp, 0, td);
|
smb_share_unlock(ssp, 0);
|
||||||
sdp->sd_level = SMBL_SHARE;
|
sdp->sd_level = SMBL_SHARE;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user