Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys backout change that made pr_stat return EOPNOTSUPP for p...



details:   https://anonhg.NetBSD.org/src/rev/8f0be5400eb8
branches:  trunk
changeset: 330398:8f0be5400eb8
user:      rtr <rtr%NetBSD.org@localhost>
date:      Mon Jul 07 15:13:21 2014 +0000

description:
backout change that made pr_stat return EOPNOTSUPP for protocols that
were not filling in struct stat.

decision made after further discussion with rmind and investigation of
how other operating systems behave.  soo_stat() is doing just enough to
be able to call what gets returned valid and thus justifys a return of
success.

additional review will be done to determine of the pr_stat functions
that were already returning EOPNOTSUPP can be considered successful with
what soo_stat() is doing.

diffstat:

 sys/net/rtsock.c                    |  6 +++---
 sys/netatalk/ddp_usrreq.c           |  7 ++++---
 sys/netbt/hci_socket.c              |  6 +++---
 sys/netbt/l2cap_socket.c            |  6 +++---
 sys/netbt/rfcomm_socket.c           |  6 +++---
 sys/netbt/sco_socket.c              |  6 +++---
 sys/netinet/raw_ip.c                |  7 ++++---
 sys/netinet/tcp_usrreq.c            |  7 ++++---
 sys/netinet/udp_usrreq.c            |  7 ++++---
 sys/netinet6/raw_ip6.c              |  7 ++++---
 sys/netinet6/udp6_usrreq.c          |  7 ++++---
 sys/netipsec/keysock.c              |  6 +++---
 sys/netnatm/natm.c                  |  6 +++---
 sys/rump/net/lib/libsockin/sockin.c |  6 +++---
 14 files changed, 48 insertions(+), 42 deletions(-)

diffs (truncated from 384 to 300 lines):

diff -r 8e97a0e3333f -r 8f0be5400eb8 sys/net/rtsock.c
--- a/sys/net/rtsock.c  Mon Jul 07 10:18:20 2014 +0000
+++ b/sys/net/rtsock.c  Mon Jul 07 15:13:21 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtsock.c,v 1.151 2014/07/07 10:18:20 rtr Exp $ */
+/*     $NetBSD: rtsock.c,v 1.152 2014/07/07 15:13:21 rtr Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.151 2014/07/07 10:18:20 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.152 2014/07/07 15:13:21 rtr Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -233,7 +233,7 @@
 static int
 COMPATNAME(route_stat)(struct socket *so, struct stat *ub)
 {
-       return EOPNOTSUPP;
+       return 0;
 }
 
 static int
diff -r 8e97a0e3333f -r 8f0be5400eb8 sys/netatalk/ddp_usrreq.c
--- a/sys/netatalk/ddp_usrreq.c Mon Jul 07 10:18:20 2014 +0000
+++ b/sys/netatalk/ddp_usrreq.c Mon Jul 07 15:13:21 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ddp_usrreq.c,v 1.49 2014/07/07 07:09:58 rtr Exp $       */
+/*     $NetBSD: ddp_usrreq.c,v 1.50 2014/07/07 15:13:21 rtr Exp $       */
 
 /*
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ddp_usrreq.c,v 1.49 2014/07/07 07:09:58 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ddp_usrreq.c,v 1.50 2014/07/07 15:13:21 rtr Exp $");
 
 #include "opt_mbuftrace.h"
 
@@ -481,7 +481,8 @@
 static int
 ddp_stat(struct socket *so, struct stat *ub)
 {
-       return EOPNOTSUPP;
+       /* stat: don't bother with a blocksize. */
+       return 0;
 }
 
 /*
diff -r 8e97a0e3333f -r 8f0be5400eb8 sys/netbt/hci_socket.c
--- a/sys/netbt/hci_socket.c    Mon Jul 07 10:18:20 2014 +0000
+++ b/sys/netbt/hci_socket.c    Mon Jul 07 15:13:21 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hci_socket.c,v 1.28 2014/07/07 07:09:58 rtr Exp $      */
+/*     $NetBSD: hci_socket.c,v 1.29 2014/07/07 15:13:21 rtr Exp $      */
 
 /*-
  * Copyright (c) 2005 Iain Hibbert.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hci_socket.c,v 1.28 2014/07/07 07:09:58 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hci_socket.c,v 1.29 2014/07/07 15:13:21 rtr Exp $");
 
 /* load symbolic names */
 #ifdef BLUETOOTH_DEBUG
