Commit 89a52e10 authored by Sukadev Bhattiprolu's avatar Sukadev Bhattiprolu Committed by Linus Torvalds
Browse files

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: default avatarSukadev Bhattiprolu <sukadev@us.ibm.com>
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 527b3e47

fs/devpts/inode.c

+8 −3
Original line number Original line Diff line number Diff line
@@ -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);

	}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE