diff options
| -rw-r--r-- | sys/nfs/nfs.h | 3 | ||||
| -rw-r--r-- | sys/nfs/nfs_socket.c | 9 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h index 96c16820d3b..158a9b230e4 100644 --- a/sys/nfs/nfs.h +++ b/sys/nfs/nfs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs.h,v 1.32 2008/07/05 12:51:04 thib Exp $ */ +/* $OpenBSD: nfs.h,v 1.33 2008/07/05 17:34:26 thib Exp $ */ /* $NetBSD: nfs.h,v 1.10.4.1 1996/05/27 11:23:56 fvdl Exp $ */ /* @@ -276,7 +276,6 @@ extern TAILQ_HEAD(nfsreqhead, nfsreq) nfs_reqq; #define R_SOCKERR 0x10 /* Fatal error on socket */ #define R_TPRINTFMSG 0x20 /* Did a tprintf msg. */ #define R_MUSTRESEND 0x40 /* Must resend request */ -#define R_GETONEREP 0x80 /* Probe for one reply only */ /* * A list of nfssvc_sock structures is maintained with all the sockets diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c index 9727fa9e527..985a23b962a 100644 --- a/sys/nfs/nfs_socket.c +++ b/sys/nfs/nfs_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_socket.c,v 1.64 2008/06/14 03:16:06 thib Exp $ */ +/* $OpenBSD: nfs_socket.c,v 1.65 2008/07/05 17:34:26 thib Exp $ */ /* $NetBSD: nfs_socket.c,v 1.27 1996/04/15 20:20:00 thorpej Exp $ */ /* @@ -696,8 +696,6 @@ nfs_reply(myrep) if (NFSIGNORE_SOERROR(nmp->nm_soflags, error)) { if (nmp->nm_so) nmp->nm_so->so_error = 0; - if (myrep->r_flags & R_GETONEREP) - return (0); continue; } return (error); @@ -716,8 +714,6 @@ nfs_reply(myrep) nfsstats.rpcinvalid++; m_freem(mrep); nfsmout: - if (myrep->r_flags & R_GETONEREP) - return (0); continue; } @@ -800,8 +796,6 @@ nfsmout: panic("nfsreply nil"); return (0); } - if (myrep->r_flags & R_GETONEREP) - return (0); } } @@ -1334,6 +1328,7 @@ nfs_rcvlock(rep) slpflag = PCATCH; else slpflag = 0; + while (*flagp & NFSMNT_RCVLOCK) { if (nfs_sigintr(rep->r_nmp, rep, rep->r_procp)) return (EINTR); |