catalog.c (a292241cccb7e20e8b997a9a44177e7c98141859) catalog.c (89ac9b4d3d1a049ae1054f99b1aed81092cd0a82)
1/*
2 * linux/fs/hfsplus/catalog.c
3 *
4 * Copyright (C) 2001
5 * Brad Boyer (flar@allandria.com)
6 * (C) 2003 Ardis Technologies <roman@ardistech.com>
7 *
8 * Handling of catalog records

--- 24 unchanged lines hidden (view full) ---

33 k1p = k1->cat.parent;
34 k2p = k2->cat.parent;
35 if (k1p != k2p)
36 return be32_to_cpu(k1p) < be32_to_cpu(k2p) ? -1 : 1;
37
38 return hfsplus_strcmp(&k1->cat.name, &k2->cat.name);
39}
40
1/*
2 * linux/fs/hfsplus/catalog.c
3 *
4 * Copyright (C) 2001
5 * Brad Boyer (flar@allandria.com)
6 * (C) 2003 Ardis Technologies <roman@ardistech.com>
7 *
8 * Handling of catalog records

--- 24 unchanged lines hidden (view full) ---

33 k1p = k1->cat.parent;
34 k2p = k2->cat.parent;
35 if (k1p != k2p)
36 return be32_to_cpu(k1p) < be32_to_cpu(k2p) ? -1 : 1;
37
38 return hfsplus_strcmp(&k1->cat.name, &k2->cat.name);
39}
40
41void hfsplus_cat_build_key(struct super_block *sb, hfsplus_btree_key *key,
42 u32 parent, struct qstr *str)
41/* Generates key for catalog file/folders record. */
42int hfsplus_cat_build_key(struct super_block *sb,
43 hfsplus_btree_key *key, u32 parent, struct qstr *str)
43{
44{
44 int len;
45 int len, err;
45
46 key->cat.parent = cpu_to_be32(parent);
46
47 key->cat.parent = cpu_to_be32(parent);
47 if (str) {
48 hfsplus_asc2uni(sb, &key->cat.name, HFSPLUS_MAX_STRLEN,
49 str->name, str->len);
50 len = be16_to_cpu(key->cat.name.length);
51 } else {
52 key->cat.name.length = 0;
53 len = 0;
54 }
48 err = hfsplus_asc2uni(sb, &key->cat.name, HFSPLUS_MAX_STRLEN,
49 str->name, str->len);
50 if (unlikely(err < 0))
51 return err;
52
53 len = be16_to_cpu(key->cat.name.length);
55 key->key_len = cpu_to_be16(6 + 2 * len);
54 key->key_len = cpu_to_be16(6 + 2 * len);
55 return 0;
56}
57
56}
57
58/* Generates key for catalog thread record. */
59void hfsplus_cat_build_key_with_cnid(struct super_block *sb,
60 hfsplus_btree_key *key, u32 parent)
61{
62 key->cat.parent = cpu_to_be32(parent);
63 key->cat.name.length = 0;
64 key->key_len = cpu_to_be16(6);
65}
66
58static void hfsplus_cat_build_key_uni(hfsplus_btree_key *key, u32 parent,
59 struct hfsplus_unistr *name)
60{
61 int ustrlen;
62
63 ustrlen = be16_to_cpu(name->length);
64 key->cat.parent = cpu_to_be32(parent);
65 key->cat.name.length = cpu_to_be16(ustrlen);

--- 96 unchanged lines hidden (view full) ---

162 return sizeof(*file);
163 }
164}
165
166static int hfsplus_fill_cat_thread(struct super_block *sb,
167 hfsplus_cat_entry *entry, int type,
168 u32 parentid, struct qstr *str)
169{
67static void hfsplus_cat_build_key_uni(hfsplus_btree_key *key, u32 parent,
68 struct hfsplus_unistr *name)
69{
70 int ustrlen;
71
72 ustrlen = be16_to_cpu(name->length);
73 key->cat.parent = cpu_to_be32(parent);
74 key->cat.name.length = cpu_to_be16(ustrlen);

--- 96 unchanged lines hidden (view full) ---

171 return sizeof(*file);
172 }
173}
174
175static int hfsplus_fill_cat_thread(struct super_block *sb,
176 hfsplus_cat_entry *entry, int type,
177 u32 parentid, struct qstr *str)
178{
179 int err;
180
170 entry->type = cpu_to_be16(type);
171 entry->thread.reserved = 0;
172 entry->thread.parentID = cpu_to_be32(parentid);
181 entry->type = cpu_to_be16(type);
182 entry->thread.reserved = 0;
183 entry->thread.parentID = cpu_to_be32(parentid);
173 hfsplus_asc2uni(sb, &entry->thread.nodeName, HFSPLUS_MAX_STRLEN,
184 err = hfsplus_asc2uni(sb, &entry->thread.nodeName, HFSPLUS_MAX_STRLEN,
174 str->name, str->len);
185 str->name, str->len);
186 if (unlikely(err < 0))
187 return err;
188
175 return 10 + be16_to_cpu(entry->thread.nodeName.length) * 2;
176}
177
178/* Try to get a catalog entry for given catalog id */
179int hfsplus_find_cat(struct super_block *sb, u32 cnid,
180 struct hfs_find_data *fd)
181{
182 hfsplus_cat_entry tmp;
183 int err;
184 u16 type;
185
189 return 10 + be16_to_cpu(entry->thread.nodeName.length) * 2;
190}
191
192/* Try to get a catalog entry for given catalog id */
193int hfsplus_find_cat(struct super_block *sb, u32 cnid,
194 struct hfs_find_data *fd)
195{
196 hfsplus_cat_entry tmp;
197 int err;
198 u16 type;
199
186 hfsplus_cat_build_key(sb, fd->search_key, cnid, NULL);
200 hfsplus_cat_build_key_with_cnid(sb, fd->search_key, cnid);
187 err = hfs_brec_read(fd, &tmp, sizeof(hfsplus_cat_entry));
188 if (err)
189 return err;
190
191 type = be16_to_cpu(tmp.type);
192 if (type != HFSPLUS_FOLDER_THREAD && type != HFSPLUS_FILE_THREAD) {
193 pr_err("found bad thread record in catalog\n");
194 return -EIO;

--- 50 unchanged lines hidden (view full) ---

245 int err;
246
247 hfs_dbg(CAT_MOD, "create_cat: %s,%u(%d)\n",
248 str->name, cnid, inode->i_nlink);
249 err = hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &fd);
250 if (err)
251 return err;
252
201 err = hfs_brec_read(fd, &tmp, sizeof(hfsplus_cat_entry));
202 if (err)
203 return err;
204
205 type = be16_to_cpu(tmp.type);
206 if (type != HFSPLUS_FOLDER_THREAD && type != HFSPLUS_FILE_THREAD) {
207 pr_err("found bad thread record in catalog\n");
208 return -EIO;

--- 50 unchanged lines hidden (view full) ---

259 int err;
260
261 hfs_dbg(CAT_MOD, "create_cat: %s,%u(%d)\n",
262 str->name, cnid, inode->i_nlink);
263 err = hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &fd);
264 if (err)
265 return err;
266
253 hfsplus_cat_build_key(sb, fd.search_key, cnid, NULL);
267 hfsplus_cat_build_key_with_cnid(sb, fd.search_key, cnid);
254 entry_size = hfsplus_fill_cat_thread(sb, &entry,
255 S_ISDIR(inode->i_mode) ?
256 HFSPLUS_FOLDER_THREAD : HFSPLUS_FILE_THREAD,
257 dir->i_ino, str);
268 entry_size = hfsplus_fill_cat_thread(sb, &entry,
269 S_ISDIR(inode->i_mode) ?
270 HFSPLUS_FOLDER_THREAD : HFSPLUS_FILE_THREAD,
271 dir->i_ino, str);
272 if (unlikely(entry_size < 0)) {
273 err = entry_size;
274 goto err2;
275 }
276
258 err = hfs_brec_find(&fd, hfs_find_rec_by_key);
259 if (err != -ENOENT) {
260 if (!err)
261 err = -EEXIST;
262 goto err2;
263 }
264 err = hfs_brec_insert(&fd, &entry, entry_size);
265 if (err)
266 goto err2;
267
277 err = hfs_brec_find(&fd, hfs_find_rec_by_key);
278 if (err != -ENOENT) {
279 if (!err)
280 err = -EEXIST;
281 goto err2;
282 }
283 err = hfs_brec_insert(&fd, &entry, entry_size);
284 if (err)
285 goto err2;
286
268 hfsplus_cat_build_key(sb, fd.search_key, dir->i_ino, str);
287 err = hfsplus_cat_build_key(sb, fd.search_key, dir->i_ino, str);
288 if (unlikely(err))
289 goto err1;
290
269 entry_size = hfsplus_cat_build_record(&entry, cnid, inode);
270 err = hfs_brec_find(&fd, hfs_find_rec_by_key);
271 if (err != -ENOENT) {
272 /* panic? */
273 if (!err)
274 err = -EEXIST;
275 goto err1;
276 }

--- 6 unchanged lines hidden (view full) ---

283 hfsplus_subfolders_inc(dir);
284 dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
285 hfsplus_mark_inode_dirty(dir, HFSPLUS_I_CAT_DIRTY);
286
287 hfs_find_exit(&fd);
288 return 0;
289
290err1:
291 entry_size = hfsplus_cat_build_record(&entry, cnid, inode);
292 err = hfs_brec_find(&fd, hfs_find_rec_by_key);
293 if (err != -ENOENT) {
294 /* panic? */
295 if (!err)
296 err = -EEXIST;
297 goto err1;
298 }

--- 6 unchanged lines hidden (view full) ---

305 hfsplus_subfolders_inc(dir);
306 dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
307 hfsplus_mark_inode_dirty(dir, HFSPLUS_I_CAT_DIRTY);
308
309 hfs_find_exit(&fd);
310 return 0;
311
312err1:
291 hfsplus_cat_build_key(sb, fd.search_key, cnid, NULL);
313 hfsplus_cat_build_key_with_cnid(sb, fd.search_key, cnid);
292 if (!hfs_brec_find(&fd, hfs_find_rec_by_key))
293 hfs_brec_remove(&fd);
294err2:
295 hfs_find_exit(&fd);
296 return err;
297}
298
299int hfsplus_delete_cat(u32 cnid, struct inode *dir, struct qstr *str)

