diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
| commit | 95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch) | |
| tree | 27a92a942821cde1edda9a1b088718d436b3efe4 /fs/hfs/inode.c | |
| parent | 45b27b0a0652331d104c953a5b192d843fff88f8 (diff) | |
Merge with Linux 2.3.40.
Diffstat (limited to 'fs/hfs/inode.c')
| -rw-r--r-- | fs/hfs/inode.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c index 8fde9117d..af09655a0 100644 --- a/fs/hfs/inode.c +++ b/fs/hfs/inode.c @@ -44,14 +44,18 @@ static void init_file_inode(struct inode *inode, hfs_u8 fork) } if (fork == HFS_FK_DATA) { +#if 0 /* XXX: disable crlf translations for now */ hfs_u32 type = hfs_get_nl(entry->info.file.finfo.fdType); - fk = &entry->u.file.data_fork; HFS_I(inode)->convert = ((HFS_SB(inode->i_sb)->s_conv == 't') || ((HFS_SB(inode->i_sb)->s_conv == 'a') && ((type == htonl(0x54455854)) || /* "TEXT" */ (type == htonl(0x7474726f))))); /* "ttro" */ +#else + HFS_I(inode)->convert = 0; +#endif + fk = &entry->u.file.data_fork; } else { fk = &entry->u.file.rsrc_fork; HFS_I(inode)->convert = 0; |