luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ISDN: capi, use kref from tty_port

Browse Source 
After commit "TTY: move tty buffers to tty_port", the tty buffers are
not freed in some drivers. This is because tty_port_destructor is not
called whenever a tty_port is freed. This was an assumption I counted
with but was unfortunately untrue. So fix the drivers to fulfil this
assumption.

Here it is enough to switch to refcounting in tty_port.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2012-11-15 09:49:50 +01:00 committed by Greg Kroah-Hartman
parent 81c79838ca
commit 55bef83cc6
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/isdn/capi/capi.c
View File

@ -77,8 +77,6 @@ struct ackqueue_entry {
}; };
struct capiminor { struct capiminor {
struct kref kref;
unsigned int minor; unsigned int minor;
struct capi20_appl *ap; struct capi20_appl *ap;
@ -190,7 +188,20 @@ static void capiminor_del_all_ack(struct capiminor *mp)
/* -------- struct capiminor ---------------------------------------- */ /* -------- struct capiminor ---------------------------------------- */
static const struct tty_port_operations capiminor_port_ops; /* we have none */ static void capiminor_destroy(struct tty_port *port)
{
struct capiminor *mp = container_of(port, struct capiminor, port);
kfree_skb(mp->outskb);
skb_queue_purge(&mp->inqueue);
skb_queue_purge(&mp->outqueue);
capiminor_del_all_ack(mp);
kfree(mp);
}
static const struct tty_port_operations capiminor_port_ops = {
.destruct = capiminor_destroy,
};
static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci) static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci)
{ {
@ -204,8 +215,6 @@ static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci)
return NULL; return NULL;
} }
kref_init(&mp->kref);
mp->ap = ap; mp->ap = ap;
mp->ncci = ncci; mp->ncci = ncci;
INIT_LIST_HEAD(&mp->ackqueue); INIT_LIST_HEAD(&mp->ackqueue);
@ -247,21 +256,10 @@ static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci)
spin_unlock(&capiminors_lock); spin_unlock(&capiminors_lock);
err_out1: err_out1:
kfree(mp); tty_port_put(&mp->port);
return NULL; return NULL;
} }
static void capiminor_destroy(struct kref *kref)
{
struct capiminor *mp = container_of(kref, struct capiminor, kref);
kfree_skb(mp->outskb);
skb_queue_purge(&mp->inqueue);
skb_queue_purge(&mp->outqueue);
capiminor_del_all_ack(mp);
kfree(mp);
}
static struct capiminor *capiminor_get(unsigned int minor) static struct capiminor *capiminor_get(unsigned int minor)
{ {
struct capiminor *mp; struct capiminor *mp;
@ -269,7 +267,7 @@ static struct capiminor *capiminor_get(unsigned int minor)
spin_lock(&capiminors_lock); spin_lock(&capiminors_lock);
mp = capiminors[minor]; mp = capiminors[minor];
if (mp) if (mp)
kref_get(&mp->kref); tty_port_get(&mp->port);
spin_unlock(&capiminors_lock); spin_unlock(&capiminors_lock);
return mp; return mp;
@ -277,7 +275,7 @@ static struct capiminor *capiminor_get(unsigned int minor)
static inline void capiminor_put(struct capiminor *mp) static inline void capiminor_put(struct capiminor *mp)
{ {
kref_put(&mp->kref, capiminor_destroy); tty_port_put(&mp->port);
} }
static void capiminor_free(struct capiminor *mp) static void capiminor_free(struct capiminor *mp)