@@ -496,7 +496,7 @@
 static int
 hci_stat(struct socket *so, struct stat *ub)
 {
-       return EOPNOTSUPP;
+       return 0;
 }
 
 /*
diff -r 8e97a0e3333f -r 8f0be5400eb8 sys/netbt/l2cap_socket.c
--- a/sys/netbt/l2cap_socket.c  Mon Jul 07 10:18:20 2014 +0000
+++ b/sys/netbt/l2cap_socket.c  Mon Jul 07 15:13:21 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: l2cap_socket.c,v 1.19 2014/07/07 07:09:58 rtr Exp $    */
+/*     $NetBSD: l2cap_socket.c,v 1.20 2014/07/07 15:13:21 rtr Exp $    */
 
 /*-
  * Copyright (c) 2005 Iain Hibbert.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: l2cap_socket.c,v 1.19 2014/07/07 07:09:58 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: l2cap_socket.c,v 1.20 2014/07/07 15:13:21 rtr Exp $");
 
 /* load symbolic names */
 #ifdef BLUETOOTH_DEBUG
@@ -125,7 +125,7 @@
 static int
 l2cap_stat(struct socket *so, struct stat *ub)
 {
-       return EOPNOTSUPP;
+       return 0;
 }
 
 /*
diff -r 8e97a0e3333f -r 8f0be5400eb8 sys/netbt/rfcomm_socket.c
--- a/sys/netbt/rfcomm_socket.c Mon Jul 07 10:18:20 2014 +0000
+++ b/sys/netbt/rfcomm_socket.c Mon Jul 07 15:13:21 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rfcomm_socket.c,v 1.20 2014/07/07 07:09:58 rtr Exp $   */
+/*     $NetBSD: rfcomm_socket.c,v 1.21 2014/07/07 15:13:21 rtr Exp $   */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rfcomm_socket.c,v 1.20 2014/07/07 07:09:58 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rfcomm_socket.c,v 1.21 2014/07/07 15:13:21 rtr Exp $");
 
 /* load symbolic names */
 #ifdef BLUETOOTH_DEBUG
@@ -133,7 +133,7 @@
 static int
 rfcomm_stat(struct socket *so, struct stat *ub)
 {
-       return EOPNOTSUPP;
+       return 0;
 }
 
 /*
diff -r 8e97a0e3333f -r 8f0be5400eb8 sys/netbt/sco_socket.c
--- a/sys/netbt/sco_socket.c    Mon Jul 07 10:18:20 2014 +0000
+++ b/sys/netbt/sco_socket.c    Mon Jul 07 15:13:21 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sco_socket.c,v 1.21 2014/07/07 07:09:58 rtr Exp $      */
+/*     $NetBSD: sco_socket.c,v 1.22 2014/07/07 15:13:21 rtr Exp $      */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sco_socket.c,v 1.21 2014/07/07 07:09:58 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sco_socket.c,v 1.22 2014/07/07 15:13:21 rtr Exp $");
 
 /* load symbolic names */
 #ifdef BLUETOOTH_DEBUG
@@ -116,7 +116,7 @@
 static int
 sco_stat(struct socket *so, struct stat *ub)
 {
-       return EOPNOTSUPP;
+       return 0;
 }
 
 /*
diff -r 8e97a0e3333f -r 8f0be5400eb8 sys/netinet/raw_ip.c
--- a/sys/netinet/raw_ip.c      Mon Jul 07 10:18:20 2014 +0000
+++ b/sys/netinet/raw_ip.c      Mon Jul 07 15:13:21 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: raw_ip.c,v 1.129 2014/07/07 07:09:58 rtr Exp $ */
+/*     $NetBSD: raw_ip.c,v 1.130 2014/07/07 15:13:21 rtr Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.129 2014/07/07 07:09:58 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.130 2014/07/07 15:13:21 rtr Exp $");
 
 #include "opt_inet.h"
 #include "opt_compat_netbsd.h"
@@ -575,7 +575,8 @@
 static int
 rip_stat(struct socket *so, struct stat *ub)
 {
-       return EOPNOTSUPP;
+       /* stat: don't bother with a blocksize. */
+       return 0;
 }
 
 int
diff -r 8e97a0e3333f -r 8f0be5400eb8 sys/netinet/tcp_usrreq.c
--- a/sys/netinet/tcp_usrreq.c  Mon Jul 07 10:18:20 2014 +0000
+++ b/sys/netinet/tcp_usrreq.c  Mon Jul 07 15:13:21 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_usrreq.c,v 1.182 2014/07/07 07:09:58 rtr Exp $     */
+/*     $NetBSD: tcp_usrreq.c,v 1.183 2014/07/07 15:13:21 rtr Exp $     */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.182 2014/07/07 07:09:58 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.183 2014/07/07 15:13:21 rtr Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -956,7 +956,8 @@
 static int
 tcp_stat(struct socket *so, struct stat *ub)
 {
-       return EOPNOTSUPP;
+       /* stat: don't bother with a blocksize.  */
+       return 0;
 }
 
 /*
diff -r 8e97a0e3333f -r 8f0be5400eb8 sys/netinet/udp_usrreq.c
--- a/sys/netinet/udp_usrreq.c  Mon Jul 07 10:18:20 2014 +0000
+++ b/sys/netinet/udp_usrreq.c  Mon Jul 07 15:13:21 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: udp_usrreq.c,v 1.204 2014/07/07 07:09:58 rtr Exp $     */
+/*     $NetBSD: udp_usrreq.c,v 1.205 2014/07/07 15:13:21 rtr Exp $     */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.204 2014/07/07 07:09:58 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.205 2014/07/07 15:13:21 rtr Exp $");
 
 #include "opt_inet.h"
 #include "opt_compat_netbsd.h"
@@ -903,7 +903,8 @@
 static int
 udp_stat(struct socket *so, struct stat *ub)
 {
-       return EOPNOTSUPP;
+       /* stat: don't bother with a blocksize. */
+       return 0;
 }
 
 static int
diff -r 8e97a0e3333f -r 8f0be5400eb8 sys/netinet6/raw_ip6.c
--- a/sys/netinet6/raw_ip6.c    Mon Jul 07 10:18:20 2014 +0000
+++ b/sys/netinet6/raw_ip6.c    Mon Jul 07 15:13:21 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: raw_ip6.c,v 1.123 2014/07/07 07:09:59 rtr Exp $        */
+/*     $NetBSD: raw_ip6.c,v 1.124 2014/07/07 15:13:21 rtr Exp $        */
 /*     $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $        */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.123 2014/07/07 07:09:59 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.124 2014/07/07 15:13:21 rtr Exp $");
 
 #include "opt_ipsec.h"
 
@@ -653,7 +653,8 @@
 static int
 rip6_stat(struct socket *so, struct stat *ub)
 {
-       return EOPNOTSUPP;
+       /* stat: don't bother with a blocksize */
+       return 0;
 }
 
 int
diff -r 8e97a0e3333f -r 8f0be5400eb8 sys/netinet6/udp6_usrreq.c
--- a/sys/netinet6/udp6_usrreq.c        Mon Jul 07 10:18:20 2014 +0000
+++ b/sys/netinet6/udp6_usrreq.c        Mon Jul 07 15:13:21 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: udp6_usrreq.c,v 1.103 2014/07/07 07:09:59 rtr Exp $    */
+/*     $NetBSD: udp6_usrreq.c,v 1.104 2014/07/07 15:13:21 rtr Exp $    */
 /*     $KAME: udp6_usrreq.c,v 1.86 2001/05/27 17:33:00 itojun Exp $    */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.103 2014/07/07 07:09:59 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.104 2014/07/07 15:13:21 rtr Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet_csum.h"
@@ -696,7 +696,8 @@
 static int
 udp6_stat(struct socket *so, struct stat *ub)
 {
-       return EOPNOTSUPP;
+       /* stat: don't bother with a blocksize */
+       return 0;



Home | Main Index | Thread Index | Old Index