diff options
author | davide <davide@FreeBSD.org> | 2012-11-22 09:13:45 +0000 |
---|---|---|
committer | davide <davide@FreeBSD.org> | 2012-11-22 09:13:45 +0000 |
commit | e52463677acb50f5a4718a048d7a26021e902fdb (patch) | |
tree | bb549c4934fdc008f1faf4e1e0966b8a1368995a /sys/fs | |
parent | 017de7d0303ff918f52d32ec10a552ddb5c8906f (diff) | |
download | FreeBSD-src-e52463677acb50f5a4718a048d7a26021e902fdb.zip FreeBSD-src-e52463677acb50f5a4718a048d7a26021e902fdb.tar.gz |
- Remove reset of vpp pointer in some places as long as it's not really
useful and has the side effect of obfuscating the code a bit.
- Remove spurious references to simple_lock.
Reported by: attilio [1]
Sponsored by: iXsystems inc.
Diffstat (limited to 'sys/fs')
-rw-r--r-- | sys/fs/smbfs/smbfs.h | 1 | ||||
-rw-r--r-- | sys/fs/smbfs/smbfs_node.c | 3 | ||||
-rw-r--r-- | sys/fs/smbfs/smbfs_vfsops.c | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/sys/fs/smbfs/smbfs.h b/sys/fs/smbfs/smbfs.h index 9f7fce3..2ebdf8b 100644 --- a/sys/fs/smbfs/smbfs.h +++ b/sys/fs/smbfs/smbfs.h @@ -79,7 +79,6 @@ struct smbmount { uint64_t sm_flags; long sm_nextino; struct smb_share * sm_share; -/* struct simplelock sm_npslock;*/ struct smbnode * sm_npstack[SMBFS_MAXPATHCOMP]; int sm_caseopt; int sm_didrele; diff --git a/sys/fs/smbfs/smbfs_node.c b/sys/fs/smbfs/smbfs_node.c index 8fb9c80..2427ebe 100644 --- a/sys/fs/smbfs/smbfs_node.c +++ b/sys/fs/smbfs/smbfs_node.c @@ -114,7 +114,6 @@ smbfs_node_alloc(struct mount *mp, struct vnode *dvp, const char *dirnm, sc.n_parent = dvp; sc.n_nmlen = nmlen; sc.n_name = name; - *vpp = NULL; if (smp->sm_root != NULL && dvp == NULL) { SMBERROR("do not allocate root vnode twice!\n"); return EINVAL; @@ -136,7 +135,6 @@ smbfs_node_alloc(struct mount *mp, struct vnode *dvp, const char *dirnm, vprint("smbfs_node_alloc: dead parent vnode", dvp); return EINVAL; } - *vpp = NULL; error = vfs_hash_get(mp, smbfs_hash(name, nmlen), LK_EXCLUSIVE, td, vpp, smbfs_vnode_cmp, &sc); if (error) @@ -233,7 +231,6 @@ smbfs_nget(struct mount *mp, struct vnode *dvp, const char *name, int nmlen, struct vnode *vp; int error, sep; - *vpp = NULL; dnp = (dvp) ? VTOSMB(dvp) : NULL; sep = 0; if (dnp != NULL) { diff --git a/sys/fs/smbfs/smbfs_vfsops.c b/sys/fs/smbfs/smbfs_vfsops.c index 781857d..8b92376 100644 --- a/sys/fs/smbfs/smbfs_vfsops.c +++ b/sys/fs/smbfs/smbfs_vfsops.c @@ -207,7 +207,6 @@ smbfs_mount(struct mount *mp) vfs_flagopt(mp->mnt_optnew, "nolong", &smp->sm_flags, SMBFS_MOUNT_NO_LONG); -/* simple_lock_init(&smp->sm_npslock);*/ pc = mp->mnt_stat.f_mntfromname; pe = pc + sizeof(mp->mnt_stat.f_mntfromname); bzero(pc, MNAMELEN); |