From: Roman Zippel Read the correct ctime from disk (it was written but never read for some reason). Read also creation date, which is used in the next patch. (Problem found by Olivier Castan ) Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton --- fs/hfsplus/catalog.c | 14 ++++++++++---- fs/hfsplus/hfsplus_fs.h | 1 + fs/hfsplus/inode.c | 6 ++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff -puN fs/hfsplus/catalog.c~hfs-set-correct-ctime fs/hfsplus/catalog.c --- devel/fs/hfsplus/catalog.c~hfs-set-correct-ctime 2006-01-16 20:01:53.000000000 -0800 +++ devel-akpm/fs/hfsplus/catalog.c 2006-01-16 20:01:53.000000000 -0800 @@ -94,8 +94,11 @@ static int hfsplus_cat_build_record(hfsp memset(folder, 0, sizeof(*folder)); folder->type = cpu_to_be16(HFSPLUS_FOLDER); folder->id = cpu_to_be32(inode->i_ino); - folder->create_date = folder->content_mod_date = - folder->attribute_mod_date = folder->access_date = hfsp_now2mt(); + HFSPLUS_I(inode).create_date = + folder->create_date = + folder->content_mod_date = + folder->attribute_mod_date = + folder->access_date = hfsp_now2mt(); hfsplus_set_perms(inode, &folder->permissions); if (inode == HFSPLUS_SB(inode->i_sb).hidden_dir) /* invisible and namelocked */ @@ -109,8 +112,11 @@ static int hfsplus_cat_build_record(hfsp file->type = cpu_to_be16(HFSPLUS_FILE); file->flags = cpu_to_be16(HFSPLUS_FILE_THREAD_EXISTS); file->id = cpu_to_be32(cnid); - file->create_date = file->content_mod_date = - file->attribute_mod_date = file->access_date = hfsp_now2mt(); + HFSPLUS_I(inode).create_date = + file->create_date = + file->content_mod_date = + file->attribute_mod_date = + file->access_date = hfsp_now2mt(); if (cnid == inode->i_ino) { hfsplus_set_perms(inode, &file->permissions); file->user_info.fdType = cpu_to_be32(HFSPLUS_SB(inode->i_sb).type); diff -puN fs/hfsplus/hfsplus_fs.h~hfs-set-correct-ctime fs/hfsplus/hfsplus_fs.h --- devel/fs/hfsplus/hfsplus_fs.h~hfs-set-correct-ctime 2006-01-16 20:01:53.000000000 -0800 +++ devel-akpm/fs/hfsplus/hfsplus_fs.h 2006-01-16 20:01:53.000000000 -0800 @@ -166,6 +166,7 @@ struct hfsplus_inode_info { struct inode *rsrc_inode; unsigned long flags; + __be32 create_date; /* Device number in hfsplus_permissions in catalog */ u32 dev; /* BSD system and user file flags */ diff -puN fs/hfsplus/inode.c~hfs-set-correct-ctime fs/hfsplus/inode.c --- devel/fs/hfsplus/inode.c~hfs-set-correct-ctime 2006-01-16 20:01:53.000000000 -0800 +++ devel-akpm/fs/hfsplus/inode.c 2006-01-16 20:01:53.000000000 -0800 @@ -431,7 +431,8 @@ int hfsplus_cat_read_inode(struct inode inode->i_size = 2 + be32_to_cpu(folder->valence); inode->i_atime = hfsp_mt2ut(folder->access_date); inode->i_mtime = hfsp_mt2ut(folder->content_mod_date); - inode->i_ctime = inode->i_mtime; + inode->i_ctime = hfsp_mt2ut(folder->attribute_mod_date); + HFSPLUS_I(inode).create_date = folder->create_date; HFSPLUS_I(inode).fs_blocks = 0; inode->i_op = &hfsplus_dir_inode_operations; inode->i_fop = &hfsplus_dir_operations; @@ -462,7 +463,8 @@ int hfsplus_cat_read_inode(struct inode } inode->i_atime = hfsp_mt2ut(file->access_date); inode->i_mtime = hfsp_mt2ut(file->content_mod_date); - inode->i_ctime = inode->i_mtime; + inode->i_ctime = hfsp_mt2ut(file->attribute_mod_date); + HFSPLUS_I(inode).create_date = file->create_date; } else { printk(KERN_ERR "hfs: bad catalog entry used to create inode\n"); res = -EIO; _