GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-29 10:01:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tty: move the non-file related parts of tty_release to new tty_release_struct

Browse source 
For in-kernel tty users, we need to be able to create and destroy
'struct tty' that are not associated with a file. The creation side is
fine, but tty_release() needs to be split into the file handle portion
and the struct tty portion. Introduce a new function, tty_release_struct,
to handle just the destroying of a struct tty.

Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-By: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Rob Herring 2017-01-16 16:54:28 -06:00 • committed by Greg Kroah-Hartman
parent 2cc32b18d1
commit 9ed90d2044
2 changed files with 33 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

50
drivers/tty/tty_io.c
View file

@ -1744,6 +1744,37 @@ static int tty_release_checks(struct tty_struct *tty, int idx)
return 0; return 0;
} }
/**
* tty_release_struct - release a tty struct
* @tty: tty device
* @idx: index of the tty
*
* Performs the final steps to release and free a tty device. It is
* roughly the reverse of tty_init_dev.
*/
void tty_release_struct(struct tty_struct *tty, int idx)
{
/*
* Ask the line discipline code to release its structures
*/
tty_ldisc_release(tty);
/* Wait for pending work before tty destruction commmences */
tty_flush_works(tty);
tty_debug_hangup(tty, "freeing structure\n");
/*
* The release_tty function takes care of the details of clearing
* the slots and preserving the termios structure. The tty_unlock_pair
* should be safe as we keep a kref while the tty is locked (so the
* unlock never unlocks a freed tty).
*/
mutex_lock(&tty_mutex);
release_tty(tty, idx);
mutex_unlock(&tty_mutex);
}
EXPORT_SYMBOL_GPL(tty_release_struct);
/** /**
* tty_release - vfs callback for close * tty_release - vfs callback for close
* @inode: inode of tty * @inode: inode of tty
@ -1898,25 +1929,8 @@ int tty_release(struct inode *inode, struct file *filp)
return 0; return 0;
tty_debug_hangup(tty, "final close\n"); tty_debug_hangup(tty, "final close\n");
/*
* Ask the line discipline code to release its structures
*/
tty_ldisc_release(tty);
/* Wait for pending work before tty destruction commmences */
tty_flush_works(tty);
tty_debug_hangup(tty, "freeing structure\n");
/*
* The release_tty function takes care of the details of clearing
* the slots and preserving the termios structure. The tty_unlock_pair
* should be safe as we keep a kref while the tty is locked (so the
* unlock never unlocks a freed tty).
*/
mutex_lock(&tty_mutex);
release_tty(tty, idx);
mutex_unlock(&tty_mutex);
tty_release_struct(tty, idx);
return 0; return 0;
} }

1
include/linux/tty.h
View file

@ -528,6 +528,7 @@ extern int tty_alloc_file(struct file *file);
extern void tty_add_file(struct tty_struct *tty, struct file *file); extern void tty_add_file(struct tty_struct *tty, struct file *file);
extern void tty_free_file(struct file *file); extern void tty_free_file(struct file *file);
extern struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx); extern struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx);
extern void tty_release_struct(struct tty_struct *tty, int idx);
extern int tty_release(struct inode *inode, struct file *filp); extern int tty_release(struct inode *inode, struct file *filp);
extern void tty_init_termios(struct tty_struct *tty); extern void tty_init_termios(struct tty_struct *tty);
extern int tty_standard_install(struct tty_driver *driver, extern int tty_standard_install(struct tty_driver *driver,