Index: fs/nwfs/nwfs_subr.c
===================================================================
RCS file: /home/ncvs/src/sys/fs/nwfs/nwfs_subr.c,v
retrieving revision 1.11
diff -u -r1.11 nwfs_subr.c
--- fs/nwfs/nwfs_subr.c	3 Feb 2003 19:49:33 -0000	1.11
+++ fs/nwfs/nwfs_subr.c	21 Feb 2003 12:08:21 -0000
@@ -60,12 +60,12 @@
 {
 	u_int8_t name_len;
 
-	md_get_mem(&rqp->rp, (caddr_t)target, NCP_INFOSZ, MB_MSYSTEM);
+	md_get_mem(&rqp->rp, (caddr_t)target, NCP_INFOSZ, MBC_MSYSTEM);
 	if (!withname)
 		return 0;
 	md_get_uint8(&rqp->rp, &name_len);
 	target->nameLen = name_len;
-	md_get_mem(&rqp->rp, (caddr_t)target->entryName, name_len, MB_MSYSTEM);
+	md_get_mem(&rqp->rp, (caddr_t)target->entryName, name_len, MBC_MSYSTEM);
 	target->entryName[name_len] = '\0';
 	ncp_path2unix(target->entryName, target->entryName, name_len, &nmp->m.nls);
 	return 0;
@@ -94,7 +94,7 @@
 	error = ncp_request(rqp);
 	if (error)
 		return error;
-	md_get_mem(&rqp->rp, (caddr_t)&np->n_seq, sizeof(np->n_seq), MB_MSYSTEM);
+	md_get_mem(&rqp->rp, (caddr_t)&np->n_seq, sizeof(np->n_seq), MBC_MSYSTEM);
 	ncp_rq_done(rqp);
 	return 0;
 }
@@ -117,7 +117,7 @@
 	mb_put_uint8(&rqp->rq, 0);		/* data stream */
 	mb_put_uint16le(&rqp->rq, 0xffff);	/* Search attribs */
 	mb_put_uint32le(&rqp->rq, IM_ALL);	/* return info mask */
-	mb_put_mem(&rqp->rq, (caddr_t)seq, 9, MB_MSYSTEM);
+	mb_put_mem(&rqp->rq, (caddr_t)seq, 9, MBC_MSYSTEM);
 	mb_put_uint8(&rqp->rq, 2);		/* 2 byte pattern */
 	mb_put_uint8(&rqp->rq, 0xff);		/* following is a wildcard */
 	mb_put_uint8(&rqp->rq, '*');
@@ -125,7 +125,7 @@
 	error = ncp_request(rqp);
 	if (error)
 		return error;
-	md_get_mem(&rqp->rp, (caddr_t)seq, sizeof(*seq), MB_MSYSTEM);
+	md_get_mem(&rqp->rp, (caddr_t)seq, sizeof(*seq), MBC_MSYSTEM);
 	md_get_uint8(&rqp->rp, NULL);		/* skip */
 	error = ncp_extract_file_info(nmp, rqp, target, 1);
 	ncp_rq_done(rqp);
@@ -277,7 +277,7 @@
 	if (error)
 		return error;
 	mb_put_uint8(&rqp->rq, 0);
-	mb_put_mem(&rqp->rq, (caddr_t)fh, 6, MB_MSYSTEM);
+	mb_put_mem(&rqp->rq, (caddr_t)fh, 6, MBC_MSYSTEM);
 	error = ncp_request(rqp);
 	if (error)
 		return error;
@@ -326,12 +326,12 @@
 	mb_put_uint16le(&rqp->rq, oldtype);
 	/* source Handle Path */
 	mb_put_uint8(&rqp->rq, volume);
-	mb_put_mem(&rqp->rq, (c_caddr_t)&fdir, sizeof(fdir), MB_MSYSTEM);
+	mb_put_mem(&rqp->rq, (c_caddr_t)&fdir, sizeof(fdir), MBC_MSYSTEM);
 	mb_put_uint8(&rqp->rq, 1);
 	mb_put_uint8(&rqp->rq, 1);	/* 1 source component */
 	/* dest Handle Path */
 	mb_put_uint8(&rqp->rq, volume);
-	mb_put_mem(&rqp->rq, (c_caddr_t)&tdir, sizeof(tdir), MB_MSYSTEM);
+	mb_put_mem(&rqp->rq, (c_caddr_t)&tdir, sizeof(tdir), MBC_MSYSTEM);
 	mb_put_uint8(&rqp->rq, 1);
 	mb_put_uint8(&rqp->rq, 1);	/* 1 destination component */
 	ncp_rq_pathstring(rqp, oldlen, old_name, nt);
@@ -363,7 +363,7 @@
 	mb_put_uint8(&rqp->rq, 0);	/* reserved */
 	mb_put_uint16le(&rqp->rq, SA_ALL);	/* search attribs: all */
 	mb_put_uint32le(&rqp->rq, info_mask);
-	mb_put_mem(&rqp->rq, (caddr_t)info, sizeof(*info), MB_MSYSTEM);
+	mb_put_mem(&rqp->rq, (caddr_t)info, sizeof(*info), MBC_MSYSTEM);
 	ncp_rq_dbase_path(rqp, volnum, dirent, 0, NULL, NULL);
 	error = ncp_request(rqp);
 	if (!error)
@@ -397,7 +397,7 @@
 			return error;
 		}
 		mb_put_uint8(&rqp->rq, 0);
-		mb_put_mem(&rqp->rq, (caddr_t)&nwn.fh, 6, MB_MSYSTEM);
+		mb_put_mem(&rqp->rq, (caddr_t)&nwn.fh, 6, MBC_MSYSTEM);
 		mb_put_uint32be(&rqp->rq, vap->va_size);
 		mb_put_uint16be(&rqp->rq, 0);
 		error = ncp_request(rqp);
