From 2b7da2dbf18b4848fc6bc0b105564dc50ab61c6e Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Sun, 2 Nov 2008 23:20:27 +0000 Subject: [PATCH] Catch up with netsmb locking: explicit thread arguments no longer required. --- sys/fs/smbfs/smbfs_vfsops.c | 4 ++-- sys/netsmb/smb_dev.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/fs/smbfs/smbfs_vfsops.c b/sys/fs/smbfs/smbfs_vfsops.c index 9e1dc1656db1..71b3960893ba 100644 --- a/sys/fs/smbfs/smbfs_vfsops.c +++ b/sys/fs/smbfs/smbfs_vfsops.c @@ -173,7 +173,7 @@ smbfs_mount(struct mount *mp, struct thread *td) 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 mntflags, struct thread *td) 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); diff --git a/sys/netsmb/smb_dev.c b/sys/netsmb/smb_dev.c index 50cc64420235..084536350bb7 100644 --- a/sys/netsmb/smb_dev.c +++ b/sys/netsmb/smb_dev.c @@ -204,7 +204,7 @@ nsmb_dev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thre 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 cmd, caddr_t data, int flag, struct thre 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 cmd, caddr_t data, int flag, struct thre 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;