--- 8 unchanged lines hidden (view full) ---

308 hfs_dbg(CAT_MOD, "delete_cat: %s,%u\n", str ? str->name : NULL, cnid);
309 err = hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &fd);
310 if (err)
311 return err;
312
313 if (!str) {
314 int len;
315
314 if (!hfs_brec_find(&fd, hfs_find_rec_by_key))
315 hfs_brec_remove(&fd);
316err2:
317 hfs_find_exit(&fd);
318 return err;
319}
320
321int hfsplus_delete_cat(u32 cnid, struct inode *dir, struct qstr *str)

--- 8 unchanged lines hidden (view full) ---

330 hfs_dbg(CAT_MOD, "delete_cat: %s,%u\n", str ? str->name : NULL, cnid);
331 err = hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &fd);
332 if (err)
333 return err;
334
335 if (!str) {
336 int len;
337
316 hfsplus_cat_build_key(sb, fd.search_key, cnid, NULL);
338 hfsplus_cat_build_key_with_cnid(sb, fd.search_key, cnid);
317 err = hfs_brec_find(&fd, hfs_find_rec_by_key);
318 if (err)
319 goto out;
320
321 off = fd.entryoffset +
322 offsetof(struct hfsplus_cat_thread, nodeName);
323 fd.search_key->cat.parent = cpu_to_be32(dir->i_ino);
324 hfs_bnode_read(fd.bnode,
325 &fd.search_key->cat.name.length, off, 2);
326 len = be16_to_cpu(fd.search_key->cat.name.length) * 2;
327 hfs_bnode_read(fd.bnode,
328 &fd.search_key->cat.name.unicode,
329 off + 2, len);
330 fd.search_key->key_len = cpu_to_be16(6 + len);
331 } else
339 err = hfs_brec_find(&fd, hfs_find_rec_by_key);
340 if (err)
341 goto out;
342
343 off = fd.entryoffset +
344 offsetof(struct hfsplus_cat_thread, nodeName);
345 fd.search_key->cat.parent = cpu_to_be32(dir->i_ino);
346 hfs_bnode_read(fd.bnode,
347 &fd.search_key->cat.name.length, off, 2);
348 len = be16_to_cpu(fd.search_key->cat.name.length) * 2;
349 hfs_bnode_read(fd.bnode,
350 &fd.search_key->cat.name.unicode,
351 off + 2, len);
352 fd.search_key->key_len = cpu_to_be16(6 + len);
353 } else
332 hfsplus_cat_build_key(sb, fd.search_key, dir->i_ino, str);
354 err = hfsplus_cat_build_key(sb, fd.search_key, dir->i_ino, str);
355 if (unlikely(err))
356 goto out;
333
334 err = hfs_brec_find(&fd, hfs_find_rec_by_key);
335 if (err)
336 goto out;
337
338 type = hfs_bnode_read_u16(fd.bnode, fd.entryoffset);
339 if (type == HFSPLUS_FILE) {
340#if 0

--- 14 unchanged lines hidden (view full) ---

355 if (fd.tree->keycmp(fd.search_key, (void *)&rd->key) < 0)
356 rd->file->f_pos--;
357 }
358
359 err = hfs_brec_remove(&fd);
360 if (err)
361 goto out;
362
357
358 err = hfs_brec_find(&fd, hfs_find_rec_by_key);
359 if (err)
360 goto out;
361
362 type = hfs_bnode_read_u16(fd.bnode, fd.entryoffset);
363 if (type == HFSPLUS_FILE) {
364#if 0

--- 14 unchanged lines hidden (view full) ---

379 if (fd.tree->keycmp(fd.search_key, (void *)&rd->key) < 0)
380 rd->file->f_pos--;
381 }
382
383 err = hfs_brec_remove(&fd);
384 if (err)
385 goto out;
386
363 hfsplus_cat_build_key(sb, fd.search_key, cnid, NULL);
387 hfsplus_cat_build_key_with_cnid(sb, fd.search_key, cnid);
364 err = hfs_brec_find(&fd, hfs_find_rec_by_key);
365 if (err)
366 goto out;
367
368 err = hfs_brec_remove(&fd);
369 if (err)
370 goto out;
371