@@ -455,7 +455,7 @@
 	if (len > NCP_VOLNAME_LEN) {
 		error = ENAMETOOLONG;
 	} else {
-		md_get_mem(&rqp->rp, (caddr_t)&target->volume_name, len, MB_MSYSTEM);
+		md_get_mem(&rqp->rp, (caddr_t)&target->volume_name, len, MBC_MSYSTEM);
 	}
 	ncp_rq_done(rqp);
 	return error;
Index: fs/smbfs/smbfs_smb.c
===================================================================
RCS file: /home/ncvs/src/sys/fs/smbfs/smbfs_smb.c,v
retrieving revision 1.10
diff -u -r1.10 smbfs_smb.c
--- fs/smbfs/smbfs_smb.c	19 Feb 2003 05:47:19 -0000	1.10
+++ fs/smbfs/smbfs_smb.c	21 Feb 2003 12:09:36 -0000
@@ -107,7 +107,7 @@
 	mb_put_uint8(mbp, 0xff);	/* secondary command */
 	mb_put_uint8(mbp, 0);		/* MBZ */
 	mb_put_uint16le(mbp, 0);
-	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MBC_MSYSTEM);
 	mb_put_uint8(mbp, ltype);	/* locktype */
 	mb_put_uint8(mbp, 0);		/* oplocklevel - 0 seems is NO_OPLOCK */
 	mb_put_uint32le(mbp, 0);	/* timeout - break immediately */
@@ -340,7 +340,7 @@
 		return error;
 	mbp = &t2p->t2_tparam;
 	mb_init(mbp);
-	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MBC_MSYSTEM);
 	mb_put_uint16le(mbp, SMB_SET_FILE_END_OF_FILE_INFO);
 	mb_put_uint32le(mbp, 0);
 	mbp = &t2p->t2_tdata;
@@ -370,7 +370,7 @@
 		return (error);
 	smb_rq_getrequest(rqp, &mbp);
 	smb_rq_wstart(rqp);
-	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MBC_MSYSTEM);
 	smb_rq_wend(rqp);
 	smb_rq_bstart(rqp);
 	smb_rq_bend(rqp);
@@ -407,7 +407,7 @@
 		return error;
 	smb_rq_getrequest(rqp, &mbp);
 	smb_rq_wstart(rqp);
-	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MBC_MSYSTEM);
 	mb_put_uint16le(mbp, 0);
 	mb_put_uint32le(mbp, newsize);
 	mb_put_uint16le(mbp, 0);
@@ -499,7 +499,7 @@
 	} else
 		time = 0;
 	mb_put_uint32le(mbp, time);		/* mtime */
-	mb_put_mem(mbp, NULL, 5 * 2, MB_MZERO);
+	mb_put_mem(mbp, NULL, 5 * 2, MBC_MZERO);
 	smb_rq_wend(rqp);
 	smb_rq_bstart(rqp);
 	mb_put_uint8(mbp, SMB_DT_ASCII);
@@ -644,7 +644,7 @@
 	tzoff = SSTOVC(ssp)->vc_sopt.sv_tz;
 	smb_rq_getrequest(rqp, &mbp);
 	smb_rq_wstart(rqp);
-	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MBC_MSYSTEM);
 	mb_put_uint32le(mbp, 0);		/* creation time */
 
 	if (atime)
@@ -689,7 +689,7 @@
 	svtz = SSTOVC(ssp)->vc_sopt.sv_tz;
 	mbp = &t2p->t2_tparam;
 	mb_init(mbp);
-	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MBC_MSYSTEM);
 	mb_put_uint16le(mbp, SMB_SET_FILE_BASIC_INFO);
 	mb_put_uint32le(mbp, 0);
 	mbp = &t2p->t2_tdata;
@@ -783,7 +783,7 @@
 		return error;
 	smb_rq_getrequest(rqp, &mbp);
 	smb_rq_wstart(rqp);
-	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MBC_MSYSTEM);
 	if (mtime) {
 		smb_time_local2server(mtime, SSTOVC(ssp)->vc_sopt.sv_tz, &time);
 	} else
@@ -1026,7 +1026,7 @@
 		mb_put_uint8(mbp, 0);	/* file name length */
 		mb_put_uint8(mbp, SMB_DT_VARIABLE);
 		mb_put_uint16le(mbp, SMB_SKEYLEN);
-		mb_put_mem(mbp, ctx->f_skey, SMB_SKEYLEN, MB_MSYSTEM);
+		mb_put_mem(mbp, ctx->f_skey, SMB_SKEYLEN, MBC_MSYSTEM);
 	}
 	smb_rq_bend(rqp);
 	error = smb_rq_simple(rqp);
@@ -1101,13 +1101,13 @@
 	}
 	rqp = ctx->f_rq;
 	smb_rq_getreply(rqp, &mbp);
-	md_get_mem(mbp, ctx->f_skey, SMB_SKEYLEN, MB_MSYSTEM);
+	md_get_mem(mbp, ctx->f_skey, SMB_SKEYLEN, MBC_MSYSTEM);
 	md_get_uint8(mbp, &battr);
 	md_get_uint16le(mbp, &time);
 	md_get_uint16le(mbp, &date);
 	md_get_uint32le(mbp, &size);
 	cp = ctx->f_name;
-	md_get_mem(mbp, cp, sizeof(ctx->f_fname), MB_MSYSTEM);
+	md_get_mem(mbp, cp, sizeof(ctx->f_fname), MBC_MSYSTEM);
 	cp[sizeof(ctx->f_fname) - 1] = 0;
 	cp += strlen(cp) - 1;
 	while (*cp == ' ' && cp >= ctx->f_name)
@@ -1177,13 +1177,13 @@
 		ctx->f_t2 = t2p;
 		mbp = &t2p->t2_tparam;
 		mb_init(mbp);
-		mb_put_mem(mbp, (caddr_t)&ctx->f_Sid, 2, MB_MSYSTEM);
+		mb_put_mem(mbp, (caddr_t)&ctx->f_Sid, 2, MBC_MSYSTEM);
 		mb_put_uint16le(mbp, ctx->f_limit);
 		mb_put_uint16le(mbp, ctx->f_infolevel);
 		mb_put_uint32le(mbp, 0);		/* resume key */
 		mb_put_uint16le(mbp, flags);
 		if (ctx->f_rname)
-			mb_put_mem(mbp, ctx->f_rname, strlen(ctx->f_rname) + 1, MB_MSYSTEM);
+			mb_put_mem(mbp, ctx->f_rname, strlen(ctx->f_rname) + 1, MBC_MSYSTEM);
 		else
 			mb_put_uint8(mbp, 0);	/* resume file name */
 #if 0
@@ -1251,7 +1251,7 @@
 		return error;
 	smb_rq_getrequest(rqp, &mbp);
 	smb_rq_wstart(rqp);
-	mb_put_mem(mbp, (caddr_t)&ctx->f_Sid, 2, MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&ctx->f_Sid, 2, MBC_MSYSTEM);
 	smb_rq_wend(rqp);
 	smb_rq_bstart(rqp);
 	smb_rq_bend(rqp);
@@ -1345,13 +1345,13 @@
 	}
 	nmlen = min(size, SMB_MAXFNAMELEN);
 	cp = ctx->f_name;
-	error = md_get_mem(mbp, cp, nmlen, MB_MSYSTEM);
+	error = md_get_mem(mbp, cp, nmlen, MBC_MSYSTEM);
 	if (error)
 		return error;
 	if (next) {
 		cnt = next - nmlen - fxsz;
 		if (cnt > 0)
-			md_get_mem(mbp, NULL, cnt, MB_MSYSTEM);
+			md_get_mem(mbp, NULL, cnt, MBC_MSYSTEM);
 		else if (cnt < 0) {
 			SMBERROR("out of sync\n");
 			return EBADRPC;
Index: kern/subr_mchain.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/subr_mchain.c,v
retrieving revision 1.14
diff -u -r1.14 subr_mchain.c
--- kern/subr_mchain.c	19 Feb 2003 10:12:42 -0000	1.14
+++ kern/subr_mchain.c	21 Feb 2003 12:11:52 -0000
@@ -133,49 +133,49 @@
 int
 mb_put_uint8(struct mbchain *mbp, u_int8_t x)
 {
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MBC_MSYSTEM);
 }
 
 int
 mb_put_uint16be(struct mbchain *mbp, u_int16_t x)
 {
 	x = htobe16(x);
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MBC_MSYSTEM);
 }
 
 int
 mb_put_uint16le(struct mbchain *mbp, u_int16_t x)
 {
 	x = htole16(x);
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MBC_MSYSTEM);
 }
 
 int
 mb_put_uint32be(struct mbchain *mbp, u_int32_t x)
 {
 	x = htobe32(x);
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MBC_MSYSTEM);
 }
 
 int
 mb_put_uint32le(struct mbchain *mbp, u_int32_t x)
 {
 	x = htole32(x);
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MBC_MSYSTEM);
 }
 
 int
 mb_put_int64be(struct mbchain *mbp, int64_t x)
 {
 	x = htobe64(x);
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MBC_MSYSTEM);
 }
 
 int
 mb_put_int64le(struct mbchain *mbp, int64_t x)
 {
 	x = htole64(x);
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MBC_MSYSTEM);
 }
 
 int
@@ -203,24 +203,24 @@
 		cplen = mleft > size ? size : mleft;
 		dst = mtod(m, caddr_t) + m->m_len;
 		switch (type) {
-		    case MB_MCUSTOM:
+		    case MBC_MCUSTOM:
 			error = mbp->mb_copy(mbp, source, dst, cplen);
 			if (error)
 				return error;
 			break;
-		    case MB_MINLINE:
+		    case MBC_MINLINE:
 			for (src = source, count = cplen; count; count--)
 				*dst++ = *src++;
 			break;
-		    case MB_MSYSTEM:
+		    case MBC_MSYSTEM:
 			bcopy(source, dst, cplen);
 			break;
-		    case MB_MUSER:
+		    case MBC_MUSER:
 			error = copyin(source, dst, cplen);
 			if (error)
 				return error;
 			break;
-		    case MB_MZERO:
+		    case MBC_MZERO:
 			bzero(dst, cplen);
 			break;
 		}
@@ -259,7 +259,7 @@
 	long left;
 	int mtype, error;
 
