Module Name: src
Committed By: matt
Date: Fri Sep 5 05:34:57 UTC 2014
Modified Files:
src/sys/nfs: nfs_bio.c nfs_clntsocket.c nfs_socket.c
Log Message:
Don't use catch as a variable name.
To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 src/sys/nfs/nfs_bio.c
cvs rdiff -u -r1.1 -r1.2 src/sys/nfs/nfs_clntsocket.c
cvs rdiff -u -r1.192 -r1.193 src/sys/nfs/nfs_socket.c
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_bio.c
diff -u src/sys/nfs/nfs_bio.c:1.189 src/sys/nfs/nfs_bio.c:1.190
--- src/sys/nfs/nfs_bio.c:1.189 Mon Aug 12 17:46:38 2013
+++ src/sys/nfs/nfs_bio.c Fri Sep 5 05:34:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_bio.c,v 1.189 2013/08/12 17:46:38 hannken Exp $ */
+/* $NetBSD: nfs_bio.c,v 1.190 2014/09/05 05:34:57 matt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.189 2013/08/12 17:46:38 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.190 2014/09/05 05:34:57 matt Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@@ -615,15 +615,15 @@ nfs_vinvalbuf(struct vnode *vp, int flag
struct nfsnode *np = VTONFS(vp);
struct nfsmount *nmp = VFSTONFS(vp->v_mount);
int error = 0, allerror = 0, slptimeo;
- bool catch;
+ bool catch_p;
if ((nmp->nm_flag & NFSMNT_INT) == 0)
intrflg = 0;
if (intrflg) {
- catch = true;
+ catch_p = true;
slptimeo = 2 * hz;
} else {
- catch = false;
+ catch_p = false;
slptimeo = 0;
}
/*
@@ -645,7 +645,7 @@ nfs_vinvalbuf(struct vnode *vp, int flag
*/
np->n_flag |= NFLUSHINPROG;
mutex_exit(vp->v_interlock);
- error = vinvalbuf(vp, flags, cred, l, catch, 0);
+ error = vinvalbuf(vp, flags, cred, l, catch_p, 0);
while (error) {
if (allerror == 0)
allerror = error;
@@ -737,7 +737,7 @@ nfs_asyncio(struct buf *bp)
struct nfs_iod *iod;
struct nfsmount *nmp;
int slptimeo = 0, error;
- bool catch = false;
+ bool catch_p = false;
if (nfs_numasync == 0)
return (EIO);
@@ -745,7 +745,7 @@ nfs_asyncio(struct buf *bp)
nmp = VFSTONFS(bp->b_vp->v_mount);
again:
if (nmp->nm_flag & NFSMNT_INT)
- catch = true;
+ catch_p = true;
/*
* Find a free iod to process this request.
@@ -796,7 +796,7 @@ again:
if (curlwp == uvm.pagedaemon_lwp) {
/* Enque for later, to avoid free-page deadlock */
} else while (nmp->nm_bufqlen >= 2 * nmp->nm_bufqiods) {
- if (catch) {
+ if (catch_p) {
error = cv_timedwait_sig(&nmp->nm_aiocv,
&nmp->nm_lock, slptimeo);
} else {
@@ -808,8 +808,8 @@ again:
mutex_exit(&nmp->nm_lock);
return (EINTR);
}
- if (catch) {
- catch = false;
+ if (catch_p) {
+ catch_p = false;
slptimeo = 2 * hz;
}
}
Index: src/sys/nfs/nfs_clntsocket.c
diff -u src/sys/nfs/nfs_clntsocket.c:1.1 src/sys/nfs/nfs_clntsocket.c:1.2
--- src/sys/nfs/nfs_clntsocket.c:1.1 Tue Mar 2 23:19:09 2010
+++ src/sys/nfs/nfs_clntsocket.c Fri Sep 5 05:34:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_clntsocket.c,v 1.1 2010/03/02 23:19:09 pooka Exp $ */
+/* $NetBSD: nfs_clntsocket.c,v 1.2 2014/09/05 05:34:57 matt Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_clntsocket.c,v 1.1 2010/03/02 23:19:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_clntsocket.c,v 1.2 2014/09/05 05:34:57 matt Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@@ -964,13 +964,13 @@ nfs_sndlock(struct nfsmount *nmp, struct
{
struct lwp *l;
int timeo = 0;
- bool catch = false;
+ bool catch_p = false;
int error = 0;
if (rep) {
l = rep->r_lwp;
if (rep->r_nmp->nm_flag & NFSMNT_INT)
- catch = true;
+ catch_p = true;
} else
l = NULL;
mutex_enter(&nmp->nm_lock);
@@ -979,13 +979,13 @@ nfs_sndlock(struct nfsmount *nmp, struct
error = EINTR;
goto quit;
}
- if (catch) {
+ if (catch_p) {
cv_timedwait_sig(&nmp->nm_sndcv, &nmp->nm_lock, timeo);
} else {
cv_timedwait(&nmp->nm_sndcv, &nmp->nm_lock, timeo);
}
- if (catch) {
- catch = false;
+ if (catch_p) {
+ catch_p = false;
timeo = 2 * hz;
}
}
Index: src/sys/nfs/nfs_socket.c
diff -u src/sys/nfs/nfs_socket.c:1.192 src/sys/nfs/nfs_socket.c:1.193
--- src/sys/nfs/nfs_socket.c:1.192 Tue Aug 5 07:55:32 2014
+++ src/sys/nfs/nfs_socket.c Fri Sep 5 05:34:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_socket.c,v 1.192 2014/08/05 07:55:32 rtr Exp $ */
+/* $NetBSD: nfs_socket.c,v 1.193 2014/09/05 05:34:57 matt Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.192 2014/08/05 07:55:32 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.193 2014/09/05 05:34:57 matt Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@@ -889,12 +889,12 @@ nfs_rcvlock(struct nfsmount *nmp, struct
{
int *flagp = &nmp->nm_iflag;
int slptimeo = 0;
- bool catch;
+ bool catch_p;
int error = 0;
KASSERT(nmp == rep->r_nmp);
- catch = (nmp->nm_flag & NFSMNT_INT) != 0;
+ catch_p = (nmp->nm_flag & NFSMNT_INT) != 0;
mutex_enter(&nmp->nm_lock);
while (/* CONSTCOND */ true) {
if (*flagp & NFSMNT_DISMNT) {
@@ -921,15 +921,15 @@ nfs_rcvlock(struct nfsmount *nmp, struct
*flagp |= NFSMNT_RCVLOCK;
break;
}
- if (catch) {
+ if (catch_p) {
cv_timedwait_sig(&nmp->nm_rcvcv, &nmp->nm_lock,
slptimeo);
} else {
cv_timedwait(&nmp->nm_rcvcv, &nmp->nm_lock,
slptimeo);
}
- if (catch) {
- catch = false;
+ if (catch_p) {
+ catch_p = false;
slptimeo = 2 * hz;
}
}
