diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
commit | 99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch) | |
tree | 3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /fs/udf/inode.c | |
parent | e73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff) |
Merge with Linux 2.3.38.
Diffstat (limited to 'fs/udf/inode.c')
-rw-r--r-- | fs/udf/inode.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 05e03def5..e2e12df8e 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -1147,19 +1147,18 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh) } case FILE_TYPE_BLOCK: { - inode->i_op = &blkdev_inode_operations; inode->i_mode |= S_IFBLK; break; } case FILE_TYPE_CHAR: { - inode->i_op = &chrdev_inode_operations; inode->i_mode |= S_IFCHR; break; } case FILE_TYPE_FIFO: { - init_fifo(inode); + init_special_inode(inode, inode->i_mode | S_IFIFO, 0); + break; } case FILE_TYPE_SYMLINK: { @@ -1185,9 +1184,9 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh) if (dsea) { - inode->i_rdev = to_kdev_t( - (le32_to_cpu(dsea->majorDeviceIdent)) << 8) | - (le32_to_cpu(dsea->minorDeviceIdent) & 0xFF); + init_special_inode(inode, inode->i_mode, + ((le32_to_cpu(dsea->majorDeviceIdent)) << 8) | + (le32_to_cpu(dsea->minorDeviceIdent) & 0xFF)); /* Developer ID ??? */ udf_release_data(tbh); } |