mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 03:36:19 +00:00
Simplify devpts_pty_new()
devpts_pty_new() is called when setting up a new pty and would not will not have an existing dentry or inode for the pty. So don't bother looking for an existing dentry - just create a new one. Signed-off-by: Sukadev Bhattiprolu <sukadev@us.ibm.com> Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
527b3e4773
commit
89a52e109e
1 changed files with 8 additions and 3 deletions
|
@ -220,6 +220,7 @@ int devpts_pty_new(struct inode *ptmx_inode, struct tty_struct *tty)
|
|||
dev_t device = MKDEV(driver->major, driver->minor_start+number);
|
||||
struct dentry *dentry;
|
||||
struct inode *inode = new_inode(devpts_mnt->mnt_sb);
|
||||
char s[12];
|
||||
|
||||
/* We're supposed to be given the slave end of a pty */
|
||||
BUG_ON(driver->type != TTY_DRIVER_TYPE_PTY);
|
||||
|
@ -235,9 +236,13 @@ int devpts_pty_new(struct inode *ptmx_inode, struct tty_struct *tty)
|
|||
init_special_inode(inode, S_IFCHR|config.mode, device);
|
||||
inode->i_private = tty;
|
||||
|
||||
dentry = get_node(number);
|
||||
if (!IS_ERR(dentry) && !dentry->d_inode) {
|
||||
d_instantiate(dentry, inode);
|
||||
sprintf(s, "%d", number);
|
||||
|
||||
mutex_lock(&devpts_root->d_inode->i_mutex);
|
||||
|
||||
dentry = d_alloc_name(devpts_root, s);
|
||||
if (!IS_ERR(dentry)) {
|
||||
d_add(dentry, inode);
|
||||
fsnotify_create(devpts_root->d_inode, dentry);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue