svn commit: r360056 - in projects/nfs-over-tls/sys/fs: nfs nfsserver
Rick Macklem
rmacklem at FreeBSD.org
Fri Apr 17 21:33:47 UTC 2020
Author: rmacklem
Date: Fri Apr 17 21:33:45 2020
New Revision: 360056
URL: https://svnweb.freebsd.org/changeset/base/360056
Log:
Replace all occurrences of mbuf_t with "struct mbuf *".
This brings the code in line with head to make merges from head easier.
Modified:
projects/nfs-over-tls/sys/fs/nfs/nfs.h
projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c
projects/nfs-over-tls/sys/fs/nfs/nfs_var.h
projects/nfs-over-tls/sys/fs/nfs/nfsrvcache.h
projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdcache.c
projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdserv.c
projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdstate.c
Modified: projects/nfs-over-tls/sys/fs/nfs/nfs.h
==============================================================================
--- projects/nfs-over-tls/sys/fs/nfs/nfs.h Fri Apr 17 21:17:51 2020 (r360055)
+++ projects/nfs-over-tls/sys/fs/nfs/nfs.h Fri Apr 17 21:33:45 2020 (r360056)
@@ -638,10 +638,10 @@ struct nfsgss_mechlist {
* This structure is used by the server for describing each request.
*/
struct nfsrv_descript {
- mbuf_t nd_mrep; /* Request mbuf list */
- mbuf_t nd_md; /* Current dissect mbuf */
- mbuf_t nd_mreq; /* Reply mbuf list */
- mbuf_t nd_mb; /* Current build mbuf */
+ struct mbuf *nd_mrep; /* Request mbuf list */
+ struct mbuf *nd_md; /* Current dissect mbuf */
+ struct mbuf *nd_mreq; /* Reply mbuf list */
+ struct mbuf *nd_mb; /* Current build mbuf */
NFSSOCKADDR_T nd_nam; /* and socket addr */
NFSSOCKADDR_T nd_nam2; /* return socket addr */
caddr_t nd_dpos; /* Current dissect pos */
Modified: projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c Fri Apr 17 21:17:51 2020 (r360055)
+++ projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c Fri Apr 17 21:33:45 2020 (r360056)
@@ -859,9 +859,9 @@ out:
APPLESTATIC int
nfsm_strtom(struct nfsrv_descript *nd, const char *cp, int siz)
{
- mbuf_t m2;
+ struct mbuf *m2;
int xfer, left;
- mbuf_t m1;
+ struct mbuf *m1;
int rem, bytesize;
u_int32_t *tl;
char *cp2;
@@ -4473,7 +4473,7 @@ nfsrv_refstrbigenough(int siz, u_char **cpp, u_char **
APPLESTATIC void
nfsrvd_rephead(struct nfsrv_descript *nd)
{
- mbuf_t mreq;
+ struct mbuf *mreq;
if ((nd->nd_flag & ND_NOMAP) != 0) {
mreq = mb_alloc_ext_plus_pages(PAGE_SIZE, M_WAITOK, false,
Modified: projects/nfs-over-tls/sys/fs/nfs/nfs_var.h
==============================================================================
--- projects/nfs-over-tls/sys/fs/nfs/nfs_var.h Fri Apr 17 21:17:51 2020 (r360055)
+++ projects/nfs-over-tls/sys/fs/nfs/nfs_var.h Fri Apr 17 21:33:45 2020 (r360056)
@@ -325,7 +325,7 @@ int nfsm_mbufuio(struct nfsrv_descript *, struct uio *
int nfsm_fhtom(struct nfsrv_descript *, u_int8_t *, int, int);
int nfsm_advance(struct nfsrv_descript *, int, int);
void *nfsm_dissct(struct nfsrv_descript *, int, int);
-void nfsm_trimtrailing(struct nfsrv_descript *, mbuf_t,
+void nfsm_trimtrailing(struct nfsrv_descript *, struct mbuf *,
caddr_t, int, int);
void newnfs_copycred(struct nfscred *, struct ucred *);
void newnfs_copyincred(struct ucred *, struct nfscred *);
@@ -682,10 +682,10 @@ int nfsvno_namei(struct nfsrv_descript *, struct namei
vnode_t, int, struct nfsexstuff *, NFSPROC_T *, vnode_t *);
void nfsvno_setpathbuf(struct nameidata *, char **, u_long **);
void nfsvno_relpathbuf(struct nameidata *);
-int nfsvno_readlink(vnode_t, struct ucred *, int, NFSPROC_T *, mbuf_t *,
- mbuf_t *, int *);
+int nfsvno_readlink(vnode_t, struct ucred *, int, NFSPROC_T *, struct mbuf **,
+ struct mbuf **, int *);
int nfsvno_read(vnode_t, off_t, int, struct ucred *, int, NFSPROC_T *,
- mbuf_t *, mbuf_t *);
+ struct mbuf **, struct mbuf **);
int nfsvno_write(vnode_t, off_t, int, int *, struct nfsrv_descript *,
NFSPROC_T *);
int nfsvno_createsub(struct nfsrv_descript *, struct nameidata *,
Modified: projects/nfs-over-tls/sys/fs/nfs/nfsrvcache.h
==============================================================================
--- projects/nfs-over-tls/sys/fs/nfs/nfsrvcache.h Fri Apr 17 21:17:51 2020 (r360055)
+++ projects/nfs-over-tls/sys/fs/nfs/nfsrvcache.h Fri Apr 17 21:33:45 2020 (r360056)
@@ -53,7 +53,7 @@ struct nfsrvcache {
u_int32_t rc_xid; /* rpc id number */
time_t rc_timestamp; /* Time done */
union {
- mbuf_t repmb; /* Reply mbuf list OR */
+ struct mbuf *repmb; /* Reply mbuf list OR */
int repstat; /* Reply status */
} rc_un;
union {
Modified: projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdcache.c
==============================================================================
--- projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdcache.c Fri Apr 17 21:17:51 2020 (r360055)
+++ projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdcache.c Fri Apr 17 21:33:45 2020 (r360056)
@@ -285,7 +285,7 @@ static void nfsrc_lock(struct nfsrvcache *rp);
static void nfsrc_unlock(struct nfsrvcache *rp);
static void nfsrc_wanted(struct nfsrvcache *rp);
static void nfsrc_freecache(struct nfsrvcache *rp);
-static int nfsrc_getlenandcksum(mbuf_t m1, u_int16_t *cksum);
+static int nfsrc_getlenandcksum(struct mbuf *m1, u_int16_t *cksum);
static void nfsrc_marksametcpconn(u_int64_t);
/*
@@ -460,7 +460,7 @@ nfsrvd_updatecache(struct nfsrv_descript *nd)
{
struct nfsrvcache *rp;
struct nfsrvcache *retrp = NULL;
- mbuf_t m;
+ struct mbuf *m;
struct mtx *mutex;
rp = nd->nd_rp;
@@ -1013,10 +1013,10 @@ nfsrvd_derefcache(struct nfsrvcache *rp)
* NFSRVCACHE_CHECKLEN bytes.
*/
static int
-nfsrc_getlenandcksum(mbuf_t m1, u_int16_t *cksum)
+nfsrc_getlenandcksum(struct mbuf *m1, u_int16_t *cksum)
{
int len = 0, cklen;
- mbuf_t m;
+ struct mbuf *m;
m = m1;
while (m) {
Modified: projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdserv.c
==============================================================================
--- projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdserv.c Fri Apr 17 21:17:51 2020 (r360055)
+++ projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdserv.c Fri Apr 17 21:33:45 2020 (r360056)
@@ -662,7 +662,7 @@ nfsrvd_readlink(struct nfsrv_descript *nd, __unused in
vnode_t vp, __unused struct nfsexstuff *exp)
{
u_int32_t *tl;
- mbuf_t mp = NULL, mpend = NULL;
+ struct mbuf *mp = NULL, *mpend = NULL;
int getret = 1, len;
struct nfsvattr nva;
struct thread *p = curthread;
@@ -725,7 +725,7 @@ nfsrvd_read(struct nfsrv_descript *nd, __unused int is
{
u_int32_t *tl;
int error = 0, cnt, getret = 1, gotproxystateid, reqlen, eof = 0;
- mbuf_t m2, m3;
+ struct mbuf *m2, *m3;
struct nfsvattr nva;
off_t off = 0x0;
struct nfsstate st, *stp = &st;
@@ -5547,7 +5547,7 @@ nfsrvd_getxattr(struct nfsrv_descript *nd, __unused in
vnode_t vp, __unused struct nfsexstuff *exp)
{
uint32_t *tl;
- mbuf_t mp = NULL, mpend = NULL;
+ struct mbuf *mp = NULL, *mpend = NULL;
int error, len;
char *name;
struct thread *p = curthread;
Modified: projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdstate.c Fri Apr 17 21:17:51 2020 (r360055)
+++ projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdstate.c Fri Apr 17 21:33:45 2020 (r360056)
@@ -4417,7 +4417,7 @@ nfsrv_docallback(struct nfsclient *clp, int procnum, n
int trunc, fhandle_t *fhp, struct nfsvattr *nap, nfsattrbit_t *attrbitp,
int laytype, NFSPROC_T *p)
{
- mbuf_t m;
+ struct mbuf *m;
u_int32_t *tl;
struct nfsrv_descript *nd;
struct ucred *cred;
More information about the svn-src-projects
mailing list