Commit 1a54a76d authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

TTY: let alloc_tty_driver deduce the owner automatically 



Like the rest of the kernel, make a stub from alloc_tty_driver which
calls __alloc_tty_driver with proper owner. This will save us one more
assignment on the driver side.

Also this fixes some drivers which didn't set the owner. This allowed
user to remove the module from the system even though a tty from the
driver is still open.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a8fbc974

drivers/tty/tty_io.c

+3 −2
Original line number Diff line number Diff line
@@ -3049,7 +3049,7 @@ void tty_unregister_device(struct tty_driver *driver, unsigned index) 
}

EXPORT_SYMBOL(tty_unregister_device);



struct tty_driver *alloc_tty_driver(int lines)

struct tty_driver *__alloc_tty_driver(int lines, struct module *owner)

{

	struct tty_driver *driver;
@@ -3058,11 +3058,12 @@ struct tty_driver *alloc_tty_driver(int lines) 
		kref_init(&driver->kref);

		driver->magic = TTY_DRIVER_MAGIC;

		driver->num = lines;

		driver->owner = owner;

		/* later we'll move allocation of tables here */

	}

	return driver;

}

EXPORT_SYMBOL(alloc_tty_driver);

EXPORT_SYMBOL(__alloc_tty_driver);



static void destruct_tty_driver(struct kref *kref)

{

include/linux/tty_driver.h

+4 −1
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ 
 *	if provided (otherwise EINVAL will be returned).

 */



#include <linux/export.h>

#include <linux/fs.h>

#include <linux/list.h>

#include <linux/cdev.h>
@@ -324,7 +325,7 @@ struct tty_driver { 


extern struct list_head tty_drivers;



extern struct tty_driver *alloc_tty_driver(int lines);

extern struct tty_driver *__alloc_tty_driver(int lines, struct module *owner);

extern void put_tty_driver(struct tty_driver *driver);

extern void tty_set_operations(struct tty_driver *driver,

			const struct tty_operations *op);
@@ -332,6 +333,8 @@ extern struct tty_driver *tty_find_polling_driver(char *name, int *line); 


extern void tty_driver_kref_put(struct tty_driver *driver);



#define alloc_tty_driver(lines) __alloc_tty_driver(lines, THIS_MODULE)



static inline struct tty_driver *tty_driver_kref_get(struct tty_driver *d)

{

	kref_get(&d->kref);

CRA Git | Maintained and supported by SUSTech CRA and CCSE