Automerge

ce08711a · Linus Torvalds · 884b4b8e · 7c99b975 · ce08711a
Commit ce08711a authored Apr 03, 2002 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 6 deletions

fs/jfs/namei.c fs/jfs/namei.c +1 -6

No files found.
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -1360,12 +1360,7 @@ int jfs_mknod(struct inode *dir, struct dentry *dentry, int mode, int rdev)
 		goto out1;
 	}
-	if (S_ISREG(ip->i_mode)) {
+	init_special_inode(ip, ip->i_mode, rdev);
-		ip->i_op = &jfs_file_inode_operations;
-		ip->i_fop = &jfs_file_operations;
-		ip->i_mapping->a_ops = &jfs_aops;
-	} else
-		init_special_inode(ip, ip->i_mode, rdev);
 	insert_inode_hash(ip);
 	mark_inode_dirty(ip);