summaryrefslogtreecommitdiffstats
path: root/sys/fs/smbfs/smbfs_vfsops.c
diff options
context:
space:
mode:
authordavide <davide@FreeBSD.org>2013-05-04 14:18:10 +0000
committerdavide <davide@FreeBSD.org>2013-05-04 14:18:10 +0000
commit8fda0a3d2e48bd068e61f4b4b63aa11614fae230 (patch)
treeceabbdf55b02c0f9c9a1939a44bc163d06f25c0f /sys/fs/smbfs/smbfs_vfsops.c
parent49171951e3c2ee391cc14135ca9389ecb4e38f47 (diff)
downloadFreeBSD-src-8fda0a3d2e48bd068e61f4b4b63aa11614fae230.zip
FreeBSD-src-8fda0a3d2e48bd068e61f4b4b63aa11614fae230.tar.gz
Overhaul locking in netsmb, getting rid of the obsolete lockmgr() primitive.
This solves a long standing LOR between smb_conn and smb_vc. Tested by: martymac, pho (previous version)
Diffstat (limited to 'sys/fs/smbfs/smbfs_vfsops.c')
-rw-r--r--sys/fs/smbfs/smbfs_vfsops.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/fs/smbfs/smbfs_vfsops.c b/sys/fs/smbfs/smbfs_vfsops.c
index 938b7ff..66512e9 100644
--- a/sys/fs/smbfs/smbfs_vfsops.c
+++ b/sys/fs/smbfs/smbfs_vfsops.c
@@ -169,7 +169,7 @@ smbfs_mount(struct mount *mp)
return error;
}
vcp = SSTOVC(ssp);
- smb_share_unlock(ssp, 0);
+ smb_share_unlock(ssp);
mp->mnt_stat.f_iosize = SSTOVC(ssp)->vc_txmax;
mp->mnt_data = smp;
smp->sm_share = ssp;
@@ -286,7 +286,7 @@ smbfs_unmount(struct mount *mp, int mntflags)
return error;
scred = smbfs_malloc_scred();
smb_makescred(scred, td, td->td_ucred);
- error = smb_share_lock(smp->sm_share, LK_EXCLUSIVE);
+ error = smb_share_lock(smp->sm_share);
if (error)
goto out;
smb_share_put(smp->sm_share, scred);
OpenPOWER on IntegriCloud