From 7a72335c07317bff2fcf6c420beb1b6bb5a04866 Mon Sep 17 00:00:00 2001 From: Sukadev Bhattiprolu Date: Mon, 13 Oct 2008 10:43:18 +0100 Subject: [PATCH] --- yaml --- r: 113467 b: refs/heads/master c: 89a52e109e2e2fe8bbd4e316cdb910774519c029 h: refs/heads/master i: 113465: 38d0d814798b461d686f6ce09ceae391d0fbd887 113463: f3706991490ed3d95cf7d8556ab37e4435c43269 v: v3 --- [refs] | 2 +- trunk/fs/devpts/inode.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1af64d3333b3..048283e602d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 527b3e4773628b30d03323a2cb5fb0d84441990f +refs/heads/master: 89a52e109e2e2fe8bbd4e316cdb910774519c029 diff --git a/trunk/fs/devpts/inode.c b/trunk/fs/devpts/inode.c index b292ed7ff1ca..50e885f84bb0 100644 --- a/trunk/fs/devpts/inode.c +++ b/trunk/fs/devpts/inode.c @@ -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); }