Skip to content

Commit

Permalink
can: rename can_try_module_get to can_get_proto
Browse files Browse the repository at this point in the history
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Kurt Van Dijck authored and David S. Miller committed May 4, 2011
1 parent 1650629 commit c8d55a9
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions net/can/af_can.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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)
{
Expand All @@ -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) {
Expand All @@ -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

Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit c8d55a9

Please sign in to comment.