Module Name: src
Committed By: christos
Date: Mon Jul 30 10:45:03 UTC 2012
Modified Files:
src/sys/kern: uipc_usrreq.c
Log Message:
remove infinite loop on error, extra parens on return.
To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 src/sys/kern/uipc_usrreq.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/kern/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.138 src/sys/kern/uipc_usrreq.c:1.139
--- src/sys/kern/uipc_usrreq.c:1.138 Mon Jul 30 06:42:24 2012
+++ src/sys/kern/uipc_usrreq.c Mon Jul 30 06:45:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq.c,v 1.138 2012/07/30 10:42:24 christos Exp $ */
+/* $NetBSD: uipc_usrreq.c,v 1.139 2012/07/30 10:45:03 christos Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.138 2012/07/30 10:42:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.139 2012/07/30 10:45:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1341,12 +1341,11 @@ unp_externalize(struct mbuf *rights, str
*rp++ = 0;
unp_discard_now(fp);
}
- goto out;
}
rw_exit(&p->p_cwdi->cwdi_lock);
kmem_free(fdp, nfds * sizeof(int));
- return (error);
+ return error;
}
int
