On Wed, Jun 30, 2004 at 03:36:06PM -0700, David S. Miller wrote:
>
> Why don't you combine the two "ERR_PTR(-ECONNREFUSED)" tests
> into one test like:
>
> if ((nlk->pid == 0 && !nlk->data_ready) ||
> (sock->sk_state == NELTINK_CONNECTED &&
> nlk->dst_pid != nlk_sk(ssk)->pid)) {
> sock_put(sock);
> return ERR_PTR(-ECONNREFUSED);
> }
>
> so we don't have two copies of the "sock_put(); return ERR_PTR()"
> thing emitted by the compiler?
Well at least under i386, gcc (3.3.4) is smart enough to merge these
common exit paths.
But yes we could merge them. What about the following incremental
patch?
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
p
Description: Text document
|