-	mtype = (uiop->uio_segflg == UIO_SYSSPACE) ? MB_MSYSTEM : MB_MUSER;
+	mtype = (uiop->uio_segflg == UIO_SYSSPACE) ? MBC_MSYSTEM : MBC_MUSER;
 
 	while (size > 0 && uiop->uio_resid) {
 		if (uiop->uio_iovcnt <= 0 || uiop->uio_iov == NULL)
@@ -360,13 +360,13 @@
 int
 md_get_uint8(struct mdchain *mdp, u_int8_t *x)
 {
-	return md_get_mem(mdp, x, 1, MB_MINLINE);
+	return md_get_mem(mdp, x, 1, MBC_MINLINE);
 }
 
 int
 md_get_uint16(struct mdchain *mdp, u_int16_t *x)
 {
-	return md_get_mem(mdp, (caddr_t)x, 2, MB_MINLINE);
+	return md_get_mem(mdp, (caddr_t)x, 2, MBC_MINLINE);
 }
 
 int
@@ -393,7 +393,7 @@
 int
 md_get_uint32(struct mdchain *mdp, u_int32_t *x)
 {
-	return md_get_mem(mdp, (caddr_t)x, 4, MB_MINLINE);
+	return md_get_mem(mdp, (caddr_t)x, 4, MBC_MINLINE);
 }
 
 int
@@ -423,7 +423,7 @@
 int
 md_get_int64(struct mdchain *mdp, int64_t *x)
 {
-	return md_get_mem(mdp, (caddr_t)x, 8, MB_MINLINE);
+	return md_get_mem(mdp, (caddr_t)x, 8, MBC_MINLINE);
 }
 
 int
@@ -478,15 +478,15 @@
 		if (target == NULL)
 			continue;
 		switch (type) {
-		    case MB_MUSER:
+		    case MBC_MUSER:
 			error = copyout(s, target, count);
 			if (error)
 				return error;
 			break;
-		    case MB_MSYSTEM:
+		    case MBC_MSYSTEM:
 			bcopy(s, target, count);
 			break;
-		    case MB_MINLINE:
+		    case MBC_MINLINE:
 			while (count--)
 				*target++ = *s++;
 			continue;
@@ -504,7 +504,7 @@
 	rm = m_copym(m, mdp->md_pos - mtod(m, u_char*), size, M_TRYWAIT);
 	if (rm == NULL)
 		return EBADRPC;
-	md_get_mem(mdp, NULL, size, MB_MZERO);
+	md_get_mem(mdp, NULL, size, MBC_MZERO);
 	*ret = rm;
 	return 0;
 }
@@ -516,7 +516,7 @@
 	long left;
 	int mtype, error;
 
-	mtype = (uiop->uio_segflg == UIO_SYSSPACE) ? MB_MSYSTEM : MB_MUSER;
+	mtype = (uiop->uio_segflg == UIO_SYSSPACE) ? MBC_MSYSTEM : MBC_MUSER;
 	while (size > 0 && uiop->uio_resid) {
 		if (uiop->uio_iovcnt <= 0 || uiop->uio_iov == NULL)
 			return EFBIG;
Index: netncp/ncp_mod.c
===================================================================
RCS file: /home/ncvs/src/sys/netncp/ncp_mod.c,v
retrieving revision 1.5
diff -u -r1.5 ncp_mod.c
--- netncp/ncp_mod.c	22 Mar 2001 10:38:16 -0000	1.5
+++ netncp/ncp_mod.c	21 Feb 2003 12:13:24 -0000
@@ -132,7 +132,7 @@
 		return error;
 	if (rqsize) {
 		error = mb_put_mem(&rqp->rq, (caddr_t)uap->ncpbuf->packet,
-		    rqsize, MB_MUSER);
+		    rqsize, MBC_MUSER);
 		if (error)
 			goto bad;
 	}
@@ -140,7 +140,7 @@
 	error = ncp_request(rqp);
 	if (error == 0 && rqp->nr_rpsize)
 		error = md_get_mem(&rqp->rp, (caddr_t)uap->ncpbuf->packet, 
-				rqp->nr_rpsize, MB_MUSER);
+				rqp->nr_rpsize, MBC_MUSER);
 	copyout(&rqp->nr_cs, &uap->ncpbuf->cs, sizeof(rqp->nr_cs));
 	copyout(&rqp->nr_cc, &uap->ncpbuf->cc, sizeof(rqp->nr_cc));
 	copyout(&rqp->nr_rpsize, &uap->ncpbuf->rpsize, sizeof(rqp->nr_rpsize));
@@ -410,7 +410,7 @@
 	if (error)
 		return error;
 	for(fp = nfp->rqf, i = 0; i < nfp->rqfcnt; i++, fp++) {
-		error = mb_put_mem(&rqp->rq, (caddr_t)fp->fragAddress, fp->fragSize, MB_MUSER);
+		error = mb_put_mem(&rqp->rq, (caddr_t)fp->fragAddress, fp->fragSize, MBC_MUSER);
 		if (error)
 			goto bad;
 	}
@@ -425,7 +425,7 @@
 			if (error)
 				break;
 			fsize = min(fsize, rpsize);
-			error = md_get_mem(&rqp->rp, (caddr_t)fp->fragAddress, fsize, MB_MUSER);
+			error = md_get_mem(&rqp->rp, (caddr_t)fp->fragAddress, fsize, MBC_MUSER);
 			if (error)
 				break;
 			rpsize -= fsize;
Index: netncp/ncp_ncp.c
===================================================================
RCS file: /home/ncvs/src/sys/netncp/ncp_ncp.c,v
retrieving revision 1.13
diff -u -r1.13 ncp_ncp.c
--- netncp/ncp_ncp.c	14 Feb 2003 09:16:43 -0000	1.13
+++ netncp/ncp_ncp.c	21 Feb 2003 12:13:24 -0000
@@ -284,7 +284,7 @@
 		return error;
 	md_get_uint32be(&rqp->rp, &target->object_id);
 	md_get_uint16be(&rqp->rp, &target->object_type);
-	md_get_mem(&rqp->rp, (caddr_t)target->object_name, 48, MB_MSYSTEM);
+	md_get_mem(&rqp->rp, (caddr_t)target->object_name, 48, MBC_MSYSTEM);
 	ncp_rq_done(rqp);
 	return 0;
 }
@@ -305,7 +305,7 @@
 	error = ncp_request(rqp);
 	if (error)
 		return error;
-	md_get_mem(&rqp->rp, target, 8, MB_MSYSTEM);
+	md_get_mem(&rqp->rp, target, 8, MBC_MSYSTEM);
 	ncp_rq_done(rqp);
 	return error;
 }
@@ -356,7 +356,7 @@
 	if (error)
 		return error;
 	mbp = &rqp->rq;
-	mb_put_mem(mbp, encrypted, 8, MB_MSYSTEM);
+	mb_put_mem(mbp, encrypted, 8, MBC_MSYSTEM);
 	mb_put_uint16be(mbp, object->object_type);
 	ncp_rq_pstring(rqp, object->object_name);
 	error = ncp_request(rqp);
@@ -414,7 +414,7 @@
 				break;
 			mbp = &rqp->rq;
 			mb_put_uint8(mbp, 0);
-			mb_put_mem(mbp, (caddr_t)file, 6, MB_MSYSTEM);
+			mb_put_mem(mbp, (caddr_t)file, 6, MBC_MSYSTEM);
 			mb_put_uint32be(mbp, uiop->uio_offset);
 			mb_put_uint16be(mbp, len);
 			rqp->nr_minrplen = 2;
@@ -423,7 +423,7 @@
 				break;
 			md_get_uint16be(&rqp->rp, &retlen);
 			if (uiop->uio_offset & 1)
-				md_get_mem(&rqp->rp, NULL, 1, MB_MSYSTEM);
+				md_get_mem(&rqp->rp, NULL, 1, MBC_MSYSTEM);
 			error = md_get_uio(&rqp->rp, uiop, retlen);
 			ncp_rq_done(rqp);
 		} else {
@@ -464,7 +464,7 @@
 			break;
 		mbp = &rqp->rq;
 		mb_put_uint8(mbp, 0);
-		mb_put_mem(mbp, (caddr_t)file, 6, MB_MSYSTEM);
+		mb_put_mem(mbp, (caddr_t)file, 6, MBC_MSYSTEM);
 		mb_put_uint32be(mbp, uiop->uio_offset);
 		mb_put_uint16be(mbp, len);
 		error = mb_put_uio(mbp, uiop, len);
Index: netncp/ncp_rq.c
===================================================================
RCS file: /home/ncvs/src/sys/netncp/ncp_rq.c,v
retrieving revision 1.11
diff -u -r1.11 ncp_rq.c
--- netncp/ncp_rq.c	19 Feb 2003 05:47:37 -0000	1.11
+++ netncp/ncp_rq.c	21 Feb 2003 12:13:24 -0000
@@ -164,7 +164,7 @@
 	mb_put_uint8(mbp, size);
 	mbp->mb_copy = ncp_rq_pathstrhelp;
 	mbp->mb_udata = nt;
-	return mb_put_mem(mbp, (c_caddr_t)name, size, MB_MCUSTOM);
+	return mb_put_mem(mbp, (c_caddr_t)name, size, MBC_MCUSTOM);
 }
 
 int 
@@ -178,7 +178,7 @@
 	error = mb_put_uint8(&rqp->rq, len);
 	if (error)
 		return error;
-	return mb_put_mem(&rqp->rq, s, len, MB_MSYSTEM);
+	return mb_put_mem(&rqp->rq, s, len, MBC_MSYSTEM);
 }
 
 int 
@@ -189,7 +189,7 @@
 	int complen;
 
 	mb_put_uint8(mbp, vol_num);
-	mb_put_mem(mbp, (c_caddr_t)&dir_base, sizeof(dir_base), MB_MSYSTEM);
+	mb_put_mem(mbp, (c_caddr_t)&dir_base, sizeof(dir_base), MBC_MSYSTEM);
 	mb_put_uint8(mbp, 1);	/* with dirbase */
 	if (path != NULL && path[0]) {
 		if (namelen < 0) {
@@ -198,7 +198,7 @@
 			for(; namelen; namelen--) {
 				complen = *path++;
 				mb_put_uint8(mbp, complen);
-				mb_put_mem(mbp, path, complen, MB_MSYSTEM);
+				mb_put_mem(mbp, path, complen, MBC_MSYSTEM);
 				path += complen;
 			}
 		} else {
@@ -228,7 +228,7 @@
 	m_copydata(rqp->rq.mb_top, sizeof(struct ncp_rqhdr) - 1,
 		min((*size) - sizeof(struct ncp_rqhdr)+1, 52), data + 12);
 	ncp_sign(conn->sign_state, data, conn->sign_state);
-	error = mb_put_mem(&rqp->rq, (caddr_t)conn->sign_state, 8, MB_MSYSTEM);
+	error = mb_put_mem(&rqp->rq, (caddr_t)conn->sign_state, 8, MBC_MSYSTEM);
 	if (error)
 		return error;
 	(*size) += 8;
@@ -405,7 +405,7 @@
 		ncp_conn_invalidate(conn);
 		error = ECONNRESET;
 	}
-	md_get_mem(&rqp->rp, NULL, sizeof(*rp), MB_MSYSTEM);
+	md_get_mem(&rqp->rp, NULL, sizeof(*rp), MBC_MSYSTEM);
 	return error;
 }
 
Index: netsmb/smb_rq.c
===================================================================
RCS file: /home/ncvs/src/sys/netsmb/smb_rq.c,v
retrieving revision 1.11
diff -u -r1.11 smb_rq.c
--- netsmb/smb_rq.c	19 Feb 2003 05:47:38 -0000	1.11
+++ netsmb/smb_rq.c	21 Feb 2003 12:14:16 -0000
@@ -119,7 +119,7 @@
 	error = mb_init(mbp);
 	if (error)
 		return error;
-	mb_put_mem(mbp, SMB_SIGNATURE, SMB_SIGLEN, MB_MSYSTEM);
+	mb_put_mem(mbp, SMB_SIGNATURE, SMB_SIGLEN, MBC_MSYSTEM);
 	mb_put_uint8(mbp, cmd);
 	mb_put_uint32le(mbp, 0);		/* DosError */
 	mb_put_uint8(mbp, vcp->vc_hflags);