--- 28 unchanged lines hidden (view full) ---

400 cnid, src_dir->i_ino, src_name->name,
401 dst_dir->i_ino, dst_name->name);
402 err = hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &src_fd);
403 if (err)
404 return err;
405 dst_fd = src_fd;
406
407 /* find the old dir entry and read the data */
388 err = hfs_brec_find(&fd, hfs_find_rec_by_key);
389 if (err)
390 goto out;
391
392 err = hfs_brec_remove(&fd);
393 if (err)
394 goto out;
395

--- 28 unchanged lines hidden (view full) ---

424 cnid, src_dir->i_ino, src_name->name,
425 dst_dir->i_ino, dst_name->name);
426 err = hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &src_fd);
427 if (err)
428 return err;
429 dst_fd = src_fd;
430
431 /* find the old dir entry and read the data */
408 hfsplus_cat_build_key(sb, src_fd.search_key, src_dir->i_ino, src_name);
432 err = hfsplus_cat_build_key(sb, src_fd.search_key,
433 src_dir->i_ino, src_name);
434 if (unlikely(err))
435 goto out;
436
409 err = hfs_brec_find(&src_fd, hfs_find_rec_by_key);
410 if (err)
411 goto out;
412 if (src_fd.entrylength > sizeof(entry) || src_fd.entrylength < 0) {
413 err = -EIO;
414 goto out;
415 }
416
417 hfs_bnode_read(src_fd.bnode, &entry, src_fd.entryoffset,
418 src_fd.entrylength);
419 type = be16_to_cpu(entry.type);
420
421 /* create new dir entry with the data from the old entry */
437 err = hfs_brec_find(&src_fd, hfs_find_rec_by_key);
438 if (err)
439 goto out;
440 if (src_fd.entrylength > sizeof(entry) || src_fd.entrylength < 0) {
441 err = -EIO;
442 goto out;
443 }
444
445 hfs_bnode_read(src_fd.bnode, &entry, src_fd.entryoffset,
446 src_fd.entrylength);
447 type = be16_to_cpu(entry.type);
448
449 /* create new dir entry with the data from the old entry */
422 hfsplus_cat_build_key(sb, dst_fd.search_key, dst_dir->i_ino, dst_name);
450 err = hfsplus_cat_build_key(sb, dst_fd.search_key,
451 dst_dir->i_ino, dst_name);
452 if (unlikely(err))
453 goto out;
454
423 err = hfs_brec_find(&dst_fd, hfs_find_rec_by_key);
424 if (err != -ENOENT) {
425 if (!err)
426 err = -EEXIST;
427 goto out;
428 }
429
430 err = hfs_brec_insert(&dst_fd, &entry, src_fd.entrylength);
431 if (err)
432 goto out;
433 dst_dir->i_size++;
434 if (type == HFSPLUS_FOLDER)
435 hfsplus_subfolders_inc(dst_dir);
436 dst_dir->i_mtime = dst_dir->i_ctime = CURRENT_TIME_SEC;
437
438 /* finally remove the old entry */
455 err = hfs_brec_find(&dst_fd, hfs_find_rec_by_key);
456 if (err != -ENOENT) {
457 if (!err)
458 err = -EEXIST;
459 goto out;
460 }
461
462 err = hfs_brec_insert(&dst_fd, &entry, src_fd.entrylength);
463 if (err)
464 goto out;
465 dst_dir->i_size++;
466 if (type == HFSPLUS_FOLDER)
467 hfsplus_subfolders_inc(dst_dir);
468 dst_dir->i_mtime = dst_dir->i_ctime = CURRENT_TIME_SEC;
469
470 /* finally remove the old entry */
439 hfsplus_cat_build_key(sb, src_fd.search_key, src_dir->i_ino, src_name);
471 err = hfsplus_cat_build_key(sb, src_fd.search_key,
472 src_dir->i_ino, src_name);
473 if (unlikely(err))
474 goto out;
475
440 err = hfs_brec_find(&src_fd, hfs_find_rec_by_key);
441 if (err)
442 goto out;
443 err = hfs_brec_remove(&src_fd);
444 if (err)
445 goto out;
446 src_dir->i_size--;
447 if (type == HFSPLUS_FOLDER)
448 hfsplus_subfolders_dec(src_dir);
449 src_dir->i_mtime = src_dir->i_ctime = CURRENT_TIME_SEC;
450
451 /* remove old thread entry */
476 err = hfs_brec_find(&src_fd, hfs_find_rec_by_key);
477 if (err)
478 goto out;
479 err = hfs_brec_remove(&src_fd);
480 if (err)
481 goto out;
482 src_dir->i_size--;
483 if (type == HFSPLUS_FOLDER)
484 hfsplus_subfolders_dec(src_dir);
485 src_dir->i_mtime = src_dir->i_ctime = CURRENT_TIME_SEC;
486
487 /* remove old thread entry */
452 hfsplus_cat_build_key(sb, src_fd.search_key, cnid, NULL);
488 hfsplus_cat_build_key_with_cnid(sb, src_fd.search_key, cnid);
453 err = hfs_brec_find(&src_fd, hfs_find_rec_by_key);
454 if (err)
455 goto out;
456 type = hfs_bnode_read_u16(src_fd.bnode, src_fd.entryoffset);
457 err = hfs_brec_remove(&src_fd);
458 if (err)
459 goto out;
460
461 /* create new thread entry */
489 err = hfs_brec_find(&src_fd, hfs_find_rec_by_key);
490 if (err)
491 goto out;
492 type = hfs_bnode_read_u16(src_fd.bnode, src_fd.entryoffset);
493 err = hfs_brec_remove(&src_fd);
494 if (err)
495 goto out;
496
497 /* create new thread entry */
462 hfsplus_cat_build_key(sb, dst_fd.search_key, cnid, NULL);
498 hfsplus_cat_build_key_with_cnid(sb, dst_fd.search_key, cnid);
463 entry_size = hfsplus_fill_cat_thread(sb, &entry, type,
464 dst_dir->i_ino, dst_name);
499 entry_size = hfsplus_fill_cat_thread(sb, &entry, type,
500 dst_dir->i_ino, dst_name);
501 if (unlikely(entry_size < 0)) {
502 err = entry_size;
503 goto out;
504 }
505
465 err = hfs_brec_find(&dst_fd, hfs_find_rec_by_key);
466 if (err != -ENOENT) {
467 if (!err)
468 err = -EEXIST;
469 goto out;
470 }
471 err = hfs_brec_insert(&dst_fd, &entry, entry_size);
472
473 hfsplus_mark_inode_dirty(dst_dir, HFSPLUS_I_CAT_DIRTY);
474 hfsplus_mark_inode_dirty(src_dir, HFSPLUS_I_CAT_DIRTY);
475out:
476 hfs_bnode_put(dst_fd.bnode);
477 hfs_find_exit(&src_fd);
478 return err;
479}
506 err = hfs_brec_find(&dst_fd, hfs_find_rec_by_key);
507 if (err != -ENOENT) {
508 if (!err)
509 err = -EEXIST;
510 goto out;
511 }
512 err = hfs_brec_insert(&dst_fd, &entry, entry_size);
513
514 hfsplus_mark_inode_dirty(dst_dir, HFSPLUS_I_CAT_DIRTY);
515 hfsplus_mark_inode_dirty(src_dir, HFSPLUS_I_CAT_DIRTY);
516out:
517 hfs_bnode_put(dst_fd.bnode);
518 hfs_find_exit(&src_fd);
519 return err;
520}