hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Sukadev Bhattiprolu 2008-10-13 10:43:18 +01:00 committed by Linus Torvalds
parent 527b3e4773
commit 89a52e109e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/devpts/inode.c
View File

@ -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); dev_t device = MKDEV(driver->major, driver->minor_start+number);
struct dentry *dentry; struct dentry *dentry;
struct inode *inode = new_inode(devpts_mnt->mnt_sb); struct inode *inode = new_inode(devpts_mnt->mnt_sb);
char s[12];
/* We're supposed to be given the slave end of a pty */ /* We're supposed to be given the slave end of a pty */
BUG_ON(driver->type != TTY_DRIVER_TYPE_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); init_special_inode(inode, S_IFCHR|config.mode, device);
inode->i_private = tty; inode->i_private = tty;
dentry = get_node(number); sprintf(s, "%d", number);
if (!IS_ERR(dentry) && !dentry->d_inode) {
d_instantiate(dentry, inode); 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); fsnotify_create(devpts_root->d_inode, dentry);
} }