From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernard Pidoux Subject: Re: [PATCH]: Kill spurious sk->sk_socket NULL assignments in netrom. Date: Tue, 17 Jun 2008 15:58:59 +0200 Message-ID: <4857C323.5040402@upmc.fr> References: <20080617.032409.216520881.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, ralf@linux-mips.org, linux-hams@vger.kernel.org To: David Miller Return-path: In-Reply-To: <20080617.032409.216520881.davem@davemloft.net> Sender: linux-hams-owner@vger.kernel.org List-Id: netdev.vger.kernel.org David, All patches applied and running. Thanks. Bernard, f6bvp David Miller wrote: > Both of these assignments are spurious, so we can delete them. > > Applied and pushed out to net-next-2.6 > > netrom: Kill spurious NULL'ing of sk->sk_socket. > > In nr_release(), one code path calls sock_orphan() which > will NULL out sk->sk_socket already. > > In the other case, handling states other than NR_STATE_{0,1,2,3}, > seems to not be possible other than due to bugs. Even for an > uninitialized nr->state value, that would be zero or NR_STATE_0. > It might be wise to stick a WARN_ON() here. > > Signed-off-by: David S. Miller > --- > net/netrom/af_netrom.c | 2 -- > 1 files changed, 0 insertions(+), 2 deletions(-) > > diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c > index 5877962..74884f4 100644 > --- a/net/netrom/af_netrom.c > +++ b/net/netrom/af_netrom.c > @@ -536,11 +536,9 @@ static int nr_release(struct socket *sock) > sk->sk_state_change(sk); > sock_orphan(sk); > sock_set_flag(sk, SOCK_DESTROY); > - sk->sk_socket = NULL; > break; > > default: > - sk->sk_socket = NULL; > break; > } >