net: sched: rename qdisc_destroy() to qdisc_put()
Current implementation of qdisc_destroy() decrements Qdisc reference counter and only actually destroy Qdisc if reference counter value reached zero. Rename qdisc_destroy() to qdisc_put() in order for it to better describe the way in which this function currently implemented and used. Extract code that deallocates Qdisc into new private qdisc_destroy() function. It is intended to be shared between regular qdisc_put() and its unlocked version that is introduced in next patch in this series. Signed-off-by: Vlad Buslov <vladbu@mellanox.com> Acked-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
6f99528e97
commit
86bd446b5c
@@ -920,7 +920,7 @@ static void notify_and_destroy(struct net *net, struct sk_buff *skb,
|
||||
qdisc_notify(net, skb, n, clid, old, new);
|
||||
|
||||
if (old)
|
||||
qdisc_destroy(old);
|
||||
qdisc_put(old);
|
||||
}
|
||||
|
||||
/* Graft qdisc "new" to class "classid" of qdisc "parent" or
|
||||
@@ -973,7 +973,7 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent,
|
||||
qdisc_refcount_inc(new);
|
||||
|
||||
if (!ingress)
|
||||
qdisc_destroy(old);
|
||||
qdisc_put(old);
|
||||
}
|
||||
|
||||
skip:
|
||||
@@ -1561,7 +1561,7 @@ graft:
|
||||
err = qdisc_graft(dev, p, skb, n, clid, q, NULL, extack);
|
||||
if (err) {
|
||||
if (q)
|
||||
qdisc_destroy(q);
|
||||
qdisc_put(q);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user