From: Oliver Hartkopp <socketcan@hartkopp.net>
To: socketcan-core@lists.berlios.de, netdev@vger.kernel.org
Subject: Re: [net-next-2.6 PATCH] can: rename can_try_module_get to can_get_proto
Date: Wed, 04 May 2011 22:35:38 +0200 [thread overview]
Message-ID: <4DC1B89A.3080904@hartkopp.net> (raw)
In-Reply-To: <20110504044204.GD278@e-circ.dyndns.org>
On 04.05.2011 06:42, Kurt Van Dijck wrote:
> can: rename can_try_module_get to can_get_proto
>
> can_try_module_get does return a struct can_proto.
> The name explains what is done in so much detail that a caller
> may not notice that a struct can_proto is locked/unlocked.
>
> Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
>
> diff --git a/net/can/af_can.c b/net/can/af_can.c
> index 5b52762..094fc53 100644
> --- a/net/can/af_can.c
> +++ b/net/can/af_can.c
> @@ -115,7 +115,7 @@ static void can_sock_destruct(struct sock *sk)
> skb_queue_purge(&sk->sk_receive_queue);
> }
>
> -static const struct can_proto *can_try_module_get(int protocol)
> +static const struct can_proto *can_get_proto(int protocol)
> {
> const struct can_proto *cp;
>
> @@ -128,6 +128,11 @@ static const struct can_proto *can_try_module_get(int protocol)
> return cp;
> }
>
> +static inline void can_put_proto(const struct can_proto *cp)
> +{
> + module_put(cp->prot->owner);
> +}
> +
> static int can_create(struct net *net, struct socket *sock, int protocol,
> int kern)
> {
> @@ -143,7 +148,7 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
> if (!net_eq(net, &init_net))
> return -EAFNOSUPPORT;
>
> - cp = can_try_module_get(protocol);
> + cp = can_get_proto(protocol);
>
> #ifdef CONFIG_MODULES
> if (!cp) {
> @@ -160,7 +165,7 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
> printk(KERN_ERR "can: request_module "
> "(can-proto-%d) failed.\n", protocol);
>
> - cp = can_try_module_get(protocol);
> + cp = can_get_proto(protocol);
> }
> #endif
>
> @@ -195,7 +200,7 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
> }
>
> errout:
> - module_put(cp->prot->owner);
> + can_put_proto(cp);
> return err;
> }
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2011-05-04 20:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-04 4:42 [net-next-2.6 PATCH] can: rename can_try_module_get to can_get_proto Kurt Van Dijck
2011-05-04 20:35 ` Oliver Hartkopp [this message]
[not found] ` <4DC1B89A.3080904-fJ+pQTUTwRTk1uMJSBkQmQ@public.gmane.org>
2011-05-04 21:08 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4DC1B89A.3080904@hartkopp.net \
--to=socketcan@hartkopp.net \
--cc=netdev@vger.kernel.org \
--cc=socketcan-core@lists.berlios.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).