xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TTY: devpts, don't care about TTY in devpts_get_tty

Browse Source 
The goal is to stop setting and using tty->driver_data in devpts code.
It should be used solely by the driver's code, pty in this case.

First, here we remove TTY from devpts_get_tty and rename it to
devpts_get_priv. Note we do not remove type safety, we just shift the
[implicit] (void *) cast one layer up.

index was unused in devpts_get_tty, so remove that from the prototype
too.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby
2012-10-18 22:26:27 +02:00
committed by Greg Kroah-Hartman
parent cee4ad1ed9
commit 8fcbaa2b7f
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/tty/pty.c
View File

@@ -547,7 +547,7 @@ static struct tty_struct *pts_unix98_lookup(struct tty_driver *driver,
struct tty_struct *tty; struct tty_struct *tty;
mutex_lock(&devpts_mutex); mutex_lock(&devpts_mutex);
tty = devpts_get_tty(pts_inode, idx); tty = devpts_get_priv(pts_inode);
mutex_unlock(&devpts_mutex); mutex_unlock(&devpts_mutex);
/* Master must be open before slave */ /* Master must be open before slave */
if (!tty) if (!tty)

9
fs/devpts/inode.c
View File

@@ -593,10 +593,10 @@ int devpts_pty_new(struct inode *ptmx_inode, struct tty_struct *tty)
return ret; return ret;
} }
struct tty_struct *devpts_get_tty(struct inode *pts_inode, int number) void *devpts_get_priv(struct inode *pts_inode)
{ {
struct dentry *dentry; struct dentry *dentry;
struct tty_struct *tty; void *priv = NULL;
BUG_ON(pts_inode->i_rdev == MKDEV(TTYAUX_MAJOR, PTMX_MINOR)); BUG_ON(pts_inode->i_rdev == MKDEV(TTYAUX_MAJOR, PTMX_MINOR));
@@ -605,13 +605,12 @@ struct tty_struct *devpts_get_tty(struct inode *pts_inode, int number)
if (!dentry) if (!dentry)
return NULL; return NULL;
tty = NULL;
if (pts_inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC) if (pts_inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC)
tty = (struct tty_struct *)pts_inode->i_private; priv = pts_inode->i_private;
dput(dentry); dput(dentry);
return tty; return priv;
} }
void devpts_pty_kill(struct tty_struct *tty) void devpts_pty_kill(struct tty_struct *tty)

7
include/linux/devpts_fs.h
View File

@@ -21,8 +21,8 @@ int devpts_new_index(struct inode *ptmx_inode);
void devpts_kill_index(struct inode *ptmx_inode, int idx); void devpts_kill_index(struct inode *ptmx_inode, int idx);
/* mknod in devpts */ /* mknod in devpts */
int devpts_pty_new(struct inode *ptmx_inode, struct tty_struct *tty); int devpts_pty_new(struct inode *ptmx_inode, struct tty_struct *tty);
/* get tty structure */ /* get private structure */
struct tty_struct *devpts_get_tty(struct inode *pts_inode, int number); void *devpts_get_priv(struct inode *pts_inode);
/* unlink */ /* unlink */
void devpts_pty_kill(struct tty_struct *tty); void devpts_pty_kill(struct tty_struct *tty);
@@ -36,8 +36,7 @@ static inline int devpts_pty_new(struct inode *ptmx_inode,
{ {
return -EINVAL; return -EINVAL;
} }
static inline struct tty_struct *devpts_get_tty(struct inode *pts_inode, static inline void *devpts_get_priv(struct inode *pts_inode)
int number)
{ {
return NULL; return NULL;
} }