Merge branch 'linux-2.6' into for-2.6.24

[linux-2.6] / fs / adfs / inode.c

diff --git a/fs/adfs/inode.c b/fs/adfs/inode.c
index 534f3eecc985c7b5bfe9231bd4807db4091e388d..7e7a04be1278cf36994a0c2f934419e2ba919060 100644 (file)
--- a/fs/adfs/inode.c
+++ b/fs/adfs/inode.c
@@ -269,7 +269,6 @@ adfs_iget(struct super_block *sb, struct object_info *obj)
        inode->i_ino     = obj->file_id;
        inode->i_size    = obj->size;
        inode->i_nlink   = 2;
-       inode->i_blksize = PAGE_SIZE;
        inode->i_blocks  = (inode->i_size + sb->s_blocksize - 1) >>
                            sb->s_blocksize_bits;