From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Dumazet Subject: Re: [PATCH v2] x25: remove the BKL Date: Thu, 27 Jan 2011 14:20:47 +0100 Message-ID: <1296134447.2614.5.camel@edumazet-laptop> References: <1295993854-4971-1-git-send-email-arnd@arndb.de> <201101271317.01502.arnd@arndb.de> <201101271338.39295.arnd@arndb.de> Mime-Version: 1.0 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:subject:from:to:cc:in-reply-to:references :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=2uxUSWq+in/qb3hald4CVAvVmLp4uJ0PUqawor2eqMs=; b=CFc/TxOHoahYeMMoO+JdZgIQypvjyKRhYBfPW9oX2LN6JUwKPX1v/qtl0L3T8R5sah zjgoYHKr2m9wJB7gJT1LIZ2IiGLOLX/AAG8LPdm0KR2DY9WJBD2yq4jI8j3c9ruDXy8n EwTyWgl9FBuVMybSz1YBIXqinxnAvgt1Xwh9g= In-Reply-To: <201101271338.39295.arnd@arndb.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: Content-Type: text/plain; charset="utf-8" To: Arnd Bergmann Cc: Andrew Hendry , linux-kernel@vger.kernel.org, linux-x25@vger.kernel.org, netdev@vger.kernel.org Le jeudi 27 janvier 2011 =C3=A0 13:38 +0100, Arnd Bergmann a =C3=A9crit= : > diff --git a/net/x25/x25_out.c b/net/x25/x25_out.c > index d00649f..f1a6ff1 100644 > --- a/net/x25/x25_out.c > +++ b/net/x25/x25_out.c > @@ -68,8 +68,11 @@ int x25_output(struct sock *sk, struct sk_buff *sk= b) > frontlen =3D skb_headroom(skb); > =20 > while (skb->len > 0) { > - if ((skbn =3D sock_alloc_send_skb(sk, frontlen + max_len, > - noblock, &err)) =3D=3D NULL){ > + release_sock(sk); > + skbn =3D sock_alloc_send_skb(sk, frontlen + max_len, > + 1, &err); > + lock_sock(sk); > + if (!skbn) { > if (err =3D=3D -EWOULDBLOCK && noblock){ > kfree_skb(skb); > return sent; This part looks strange : noblock variable became "const 1 : NOBLOCK" Why releasing socket if you dont block in sock_alloc_send_skb() ?