Commit ce08711a authored by Linus Torvalds's avatar Linus Torvalds

Automerge

parents 884b4b8e 7c99b975
...@@ -1360,12 +1360,7 @@ int jfs_mknod(struct inode *dir, struct dentry *dentry, int mode, int rdev) ...@@ -1360,12 +1360,7 @@ int jfs_mknod(struct inode *dir, struct dentry *dentry, int mode, int rdev)
goto out1; 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); insert_inode_hash(ip);
mark_inode_dirty(ip); mark_inode_dirty(ip);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment