Changeset 3a5ee6c in mainline for uspace/srv/fs/minixfs/mfs_ops.c
- Timestamp:
- 2011-09-04T14:08:37Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- bbd4c72
- Parents:
- c699b0c
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/fs/minixfs/mfs_ops.c
rc699b0c r3a5ee6c 183 183 sb = malloc(MFS_SUPERBLOCK_SIZE); 184 184 if (!sb) { 185 free(instance); 186 free(sbi); 185 187 block_fini(service_id); 186 188 return ENOMEM; … … 190 192 rc = block_read_direct(service_id, MFS_SUPERBLOCK << 1, 1, sb); 191 193 if (rc != EOK) { 194 free(instance); 195 free(sbi); 196 free(sb); 192 197 block_fini(service_id); 193 198 return rc; … … 204 209 if (!check_magic_number(sb3->s_magic, &native, &version, &longnames)) { 205 210 mfsdebug("magic number not recognized\n"); 211 free(instance); 212 free(sbi); 213 free(sb); 206 214 block_fini(service_id); 207 215 return ENOTSUP; … … 262 270 rc = block_cache_init(service_id, sbi->block_size, 0, cmode); 263 271 if (rc != EOK) { 272 free(instance); 264 273 free(sbi); 265 free( instance);274 free(sb); 266 275 block_cache_fini(service_id); 267 276 block_fini(service_id); … … 433 442 unsigned i; 434 443 for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize; ++i) { 435 r = read_dentry(mnode, &d_info, i);444 r = mfs_read_dentry(mnode, &d_info, i); 436 445 if (r != EOK) 437 446 return r; … … 504 513 assert(mnode->instance->open_nodes_cnt > 0); 505 514 mnode->instance->open_nodes_cnt--; 506 rc = put_inode(mnode);515 rc = mfs_put_inode(mnode); 507 516 free(mnode->ino_i); 508 517 free(mnode); … … 586 595 struct mfs_ino_info *ino_i; 587 596 588 rc = get_inode(inst, &ino_i, index);597 rc = mfs_get_inode(inst, &ino_i, index); 589 598 if (rc != EOK) 590 599 goto out_err; … … 645 654 return ENAMETOOLONG; 646 655 647 int r = insert_dentry(parent, name, child->ino_i->index);656 int r = mfs_insert_dentry(parent, name, child->ino_i->index); 648 657 if (r != EOK) 649 658 goto exit_error; 650 659 651 660 if (S_ISDIR(child->ino_i->i_mode)) { 652 r = insert_dentry(child, ".", child->ino_i->index);661 r = mfs_insert_dentry(child, ".", child->ino_i->index); 653 662 if (r != EOK) 654 663 goto exit_error; 655 664 //child->ino_i->i_nlinks++; 656 665 //child->ino_i->dirty = true; 657 r = insert_dentry(child, "..", parent->ino_i->index);666 r = mfs_insert_dentry(child, "..", parent->ino_i->index); 658 667 if (r != EOK) 659 668 goto exit_error; … … 686 695 return ENOTEMPTY; 687 696 688 r = remove_dentry(parent, name);697 r = mfs_remove_dentry(parent, name); 689 698 if (r != EOK) 690 699 return r; … … 722 731 unsigned i; 723 732 for (i = 2; i < mnode->ino_i->i_size / sbi->dirsize; ++i) { 724 r = read_dentry(mnode, &d_info, i);733 r = mfs_read_dentry(mnode, &d_info, i); 725 734 if (r != EOK) 726 735 return r; … … 774 783 775 784 for (; pos < mnode->ino_i->i_size / sbi->dirsize; ++pos) { 776 rc = read_dentry(mnode, &d_info, pos);785 rc = mfs_read_dentry(mnode, &d_info, pos); 777 786 if (rc != EOK) 778 787 goto out_error; … … 807 816 block_t *b; 808 817 809 rc = read_map(&zone, mnode, pos);818 rc = mfs_read_map(&zone, mnode, pos); 810 819 if (rc != EOK) 811 820 goto out_error; … … 883 892 884 893 if (pos < boundary) { 885 r = read_map(&block, mnode, pos);894 r = mfs_read_map(&block, mnode, pos); 886 895 if (r != EOK) 887 896 goto out_err; … … 901 910 goto out_err; 902 911 903 r = write_map(mnode, pos, block, &dummy);912 r = mfs_write_map(mnode, pos, block, &dummy); 904 913 if (r != EOK) 905 914 goto out_err; … … 972 981 973 982 /*Free the entire inode content*/ 974 r = inode_shrink(mnode, mnode->ino_i->i_size);983 r = mfs_inode_shrink(mnode, mnode->ino_i->i_size); 975 984 if (r != EOK) 976 985 goto out; … … 1000 1009 r = EOK; 1001 1010 else 1002 r = inode_shrink(mnode, ino_i->i_size - size);1011 r = mfs_inode_shrink(mnode, ino_i->i_size - size); 1003 1012 1004 1013 mfs_node_put(fn);
Note:
See TracChangeset
for help on using the changeset viewer.