patch-2.4.17 linux/fs/devpts/root.c

• Lines: 23
• Date: Fri Dec 21 16:40:32 2001
• Orig file: linux-2.4.16/fs/devpts/root.c
• Orig date: Fri Aug 11 21:29:02 2000

diff -Naur -X /home/marcelo/lib/dontdiff linux-2.4.16/fs/devpts/root.c linux/fs/devpts/root.c
@@ -101,7 +101,6 @@
 	int i;
 	const char *p;
 
-	dentry->d_inode = NULL;	/* Assume failure */
 	dentry->d_op    = &devpts_dentry_operations;
 
 	if ( dentry->d_name.len == 1 && dentry->d_name.name[0] == '0' ) {
@@ -127,11 +126,10 @@
 	if ( entry >= sbi->max_ptys )
 		return NULL;
 
-	dentry->d_inode = sbi->inodes[entry];
-	if ( dentry->d_inode )
-		atomic_inc(&dentry->d_inode->i_count);
+	if ( sbi->inodes[entry] )
+		atomic_inc(&sbi->inodes[entry]->i_count);
 	
-	d_add(dentry, dentry->d_inode);
+	d_add(dentry, sbi->inodes[entry]);
 
 	return NULL;
 }