int hfsplus_cat_cmp_key(hfsplus_btree_key *k1, hfsplus_btree_key *k2)
{
- u32 k1p, k2p;
+ __be32 k1p, k2p;
k1p = k1->cat.parent;
k2p = k2->cat.parent;
if (str) {
hfsplus_asc2uni(&key->cat.name, str->name, str->len);
len = be16_to_cpu(key->cat.name.length);
- } else
- len = key->cat.name.length = 0;
+ } else {
+ key->cat.name.length = 0;
+ len = 0;
+ }
key->key_len = cpu_to_be16(6 + 2 * len);
}
if (err != -ENOENT) {
if (!err)
err = -EEXIST;
- goto out;
+ goto err2;
}
err = hfs_brec_insert(&fd, &entry, entry_size);
if (err)
- goto out;
+ goto err2;
hfsplus_cat_build_key(fd.search_key, dir->i_ino, str);
entry_size = hfsplus_cat_build_record(&entry, cnid, inode);
/* panic? */
if (!err)
err = -EEXIST;
- goto out;
+ goto err1;
}
err = hfs_brec_insert(&fd, &entry, entry_size);
- if (!err) {
- dir->i_size++;
- mark_inode_dirty(dir);
- }
-out:
+ if (err)
+ goto err1;
+
+ dir->i_size++;
+ dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
+ mark_inode_dirty(dir);
hfs_find_exit(&fd);
+ return 0;
+err1:
+ hfsplus_cat_build_key(fd.search_key, cnid, NULL);
+ if (!hfs_brec_find(&fd))
+ hfs_brec_remove(&fd);
+err2:
+ hfs_find_exit(&fd);
return err;
}
goto out;
dir->i_size--;
+ dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
mark_inode_dirty(dir);
out:
hfs_find_exit(&fd);
if (err)
goto out;
dst_dir->i_size++;
+ dst_dir->i_mtime = dst_dir->i_ctime = CURRENT_TIME_SEC;
mark_inode_dirty(dst_dir);
/* finally remove the old entry */
if (err)
goto out;
src_dir->i_size--;
+ src_dir->i_mtime = src_dir->i_ctime = CURRENT_TIME_SEC;
mark_inode_dirty(src_dir);
/* remove old thread entry */