summaryrefslogtreecommitdiff
path: root/fs/inode.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-07-04 08:54:40 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-07-04 08:54:40 -0700
commit75eead62e1de867de280c4edfc24e86cc50577cb (patch)
tree59990c678e78f2928badd292062a1632851a4f4d /fs/inode.c
parent78f1f626d9412e572e9e18a06c9989deaede8a9a (diff)
parent88cc0d3e8fc80880372e6900712a6f3f8172286a (diff)
Merge home.transmeta.com:/home/torvalds/v2.5/viro
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'fs/inode.c')
-rw-r--r--fs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/inode.c b/fs/inode.c
index a3b2cd4e8a3c..d0e6bda9772a 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -101,7 +101,7 @@ static struct inode *alloc_inode(struct super_block *sb)
struct address_space * const mapping = &inode->i_data;
inode->i_sb = sb;
- inode->i_dev = to_kdev_t(sb->s_dev);
+ inode->i_dev = sb->s_dev;
inode->i_blkbits = sb->s_blocksize_bits;
inode->i_flags = 0;
atomic_set(&inode->i_count, 1);