Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 527b3e47 authored by Sukadev Bhattiprolu's avatar Sukadev Bhattiprolu Committed by Linus Torvalds
Browse files

Simplify devpts_get_tty() 



As pointed out by H. Peter Anvin, since the inode for the pty is known,
we don't need to look it up.

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 15f1a633

fs/devpts/inode.c

+5 −12
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#define DEVPTS_SUPER_MAGIC 0x1cd1



#define DEVPTS_DEFAULT_MODE 0600

#define PTMX_MINOR	2



extern int pty_limit;			/* Config limit on Unix98 ptys */

static DEFINE_IDA(allocated_ptys);
@@ -247,19 +248,11 @@ int devpts_pty_new(struct inode *ptmx_inode, struct tty_struct *tty) 


struct tty_struct *devpts_get_tty(struct inode *pts_inode, int number)

{

	struct dentry *dentry = get_node(number);

	struct tty_struct *tty;



	tty = NULL;

	if (!IS_ERR(dentry)) {

		if (dentry->d_inode)

			tty = dentry->d_inode->i_private;

		dput(dentry);

	}



	mutex_unlock(&devpts_root->d_inode->i_mutex);

	BUG_ON(pts_inode->i_rdev == MKDEV(TTYAUX_MAJOR, PTMX_MINOR));



	return tty;

	if (pts_inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC)

		return (struct tty_struct *)pts_inode->i_private;

	return NULL;

}



void devpts_pty_kill(struct tty_struct *tty)