d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unbreak LINT.

Browse Source
This commit is contained in:
alfred 2003-11-15 00:26:42 +00:00
parent f0fc03fdfa
commit 1b5c83b1db
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/nfs4client/nfs4_vfsops.c
View File

@ -117,10 +117,6 @@ __FBSDID("$FreeBSD$");
SYSCTL_NODE(_vfs, OID_AUTO, nfs4, CTLFLAG_RW, 0, "NFS4 filesystem");
SYSCTL_STRUCT(_vfs_nfs4, NFS_NFSSTATS, nfsstats, CTLFLAG_RD,
&nfsstats, nfsstats, "S,nfsstats");
#ifdef NFS_DEBUG
int nfs_debug;
SYSCTL_INT(_vfs_nfs4, OID_AUTO, debug, CTLFLAG_RW, &nfs_debug, 0, "");
#endif
static void nfs_decode_args(struct nfsmount *nmp, struct nfs_args *argp);
static void nfs4_daemon(void *arg);

14
sys/nfsclient/krpc_subr.c
View File

@ -86,7 +86,7 @@ struct auth_unix {
int32_t ua_gidlist; /* null */
};
struct rpc_call {
struct krpc_call {
u_int32_t rp_xid; /* request transaction id */
int32_t rp_direction; /* call direction (0) */
u_int32_t rp_rpcvers; /* rpc version (2) */
@ -98,7 +98,7 @@ struct rpc_call {
struct auth_info rpc_verf;
};
struct rpc_reply {
struct krpc_reply {
u_int32_t rp_xid; /* request transaction id */
int32_t rp_direction; /* call direction (1) */
int32_t rp_astatus; /* accept status (0: accepted) */
@ -194,8 +194,8 @@ krpc_call(struct sockaddr_in *sa, u_int prog, u_int vers, u_int func,
struct sockaddr_in *sin, ssin;
struct sockaddr *from;
struct mbuf *m, *nam, *mhead;
struct rpc_call *call;
struct rpc_reply *reply;
struct krpc_call *call;
struct krpc_reply *reply;
struct sockopt sopt;
struct timeval tv;
struct uio auio;
@ -278,7 +278,7 @@ krpc_call(struct sockaddr_in *sa, u_int prog, u_int vers, u_int func,
*/
mhead = m_gethdr(M_TRYWAIT, MT_DATA);
mhead->m_next = *data;
call = mtod(mhead, struct rpc_call *);
call = mtod(mhead, struct krpc_call *);
mhead->m_len = sizeof(*call);
bzero((caddr_t)call, sizeof(*call));
/* rpc_call part */
@ -372,7 +372,7 @@ krpc_call(struct sockaddr_in *sa, u_int prog, u_int vers, u_int func,
continue;
if (m->m_len < MIN_REPLY_HDR)
continue;
reply = mtod(m, struct rpc_reply *);
reply = mtod(m, struct krpc_reply *);
/* Is it the right reply? */
if (reply->rp_direction != txdr_unsigned(RPC_REPLY))
@ -421,7 +421,7 @@ krpc_call(struct sockaddr_in *sa, u_int prog, u_int vers, u_int func,
goto out;
}
}
reply = mtod(m, struct rpc_reply *);
reply = mtod(m, struct krpc_reply *);
if (reply->rp_auth.authtype != 0) {
len += fxdr_unsigned(u_int32_t, reply->rp_auth.authlen);
len = (len + 3) & ~3; /* XXX? */