@@ -127,7 +127,7 @@
 		mb_put_uint16le(mbp, (vcp->vc_hflags2 & ~SMB_FLAGS2_UNICODE));
 	else
 		mb_put_uint16le(mbp, vcp->vc_hflags2);
-	mb_put_mem(mbp, tzero, 12, MB_MSYSTEM);
+	mb_put_mem(mbp, tzero, 12, MBC_MSYSTEM);
 	rqp->sr_rqtid = (u_int16_t*)mb_reserve(mbp, sizeof(u_int16_t));
 	mb_put_uint16le(mbp, 1 /*scred->sc_p->p_pid & 0xffff*/);
 	rqp->sr_rquid = (u_int16_t*)mb_reserve(mbp, sizeof(u_int16_t));
@@ -620,11 +620,11 @@
 	smb_rq_bstart(rqp);
 	/* TDUNICODE */
 	if (t2p->t_name)
-		mb_put_mem(mbp, t2p->t_name, nmlen, MB_MSYSTEM);
+		mb_put_mem(mbp, t2p->t_name, nmlen, MBC_MSYSTEM);
 	mb_put_uint8(mbp, 0);	/* terminating zero */
 	len = mb_fixhdr(mbp);
 	if (txpcount) {
-		mb_put_mem(mbp, NULL, ALIGN4(len) - len, MB_MZERO);
+		mb_put_mem(mbp, NULL, ALIGN4(len) - len, MBC_MZERO);
 		error = md_get_mbuf(&mbparam, txpcount, &m);
 		SMBSDEBUG("%d:%d:%d\n", error, txpcount, txmax);
 		if (error)
@@ -633,7 +633,7 @@
 	}
 	len = mb_fixhdr(mbp);
 	if (txdcount) {
-		mb_put_mem(mbp, NULL, ALIGN4(len) - len, MB_MZERO);
+		mb_put_mem(mbp, NULL, ALIGN4(len) - len, MBC_MZERO);
 		error = md_get_mbuf(&mbdata, txdcount, &m);
 		if (error)
 			goto freerq;
@@ -693,7 +693,7 @@
 		mb_put_uint8(mbp, 0);	/* name */
 		len = mb_fixhdr(mbp);
 		if (txpcount) {
-			mb_put_mem(mbp, NULL, ALIGN4(len) - len, MB_MZERO);
+			mb_put_mem(mbp, NULL, ALIGN4(len) - len, MBC_MZERO);
 			error = md_get_mbuf(&mbparam, txpcount, &m);
 			if (error)
 				goto bad;
@@ -701,7 +701,7 @@
 		}
 		len = mb_fixhdr(mbp);
 		if (txdcount) {
-			mb_put_mem(mbp, NULL, ALIGN4(len) - len, MB_MZERO);
+			mb_put_mem(mbp, NULL, ALIGN4(len) - len, MBC_MZERO);
 			error = md_get_mbuf(&mbdata, txdcount, &m);
 			if (error)
 				goto bad;
Index: netsmb/smb_rq.h
===================================================================
RCS file: /home/ncvs/src/sys/netsmb/smb_rq.h,v
retrieving revision 1.2
diff -u -r1.2 smb_rq.h
--- netsmb/smb_rq.h	31 Dec 2001 19:29:43 -0000	1.2
+++ netsmb/smb_rq.h	21 Feb 2003 12:14:16 -0000
@@ -34,7 +34,7 @@
 #ifndef _NETSMB_SMB_RQ_H_
 #define	_NETSMB_SMB_RQ_H_
 
-#ifndef MB_MSYSTEM
+#ifndef MBC_MSYSTEM
 #include <sys/mchain.h>
 #endif
 
Index: netsmb/smb_smb.c
===================================================================
RCS file: /home/ncvs/src/sys/netsmb/smb_smb.c,v
retrieving revision 1.10
diff -u -r1.10 smb_smb.c
--- netsmb/smb_smb.c	19 Feb 2003 05:47:38 -0000	1.10
+++ netsmb/smb_smb.c	21 Feb 2003 12:14:16 -0000
@@ -168,7 +168,7 @@
 			md_get_uint32le(mdp, &sp->sv_maxraw);
 			md_get_uint32le(mdp, &sp->sv_skey);
 			md_get_uint32le(mdp, &sp->sv_caps);
-			md_get_mem(mdp, stime, 8, MB_MSYSTEM);
+			md_get_mem(mdp, stime, 8, MBC_MSYSTEM);
 			md_get_uint16le(mdp, (u_int16_t*)&sp->sv_tz);
 			md_get_uint8(mdp, &sblen);
 			if (sblen && (sp->sv_sm & SMB_SM_ENCRYPT)) {
@@ -180,8 +180,8 @@
 				if (error)
 					break;
 				if (sp->sv_caps & SMB_CAP_EXT_SECURITY)
-					md_get_mem(mdp, NULL, 16, MB_MSYSTEM);
-				error = md_get_mem(mdp, vcp->vc_ch, sblen, MB_MSYSTEM);
+					md_get_mem(mdp, NULL, 16, MBC_MSYSTEM);
+				error = md_get_mem(mdp, vcp->vc_ch, sblen, MBC_MSYSTEM);
 				if (error)
 					break;
 				vcp->vc_chlen = sblen;
@@ -216,7 +216,7 @@
 				if (bc < swlen)
 					break;
 				if (swlen && (sp->sv_sm & SMB_SM_ENCRYPT)) {
-					error = md_get_mem(mdp, vcp->vc_ch, swlen, MB_MSYSTEM);
+					error = md_get_mem(mdp, vcp->vc_ch, swlen, MBC_MSYSTEM);
 					if (error)
 						break;
 					vcp->vc_chlen = swlen;
@@ -363,7 +363,7 @@
 		mb_put_uint32le(mbp, 0);
 		smb_rq_wend(rqp);
 		smb_rq_bstart(rqp);
-		mb_put_mem(mbp, pp, plen, MB_MSYSTEM);
+		mb_put_mem(mbp, pp, plen, MBC_MSYSTEM);
 		smb_put_dstring(mbp, vcp, up, SMB_CS_NONE);
 	} else {
 		mb_put_uint16le(mbp, uniplen);
@@ -372,8 +372,8 @@
 				     SMB_CAP_UNICODE : 0);
 		smb_rq_wend(rqp);
 		smb_rq_bstart(rqp);
-		mb_put_mem(mbp, pp, plen, MB_MSYSTEM);
-		mb_put_mem(mbp, (caddr_t)unipp, uniplen, MB_MSYSTEM);
+		mb_put_mem(mbp, pp, plen, MBC_MSYSTEM);
+		mb_put_mem(mbp, (caddr_t)unipp, uniplen, MBC_MSYSTEM);
 		smb_put_dstring(mbp, vcp, up, SMB_CS_NONE);		/* AccountName */
 		smb_put_dstring(mbp, vcp, vcp->vc_domain, SMB_CS_NONE);	/* PrimaryDomain */
 		smb_put_dstring(mbp, vcp, "FreeBSD", SMB_CS_NONE);	/* Client's OS */
@@ -534,7 +534,7 @@
 	mb_put_uint16le(mbp, plen);
 	smb_rq_wend(rqp);
 	smb_rq_bstart(rqp);
-	mb_put_mem(mbp, pp, plen, MB_MSYSTEM);
+	mb_put_mem(mbp, pp, plen, MBC_MSYSTEM);
 	smb_put_dmem(mbp, vcp, "\\\\", 2, caseopt);
 	pp = vcp->vc_srvname;
 	smb_put_dmem(mbp, vcp, pp, strlen(pp), caseopt);
@@ -606,7 +606,7 @@
 	mb_put_uint8(mbp, 0xff);	/* no secondary command */
 	mb_put_uint8(mbp, 0);		/* MBZ */
 	mb_put_uint16le(mbp, 0);	/* offset to secondary */
-	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MBC_MSYSTEM);
 	mb_put_uint32le(mbp, uio->uio_offset);
 	*len = min(SSTOVC(ssp)->vc_rxmax, *len);
 	mb_put_uint16le(mbp, *len);	/* MaxCount */
@@ -648,12 +648,12 @@
 		md_get_uint16le(mdp, &residhi);
 		off += 2;
 		resid = (residhi << 16) | residlo;
-		md_get_mem(mdp, NULL, 4 * 2, MB_MSYSTEM);
+		md_get_mem(mdp, NULL, 4 * 2, MBC_MSYSTEM);
 		off += 4*2;
 		md_get_uint16le(mdp, NULL);	/* ByteCount */
 		off += 2;
 		if (doff > off)	/* pad byte(s)? */
-			md_get_mem(mdp, NULL, doff - off, MB_MSYSTEM);
+			md_get_mem(mdp, NULL, doff - off, MBC_MSYSTEM);
 		if (resid == 0) {
 			*rresid = resid;
 			break;
@@ -686,7 +686,7 @@
 	mb_put_uint8(mbp, 0xff);	/* no secondary command */
 	mb_put_uint8(mbp, 0);		/* MBZ */
 	mb_put_uint16le(mbp, 0);	/* offset to secondary */
-	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MBC_MSYSTEM);
 	mb_put_uint32le(mbp, uio->uio_offset);
 	mb_put_uint32le(mbp, 0);	/* MBZ (timeout) */
 	mb_put_uint16le(mbp, 0);	/* !write-thru */
@@ -747,7 +747,7 @@
 
 	smb_rq_getrequest(rqp, &mbp);
 	smb_rq_wstart(rqp);
-	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MBC_MSYSTEM);
 	mb_put_uint16le(mbp, rlen);
 	mb_put_uint32le(mbp, uio->uio_offset);
 	mb_put_uint16le(mbp, min(uio->uio_resid, 0xffff));
@@ -765,7 +765,7 @@
 			break;
 		}
 		md_get_uint16le(mdp, &resid);
