X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/blobdiff_plain/81b34f2dc0e388e92315e8454f08d35220a09865..79bada538fd55e3686e1c73fe430c533c186f0da:/sys/vfs/nwfs/nwfs_vfsops.c

diff --git a/sys/vfs/nwfs/nwfs_vfsops.c b/sys/vfs/nwfs/nwfs_vfsops.c
index a66ad8192a..07c3f51aca 100644
--- a/sys/vfs/nwfs/nwfs_vfsops.c
+++ b/sys/vfs/nwfs/nwfs_vfsops.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/nwfs/nwfs_vfsops.c,v 1.6.2.6 2001/10/25 19:18:54 dillon Exp $
- * $DragonFly: src/sys/vfs/nwfs/nwfs_vfsops.c,v 1.13 2004/10/12 19:21:05 dillon Exp $
+ * $DragonFly: src/sys/vfs/nwfs/nwfs_vfsops.c,v 1.16 2005/02/12 01:31:38 joerg Exp $
  */
 #include "opt_ncp.h"
 #ifndef NCP
@@ -145,7 +145,6 @@ static int
 nwfs_mount(struct mount *mp, char *path, caddr_t data, struct thread *td)
 {
 	struct nwfs_args args; 	  /* will hold data from mount request */
-	size_t size;
 	int error;
 	struct nwmount *nmp = NULL;
 	struct ncp_conn *conn = NULL;
@@ -201,8 +200,6 @@ nwfs_mount(struct mount *mp, char *path, caddr_t data, struct thread *td)
 	nmp->m.dir_mode  = (nmp->m.dir_mode &
 			    (S_IRWXU|S_IRWXG|S_IRWXO)) | S_IFDIR;
 	if ((error = nwfs_initnls(nmp)) != 0) goto bad;
-	(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
-	bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);
 	pc = mp->mnt_stat.f_mntfromname;
 	pe = pc+sizeof(mp->mnt_stat.f_mntfromname);
 	bzero(pc, MNAMELEN);
@@ -219,7 +216,7 @@ nwfs_mount(struct mount *mp, char *path, caddr_t data, struct thread *td)
 	/* protect against invalid mount points */
 	nmp->m.mount_point[sizeof(nmp->m.mount_point)-1] = '\0';
 
-	vfs_add_vnodeops(&mp->mnt_vn_ops, nwfs_vnodeop_entries);
+	vfs_add_vnodeops(mp, &mp->mnt_vn_norm_ops, nwfs_vnodeop_entries);
 
 	vfs_getnewfsid(mp);
 	error = nwfs_root(mp, &vp);
@@ -463,7 +460,6 @@ nwfs_statfs(struct mount *mp, struct statfs *sbp, struct thread *td)
 		sbp->f_fsid = mp->mnt_stat.f_fsid;	/* file system id */
 		sbp->f_owner = mp->mnt_stat.f_owner;	/* user that mounted the filesystem */
 		sbp->f_type = mp->mnt_vfc->vfc_typenum;	/* type of filesystem */
-		bcopy(mp->mnt_stat.f_mntonname, sbp->f_mntonname, MNAMELEN);
 		bcopy(mp->mnt_stat.f_mntfromname, sbp->f_mntfromname, MNAMELEN);
 	}
 	strncpy(sbp->f_fstypename, mp->mnt_vfc->vfc_name, MFSNAMELEN);