Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / hfsplus / catalog.c

diff --git a/fs/hfsplus/catalog.c b/fs/hfsplus/catalog.c
index 8f194a4..f2d7c49 100644 (file)
--- a/fs/hfsplus/catalog.c
+++ b/fs/hfsplus/catalog.c
@@ -13,7 +13,8 @@
 #include "hfsplus_fs.h"
 #include "hfsplus_raw.h"
 
-int hfsplus_cat_cmp_key(hfsplus_btree_key *k1, hfsplus_btree_key *k2)
+int hfsplus_cat_case_cmp_key(const hfsplus_btree_key *k1,
+                            const hfsplus_btree_key *k2)
 {
        __be32 k1p, k2p;
 
@@ -22,17 +23,30 @@ int hfsplus_cat_cmp_key(hfsplus_btree_key *k1, hfsplus_btree_key *k2)
        if (k1p != k2p)
                return be32_to_cpu(k1p) < be32_to_cpu(k2p) ? -1 : 1;
 
-       return hfsplus_unistrcmp(&k1->cat.name, &k2->cat.name);
+       return hfsplus_strcasecmp(&k1->cat.name, &k2->cat.name);
 }
 
-void hfsplus_cat_build_key(hfsplus_btree_key *key, u32 parent,
-                         struct qstr *str)
+int hfsplus_cat_bin_cmp_key(const hfsplus_btree_key *k1,
+                           const hfsplus_btree_key *k2)
+{
+       __be32 k1p, k2p;
+
+       k1p = k1->cat.parent;
+       k2p = k2->cat.parent;
+       if (k1p != k2p)
+               return be32_to_cpu(k1p) < be32_to_cpu(k2p) ? -1 : 1;
+
+       return hfsplus_strcmp(&k1->cat.name, &k2->cat.name);
+}
+
+void hfsplus_cat_build_key(struct super_block *sb, hfsplus_btree_key *key,
+                          u32 parent, struct qstr *str)
 {
        int len;
 
        key->cat.parent = cpu_to_be32(parent);
        if (str) {
-               hfsplus_asc2uni(&key->cat.name, str->name, str->len);
+               hfsplus_asc2uni(sb, &key->cat.name, str->name, str->len);
                len = be16_to_cpu(key->cat.name.length);
        } else {
                key->cat.name.length = 0;
@@ -80,8 +94,11 @@ static int hfsplus_cat_build_record(hfsplus_cat_entry *entry, u32 cnid, struct i
                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 */
@@ -95,31 +112,41 @@ static int hfsplus_cat_build_record(hfsplus_cat_entry *entry, u32 cnid, struct i
                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);
-                       file->user_info.fdCreator = cpu_to_be32(HFSPLUS_SB(inode->i_sb).creator);
+                       if (S_ISLNK(inode->i_mode)) {
+                               file->user_info.fdType = cpu_to_be32(HFSP_SYMLINK_TYPE);
+                               file->user_info.fdCreator = cpu_to_be32(HFSP_SYMLINK_CREATOR);
+                       } else {
+                               file->user_info.fdType = cpu_to_be32(HFSPLUS_SB(inode->i_sb).type);
+                               file->user_info.fdCreator = cpu_to_be32(HFSPLUS_SB(inode->i_sb).creator);
+                       }
                        if ((file->permissions.rootflags | file->permissions.userflags) & HFSPLUS_FLG_IMMUTABLE)
                                file->flags |= cpu_to_be16(HFSPLUS_FILE_LOCKED);
                } else {
                        file->user_info.fdType = cpu_to_be32(HFSP_HARDLINK_TYPE);
                        file->user_info.fdCreator = cpu_to_be32(HFSP_HFSPLUS_CREATOR);
                        file->user_info.fdFlags = cpu_to_be16(0x100);
+                       file->create_date = HFSPLUS_I(HFSPLUS_SB(inode->i_sb).hidden_dir).create_date;
                        file->permissions.dev = cpu_to_be32(HFSPLUS_I(inode).dev);
                }
                return sizeof(*file);
        }
 }
 