-		md_get_mem(mdp, NULL, 4 * 2, MB_MSYSTEM);
+		md_get_mem(mdp, NULL, 4 * 2, MBC_MSYSTEM);
 		md_get_uint16le(mdp, &bc);
 		md_get_uint8(mdp, NULL);		/* ignore buffer type */
 		md_get_uint16le(mdp, &resid);
@@ -827,7 +827,7 @@
 		return error;
 	smb_rq_getrequest(rqp, &mbp);
 	smb_rq_wstart(rqp);
-	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MBC_MSYSTEM);
 	mb_put_uint16le(mbp, resid);
 	mb_put_uint32le(mbp, uio->uio_offset);
 	mb_put_uint16le(mbp, min(uio->uio_resid, 0xffff));
Index: netsmb/smb_subr.c
===================================================================
RCS file: /home/ncvs/src/sys/netsmb/smb_subr.c,v
retrieving revision 1.14
diff -u -r1.14 smb_subr.c
--- netsmb/smb_subr.c	19 Feb 2003 05:47:38 -0000	1.14
+++ netsmb/smb_subr.c	21 Feb 2003 12:14:16 -0000
@@ -327,11 +327,11 @@
 	if (size == 0)
 		return 0;
 	if (dp == NULL) {
-		return mb_put_mem(mbp, src, size, MB_MSYSTEM);
+		return mb_put_mem(mbp, src, size, MBC_MSYSTEM);
 	}
 	mbp->mb_copy = smb_copy_iconv;
 	mbp->mb_udata = dp;
