Index: uspace/srv/bd/rd/rd.c =================================================================== --- uspace/srv/bd/rd/rd.c (revision 04aaed8fb5f0d84ef06af90fda9391a41bdae192) +++ uspace/srv/bd/rd/rd.c (revision ee163b3f91b170b746f3137b84e988e62e4bc0bc) @@ -55,6 +55,7 @@ #include #include - -#define NAME "rd" +#include + +#define NAME "rd" /** Pointer to the ramdisk's image */ @@ -208,39 +209,42 @@ static bool rd_init(void) { - int ret = sysinfo_get_value("rd.size", &rd_size); - if ((ret != EOK) || (rd_size == 0)) { + sysarg_t size; + int ret = sysinfo_get_value("rd.size", &size); + if ((ret != EOK) || (size == 0)) { printf("%s: No RAM disk found\n", NAME); return false; } - sysarg_t rd_ph_addr; - ret = sysinfo_get_value("rd.address.physical", &rd_ph_addr); - if ((ret != EOK) || (rd_ph_addr == 0)) { + sysarg_t addr_phys; + ret = sysinfo_get_value("rd.address.physical", &addr_phys); + if ((ret != EOK) || (addr_phys == 0)) { printf("%s: Invalid RAM disk physical address\n", NAME); return false; } + rd_size = ALIGN_UP(size, block_size); rd_addr = as_get_mappable_page(rd_size); - int flags = AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE; - int retval = physmem_map((void *) rd_ph_addr, rd_addr, + unsigned int flags = + AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE; + ret = physmem_map((void *) addr_phys, rd_addr, ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, flags); - - if (retval < 0) { + if (ret < 0) { printf("%s: Error mapping RAM disk\n", NAME); return false; } - printf("%s: Found RAM disk at %p, %zu bytes\n", NAME, - (void *) rd_ph_addr, rd_size); - - int rc = loc_server_register(NAME, rd_connection); - if (rc < 0) { - printf("%s: Unable to register driver (%d)\n", NAME, rc); + printf("%s: Found RAM disk at %p, %" PRIun " bytes\n", NAME, + (void *) addr_phys, size); + + ret = loc_server_register(NAME, rd_connection); + if (ret < 0) { + printf("%s: Unable to register driver (%d)\n", NAME, ret); return false; } service_id_t service_id; - if (loc_service_register("bd/initrd", &service_id) != EOK) { + ret = loc_service_register("bd/initrd", &service_id); + if (ret != EOK) { printf("%s: Unable to register device service\n", NAME); return false; Index: uspace/srv/fs/mfs/mfs.h =================================================================== --- uspace/srv/fs/mfs/mfs.h (revision 04aaed8fb5f0d84ef06af90fda9391a41bdae192) +++ uspace/srv/fs/mfs/mfs.h (revision ee163b3f91b170b746f3137b84e988e62e4bc0bc) @@ -48,5 +48,5 @@ #define NAME "mfs" -//#define DEBUG_MODE +/* #define DEBUG_MODE */ #define min(a, b) ((a) < (b) ? (a) : (b)) @@ -71,5 +71,5 @@ } mfs_version_t; -/*Generic MinixFS superblock*/ +/* Generic MinixFS superblock */ struct mfs_sb_info { uint32_t ninodes; @@ -84,5 +84,5 @@ uint16_t state; - /*The following fields do not exist on disk but only in memory*/ + /* The following fields do not exist on disk but only in memory */ unsigned long itable_size; mfs_version_t fs_version; @@ -97,5 +97,5 @@ }; -/*Generic MinixFS inode*/ +/* Generic MinixFS inode */ struct mfs_ino_info { uint16_t i_mode; @@ -107,24 +107,24 @@ int32_t i_mtime; int32_t i_ctime; - /*Block numbers for direct zones*/ + /* Block numbers for direct zones */ uint32_t i_dzone[V2_NR_DIRECT_ZONES]; - /*Block numbers for indirect zones*/ + /* Block numbers for indirect zones */ uint32_t i_izone[V2_NR_INDIRECT_ZONES]; - /*The following fields do not exist on disk but only in memory*/ + /* The following fields do not exist on disk but only in memory */ bool dirty; fs_index_t index; }; -/*Generic MFS directory entry*/ +/* Generic MFS directory entry */ struct mfs_dentry_info { uint32_t d_inum; char d_name[MFS3_MAX_NAME_LEN + 1]; - /*The following fields do not exist on disk but only in memory*/ - - /*Index of the dentry in the list*/ + /* The following fields do not exist on disk but only in memory */ + + /* Index of the dentry in the list */ unsigned index; - /*Pointer to the node at witch the dentry belongs*/ + /* Pointer to the node at witch the dentry belongs */ struct mfs_node *node; }; @@ -136,5 +136,5 @@ }; -/*MinixFS node in core*/ +/* MinixFS node in core */ struct mfs_node { struct mfs_ino_info *ino_i; @@ -145,5 +145,5 @@ }; -/*mfs_ops.c*/ +/* mfs_ops.c */ extern vfs_out_ops_t mfs_ops; extern libfs_ops_t mfs_libfs_ops; @@ -152,8 +152,8 @@ mfs_global_init(void); -/*mfs_inode.c*/ +/* mfs_inode.c */ extern int mfs_get_inode(struct mfs_instance *inst, struct mfs_ino_info **ino_i, - fs_index_t index); + fs_index_t index); extern int @@ -163,5 +163,5 @@ mfs_inode_shrink(struct mfs_node *mnode, size_t size_shrink); -/*mfs_rw.c*/ +/* mfs_rw.c */ extern int mfs_read_map(uint32_t *b, const struct mfs_node *mnode, const uint32_t pos); @@ -169,13 +169,13 @@ extern int mfs_write_map(struct mfs_node *mnode, uint32_t pos, uint32_t new_zone, - uint32_t *old_zone); + uint32_t *old_zone); extern int mfs_prune_ind_zones(struct mfs_node *mnode, size_t new_size); -/*mfs_dentry.c*/ +/* mfs_dentry.c */ extern int mfs_read_dentry(struct mfs_node *mnode, - struct mfs_dentry_info *d_info, unsigned index); + struct mfs_dentry_info *d_info, unsigned index); extern int @@ -188,5 +188,5 @@ mfs_insert_dentry(struct mfs_node *mnode, const char *d_name, fs_index_t d_inum); -/*mfs_balloc.c*/ +/* mfs_balloc.c */ extern int mfs_alloc_inode(struct mfs_instance *inst, uint32_t *inum); @@ -201,5 +201,5 @@ mfs_free_zone(struct mfs_instance *inst, uint32_t zone); -/*mfs_utils.c*/ +/* mfs_utils.c */ extern uint16_t conv16(bool native, uint16_t n); Index: uspace/srv/fs/mfs/mfs_balloc.c =================================================================== --- uspace/srv/fs/mfs/mfs_balloc.c (revision 04aaed8fb5f0d84ef06af90fda9391a41bdae192) +++ uspace/srv/fs/mfs/mfs_balloc.c (revision ee163b3f91b170b746f3137b84e988e62e4bc0bc) @@ -198,5 +198,5 @@ limit = sbi->nzones - sbi->firstdatazone - 1; } else { - /*bid == BMAP_INODE*/ + /* bid == BMAP_INODE */ search = &sbi->isearch; start_block = 2; @@ -212,5 +212,5 @@ for (i = *search / bits_per_block; i < nblocks; ++i) { r = block_get(&b, inst->service_id, i + start_block, - BLOCK_FLAGS_NONE); + BLOCK_FLAGS_NONE); if (r != EOK) Index: uspace/srv/fs/mfs/mfs_dentry.c =================================================================== --- uspace/srv/fs/mfs/mfs_dentry.c (revision 04aaed8fb5f0d84ef06af90fda9391a41bdae192) +++ uspace/srv/fs/mfs/mfs_dentry.c (revision ee163b3f91b170b746f3137b84e988e62e4bc0bc) @@ -168,5 +168,5 @@ return ENAMETOOLONG; - /*Search the directory entry to be removed*/ + /* Search the directory entry to be removed */ unsigned i; for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize ; ++i) { Index: uspace/srv/fs/mfs/mfs_inode.c =================================================================== --- uspace/srv/fs/mfs/mfs_inode.c (revision 04aaed8fb5f0d84ef06af90fda9391a41bdae192) +++ uspace/srv/fs/mfs/mfs_inode.c (revision ee163b3f91b170b746f3137b84e988e62e4bc0bc) @@ -235,6 +235,6 @@ r = block_get(&b, mnode->instance->service_id, - itable_off + inum / sbi->ino_per_block, - BLOCK_FLAGS_NONE); + itable_off + inum / sbi->ino_per_block, + BLOCK_FLAGS_NONE); if (r != EOK) @@ -278,6 +278,6 @@ r = block_get(&b, mnode->instance->service_id, - itable_off + inum / sbi->ino_per_block, - BLOCK_FLAGS_NONE); + itable_off + inum / sbi->ino_per_block, + BLOCK_FLAGS_NONE); if (r != EOK) Index: uspace/srv/fs/mfs/mfs_ops.c =================================================================== --- uspace/srv/fs/mfs/mfs_ops.c (revision 04aaed8fb5f0d84ef06af90fda9391a41bdae192) +++ uspace/srv/fs/mfs/mfs_ops.c (revision ee163b3f91b170b746f3137b84e988e62e4bc0bc) @@ -664,4 +664,5 @@ struct mfs_node *child = cfn->data; struct mfs_sb_info *sbi = parent->instance->sbi; + bool destroy_dentry = false; mfsdebug("%s()\n", __FUNCTION__); @@ -672,17 +673,24 @@ int r = mfs_insert_dentry(parent, name, child->ino_i->index); if (r != EOK) - goto exit_error; - - child->ino_i->i_nlinks++; - child->ino_i->dirty = true; + return r; if (S_ISDIR(child->ino_i->i_mode)) { + if (child->ino_i->i_nlinks != 1) { + /* It's not possible to hardlink directories in MFS */ + destroy_dentry = true; + r = EMLINK; + goto exit; + } r = mfs_insert_dentry(child, ".", child->ino_i->index); - if (r != EOK) - goto exit_error; + if (r != EOK) { + destroy_dentry = true; + goto exit; + } r = mfs_insert_dentry(child, "..", parent->ino_i->index); - if (r != EOK) - goto exit_error; + if (r != EOK) { + destroy_dentry = true; + goto exit; + } parent->ino_i->i_nlinks++; @@ -690,5 +698,13 @@ } -exit_error: +exit: + if (destroy_dentry) { + int r2 = mfs_remove_dentry(parent, name); + if (r2 != EOK) + r = r2; + } else { + child->ino_i->i_nlinks++; + child->ino_i->dirty = true; + } return r; } @@ -821,5 +837,5 @@ found: async_data_read_finalize(callid, d_info.d_name, - str_size(d_info.d_name) + 1); + str_size(d_info.d_name) + 1); bytes = ((pos - spos) + 1); } else { Index: uspace/srv/fs/mfs/mfs_rw.c =================================================================== --- uspace/srv/fs/mfs/mfs_rw.c (revision 04aaed8fb5f0d84ef06af90fda9391a41bdae192) +++ uspace/srv/fs/mfs/mfs_rw.c (revision ee163b3f91b170b746f3137b84e988e62e4bc0bc) @@ -147,5 +147,5 @@ ino_i->dirty = true; } else { - /*Sparse block*/ + /* Sparse block */ *b = 0; return EOK; @@ -233,5 +233,5 @@ } -/**Free unused indirect zones from a MINIX inode according to it's new size. +/**Free unused indirect zones from a MINIX inode according to its new size. * * @param mnode Pointer to a generic MINIX inode in memory.