Module Name: src
Committed By: christos
Date: Wed Jan 25 16:56:13 UTC 2012
Modified Files:
src/sys/kern: uipc_syscalls.c
Log Message:
revert atomics for so_options since it is a short.
To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 src/sys/kern/uipc_syscalls.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_syscalls.c
diff -u src/sys/kern/uipc_syscalls.c:1.153 src/sys/kern/uipc_syscalls.c:1.154
--- src/sys/kern/uipc_syscalls.c:1.153 Wed Jan 25 10:51:24 2012
+++ src/sys/kern/uipc_syscalls.c Wed Jan 25 11:56:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls.c,v 1.153 2012/01/25 15:51:24 christos Exp $ */
+/* $NetBSD: uipc_syscalls.c,v 1.154 2012/01/25 16:56:13 christos Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.153 2012/01/25 15:51:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.154 2012/01/25 16:56:13 christos Exp $");
#include "opt_pipe.h"
@@ -1015,9 +1015,9 @@ sys_getsockopt(struct lwp *l, const stru
sockopt_init(&sopt, SCARG(uap, level), SCARG(uap, name), 0);
if (fp->f_flag & FNOSIGPIPE)
- atomic_or_uint(&so->so_options, SO_NOSIGPIPE);
+ so->so_options |= SO_NOSIGPIPE;
else
- atomic_and_uint(&so->so_options, ~SO_NOSIGPIPE);
+ so->so_options &= ~SO_NOSIGPIPE;
error = sogetopt(so, &sopt);
if (error)
goto out;
