Module Name: src
Committed By: yamt
Date: Mon May 4 10:28:53 UTC 2009
Modified Files:
src/sys/nfs [yamt-nfs-mp]: nfs_socket.c nfs_srvsocket.c nfs_var.h
Log Message:
fix merge botches.
To generate a diff of this commit:
cvs rdiff -u -r1.170.2.2 -r1.170.2.3 src/sys/nfs/nfs_socket.c
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/sys/nfs/nfs_srvsocket.c
cvs rdiff -u -r1.78.4.3 -r1.78.4.4 src/sys/nfs/nfs_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/nfs/nfs_socket.c
diff -u src/sys/nfs/nfs_socket.c:1.170.2.2 src/sys/nfs/nfs_socket.c:1.170.2.3
--- src/sys/nfs/nfs_socket.c:1.170.2.2 Mon May 4 08:14:22 2009
+++ src/sys/nfs/nfs_socket.c Mon May 4 10:28:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_socket.c,v 1.170.2.2 2009/05/04 08:14:22 yamt Exp $ */
+/* $NetBSD: nfs_socket.c,v 1.170.2.3 2009/05/04 10:28:53 yamt Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.170.2.2 2009/05/04 08:14:22 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.170.2.3 2009/05/04 10:28:53 yamt Exp $");
#ifdef _KERNEL_OPT
#include "fs_nfs.h"
@@ -488,7 +488,7 @@
* - return EPIPE if a connection is lost for connection based sockets (TCP...)
* - do any cleanup required by recoverable socket errors (? ? ?)
*/
-static int
+int
nfs_send(struct socket *so, struct mbuf *nam, struct mbuf *top,
struct nfsreq *rep)
{
@@ -2299,7 +2299,6 @@
}
pool_put(&nfs_srvdesc_pool, nd);
}
-#endif /* defined(NFSSERVER) || (defined(NFS) && !defined(NFS_V2_ONLY)) */
#if defined(NFS)
void nfs_reqq_dump(void);
Index: src/sys/nfs/nfs_srvsocket.c
diff -u src/sys/nfs/nfs_srvsocket.c:1.3.2.2 src/sys/nfs/nfs_srvsocket.c:1.3.2.3
--- src/sys/nfs/nfs_srvsocket.c:1.3.2.2 Mon May 4 08:14:22 2009
+++ src/sys/nfs/nfs_srvsocket.c Mon May 4 10:28:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_srvsocket.c,v 1.3.2.2 2009/05/04 08:14:22 yamt Exp $ */
+/* $NetBSD: nfs_srvsocket.c,v 1.3.2.3 2009/05/04 10:28:53 yamt Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_srvsocket.c,v 1.3.2.2 2009/05/04 08:14:22 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_srvsocket.c,v 1.3.2.3 2009/05/04 10:28:53 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -495,7 +495,7 @@
mutex_exit(&slp->ns_lock);
again:
- error = nfs_send(slp->ns_so, nd->nd_nam2, nd->nd_mreq, NULL, curlwp);
+ error = nfs_send(slp->ns_so, nd->nd_nam2, nd->nd_mreq, NULL);
if (nd->nd_nam2) {
m_free(nd->nd_nam2);
}
Index: src/sys/nfs/nfs_var.h
diff -u src/sys/nfs/nfs_var.h:1.78.4.3 src/sys/nfs/nfs_var.h:1.78.4.4
--- src/sys/nfs/nfs_var.h:1.78.4.3 Mon May 4 08:14:22 2009
+++ src/sys/nfs/nfs_var.h Mon May 4 10:28:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_var.h,v 1.78.4.3 2009/05/04 08:14:22 yamt Exp $ */
+/* $NetBSD: nfs_var.h,v 1.78.4.4 2009/05/04 10:28:53 yamt Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -168,6 +168,7 @@
int nfs_reconnect(struct nfsreq *);
void nfs_disconnect(struct nfsmount *);
void nfs_safedisconnect(struct nfsmount *);
+int nfs_send(struct socket *, struct mbuf *, struct mbuf *, struct nfsreq *);
int nfs_request(struct nfsnode *, struct mbuf *, int, struct lwp *,
kauth_cred_t, struct mbuf **, struct mbuf **, char **, int *);
int nfs_rephead(int, struct nfsrv_descript *, struct nfssvc_sock *,