-static int hfsplus_fill_cat_thread(hfsplus_cat_entry *entry, int type,
+static int hfsplus_fill_cat_thread(struct super_block *sb,
+                                  hfsplus_cat_entry *entry, int type,
                                   u32 parentid, struct qstr *str)
 {
        entry->type = cpu_to_be16(type);
        entry->thread.reserved = 0;
        entry->thread.parentID = cpu_to_be32(parentid);
-       hfsplus_asc2uni(&entry->thread.nodeName, str->name, str->len);
+       hfsplus_asc2uni(sb, &entry->thread.nodeName, str->name, str->len);
        return 10 + be16_to_cpu(entry->thread.nodeName.length) * 2;
 }
 
@@ -131,14 +158,14 @@ int hfsplus_find_cat(struct super_block *sb, u32 cnid,
        int err;
        u16 type;
 
-       hfsplus_cat_build_key(fd->search_key, cnid, NULL);
+       hfsplus_cat_build_key(sb, fd->search_key, cnid, NULL);
        err = hfs_brec_read(fd, &tmp, sizeof(hfsplus_cat_entry));
        if (err)
                return err;
 
        type = be16_to_cpu(tmp.type);
        if (type != HFSPLUS_FOLDER_THREAD && type != HFSPLUS_FILE_THREAD) {
-               printk("HFS+-fs: Found bad thread record in catalog\n");
+               printk(KERN_ERR "hfs: found bad thread record in catalog\n");
                return -EIO;
        }
 
@@ -159,8 +186,8 @@ int hfsplus_create_cat(u32 cnid, struct inode *dir, struct qstr *str, struct ino
        sb = dir->i_sb;
        hfs_find_init(HFSPLUS_SB(sb).cat_tree, &fd);
 
-       hfsplus_cat_build_key(fd.search_key, cnid, NULL);
-       entry_size = hfsplus_fill_cat_thread(&entry, S_ISDIR(inode->i_mode) ?
+       hfsplus_cat_build_key(sb, fd.search_key, cnid, NULL);
+       entry_size = hfsplus_fill_cat_thread(sb, &entry, S_ISDIR(inode->i_mode) ?
                        HFSPLUS_FOLDER_THREAD : HFSPLUS_FILE_THREAD,
                        dir->i_ino, str);
        err = hfs_brec_find(&fd);
@@ -173,7 +200,7 @@ int hfsplus_create_cat(u32 cnid, struct inode *dir, struct qstr *str, struct ino
        if (err)
                goto err2;
 
-       hfsplus_cat_build_key(fd.search_key, dir->i_ino, str);
+       hfsplus_cat_build_key(sb, fd.search_key, dir->i_ino, str);
        entry_size = hfsplus_cat_build_record(&entry, cnid, inode);
        err = hfs_brec_find(&fd);
        if (err != -ENOENT) {
@@ -193,7 +220,7 @@ int hfsplus_create_cat(u32 cnid, struct inode *dir, struct qstr *str, struct ino
        return 0;
 
 err1:
-       hfsplus_cat_build_key(fd.search_key, cnid, NULL);
+       hfsplus_cat_build_key(sb, fd.search_key, cnid, NULL);
        if (!hfs_brec_find(&fd))
                hfs_brec_remove(&fd);
 err2:
@@ -217,7 +244,7 @@ int hfsplus_delete_cat(u32 cnid, struct inode *dir, struct qstr *str)
        if (!str) {
                int len;
 
-               hfsplus_cat_build_key(fd.search_key, cnid, NULL);
+               hfsplus_cat_build_key(sb, fd.search_key, cnid, NULL);
                err = hfs_brec_find(&fd);
                if (err)
                        goto out;
@@ -229,7 +256,7 @@ int hfsplus_delete_cat(u32 cnid, struct inode *dir, struct qstr *str)
                hfs_bnode_read(fd.bnode, &fd.search_key->cat.name.unicode, off + 2, len);
                fd.search_key->key_len = cpu_to_be16(6 + len);
        } else
-               hfsplus_cat_build_key(fd.search_key, dir->i_ino, str);
+               hfsplus_cat_build_key(sb, fd.search_key, dir->i_ino, str);
 
        err = hfs_brec_find(&fd);
        if (err)
@@ -259,7 +286,7 @@ int hfsplus_delete_cat(u32 cnid, struct inode *dir, struct qstr *str)
        if (err)
                goto out;
 
-       hfsplus_cat_build_key(fd.search_key, cnid, NULL);
+       hfsplus_cat_build_key(sb, fd.search_key, cnid, NULL);
        err = hfs_brec_find(&fd);
        if (err)
                goto out;
@@ -294,7 +321,7 @@ int hfsplus_rename_cat(u32 cnid,
        dst_fd = src_fd;
 
        /* find the old dir entry and read the data */
-       hfsplus_cat_build_key(src_fd.search_key, src_dir->i_ino, src_name);
+       hfsplus_cat_build_key(sb, src_fd.search_key, src_dir->i_ino, src_name);
        err = hfs_brec_find(&src_fd);
        if (err)
                goto out;
@@ -303,7 +330,7 @@ int hfsplus_rename_cat(u32 cnid,
                                src_fd.entrylength);
 
        /* create new dir entry with the data from the old entry */
-       hfsplus_cat_build_key(dst_fd.search_key, dst_dir->i_ino, dst_name);
+       hfsplus_cat_build_key(sb, dst_fd.search_key, dst_dir->i_ino, dst_name);
        err = hfs_brec_find(&dst_fd);
        if (err != -ENOENT) {
                if (!err)
@@ -319,7 +346,7 @@ int hfsplus_rename_cat(u32 cnid,
        mark_inode_dirty(dst_dir);
 
        /* finally remove the old entry */
-       hfsplus_cat_build_key(src_fd.search_key, src_dir->i_ino, src_name);
+       hfsplus_cat_build_key(sb, src_fd.search_key, src_dir->i_ino, src_name);
        err = hfs_brec_find(&src_fd);
        if (err)
                goto out;
@@ -331,7 +358,7 @@ int hfsplus_rename_cat(u32 cnid,
        mark_inode_dirty(src_dir);
 
        /* remove old thread entry */
-       hfsplus_cat_build_key(src_fd.search_key, cnid, NULL);
+       hfsplus_cat_build_key(sb, src_fd.search_key, cnid, NULL);
        err = hfs_brec_find(&src_fd);
        if (err)
                goto out;
@@ -341,8 +368,8 @@ int hfsplus_rename_cat(u32 cnid,
                goto out;
 
        /* create new thread entry */
-       hfsplus_cat_build_key(dst_fd.search_key, cnid, NULL);
-       entry_size = hfsplus_fill_cat_thread(&entry, type, dst_dir->i_ino, dst_name);
+       hfsplus_cat_build_key(sb, dst_fd.search_key, cnid, NULL);
+       entry_size = hfsplus_fill_cat_thread(sb, &entry, type, dst_dir->i_ino, dst_name);
        err = hfs_brec_find(&dst_fd);
        if (err != -ENOENT) {
                if (!err)