Index: uspace/srv/fs/minixfs/Makefile =================================================================== --- uspace/srv/fs/minixfs/Makefile (revision 5a29b4c3cadeb6b02d51fe4644c18979144d5ed7) +++ uspace/srv/fs/minixfs/Makefile (revision ee01ff5dde9429378db0b0d38e745b080bb91784) @@ -37,5 +37,5 @@ mfs_ops.c \ mfs_inode.c \ - mfs_read.c \ + mfs_rw.c \ mfs_dentry.c \ mfs_balloc.c \ Index: pace/srv/fs/minixfs/mfs_read.c =================================================================== --- uspace/srv/fs/minixfs/mfs_read.c (revision 5a29b4c3cadeb6b02d51fe4644c18979144d5ed7) +++ (revision ) @@ -1,305 +1,0 @@ -/* - * Copyright (c) 2011 Maurizio Lombardi - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup fs - * @{ - */ - -#include -#include -#include "mfs.h" -#include "mfs_utils.h" - -static int -rw_map_ondisk(uint32_t *b, const struct mfs_node *mnode, int rblock, - bool write_mode, uint32_t w_block); - -static int -reset_block_content(struct mfs_instance *inst, uint32_t block); - -static int -alloc_zone_and_clear(struct mfs_instance *inst, uint32_t *block); - - -/**Given the position in the file expressed in - *bytes, this function returns the on-disk block - *relative to that position. - *Returns zero if the block does not exist. - */ -int read_map(uint32_t *b, const struct mfs_node *mnode, const uint32_t pos) -{ - int r; - - assert(mnode); - assert(mnode->instance); - - const struct mfs_sb_info *sbi = mnode->instance->sbi; - assert(sbi); - - const int block_size = sbi->block_size; - - /*Compute relative block number in file*/ - int rblock = pos / block_size; - - if (mnode->ino_i->i_size < (int32_t) pos) { - /*Trying to read beyond the end of file*/ - r = EOK; - *b = 0; - goto out; - } - - r = rw_map_ondisk(b, mnode, rblock, false, 0); -out: - return r; -} - -static int -rw_map_ondisk(uint32_t *b, const struct mfs_node *mnode, int rblock, - bool write_mode, uint32_t w_block) -{ - int r, nr_direct; - int ptrs_per_block; - block_t *bi1; - block_t *bi2; - - assert(mnode); - struct mfs_ino_info *ino_i = mnode->ino_i; - - assert(ino_i); - assert(mnode->instance); - - struct mfs_instance *inst = mnode->instance; - struct mfs_sb_info *sbi = inst->sbi; - assert(sbi); - - const int fs_version = sbi->fs_version; - - if (fs_version == MFS_VERSION_V1) { - nr_direct = V1_NR_DIRECT_ZONES; - ptrs_per_block = MFS_BLOCKSIZE / sizeof(uint16_t); - } else { - nr_direct = V2_NR_DIRECT_ZONES; - ptrs_per_block = sbi->block_size / sizeof(uint32_t); - } - - /*Check if the wanted block is in the direct zones*/ - if (rblock < nr_direct) { - *b = ino_i->i_dzone[rblock]; - if (write_mode) { - ino_i->i_dzone[rblock] = w_block; - ino_i->dirty = true; - } - r = EOK; - goto out; - } - rblock -= nr_direct - 1; - - if (rblock < ptrs_per_block) { - /*The wanted block is in the single indirect zone chain*/ - if (ino_i->i_izone[0] == 0) { - if (write_mode) { - uint32_t block; - r = alloc_zone_and_clear(inst, &block); - if (r != EOK) - goto out; - - ino_i->i_izone[0] = block; - ino_i->dirty = true; - } else { - r = -1; - goto out; - } - } - - r = block_get(&bi1, inst->handle, ino_i->i_izone[0], - BLOCK_FLAGS_NONE); - if (r != EOK) - goto out; - - if (fs_version == MFS_VERSION_V1) { - uint16_t *tmp = &(((uint16_t *) bi1->data)[rblock]); - *b = conv16(sbi->native, *tmp); - if (write_mode) { - *tmp = conv16(sbi->native, w_block); - bi1->dirty = true; - } - } else { - uint32_t *tmp = &(((uint32_t *) bi1->data)[rblock]); - *b = conv32(sbi->native, *tmp); - if (write_mode) { - *tmp = conv32(sbi->native, w_block); - bi1->dirty = true; - } - } - - goto out_put_1; - } - - rblock -= ptrs_per_block - 1; - - /*The wanted block is in the double indirect zone chain*/ - - /*read the first indirect zone of the chain*/ - if (ino_i->i_izone[1] == 0) { - if (write_mode) { - uint32_t block; - r = alloc_zone_and_clear(inst, &block); - if (r != EOK) - goto out; - - ino_i->i_izone[1] = block; - ino_i->dirty = true; - } else { - r = -1; - goto out; - } - } - - r = block_get(&bi1, inst->handle, ino_i->i_izone[1], - BLOCK_FLAGS_NONE); - - if (r != EOK) - goto out; - - /* - *Compute the position of the second indirect - *zone pointer in the chain. - */ - uint32_t di_block = rblock / ptrs_per_block; - - /*read the second indirect zone of the chain*/ - if (fs_version == MFS_VERSION_V1) { - uint16_t *pt16 = bi1->data; - uint16_t blk = conv16(sbi->native, pt16[di_block]); - - if (blk == 0) { - if (write_mode) { - uint32_t block; - r = alloc_zone_and_clear(inst, &block); - if (r != EOK) - goto out; - - blk = block; - pt16[di_block] = conv16(sbi->native, blk); - bi1->dirty = true; - } else { - r = 1; - goto out; - } - } - - r = block_get(&bi2, inst->handle, blk, BLOCK_FLAGS_NONE); - - if (r != EOK) - goto out_put_1; - - pt16 = bi2->data; - pt16 += di_block % ptrs_per_block; - *b = conv16(sbi->native, *pt16); - if (write_mode) { - *pt16 = conv16(sbi->native, w_block); - bi2->dirty = true; - } - } else { - uint32_t *pt32 = bi1->data; - uint32_t blk = conv32(sbi->native, pt32[di_block]); - - if (blk == 0) { - if (write_mode) { - uint32_t block; - r = alloc_zone_and_clear(inst, &block); - if (r != EOK) - goto out; - - blk = block; - pt32[di_block] = conv32(sbi->native, blk); - bi1->dirty = true; - } else { - r = 1; - goto out; - } - } - - r = block_get(&bi2, inst->handle, blk, BLOCK_FLAGS_NONE); - - if (r != EOK) - goto out_put_1; - - pt32 = bi2->data; - pt32 += di_block % ptrs_per_block; - *b = conv32(sbi->native, *pt32); - if (write_mode) { - *pt32 = conv32(sbi->native, w_block); - bi2->dirty = true; - } - } - r = EOK; - - block_put(bi2); -out_put_1: - block_put(bi1); -out: - return r; -} - - -static int -reset_block_content(struct mfs_instance *inst, uint32_t block) -{ - block_t *b; - int r; - - r = block_get(&b, inst->handle, block, BLOCK_FLAGS_NOREAD); - if (r != EOK) - return r; - - memset(b->data, 0, b->size); - b->dirty = true; - block_put(b); - - return EOK; -} - -static int -alloc_zone_and_clear(struct mfs_instance *inst, uint32_t *block) -{ - int r; - - r = mfs_alloc_bit(inst, block, BMAP_ZONE); - if (r != EOK) - goto out; - - r = reset_block_content(inst, *block); -out: - return r; -} - -/** - * @} - */ - Index: uspace/srv/fs/minixfs/mfs_rw.c =================================================================== --- uspace/srv/fs/minixfs/mfs_rw.c (revision ee01ff5dde9429378db0b0d38e745b080bb91784) +++ uspace/srv/fs/minixfs/mfs_rw.c (revision ee01ff5dde9429378db0b0d38e745b080bb91784) @@ -0,0 +1,305 @@ +/* + * Copyright (c) 2011 Maurizio Lombardi + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup fs + * @{ + */ + +#include +#include +#include "mfs.h" +#include "mfs_utils.h" + +static int +rw_map_ondisk(uint32_t *b, const struct mfs_node *mnode, int rblock, + bool write_mode, uint32_t w_block); + +static int +reset_block_content(struct mfs_instance *inst, uint32_t block); + +static int +alloc_zone_and_clear(struct mfs_instance *inst, uint32_t *block); + + +/**Given the position in the file expressed in + *bytes, this function returns the on-disk block + *relative to that position. + *Returns zero if the block does not exist. + */ +int read_map(uint32_t *b, const struct mfs_node *mnode, const uint32_t pos) +{ + int r; + + assert(mnode); + assert(mnode->instance); + + const struct mfs_sb_info *sbi = mnode->instance->sbi; + assert(sbi); + + const int block_size = sbi->block_size; + + /*Compute relative block number in file*/ + int rblock = pos / block_size; + + if (mnode->ino_i->i_size < (int32_t) pos) { + /*Trying to read beyond the end of file*/ + r = EOK; + *b = 0; + goto out; + } + + r = rw_map_ondisk(b, mnode, rblock, false, 0); +out: + return r; +} + +static int +rw_map_ondisk(uint32_t *b, const struct mfs_node *mnode, int rblock, + bool write_mode, uint32_t w_block) +{ + int r, nr_direct; + int ptrs_per_block; + block_t *bi1; + block_t *bi2; + + assert(mnode); + struct mfs_ino_info *ino_i = mnode->ino_i; + + assert(ino_i); + assert(mnode->instance); + + struct mfs_instance *inst = mnode->instance; + struct mfs_sb_info *sbi = inst->sbi; + assert(sbi); + + const int fs_version = sbi->fs_version; + + if (fs_version == MFS_VERSION_V1) { + nr_direct = V1_NR_DIRECT_ZONES; + ptrs_per_block = MFS_BLOCKSIZE / sizeof(uint16_t); + } else { + nr_direct = V2_NR_DIRECT_ZONES; + ptrs_per_block = sbi->block_size / sizeof(uint32_t); + } + + /*Check if the wanted block is in the direct zones*/ + if (rblock < nr_direct) { + *b = ino_i->i_dzone[rblock]; + if (write_mode) { + ino_i->i_dzone[rblock] = w_block; + ino_i->dirty = true; + } + r = EOK; + goto out; + } + rblock -= nr_direct - 1; + + if (rblock < ptrs_per_block) { + /*The wanted block is in the single indirect zone chain*/ + if (ino_i->i_izone[0] == 0) { + if (write_mode) { + uint32_t block; + r = alloc_zone_and_clear(inst, &block); + if (r != EOK) + goto out; + + ino_i->i_izone[0] = block; + ino_i->dirty = true; + } else { + r = -1; + goto out; + } + } + + r = block_get(&bi1, inst->handle, ino_i->i_izone[0], + BLOCK_FLAGS_NONE); + if (r != EOK) + goto out; + + if (fs_version == MFS_VERSION_V1) { + uint16_t *tmp = &(((uint16_t *) bi1->data)[rblock]); + *b = conv16(sbi->native, *tmp); + if (write_mode) { + *tmp = conv16(sbi->native, w_block); + bi1->dirty = true; + } + } else { + uint32_t *tmp = &(((uint32_t *) bi1->data)[rblock]); + *b = conv32(sbi->native, *tmp); + if (write_mode) { + *tmp = conv32(sbi->native, w_block); + bi1->dirty = true; + } + } + + goto out_put_1; + } + + rblock -= ptrs_per_block - 1; + + /*The wanted block is in the double indirect zone chain*/ + + /*read the first indirect zone of the chain*/ + if (ino_i->i_izone[1] == 0) { + if (write_mode) { + uint32_t block; + r = alloc_zone_and_clear(inst, &block); + if (r != EOK) + goto out; + + ino_i->i_izone[1] = block; + ino_i->dirty = true; + } else { + r = -1; + goto out; + } + } + + r = block_get(&bi1, inst->handle, ino_i->i_izone[1], + BLOCK_FLAGS_NONE); + + if (r != EOK) + goto out; + + /* + *Compute the position of the second indirect + *zone pointer in the chain. + */ + uint32_t di_block = rblock / ptrs_per_block; + + /*read the second indirect zone of the chain*/ + if (fs_version == MFS_VERSION_V1) { + uint16_t *pt16 = bi1->data; + uint16_t blk = conv16(sbi->native, pt16[di_block]); + + if (blk == 0) { + if (write_mode) { + uint32_t block; + r = alloc_zone_and_clear(inst, &block); + if (r != EOK) + goto out; + + blk = block; + pt16[di_block] = conv16(sbi->native, blk); + bi1->dirty = true; + } else { + r = 1; + goto out; + } + } + + r = block_get(&bi2, inst->handle, blk, BLOCK_FLAGS_NONE); + + if (r != EOK) + goto out_put_1; + + pt16 = bi2->data; + pt16 += di_block % ptrs_per_block; + *b = conv16(sbi->native, *pt16); + if (write_mode) { + *pt16 = conv16(sbi->native, w_block); + bi2->dirty = true; + } + } else { + uint32_t *pt32 = bi1->data; + uint32_t blk = conv32(sbi->native, pt32[di_block]); + + if (blk == 0) { + if (write_mode) { + uint32_t block; + r = alloc_zone_and_clear(inst, &block); + if (r != EOK) + goto out; + + blk = block; + pt32[di_block] = conv32(sbi->native, blk); + bi1->dirty = true; + } else { + r = 1; + goto out; + } + } + + r = block_get(&bi2, inst->handle, blk, BLOCK_FLAGS_NONE); + + if (r != EOK) + goto out_put_1; + + pt32 = bi2->data; + pt32 += di_block % ptrs_per_block; + *b = conv32(sbi->native, *pt32); + if (write_mode) { + *pt32 = conv32(sbi->native, w_block); + bi2->dirty = true; + } + } + r = EOK; + + block_put(bi2); +out_put_1: + block_put(bi1); +out: + return r; +} + + +static int +reset_block_content(struct mfs_instance *inst, uint32_t block) +{ + block_t *b; + int r; + + r = block_get(&b, inst->handle, block, BLOCK_FLAGS_NOREAD); + if (r != EOK) + return r; + + memset(b->data, 0, b->size); + b->dirty = true; + block_put(b); + + return EOK; +} + +static int +alloc_zone_and_clear(struct mfs_instance *inst, uint32_t *block) +{ + int r; + + r = mfs_alloc_bit(inst, block, BMAP_ZONE); + if (r != EOK) + goto out; + + r = reset_block_content(inst, *block); +out: + return r; +} + +/** + * @} + */ +