-	return mb_put_mem(mbp, src, size, MB_MCUSTOM);
+	return mb_put_mem(mbp, src, size, MBC_MCUSTOM);
 }
 
 int
Index: netsmb/smb_trantcp.c
===================================================================
RCS file: /home/ncvs/src/sys/netsmb/smb_trantcp.c,v
retrieving revision 1.17
diff -u -r1.17 smb_trantcp.c
--- netsmb/smb_trantcp.c	19 Feb 2003 05:47:38 -0000	1.17
+++ netsmb/smb_trantcp.c	21 Feb 2003 12:14:16 -0000
@@ -213,7 +213,7 @@
 	NBDEBUG("[%s]\n", cp);
 	for (;;) {
 		seglen = (*cp) + 1;
-		error = mb_put_mem(mbp, cp, seglen, MB_MSYSTEM);
+		error = mb_put_mem(mbp, cp, seglen, MBC_MSYSTEM);
 		if (error)
 			return error;
 		if (seglen == 1)
@@ -332,7 +332,7 @@
 			error = ECONNABORTED;
 			break;
 		}
-		md_get_mem(mdp, (caddr_t)&sin.sin_addr, 4, MB_MSYSTEM);
+		md_get_mem(mdp, (caddr_t)&sin.sin_addr, 4, MBC_MSYSTEM);
 		md_get_uint16(mdp, &port);
 		sin.sin_port = port;
 		nbp->nbp_state = NBST_RETARGET;
Index: netsmb/smb_usr.c
===================================================================
RCS file: /home/ncvs/src/sys/netsmb/smb_usr.c,v
retrieving revision 1.3
diff -u -r1.3 smb_usr.c
--- netsmb/smb_usr.c	18 Sep 2002 14:21:52 -0000	1.3
+++ netsmb/smb_usr.c	21 Feb 2003 12:14:16 -0000
@@ -240,12 +240,12 @@
 		return error;
 	mbp = &rqp->sr_rq;
 	smb_rq_wstart(rqp);
-	error = mb_put_mem(mbp, dp->ioc_twords, dp->ioc_twc * 2, MB_MUSER);
+	error = mb_put_mem(mbp, dp->ioc_twords, dp->ioc_twc * 2, MBC_MUSER);
 	if (error)
 		goto bad;
 	smb_rq_wend(rqp);
 	smb_rq_bstart(rqp);
-	error = mb_put_mem(mbp, dp->ioc_tbytes, dp->ioc_tbc, MB_MUSER);
+	error = mb_put_mem(mbp, dp->ioc_tbytes, dp->ioc_tbc, MBC_MUSER);
 	if (error)
 		goto bad;
 	smb_rq_bend(rqp);
@@ -260,7 +260,7 @@
 		error = EBADRPC;
 		goto bad;
 	}
-	error = md_get_mem(mdp, dp->ioc_rpbuf, wc, MB_MUSER);
+	error = md_get_mem(mdp, dp->ioc_rpbuf, wc, MBC_MUSER);
 	if (error)
 		goto bad;
 	md_get_uint16le(mdp, &bc);
@@ -269,7 +269,7 @@
 		goto bad;
 	}
 	dp->ioc_rbc = bc;
-	error = md_get_mem(mdp, dp->ioc_rpbuf + wc, bc, MB_MUSER);
+	error = md_get_mem(mdp, dp->ioc_rpbuf + wc, bc, MBC_MUSER);
 bad:
 	dp->ioc_errclass = rqp->sr_errclass;
 	dp->ioc_serror = rqp->sr_serror;
@@ -289,7 +289,7 @@
 	error = mb_init(mbp);
 	if (error)
 		return error;
-	return mb_put_mem(mbp, data, len, MB_MUSER);
+	return mb_put_mem(mbp, data, len, MBC_MUSER);
 }
 
 int
@@ -336,7 +336,7 @@
 			goto bad;
 		}
 		dp->ioc_rparamcnt = len;
-		error = md_get_mem(mdp, dp->ioc_rparam, len, MB_MUSER);
+		error = md_get_mem(mdp, dp->ioc_rparam, len, MBC_MUSER);
 		if (error)
 			goto bad;
 	} else
@@ -349,7 +349,7 @@
 			goto bad;
 		}
 		dp->ioc_rdatacnt = len;
-		error = md_get_mem(mdp, dp->ioc_rdata, len, MB_MUSER);
+		error = md_get_mem(mdp, dp->ioc_rdata, len, MBC_MUSER);
 	} else
 		dp->ioc_rdatacnt = 0;
 bad:
Index: sys/mchain.h
===================================================================
RCS file: /home/ncvs/src/sys/sys/mchain.h,v
retrieving revision 1.6
diff -u -r1.6 mchain.h
--- sys/mchain.h	16 Dec 2002 16:20:06 -0000	1.6
+++ sys/mchain.h	21 Feb 2003 12:17:49 -0000
@@ -87,11 +87,11 @@
 /*
  * Type of copy for mb_{put|get}_mem()
  */
-#define	MB_MSYSTEM	0		/* use bcopy() */
-#define MB_MUSER	1		/* use copyin()/copyout() */
-#define MB_MINLINE	2		/* use an inline copy loop */
-#define	MB_MZERO	3		/* bzero(), mb_put_mem only */
-#define	MB_MCUSTOM	4		/* use an user defined function */
+#define	MBC_MSYSTEM	0		/* use bcopy() */
+#define	MBC_MUSER	1		/* use copyin()/copyout() */
+#define	MBC_MINLINE	2		/* use an inline copy loop */
+#define	MBC_MZERO	3		/* bzero(), mb_put_mem only */
+#define	MBC_MCUSTOM	4		/* use an user defined function */
 
 struct mbuf;
 struct mbchain;