diff options
| author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2009-01-16 17:11:29 +0000 |
|---|---|---|
| committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2009-01-16 17:11:29 +0000 |
| commit | 5f4209f4dc2ab2872c12036f4f7c789d5eeea49c (patch) | |
| tree | edd7bde863bb369186805f71b18e4694921b1f97 /sys | |
| parent | e87d6dc4ffc8d645d8f39f6356a30fafe6455420 (diff) | |
turn nfs_msg into void functions, also make it take an nfsreq
argument since all of the info we need is there, makes it and
the use it a tad bit nicer.
ok blambert@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/nfs/nfs_socket.c | 24 | ||||
| -rw-r--r-- | sys/nfs/nfs_var.h | 4 |
2 files changed, 12 insertions, 16 deletions
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c index a2a28e33629..945c0cdcec2 100644 --- a/sys/nfs/nfs_socket.c +++ b/sys/nfs/nfs_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_socket.c,v 1.71 2008/12/24 02:43:52 thib Exp $ */ +/* $OpenBSD: nfs_socket.c,v 1.72 2009/01/16 17:11:28 thib Exp $ */ /* $NetBSD: nfs_socket.c,v 1.27 1996/04/15 20:20:00 thorpej Exp $ */ /* @@ -932,8 +932,7 @@ tryagain: * tprintf a response. */ if (!error && (rep->r_flags & R_TPRINTFMSG)) - nfs_msg(rep->r_procp, nmp->nm_mountp->mnt_stat.f_mntfromname, - "is alive again"); + nfs_msg(rep, "is alive again"); mrep = rep->r_mrep; md = rep->r_md; dpos = rep->r_dpos; @@ -1161,9 +1160,7 @@ nfs_timer(arg) */ if ((rep->r_flags & R_TPRINTFMSG) == 0 && rep->r_rexmit > nmp->nm_deadthresh) { - nfs_msg(rep->r_procp, - nmp->nm_mountp->mnt_stat.f_mntfromname, - "not responding"); + nfs_msg(rep, "not responding"); rep->r_flags |= R_TPRINTFMSG; } if (rep->r_rexmit >= rep->r_retry) { /* too many */ @@ -1569,20 +1566,19 @@ nfsmout: return (error); } -int -nfs_msg(p, server, msg) - struct proc *p; - char *server, *msg; +void +nfs_msg(struct nfsreq *rep, char *msg) { tpr_t tpr; - if (p) - tpr = tprintf_open(p); + if (rep->r_procp) + tpr = tprintf_open(rep->r_procp); else tpr = NULL; - tprintf(tpr, "nfs server %s: %s\n", server, msg); + + tprintf(tpr, "nfs server %s: %s\n", + rep->r_nmp->nm_mountp->mnt_stat.f_mntfromname, msg); tprintf_close(tpr); - return (0); } #ifdef NFSSERVER diff --git a/sys/nfs/nfs_var.h b/sys/nfs/nfs_var.h index 130c8660956..5177db9a949 100644 --- a/sys/nfs/nfs_var.h +++ b/sys/nfs/nfs_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_var.h,v 1.45 2009/01/15 19:41:18 thib Exp $ */ +/* $OpenBSD: nfs_var.h,v 1.46 2009/01/16 17:11:28 thib Exp $ */ /* $NetBSD: nfs_var.h,v 1.3 1996/02/18 11:53:54 fvdl Exp $ */ /* @@ -196,7 +196,7 @@ void nfs_sndunlock(int *); int nfs_rcvlock(struct nfsreq *); void nfs_rcvunlock(int *); int nfs_getreq(struct nfsrv_descript *, struct nfsd *, int); -int nfs_msg(struct proc *, char *, char *); +void nfs_msg(struct nfsreq *, char *); void nfsrv_rcv(struct socket *, caddr_t, int); int nfsrv_getstream(struct nfssvc_sock *, int); int nfsrv_dorec(struct nfssvc_sock *, struct nfsd *, |