/**@brief Dynamic allocation cache flag.*/
bool cache_dynamic;
+
+ struct jbd_fs jbd_fs;
+ struct jbd_journal jbd_journal;
};
/**@brief Block devices descriptor.*/
return EIO;
ext4_dir_en_set_inode(res.dentry, parent->index);
- ext4_bcache_set_dirty(res.block.buf);
+ ext4_trans_set_block_dirty(res.block.buf);
r = ext4_dir_destroy_result(ch, &res);
if (r != EOK)
return r;
}
return r;
}
+ bd->fs = &mp->fs;
return r;
}
r = ext4_fs_fini(&mp->fs);
if (r != EOK)
- return r;
+ goto Finish;
mp->mounted = 0;
ext4_bcache_fini_dynamic(mp->fs.bdev->bc);
free(mp->fs.bdev->bc);
}
-
- return ext4_block_fini(mp->fs.bdev);
+ r = ext4_block_fini(mp->fs.bdev);
+Finish:
+ mp->fs.bdev->fs = NULL;
+ return r;
}
static struct ext4_mountpoint *ext4_get_mount(const char *path)
return 0;
}
+int ext4_journal_start(const char *mount_point)
+{
+ int r = EOK;
+ struct ext4_mountpoint *mp = ext4_get_mount(mount_point);
+ if (!mp)
+ return ENOENT;
+
+ if (ext4_sb_feature_com(&mp->fs.sb,
+ EXT4_FCOM_HAS_JOURNAL)) {
+ r = jbd_get_fs(&mp->fs, &mp->jbd_fs);
+ if (r != EOK)
+ goto Finish;
+
+ r = jbd_journal_start(&mp->jbd_fs, &mp->jbd_journal);
+ if (r != EOK) {
+ mp->jbd_fs.dirty = false;
+ jbd_put_fs(&mp->jbd_fs);
+ goto Finish;
+ }
+ mp->fs.jbd_fs = &mp->jbd_fs;
+ mp->fs.jbd_journal = &mp->jbd_journal;
+ }
+Finish:
+ return r;
+}
+
+int ext4_journal_stop(const char *mount_point)
+{
+ int r = EOK;
+ struct ext4_mountpoint *mp = ext4_get_mount(mount_point);
+ if (!mp)
+ return ENOENT;
+
+ if (ext4_sb_feature_com(&mp->fs.sb,
+ EXT4_FCOM_HAS_JOURNAL)) {
+ r = jbd_journal_stop(&mp->jbd_journal);
+ if (r != EOK) {
+ mp->jbd_fs.dirty = false;
+ jbd_put_fs(&mp->jbd_fs);
+ mp->fs.jbd_journal = NULL;
+ mp->fs.jbd_fs = NULL;
+ goto Finish;
+ }
+
+ r = jbd_put_fs(&mp->jbd_fs);
+ if (r != EOK) {
+ mp->fs.jbd_journal = NULL;
+ mp->fs.jbd_fs = NULL;
+ goto Finish;
+ }
+
+ mp->fs.jbd_journal = NULL;
+ mp->fs.jbd_fs = NULL;
+ }
+Finish:
+ return r;
+}
+
int ext4_recover(const char *mount_point)
{
struct ext4_mountpoint *mp = ext4_get_mount(mount_point);
return r;
}
+static int ext4_trans_start(struct ext4_mountpoint *mp)
+{
+ int r = EOK;
+ if (mp->fs.jbd_journal && !mp->fs.curr_trans) {
+ struct jbd_journal *journal = mp->fs.jbd_journal;
+ struct jbd_trans *trans;
+ trans = jbd_journal_new_trans(journal);
+ if (!trans) {
+ r = ENOMEM;
+ goto Finish;
+ }
+ mp->fs.curr_trans = trans;
+ }
+Finish:
+ return r;
+}
+
+static int ext4_trans_stop(struct ext4_mountpoint *mp)
+{
+ int r = EOK;
+ if (mp->fs.jbd_journal && mp->fs.curr_trans) {
+ struct jbd_journal *journal = mp->fs.jbd_journal;
+ struct jbd_trans *trans = mp->fs.curr_trans;
+ r = jbd_journal_commit_trans(journal, trans);
+ mp->fs.curr_trans = NULL;
+ }
+ return r;
+}
+
+static void ext4_trans_abort(struct ext4_mountpoint *mp)
+{
+ if (mp->fs.jbd_journal && mp->fs.curr_trans) {
+ struct jbd_journal *journal = mp->fs.jbd_journal;
+ struct jbd_trans *trans = mp->fs.curr_trans;
+ jbd_journal_free_trans(journal, trans, true);
+ mp->fs.curr_trans = NULL;
+ }
+}
int ext4_mount_point_stats(const char *mount_point,
struct ext4_mount_stats *stats)
return false;
}
+static int ext4_trunc_inode(struct ext4_mountpoint *mp,
+ uint32_t index, uint64_t new_size)
+{
+ int r = EOK;
+ struct ext4_fs *const fs = &mp->fs;
+ struct ext4_inode_ref inode_ref;
+ uint64_t inode_size;
+ bool has_trans = mp->fs.jbd_journal && mp->fs.curr_trans;
+ r = ext4_fs_get_inode_ref(fs, index, &inode_ref);
+ if (r != EOK)
+ return r;
+
+ inode_size = ext4_inode_get_size(&fs->sb, inode_ref.inode);
+ ext4_fs_put_inode_ref(&inode_ref);
+ if (has_trans)
+ ext4_trans_stop(mp);
+
+ while (inode_size > new_size + CONFIG_MAX_TRUNCATE_SIZE) {
+
+ inode_size -= CONFIG_MAX_TRUNCATE_SIZE;
+
+ ext4_trans_start(mp);
+ r = ext4_fs_get_inode_ref(fs, index, &inode_ref);
+ if (r != EOK) {
+ ext4_trans_abort(mp);
+ break;
+ }
+ r = ext4_fs_truncate_inode(&inode_ref, inode_size);
+ if (r != EOK)
+ ext4_fs_put_inode_ref(&inode_ref);
+ else
+ r = ext4_fs_put_inode_ref(&inode_ref);
+
+ if (r != EOK) {
+ ext4_trans_abort(mp);
+ goto Finish;
+ } else
+ ext4_trans_stop(mp);
+ }
+
+ if (inode_size > new_size) {
+
+ inode_size = new_size;
+
+ ext4_trans_start(mp);
+ r = ext4_fs_get_inode_ref(fs, index, &inode_ref);
+ if (r != EOK) {
+ ext4_trans_abort(mp);
+ goto Finish;
+ }
+ r = ext4_fs_truncate_inode(&inode_ref, inode_size);
+ if (r != EOK)
+ ext4_fs_put_inode_ref(&inode_ref);
+ else
+ r = ext4_fs_put_inode_ref(&inode_ref);
+
+ if (r != EOK)
+ ext4_trans_abort(mp);
+ else
+ ext4_trans_stop(mp);
+
+ }
+
+Finish:
+
+ if (has_trans)
+ ext4_trans_start(mp);
+
+ return r;
+}
+
/*
* NOTICE: if filetype is equal to EXT4_DIRENTRY_UNKNOWN,
* any filetype of the target dir entry will be accepted.
if (parent_inode)
*parent_inode = ref.index;
+ if (flags & O_CREAT)
+ ext4_trans_start(mp);
+
len = ext4_path_check(path, &is_goal);
while (1) {
if (is_goal) {
if ((f->flags & O_TRUNC) && (imode == EXT4_INODE_MODE_FILE)) {
- r = ext4_fs_truncate_inode(&ref, 0);
+ r = ext4_trunc_inode(mp, ref.index, 0);
if (r != EOK) {
ext4_fs_put_inode_ref(&ref);
return r;
}
r = ext4_fs_put_inode_ref(&ref);
+ if (flags & O_CREAT) {
+ if (r == EOK)
+ ext4_trans_stop(mp);
+ else
+ ext4_trans_abort(mp);
+
+ }
+
return r;
}
return EINVAL;
EXT4_MP_LOCK(mp);
+ ext4_trans_start(mp);
r = ext4_generic_open2(&f, path, O_RDONLY, EXT4_DE_UNKNOWN,
&parent_inode, &name_off);
if (child_loaded)
ext4_fs_put_inode_ref(&child_ref);
+ if (r != EOK)
+ ext4_trans_abort(mp);
+ else
+ ext4_trans_stop(mp);
+
EXT4_MP_UNLOCK(mp);
return r;
return ENOENT;
EXT4_MP_LOCK(mp);
+ ext4_trans_start(mp);
r = ext4_generic_open2(&f, path, O_RDONLY, EXT4_DE_UNKNOWN,
&parent_inode, &name_off);
if (child_loaded)
ext4_fs_put_inode_ref(&child_ref);
+ if (r != EOK)
+ ext4_trans_abort(mp);
+ else
+ ext4_trans_stop(mp);
+
EXT4_MP_UNLOCK(mp);
return r;
return ENOENT;
EXT4_MP_LOCK(mp);
+ ext4_trans_start(mp);
+
r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DE_UNKNOWN,
&parent_inode, &name_off);
if (r != EOK) {
+ ext4_trans_abort(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
/*Load parent*/
r = ext4_fs_get_inode_ref(&mp->fs, parent_inode, &parent);
if (r != EOK) {
+ ext4_trans_abort(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
r = ext4_fs_get_inode_ref(&mp->fs, f.inode, &child);
if (r != EOK) {
ext4_fs_put_inode_ref(&parent);
+ ext4_trans_abort(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
+ /* We do not allow opening files here. */
+ if (ext4_inode_type(&mp->fs.sb, child.inode) ==
+ EXT4_INODE_MODE_DIRECTORY) {
+ ext4_fs_put_inode_ref(&parent);
+ ext4_fs_put_inode_ref(&child);
+ ext4_trans_abort(mp);
+ EXT4_MP_UNLOCK(mp);
+ return r;
+ }
+
+ /*Link count will be zero, the inode should be freed. */
+ if (ext4_inode_get_links_cnt(child.inode) == 1) {
+ ext4_block_cache_write_back(mp->fs.bdev, 1);
+ r = ext4_trunc_inode(mp, child.index, 0);
+ if (r != EOK) {
+ ext4_fs_put_inode_ref(&parent);
+ ext4_fs_put_inode_ref(&child);
+ ext4_trans_abort(mp);
+ EXT4_MP_UNLOCK(mp);
+ return r;
+ }
+ ext4_block_cache_write_back(mp->fs.bdev, 0);
+ }
/*Set path*/
path += name_off;
/*Link count is zero, the inode should be freed. */
if (!ext4_inode_get_links_cnt(child.inode)) {
ext4_inode_set_del_time(child.inode, -1L);
- /*Turncate*/
- ext4_block_cache_write_back(mp->fs.bdev, 1);
- /*Truncate may be IO heavy. Do it writeback cache mode.*/
- r = ext4_fs_truncate_inode(&child, 0);
- ext4_block_cache_write_back(mp->fs.bdev, 0);
-
- if (r != EOK)
- goto Finish;
r = ext4_fs_free_inode(&child);
if (r != EOK)
Finish:
ext4_fs_put_inode_ref(&child);
ext4_fs_put_inode_ref(&parent);
+
+ if (r != EOK)
+ ext4_trans_abort(mp);
+ else
+ ext4_trans_stop(mp);
+
EXT4_MP_UNLOCK(mp);
return r;
}
return ENOENT;
EXT4_MP_LOCK(mp);
+
ext4_block_cache_write_back(mp->fs.bdev, 1);
r = ext4_generic_open(f, path, flags, true, 0, 0);
ext4_block_cache_write_back(mp->fs.bdev, 0);
+
EXT4_MP_UNLOCK(mp);
return r;
}
filetype = EXT4_DE_REG_FILE;
EXT4_MP_LOCK(mp);
+
ext4_block_cache_write_back(mp->fs.bdev, 1);
r = ext4_generic_open2(f, path, flags, filetype, NULL, NULL);
ext4_block_cache_write_back(mp->fs.bdev, 0);
+
EXT4_MP_UNLOCK(mp);
return r;
}
if (r != EOK)
goto Finish;
- r = ext4_fs_truncate_inode(&ref, size);
+ r = ext4_trunc_inode(f->mp, ref.index, size);
if (r != EOK)
goto Finish;
return EPERM;
EXT4_MP_LOCK(f->mp);
+
+ ext4_trans_start(f->mp);
r = ext4_ftruncate_no_lock(f, size);
+ if (r != EOK)
+ ext4_trans_abort(f->mp);
+ else
+ ext4_trans_stop(f->mp);
+
EXT4_MP_UNLOCK(f->mp);
return r;
}
uint8_t *u8_buf = buf;
int r;
- struct ext4_block b;
struct ext4_inode_ref ref;
ext4_assert(f && f->mp);
/* Do we get an unwritten range? */
if (fblock != 0) {
- r = ext4_block_get(f->mp->fs.bdev, &b, fblock);
+ uint64_t off = fblock * block_size + unalg;
+ r = ext4_block_readbytes(f->mp->fs.bdev, off, u8_buf, len);
if (r != EOK)
goto Finish;
- memcpy(u8_buf, b.data + unalg, len);
-
- r = ext4_block_set(f->mp->fs.bdev, &b);
- if (r != EOK)
- goto Finish;
} else {
/* Yes, we do. */
memset(u8_buf, 0, len);
}
if (size) {
+ uint64_t off;
r = ext4_fs_get_inode_dblk_idx(&ref, iblock_idx, &fblock, true);
if (r != EOK)
goto Finish;
- r = ext4_block_get(f->mp->fs.bdev, &b, fblock);
- if (r != EOK)
- goto Finish;
-
- memcpy(u8_buf, b.data, size);
-
- r = ext4_block_set(f->mp->fs.bdev, &b);
+ off = fblock * block_size;
+ r = ext4_block_readbytes(f->mp->fs.bdev, off, u8_buf, size);
if (r != EOK)
goto Finish;
ext4_fsblk_t fblk;
ext4_fsblk_t fblock_start;
- struct ext4_block b;
struct ext4_inode_ref ref;
const uint8_t *u8_buf = buf;
int r, rr = EOK;
return EOK;
EXT4_MP_LOCK(f->mp);
+ ext4_trans_start(f->mp);
struct ext4_fs *const fs = &f->mp->fs;
struct ext4_sblock *const sb = &f->mp->fs.sb;
r = ext4_fs_get_inode_ref(fs, f->inode, &ref);
if (r != EOK) {
+ ext4_trans_abort(f->mp);
EXT4_MP_UNLOCK(f->mp);
return r;
}
if (unalg) {
size_t len = size;
+ uint64_t off;
if (size > (block_size - unalg))
len = block_size - unalg;
if (r != EOK)
goto Finish;
- r = ext4_block_get(f->mp->fs.bdev, &b, fblk);
- if (r != EOK)
- goto Finish;
-
- memcpy(b.data + unalg, u8_buf, len);
- ext4_bcache_set_dirty(b.buf);
-
- r = ext4_block_set(f->mp->fs.bdev, &b);
+ off = fblk * block_size + unalg;
+ r = ext4_block_writebytes(f->mp->fs.bdev, off, u8_buf, len);
if (r != EOK)
goto Finish;
goto Finish;
if (size) {
+ uint64_t off;
if (iblk_idx < ifile_blocks) {
r = ext4_fs_init_inode_dblk_idx(&ref, iblk_idx, &fblk);
if (r != EOK)
goto out_fsize;
}
- r = ext4_block_get(f->mp->fs.bdev, &b, fblk);
- if (r != EOK)
- goto Finish;
-
- memcpy(b.data, u8_buf, size);
- ext4_bcache_set_dirty(b.buf);
-
- r = ext4_block_set(f->mp->fs.bdev, &b);
+ off = fblk * block_size;
+ r = ext4_block_writebytes(f->mp->fs.bdev, off, u8_buf, size);
if (r != EOK)
goto Finish;
}
Finish:
- ext4_fs_put_inode_ref(&ref);
+ r = ext4_fs_put_inode_ref(&ref);
+
+ if (r != EOK)
+ ext4_trans_abort(f->mp);
+ else
+ ext4_trans_stop(f->mp);
+
EXT4_MP_UNLOCK(f->mp);
return r;
}
return ENOENT;
EXT4_MP_LOCK(mp);
+ ext4_trans_start(mp);
r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DE_UNKNOWN, NULL, NULL);
if (r != EOK) {
+ ext4_trans_abort(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
ext4_fclose(&f);
r = ext4_fs_get_inode_ref(&mp->fs, ino, &inode_ref);
if (r != EOK) {
+ ext4_trans_abort(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
ext4_inode_set_mode(sb, inode_ref.inode, mode);
inode_ref.dirty = true;
- ext4_fs_put_inode_ref(&inode_ref);
+ r = ext4_fs_put_inode_ref(&inode_ref);
+ if (r != EOK)
+ ext4_trans_abort(mp);
+ else
+ ext4_trans_stop(mp);
+
EXT4_MP_UNLOCK(mp);
return r;
}
return ENOENT;
EXT4_MP_LOCK(mp);
+ ext4_trans_start(mp);
r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DE_UNKNOWN, NULL, NULL);
if (r != EOK) {
+ ext4_trans_abort(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
ext4_fclose(&f);
r = ext4_fs_get_inode_ref(&mp->fs, ino, &inode_ref);
if (r != EOK) {
+ ext4_trans_abort(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
ext4_inode_set_gid(inode_ref.inode, gid);
inode_ref.dirty = true;
- ext4_fs_put_inode_ref(&inode_ref);
+ r = ext4_fs_put_inode_ref(&inode_ref);
+ if (r != EOK)
+ ext4_trans_abort(mp);
+ else
+ ext4_trans_stop(mp);
+
EXT4_MP_UNLOCK(mp);
return r;
}
return ENOENT;
EXT4_MP_LOCK(mp);
+ ext4_trans_start(mp);
r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DE_UNKNOWN, NULL, NULL);
if (r != EOK) {
+ ext4_trans_abort(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
ext4_fclose(&f);
r = ext4_fs_get_inode_ref(&mp->fs, ino, &inode_ref);
if (r != EOK) {
+ ext4_trans_abort(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
ext4_inode_set_access_time(inode_ref.inode, atime);
inode_ref.dirty = true;
- ext4_fs_put_inode_ref(&inode_ref);
+ r = ext4_fs_put_inode_ref(&inode_ref);
+ if (r != EOK)
+ ext4_trans_abort(mp);
+ else
+ ext4_trans_stop(mp);
+
EXT4_MP_UNLOCK(mp);
return r;
}
return ENOENT;
EXT4_MP_LOCK(mp);
+ ext4_trans_start(mp);
r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DE_UNKNOWN, NULL, NULL);
if (r != EOK) {
+ ext4_trans_abort(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
ext4_fclose(&f);
r = ext4_fs_get_inode_ref(&mp->fs, ino, &inode_ref);
if (r != EOK) {
+ ext4_trans_abort(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
ext4_inode_set_modif_time(inode_ref.inode, mtime);
inode_ref.dirty = true;
- ext4_fs_put_inode_ref(&inode_ref);
+ r = ext4_fs_put_inode_ref(&inode_ref);
+ if (r != EOK)
+ ext4_trans_abort(mp);
+ else
+ ext4_trans_stop(mp);
+
EXT4_MP_UNLOCK(mp);
return r;
}
return ENOENT;
EXT4_MP_LOCK(mp);
+ ext4_trans_start(mp);
r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DE_UNKNOWN, NULL, NULL);
if (r != EOK) {
+ ext4_trans_abort(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
ext4_fclose(&f);
r = ext4_fs_get_inode_ref(&mp->fs, ino, &inode_ref);
if (r != EOK) {
+ ext4_trans_abort(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
ext4_inode_set_change_inode_time(inode_ref.inode, ctime);
inode_ref.dirty = true;
- ext4_fs_put_inode_ref(&inode_ref);
+ r = ext4_fs_put_inode_ref(&inode_ref);
+ if (r != EOK)
+ ext4_trans_abort(mp);
+ else
+ ext4_trans_stop(mp);
+
EXT4_MP_UNLOCK(mp);
return r;
}
static int ext4_fsymlink_set(ext4_file *f, const void *buf, uint32_t size)
{
- struct ext4_block b;
struct ext4_inode_ref ref;
uint32_t sblock;
ext4_fsblk_t fblock;
if (r != EOK)
goto Finish;
- r = ext4_block_get(f->mp->fs.bdev, &b, fblock);
+ r = ext4_block_writebytes(f->mp->fs.bdev, 0, buf, size);
if (r != EOK)
goto Finish;
- memcpy(b.data, buf, size);
- ext4_bcache_set_dirty(b.buf);
- r = ext4_block_set(f->mp->fs.bdev, &b);
- if (r != EOK)
- goto Finish;
}
/*Stop write back cache mode*/
filetype = EXT4_DE_SYMLINK;
EXT4_MP_LOCK(mp);
+ ext4_trans_start(mp);
+
ext4_block_cache_write_back(mp->fs.bdev, 1);
r = ext4_generic_open2(&f, path, O_RDWR|O_CREAT, filetype, NULL, NULL);
if (r == EOK)
Finish:
ext4_block_cache_write_back(mp->fs.bdev, 0);
+
+ if (r != EOK)
+ ext4_trans_abort(mp);
+ else
+ ext4_trans_stop(mp);
+
EXT4_MP_UNLOCK(mp);
return r;
}
Finish:
ext4_block_cache_write_back(mp->fs.bdev, 0);
+ if (r != EOK)
+ ext4_trans_abort(mp);
+ else
+ ext4_trans_stop(mp);
+
EXT4_MP_UNLOCK(mp);
return r;
}
return EINVAL;
EXT4_MP_LOCK(mp);
+ ext4_trans_start(mp);
+
r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DE_UNKNOWN, NULL, NULL);
if (r != EOK)
goto Finish;
ext4_fs_put_xattr_ref(&xattr_ref);
ext4_fs_put_inode_ref(&inode_ref);
Finish:
+ if (r != EOK)
+ ext4_trans_abort(mp);
+ else
+ ext4_trans_stop(mp);
+
EXT4_MP_UNLOCK(mp);
return r;
}
return EINVAL;
EXT4_MP_LOCK(mp);
+ ext4_trans_start(mp);
+
r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DE_UNKNOWN, NULL, NULL);
if (r != EOK)
goto Finish;
ext4_fs_put_xattr_ref(&xattr_ref);
ext4_fs_put_inode_ref(&inode_ref);
Finish:
+ if (r != EOK)
+ ext4_trans_abort(mp);
+ else
+ ext4_trans_stop(mp);
+
EXT4_MP_UNLOCK(mp);
return r;
ext4_file f;
struct ext4_mountpoint *mp = ext4_get_mount(path);
- struct ext4_inode_ref act;
- struct ext4_inode_ref child;
- struct ext4_dir_iter it;
+ struct ext4_inode_ref act, parent;
uint32_t name_off;
- uint32_t inode_up;
- uint32_t inode_current;
- uint32_t depth = 1;
+ uint32_t inode_up, inode_current;
- bool has_children;
+ bool has_children = false;
bool is_goal;
- bool dir_end;
if (!mp)
return ENOENT;
EXT4_MP_LOCK(mp);
- struct ext4_fs *const fs = &mp->fs;
-
/*Check if exist.*/
r = ext4_generic_open(&f, path, "r", false, &inode_up, &name_off);
if (r != EOK) {
+ ext4_trans_abort(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
len = ext4_path_check(path, &is_goal);
inode_current = f.inode;
- dir_end = false;
ext4_block_cache_write_back(mp->fs.bdev, 1);
- do {
- /*Load directory node.*/
- r = ext4_fs_get_inode_ref(fs, inode_current, &act);
- if (r != EOK) {
- break;
- }
+ /*Load parent.*/
+ r = ext4_fs_get_inode_ref(&f.mp->fs, inode_up,
+ &parent);
+ if (r != EOK)
+ goto Finish;
+ r = ext4_fs_get_inode_ref(&f.mp->fs, inode_current,
+ &act);
+ if (r != EOK) {
+ ext4_fs_put_inode_ref(&parent);
+ goto Finish;
+ }
+ r = ext4_has_children(&has_children, &act);
+ if (r != EOK) {
+ ext4_fs_put_inode_ref(&parent);
+ ext4_fs_put_inode_ref(&act);
+ goto Finish;
+ }
+ if (has_children) {
+ r = ENOTEMPTY;
+ ext4_fs_put_inode_ref(&parent);
+ ext4_fs_put_inode_ref(&act);
+ goto Finish;
+ }
- /*Initialize iterator.*/
- r = ext4_dir_iterator_init(&it, &act, 0);
+ ext4_trans_start(mp);
+
+ if (ext4_inode_get_links_cnt(act.inode) == 2) {
+ /*Truncate*/
+ r = ext4_fs_truncate_inode(&act, 0);
if (r != EOK) {
+ ext4_fs_put_inode_ref(&parent);
ext4_fs_put_inode_ref(&act);
- break;
- }
-
- while (r == EOK) {
-
- if (!it.curr) {
- dir_end = true;
- break;
- }
-
- /*Get up directory inode when ".." entry*/
- if ((it.curr->name_len == 2) &&
- ext4_is_dots(it.curr->name, it.curr->name_len)) {
- inode_up = ext4_dir_en_get_inode(it.curr);
- }
-
- /*If directory or file entry, but not "." ".." entry*/
- if (!ext4_is_dots(it.curr->name, it.curr->name_len)) {
-
- /*Get child inode reference do unlink
- * directory/file.*/
- uint32_t cinode;
- cinode = ext4_dir_en_get_inode(it.curr);
- r = ext4_fs_get_inode_ref(fs, cinode, &child);
- if (r != EOK)
- break;
-
- /*If directory with no leaf children*/
- r = ext4_has_children(&has_children, &child);
- if (r != EOK) {
- ext4_fs_put_inode_ref(&child);
- break;
- }
-
- if (has_children) {
- /*Has directory children. Go into this
- * directory.*/
- inode_up = inode_current;
- inode_current = cinode;
- depth++;
- ext4_fs_put_inode_ref(&child);
- break;
- }
-
- /*No children in child directory or file. Just
- * unlink.*/
- r = ext4_unlink(f.mp, &act, &child,
- (char *)it.curr->name,
- it.curr->name_len);
- if (r != EOK) {
- ext4_fs_put_inode_ref(&child);
- break;
- }
-
- ext4_inode_set_del_time(child.inode, -1L);
- ext4_inode_set_links_cnt(child.inode, 0);
- child.dirty = true;
- /*Turncate*/
- r = ext4_fs_truncate_inode(&child, 0);
- if (r != EOK) {
- ext4_fs_put_inode_ref(&child);
- break;
- }
-
- r = ext4_fs_free_inode(&child);
- if (r != EOK) {
- ext4_fs_put_inode_ref(&child);
- break;
- }
-
- r = ext4_fs_put_inode_ref(&child);
- if (r != EOK)
- break;
- }
-
- r = ext4_dir_iterator_next(&it);
+ goto Finish;
}
+ }
- if (dir_end) {
- /*Directory iterator reached last entry*/
- ext4_has_children(&has_children, &act);
- if (!has_children) {
- inode_current = inode_up;
- if (depth)
- depth--;
- }
- /*Last unlink*/
- if (!depth) {
- /*Load parent.*/
- struct ext4_inode_ref parent;
- r = ext4_fs_get_inode_ref(&f.mp->fs, inode_up,
- &parent);
- if (r != EOK)
- goto End;
+ /* Unlink from root of current directory*/
+ r = ext4_unlink(f.mp, &parent, &act,
+ (char *)path, len);
+ if (r != EOK) {
+ ext4_fs_put_inode_ref(&parent);
+ ext4_fs_put_inode_ref(&act);
+ goto Finish;
+ }
- /* In this place all directories should be
- * unlinked.
- * Last unlink from root of current directory*/
- r = ext4_unlink(f.mp, &parent, &act,
- (char *)path, len);
- if (r != EOK) {
- ext4_fs_put_inode_ref(&parent);
- goto End;
- }
+ if (ext4_inode_get_links_cnt(act.inode) == 2) {
+ ext4_inode_set_del_time(act.inode, -1L);
+ ext4_inode_set_links_cnt(act.inode, 0);
+ act.dirty = true;
- if (ext4_inode_get_links_cnt(act.inode) == 2) {
- ext4_inode_set_del_time(act.inode, -1L);
- ext4_inode_set_links_cnt(act.inode, 0);
- act.dirty = true;
- /*Turncate*/
- r = ext4_fs_truncate_inode(&act, 0);
- if (r != EOK) {
- ext4_fs_put_inode_ref(&parent);
- goto End;
- }
-
- r = ext4_fs_free_inode(&act);
- if (r != EOK) {
- ext4_fs_put_inode_ref(&parent);
- goto End;
- }
- }
-
- r = ext4_fs_put_inode_ref(&parent);
- if (r != EOK)
- goto End;
- }
+ r = ext4_fs_free_inode(&act);
+ if (r != EOK) {
+ ext4_fs_put_inode_ref(&parent);
+ ext4_fs_put_inode_ref(&act);
+ goto Finish;
}
+ }
- End:
- ext4_dir_iterator_fini(&it);
- ext4_fs_put_inode_ref(&act);
- dir_end = false;
-
- /*When something goes wrong. End loop.*/
- if (r != EOK)
- break;
+ r = ext4_fs_put_inode_ref(&parent);
+ if (r != EOK)
+ goto Finish;
- } while (depth);
+ r = ext4_fs_put_inode_ref(&act);
+Finish:
+ if (r != EOK)
+ ext4_trans_abort(mp);
+ else
+ ext4_trans_stop(mp);
ext4_block_cache_write_back(mp->fs.bdev, 0);
EXT4_MP_UNLOCK(mp);
+
return r;
}
return ENOENT;
EXT4_MP_LOCK(mp);
+ ext4_trans_start(mp);
/*Check if exist.*/
r = ext4_generic_open(&f, path, "r", false, 0, 0);
if (r == EOK) {
/*Directory already created*/
+ ext4_trans_stop(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
/*Create new dir*/
r = ext4_generic_open(&f, path, "w", false, 0, 0);
if (r != EOK) {
+ ext4_trans_abort(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
+ ext4_trans_stop(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
}
break;
case 1:
- r = jbd_trans_revoke_block(t, rand_block);
+ r = jbd_trans_try_revoke_block(t, rand_block);
if (r != EOK) {
jbd_journal_free_trans(journal, t,
true);
projects / lwext4.git / blobdiff