* @brief Ext4 high level operations (file, directory, mountpoints...)
*/
-#include "ext4_config.h"
-#include "ext4_types.h"
-#include "ext4_misc.h"
-#include "ext4_errno.h"
-#include "ext4_oflags.h"
-#include "ext4_debug.h"
-
-#include "ext4.h"
-#include "ext4_trans.h"
-#include "ext4_blockdev.h"
-#include "ext4_fs.h"
-#include "ext4_dir.h"
-#include "ext4_inode.h"
-#include "ext4_super.h"
-#include "ext4_block_group.h"
-#include "ext4_dir_idx.h"
-#include "ext4_xattr.h"
-#include "ext4_journal.h"
+#include <ext4_config.h>
+#include <ext4_types.h>
+#include <ext4_misc.h>
+#include <ext4_errno.h>
+#include <ext4_oflags.h>
+#include <ext4_debug.h>
+
+#include <ext4.h>
+#include <ext4_trans.h>
+#include <ext4_blockdev.h>
+#include <ext4_fs.h>
+#include <ext4_dir.h>
+#include <ext4_inode.h>
+#include <ext4_super.h>
+#include <ext4_block_group.h>
+#include <ext4_dir_idx.h>
+#include <ext4_xattr.h>
+#include <ext4_journal.h>
#include <stdlib.h>
bool mounted;
/**@brief Mount point name (@ref ext4_mount)*/
- char name[32];
+ char name[CONFIG_EXT4_MAX_MP_NAME + 1];
/**@brief OS dependent lock/unlock functions.*/
const struct ext4_lock *os_locks;
/**@brief Ext4 filesystem internals.*/
struct ext4_fs fs;
- /**@brief Dynamic allocation cache flag.*/
- bool cache_dynamic;
-
+ /**@brief JBD fs.*/
struct jbd_fs jbd_fs;
+
+ /**@brief Journal.*/
struct jbd_journal jbd_journal;
+
+ /**@brief Block cache.*/
+ struct ext4_bcache bc;
};
/**@brief Block devices descriptor.*/
-struct _ext4_devices {
+struct ext4_block_devices {
- /**@brief Block device name (@ref ext4_device_register)*/
- char name[32];
+ /**@brief Block device name.*/
+ char name[CONFIG_EXT4_MAX_BLOCKDEV_NAME + 1];
/**@brief Block device handle.*/
struct ext4_blockdev *bd;
-
- /**@brief Block cache handle.*/
- struct ext4_bcache *bc;
};
/**@brief Block devices.*/
-struct _ext4_devices _bdevices[CONFIG_EXT4_BLOCKDEVS_COUNT];
+static struct ext4_block_devices s_bdevices[CONFIG_EXT4_BLOCKDEVS_COUNT];
/**@brief Mountpoints.*/
-struct ext4_mountpoint _mp[CONFIG_EXT4_MOUNTPOINTS_COUNT];
+static struct ext4_mountpoint s_mp[CONFIG_EXT4_MOUNTPOINTS_COUNT];
-int ext4_device_register(struct ext4_blockdev *bd, struct ext4_bcache *bc,
+int ext4_device_register(struct ext4_blockdev *bd,
const char *dev_name)
{
- uint32_t i;
ext4_assert(bd && dev_name);
- for (i = 0; i < CONFIG_EXT4_BLOCKDEVS_COUNT; ++i) {
- if (!_bdevices[i].bd) {
- strcpy(_bdevices[i].name, dev_name);
- _bdevices[i].bd = bd;
- _bdevices[i].bc = bc;
- return EOK;
- }
+ if (strlen(dev_name) > CONFIG_EXT4_MAX_BLOCKDEV_NAME)
+ return EINVAL;
+
+ for (size_t i = 0; i < CONFIG_EXT4_BLOCKDEVS_COUNT; ++i) {
+ if (!strcmp(s_bdevices[i].name, dev_name))
+ return EEXIST;
+ }
- if (!strcmp(_bdevices[i].name, dev_name))
+ for (size_t i = 0; i < CONFIG_EXT4_BLOCKDEVS_COUNT; ++i) {
+ if (!s_bdevices[i].bd) {
+ strcpy(s_bdevices[i].name, dev_name);
+ s_bdevices[i].bd = bd;
return EOK;
+ }
}
+
return ENOSPC;
}
+int ext4_device_unregister(const char *dev_name)
+{
+ ext4_assert(dev_name);
+
+ for (size_t i = 0; i < CONFIG_EXT4_BLOCKDEVS_COUNT; ++i) {
+ if (strcmp(s_bdevices[i].name, dev_name))
+ continue;
+
+ memset(&s_bdevices[i], 0, sizeof(s_bdevices[i]));
+ }
+
+ return ENOENT;
+}
+
+int ext4_device_unregister_all(void)
+{
+ memset(s_bdevices, 0, sizeof(s_bdevices));
+
+ return EOK;
+}
+
/****************************************************************************/
static bool ext4_is_dots(const uint8_t *name, size_t name_size)
int ext4_mount(const char *dev_name, const char *mount_point,
bool read_only)
{
- ext4_assert(mount_point && dev_name);
int r;
- int i;
-
uint32_t bsize;
+ struct ext4_bcache *bc;
struct ext4_blockdev *bd = 0;
- struct ext4_bcache *bc = 0;
struct ext4_mountpoint *mp = 0;
- if (mount_point[strlen(mount_point) - 1] != '/')
+ ext4_assert(mount_point && dev_name);
+
+ size_t mp_len = strlen(mount_point);
+
+ if (mp_len > CONFIG_EXT4_MAX_MP_NAME)
+ return EINVAL;
+
+ if (mount_point[mp_len - 1] != '/')
return ENOTSUP;
- for (i = 0; i < CONFIG_EXT4_BLOCKDEVS_COUNT; ++i) {
- if (_bdevices[i].name) {
- if (!strcmp(dev_name, _bdevices[i].name)) {
- bd = _bdevices[i].bd;
- bc = _bdevices[i].bc;
- break;
- }
+ for (size_t i = 0; i < CONFIG_EXT4_BLOCKDEVS_COUNT; ++i) {
+ if (!strcmp(dev_name, s_bdevices[i].name)) {
+ bd = s_bdevices[i].bd;
+ break;
}
}
if (!bd)
return ENODEV;
- for (i = 0; i < CONFIG_EXT4_MOUNTPOINTS_COUNT; ++i) {
- if (!_mp[i].mounted) {
- strcpy(_mp[i].name, mount_point);
- _mp[i].mounted = 1;
- mp = &_mp[i];
+ for (size_t i = 0; i < CONFIG_EXT4_MOUNTPOINTS_COUNT; ++i) {
+ if (!s_mp[i].mounted) {
+ strcpy(s_mp[i].name, mount_point);
+ s_mp[i].mounted = 1;
+ mp = &s_mp[i];
break;
}
- if (!strcmp(_mp[i].name, mount_point))
+ if (!strcmp(s_mp[i].name, mount_point))
return EOK;
}
bsize = ext4_sb_get_block_size(&mp->fs.sb);
ext4_block_set_lb_size(bd, bsize);
+ bc = &mp->bc;
- mp->cache_dynamic = 0;
-
- if (!bc) {
- /*Automatic block cache alloc.*/
- mp->cache_dynamic = 1;
- bc = ext4_malloc(sizeof(struct ext4_bcache));
-
- r = ext4_bcache_init_dynamic(bc, CONFIG_BLOCK_DEV_CACHE_SIZE,
- bsize);
- if (r != EOK) {
- ext4_free(bc);
- ext4_block_fini(bd);
- return r;
- }
+ r = ext4_bcache_init_dynamic(bc, CONFIG_BLOCK_DEV_CACHE_SIZE, bsize);
+ if (r != EOK) {
+ ext4_block_fini(bd);
+ return r;
}
if (bsize != bc->itemsize)
if (r != EOK) {
ext4_bcache_cleanup(bc);
ext4_block_fini(bd);
- if (mp->cache_dynamic) {
- ext4_bcache_fini_dynamic(bc);
- ext4_free(bc);
- }
+ ext4_bcache_fini_dynamic(bc);
return r;
}
- bd->fs = &mp->fs;
+ bd->fs = &mp->fs;
return r;
}
struct ext4_mountpoint *mp = 0;
for (i = 0; i < CONFIG_EXT4_MOUNTPOINTS_COUNT; ++i) {
- if (!strcmp(_mp[i].name, mount_point)) {
- mp = &_mp[i];
+ if (!strcmp(s_mp[i].name, mount_point)) {
+ mp = &s_mp[i];
break;
}
}
mp->mounted = 0;
ext4_bcache_cleanup(mp->fs.bdev->bc);
- if (mp->cache_dynamic) {
- ext4_bcache_fini_dynamic(mp->fs.bdev->bc);
- ext4_free(mp->fs.bdev->bc);
- }
+ ext4_bcache_fini_dynamic(mp->fs.bdev->bc);
+
r = ext4_block_fini(mp->fs.bdev);
Finish:
mp->fs.bdev->fs = NULL;
static struct ext4_mountpoint *ext4_get_mount(const char *path)
{
- int i;
- for (i = 0; i < CONFIG_EXT4_MOUNTPOINTS_COUNT; ++i) {
+ for (size_t i = 0; i < CONFIG_EXT4_MOUNTPOINTS_COUNT; ++i) {
- if (!_mp[i].mounted)
+ if (!s_mp[i].mounted)
continue;
- if (!strncmp(_mp[i].name, path, strlen(_mp[i].name)))
- return &_mp[i];
+ if (!strncmp(s_mp[i].name, path, strlen(s_mp[i].name)))
+ return &s_mp[i];
}
+
return NULL;
}
{
int r = EOK;
struct ext4_mountpoint *mp = ext4_get_mount(mount_point);
+
if (!mp)
return ENOENT;
{
int r = EOK;
struct ext4_mountpoint *mp = ext4_get_mount(mount_point);
+
if (!mp)
return ENOENT;
static int __ext4_recover(const char *mount_point)
{
struct ext4_mountpoint *mp = ext4_get_mount(mount_point);
+ int r = ENOTSUP;
+
if (!mp)
return ENOENT;
- int r = ENOTSUP;
EXT4_MP_LOCK(mp);
if (ext4_sb_feature_com(&mp->fs.sb, EXT4_FCOM_HAS_JOURNAL)) {
struct jbd_fs *jbd_fs = ext4_calloc(1, sizeof(struct jbd_fs));
goto Finish;
}
-
r = jbd_get_fs(&mp->fs, jbd_fs);
if (r != EOK) {
ext4_free(jbd_fs);
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;
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;
struct ext4_mountpoint *mp = 0;
for (i = 0; i < CONFIG_EXT4_MOUNTPOINTS_COUNT; ++i) {
- if (!strcmp(_mp[i].name, mount_point)) {
- mp = &_mp[i];
+ if (!strcmp(s_mp[i].name, mount_point)) {
+ mp = &s_mp[i];
break;
}
}
if (parent_inode)
*parent_inode = ref.index;
- if (flags & O_CREAT)
- ext4_trans_start(mp);
-
len = ext4_path_check(path, &is_goal);
while (1) {
struct ext4_inode_ref child_ref;
r = ext4_fs_alloc_inode(fs, &child_ref,
is_goal ? ftype : EXT4_DE_DIR);
+
if (r != EOK)
break;
+ ext4_fs_inode_blocks_init(fs, &child_ref);
/*Link with root dir.*/
r = ext4_link(mp, &ref, &child_ref, path, len, false);
if (name_off)
*name_off += len + 1;
- };
+ }
if (r != EOK) {
ext4_fs_put_inode_ref(&ref);
if (f->flags & O_APPEND)
f->fpos = f->fsize;
-
- }
-
- 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 ext4_fs_put_inode_ref(&ref);
}
/****************************************************************************/
{
uint32_t iflags;
int filetype;
+ int r;
+ struct ext4_mountpoint *mp = ext4_get_mount(path);
+
if (ext4_parse_flags(flags, &iflags) == false)
return EINVAL;
else
filetype = EXT4_DE_DIR;
- return ext4_generic_open2(f, path, iflags, filetype, parent_inode,
- name_off);
+ if (iflags & O_CREAT)
+ ext4_trans_start(mp);
+
+ r = ext4_generic_open2(f, path, iflags, filetype, parent_inode,
+ name_off);
+
+ if (iflags & O_CREAT) {
+ if (r == EOK)
+ ext4_trans_stop(mp);
+ else
+ ext4_trans_abort(mp);
+ }
+
+ return r;
}
static int ext4_create_hardlink(const char *path,
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 (r != EOK)
- goto Finish;
+ if (r != EOK) {
+ EXT4_MP_UNLOCK(mp);
+ return r;
+ }
child_inode = f.inode;
ext4_fclose(&f);
+ ext4_trans_start(mp);
/*We have file to unlink. Load it.*/
r = ext4_fs_get_inode_ref(&mp->fs, child_inode, &child_ref);
return EROFS;
EXT4_MP_LOCK(mp);
- ext4_trans_start(mp);
r = ext4_generic_open2(&f, path, O_RDONLY, EXT4_DE_UNKNOWN,
&parent_inode, &name_off);
- if (r != EOK)
- goto Finish;
+ if (r != EOK) {
+ EXT4_MP_UNLOCK(mp);
+ return r;
+ }
child_inode = f.inode;
ext4_fclose(&f);
+ ext4_trans_start(mp);
/*Load parent*/
r = ext4_fs_get_inode_ref(&mp->fs, parent_inode, &parent_ref);
int ext4_cache_write_back(const char *path, bool on)
{
struct ext4_mountpoint *mp = ext4_get_mount(path);
+ int ret;
if (!mp)
return ENOENT;
EXT4_MP_LOCK(mp);
- ext4_block_cache_write_back(mp->fs.bdev, on);
+ ret = ext4_block_cache_write_back(mp->fs.bdev, on);
EXT4_MP_UNLOCK(mp);
- return EOK;
+ return ret;
+}
+
+int ext4_cache_flush(const char *path)
+{
+ struct ext4_mountpoint *mp = ext4_get_mount(path);
+ int ret;
+
+ if (!mp)
+ return ENOENT;
+
+ EXT4_MP_LOCK(mp);
+ ret = ext4_block_cache_flush(mp->fs.bdev);
+ EXT4_MP_UNLOCK(mp);
+ return ret;
}
int ext4_fremove(const char *path)
{
ext4_file f;
uint32_t parent_inode;
+ uint32_t child_inode;
uint32_t name_off;
bool is_goal;
int r;
return EROFS;
EXT4_MP_LOCK(mp);
- ext4_trans_start(mp);
-
- r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DE_UNKNOWN,
+ r = ext4_generic_open2(&f, path, O_RDONLY, EXT4_DE_UNKNOWN,
&parent_inode, &name_off);
if (r != EOK) {
- ext4_trans_abort(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
+ child_inode = f.inode;
+ ext4_fclose(&f);
+ ext4_trans_start(mp);
+
/*Load parent*/
r = ext4_fs_get_inode_ref(&mp->fs, parent_inode, &parent);
if (r != EOK) {
}
/*We have file to delete. Load it.*/
- r = ext4_fs_get_inode_ref(&mp->fs, f.inode, &child);
+ r = ext4_fs_get_inode_ref(&mp->fs, child_inode, &child);
if (r != EOK) {
ext4_fs_put_inode_ref(&parent);
ext4_trans_abort(mp);
return r;
}
-int ext4_fill_raw_inode(const char *path, uint32_t *ret_ino,
- struct ext4_inode *inode)
-{
- int r;
- ext4_file f;
- struct ext4_inode_ref inode_ref;
- struct ext4_mountpoint *mp = ext4_get_mount(path);
- uint32_t ino;
-
- if (!mp)
- return ENOENT;
-
- EXT4_MP_LOCK(mp);
-
- r = ext4_generic_open2(&f, path, O_RDONLY, EXT4_DE_UNKNOWN, NULL, NULL);
- if (r != EOK) {
- EXT4_MP_UNLOCK(mp);
- return r;
- }
-
- ino = f.inode;
- ext4_fclose(&f);
-
- /*Load parent*/
- r = ext4_fs_get_inode_ref(&mp->fs, ino, &inode_ref);
- if (r != EOK) {
- EXT4_MP_UNLOCK(mp);
- return r;
- }
-
- memcpy(inode, inode_ref.inode, sizeof(struct ext4_inode));
- ext4_fs_put_inode_ref(&inode_ref);
- EXT4_MP_UNLOCK(mp);
-
- if (ret_ino)
- *ret_ino = ino;
-
- return r;
-}
-
-int ext4_fopen(ext4_file *f, const char *path, const char *flags)
+int ext4_fopen(ext4_file *file, const char *path, const char *flags)
{
struct ext4_mountpoint *mp = ext4_get_mount(path);
int r;
EXT4_MP_LOCK(mp);
ext4_block_cache_write_back(mp->fs.bdev, 1);
- r = ext4_generic_open(f, path, flags, true, 0, 0);
+ r = ext4_generic_open(file, path, flags, true, 0, 0);
ext4_block_cache_write_back(mp->fs.bdev, 0);
EXT4_MP_UNLOCK(mp);
return r;
}
-int ext4_fopen2(ext4_file *f, const char *path, int flags)
+int ext4_fopen2(ext4_file *file, const char *path, int flags)
{
struct ext4_mountpoint *mp = ext4_get_mount(path);
int 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);
+ if (flags & O_CREAT)
+ ext4_trans_start(mp);
+
+ r = ext4_generic_open2(file, path, flags, filetype, NULL, NULL);
+
+ if (flags & O_CREAT) {
+ if (r == EOK)
+ ext4_trans_stop(mp);
+ else
+ ext4_trans_abort(mp);
+ }
+
+ ext4_block_cache_write_back(mp->fs.bdev, 0);
EXT4_MP_UNLOCK(mp);
+
return r;
}
-int ext4_fclose(ext4_file *f)
+int ext4_fclose(ext4_file *file)
{
- ext4_assert(f && f->mp);
+ ext4_assert(file && file->mp);
- f->mp = 0;
- f->flags = 0;
- f->inode = 0;
- f->fpos = f->fsize = 0;
+ file->mp = 0;
+ file->flags = 0;
+ file->inode = 0;
+ file->fpos = file->fsize = 0;
return EOK;
}
-static int ext4_ftruncate_no_lock(ext4_file *f, uint64_t size)
+static int ext4_ftruncate_no_lock(ext4_file *file, uint64_t size)
{
struct ext4_inode_ref ref;
int r;
- r = ext4_fs_get_inode_ref(&f->mp->fs, f->inode, &ref);
+ r = ext4_fs_get_inode_ref(&file->mp->fs, file->inode, &ref);
if (r != EOK) {
- EXT4_MP_UNLOCK(f->mp);
+ EXT4_MP_UNLOCK(file->mp);
return r;
}
/*Sync file size*/
- f->fsize = ext4_inode_get_size(&f->mp->fs.sb, ref.inode);
- if (f->fsize <= size) {
+ file->fsize = ext4_inode_get_size(&file->mp->fs.sb, ref.inode);
+ if (file->fsize <= size) {
r = EOK;
goto Finish;
}
/*Start write back cache mode.*/
- r = ext4_block_cache_write_back(f->mp->fs.bdev, 1);
+ r = ext4_block_cache_write_back(file->mp->fs.bdev, 1);
if (r != EOK)
goto Finish;
- r = ext4_trunc_inode(f->mp, ref.index, size);
+ r = ext4_trunc_inode(file->mp, ref.index, size);
if (r != EOK)
goto Finish;
- f->fsize = size;
- if (f->fpos > size)
- f->fpos = size;
+ file->fsize = size;
+ if (file->fpos > size)
+ file->fpos = size;
/*Stop write back cache mode*/
- ext4_block_cache_write_back(f->mp->fs.bdev, 0);
+ ext4_block_cache_write_back(file->mp->fs.bdev, 0);
if (r != EOK)
goto Finish;
return r;
}
-int ext4_fread(ext4_file *f, void *buf, size_t size, size_t *rcnt)
+int ext4_fread(ext4_file *file, void *buf, size_t size, size_t *rcnt)
{
uint32_t unalg;
uint32_t iblock_idx;
int r;
struct ext4_inode_ref ref;
- ext4_assert(f && f->mp);
+ ext4_assert(file && file->mp);
- if (f->flags & O_WRONLY)
+ if (file->flags & O_WRONLY)
return EPERM;
if (!size)
return EOK;
- EXT4_MP_LOCK(f->mp);
+ EXT4_MP_LOCK(file->mp);
- struct ext4_fs *const fs = &f->mp->fs;
- struct ext4_sblock *const sb = &f->mp->fs.sb;
+ struct ext4_fs *const fs = &file->mp->fs;
+ struct ext4_sblock *const sb = &file->mp->fs.sb;
if (rcnt)
*rcnt = 0;
- r = ext4_fs_get_inode_ref(fs, f->inode, &ref);
+ r = ext4_fs_get_inode_ref(fs, file->inode, &ref);
if (r != EOK) {
- EXT4_MP_UNLOCK(f->mp);
+ EXT4_MP_UNLOCK(file->mp);
return r;
}
/*Sync file size*/
- f->fsize = ext4_inode_get_size(sb, ref.inode);
+ file->fsize = ext4_inode_get_size(sb, ref.inode);
block_size = ext4_sb_get_block_size(sb);
- size = ((uint64_t)size > (f->fsize - f->fpos))
- ? ((size_t)(f->fsize - f->fpos)) : size;
+ size = ((uint64_t)size > (file->fsize - file->fpos))
+ ? ((size_t)(file->fsize - file->fpos)) : size;
- iblock_idx = (uint32_t)((f->fpos) / block_size);
- iblock_last = (uint32_t)((f->fpos + size) / block_size);
- unalg = (f->fpos) % block_size;
+ iblock_idx = (uint32_t)((file->fpos) / block_size);
+ iblock_last = (uint32_t)((file->fpos + size) / block_size);
+ unalg = (file->fpos) % block_size;
/*If the size of symlink is smaller than 60 bytes*/
bool softlink;
softlink = ext4_inode_is_type(sb, ref.inode, EXT4_INODE_MODE_SOFTLINK);
- if (softlink && f->fsize < sizeof(ref.inode->blocks)
+ if (softlink && file->fsize < sizeof(ref.inode->blocks)
&& !ext4_inode_get_blocks_count(sb, ref.inode)) {
char *content = (char *)ref.inode->blocks;
- if (f->fpos < f->fsize) {
+ if (file->fpos < file->fsize) {
size_t len = size;
- if (unalg + size > (uint32_t)f->fsize)
- len = (uint32_t)f->fsize - unalg;
+ if (unalg + size > (uint32_t)file->fsize)
+ len = (uint32_t)file->fsize - unalg;
memcpy(buf, content + unalg, len);
if (rcnt)
*rcnt = len;
/* Do we get an unwritten range? */
if (fblock != 0) {
uint64_t off = fblock * block_size + unalg;
- r = ext4_block_readbytes(f->mp->fs.bdev, off, u8_buf, len);
+ r = ext4_block_readbytes(file->mp->fs.bdev, off, u8_buf, len);
if (r != EOK)
goto Finish;
u8_buf += len;
size -= len;
- f->fpos += len;
+ file->fpos += len;
if (rcnt)
*rcnt += len;
fblock_count++;
}
- r = ext4_blocks_get_direct(f->mp->fs.bdev, u8_buf, fblock_start,
+ r = ext4_blocks_get_direct(file->mp->fs.bdev, u8_buf, fblock_start,
fblock_count);
if (r != EOK)
goto Finish;
size -= block_size * fblock_count;
u8_buf += block_size * fblock_count;
- f->fpos += block_size * fblock_count;
+ file->fpos += block_size * fblock_count;
if (rcnt)
*rcnt += block_size * fblock_count;
goto Finish;
off = fblock * block_size;
- r = ext4_block_readbytes(f->mp->fs.bdev, off, u8_buf, size);
+ r = ext4_block_readbytes(file->mp->fs.bdev, off, u8_buf, size);
if (r != EOK)
goto Finish;
- f->fpos += size;
+ file->fpos += size;
if (rcnt)
*rcnt += size;
Finish:
ext4_fs_put_inode_ref(&ref);
- EXT4_MP_UNLOCK(f->mp);
+ EXT4_MP_UNLOCK(file->mp);
return r;
}
-int ext4_fwrite(ext4_file *f, const void *buf, size_t size, size_t *wcnt)
+int ext4_fwrite(ext4_file *file, const void *buf, size_t size, size_t *wcnt)
{
uint32_t unalg;
uint32_t iblk_idx;
const uint8_t *u8_buf = buf;
int r, rr = EOK;
- ext4_assert(f && f->mp);
+ ext4_assert(file && file->mp);
- if (f->mp->fs.read_only)
+ if (file->mp->fs.read_only)
return EROFS;
- if (f->flags & O_RDONLY)
+ if (file->flags & O_RDONLY)
return EPERM;
if (!size)
return EOK;
- EXT4_MP_LOCK(f->mp);
- ext4_trans_start(f->mp);
+ EXT4_MP_LOCK(file->mp);
+ ext4_trans_start(file->mp);
- struct ext4_fs *const fs = &f->mp->fs;
- struct ext4_sblock *const sb = &f->mp->fs.sb;
+ struct ext4_fs *const fs = &file->mp->fs;
+ struct ext4_sblock *const sb = &file->mp->fs.sb;
if (wcnt)
*wcnt = 0;
- r = ext4_fs_get_inode_ref(fs, f->inode, &ref);
+ r = ext4_fs_get_inode_ref(fs, file->inode, &ref);
if (r != EOK) {
- ext4_trans_abort(f->mp);
- EXT4_MP_UNLOCK(f->mp);
+ ext4_trans_abort(file->mp);
+ EXT4_MP_UNLOCK(file->mp);
return r;
}
/*Sync file size*/
- f->fsize = ext4_inode_get_size(sb, ref.inode);
+ file->fsize = ext4_inode_get_size(sb, ref.inode);
block_size = ext4_sb_get_block_size(sb);
- iblock_last = (uint32_t)((f->fpos + size) / block_size);
- iblk_idx = (uint32_t)(f->fpos / block_size);
- ifile_blocks = (uint32_t)((f->fsize + block_size - 1) / block_size);
+ iblock_last = (uint32_t)((file->fpos + size) / block_size);
+ iblk_idx = (uint32_t)(file->fpos / block_size);
+ ifile_blocks = (uint32_t)((file->fsize + block_size - 1) / block_size);
- unalg = (f->fpos) % block_size;
+ unalg = (file->fpos) % block_size;
if (unalg) {
size_t len = size;
goto Finish;
off = fblk * block_size + unalg;
- r = ext4_block_writebytes(f->mp->fs.bdev, off, u8_buf, len);
+ r = ext4_block_writebytes(file->mp->fs.bdev, off, u8_buf, len);
if (r != EOK)
goto Finish;
u8_buf += len;
size -= len;
- f->fpos += len;
+ file->fpos += len;
if (wcnt)
*wcnt += len;
}
/*Start write back cache mode.*/
- r = ext4_block_cache_write_back(f->mp->fs.bdev, 1);
+ r = ext4_block_cache_write_back(file->mp->fs.bdev, 1);
if (r != EOK)
goto Finish;
fblock_count++;
}
- r = ext4_blocks_set_direct(f->mp->fs.bdev, u8_buf, fblock_start,
+ r = ext4_blocks_set_direct(file->mp->fs.bdev, u8_buf, fblock_start,
fblock_count);
if (r != EOK)
break;
size -= block_size * fblock_count;
u8_buf += block_size * fblock_count;
- f->fpos += block_size * fblock_count;
+ file->fpos += block_size * fblock_count;
if (wcnt)
*wcnt += block_size * fblock_count;
}
/*Stop write back cache mode*/
- ext4_block_cache_write_back(f->mp->fs.bdev, 0);
+ ext4_block_cache_write_back(file->mp->fs.bdev, 0);
if (r != EOK)
goto Finish;
}
off = fblk * block_size;
- r = ext4_block_writebytes(f->mp->fs.bdev, off, u8_buf, size);
+ r = ext4_block_writebytes(file->mp->fs.bdev, off, u8_buf, size);
if (r != EOK)
goto Finish;
- f->fpos += size;
+ file->fpos += size;
if (wcnt)
*wcnt += size;
}
out_fsize:
- if (f->fpos > f->fsize) {
- f->fsize = f->fpos;
- ext4_inode_set_size(ref.inode, f->fsize);
+ if (file->fpos > file->fsize) {
+ file->fsize = file->fpos;
+ ext4_inode_set_size(ref.inode, file->fsize);
ref.dirty = true;
}
r = ext4_fs_put_inode_ref(&ref);
if (r != EOK)
- ext4_trans_abort(f->mp);
+ ext4_trans_abort(file->mp);
else
- ext4_trans_stop(f->mp);
+ ext4_trans_stop(file->mp);
- EXT4_MP_UNLOCK(f->mp);
+ EXT4_MP_UNLOCK(file->mp);
return r;
}
-int ext4_fseek(ext4_file *f, uint64_t offset, uint32_t origin)
+int ext4_fseek(ext4_file *file, int64_t offset, uint32_t origin)
{
switch (origin) {
case SEEK_SET:
- if (offset > f->fsize)
+ if (offset < 0 || (uint64_t)offset > file->fsize)
return EINVAL;
- f->fpos = offset;
+ file->fpos = offset;
return EOK;
case SEEK_CUR:
- if ((offset + f->fpos) > f->fsize)
+ if ((offset < 0 && (uint64_t)(-offset) > file->fpos) ||
+ (offset > 0 &&
+ (uint64_t)offset > (file->fsize - file->fpos)))
return EINVAL;
- f->fpos += offset;
+ file->fpos += offset;
return EOK;
case SEEK_END:
- if (offset > f->fsize)
+ if (offset < 0 || (uint64_t)offset > file->fsize)
return EINVAL;
- f->fpos = f->fsize - offset;
+ file->fpos = file->fsize - offset;
return EOK;
}
return EINVAL;
}
-uint64_t ext4_ftell(ext4_file *f)
+uint64_t ext4_ftell(ext4_file *file)
{
- return f->fpos;
+ return file->fpos;
}
-uint64_t ext4_fsize(ext4_file *f)
+uint64_t ext4_fsize(ext4_file *file)
{
- return f->fsize;
+ return file->fsize;
}
-int ext4_chmod(const char *path, uint32_t mode)
+
+static int ext4_trans_get_inode_ref(const char *path,
+ struct ext4_mountpoint *mp,
+ struct ext4_inode_ref *inode_ref)
{
int r;
- uint32_t ino, orig_mode;
ext4_file f;
- struct ext4_sblock *sb;
- struct ext4_inode_ref inode_ref;
- struct ext4_mountpoint *mp = ext4_get_mount(path);
- if (!mp)
- return ENOENT;
-
- if (mp->fs.read_only)
- return EROFS;
+ r = ext4_generic_open2(&f, path, O_RDONLY, EXT4_DE_UNKNOWN, NULL, NULL);
+ if (r != EOK)
+ return r;
- 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;
- }
- ino = f.inode;
- sb = &mp->fs.sb;
- ext4_fclose(&f);
- r = ext4_fs_get_inode_ref(&mp->fs, ino, &inode_ref);
+ r = ext4_fs_get_inode_ref(&mp->fs, f.inode, inode_ref);
if (r != EOK) {
ext4_trans_abort(mp);
- EXT4_MP_UNLOCK(mp);
return r;
}
- orig_mode = ext4_inode_get_mode(sb, inode_ref.inode);
- orig_mode &= ~0xFFF;
- orig_mode |= mode & 0xFFF;
- ext4_inode_set_mode(sb, inode_ref.inode, orig_mode);
- inode_ref.dirty = true;
+ return r;
+}
- r = ext4_fs_put_inode_ref(&inode_ref);
+static int ext4_trans_put_inode_ref(struct ext4_mountpoint *mp,
+ struct ext4_inode_ref *inode_ref)
+{
+ int r;
+
+ 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;
}
-int ext4_chown(const char *path, uint32_t uid, uint32_t gid)
+
+int ext4_raw_inode_fill(const char *path, uint32_t *ret_ino,
+ struct ext4_inode *inode)
{
int r;
ext4_file f;
- uint32_t ino;
struct ext4_inode_ref inode_ref;
struct ext4_mountpoint *mp = ext4_get_mount(path);
if (!mp)
return ENOENT;
- if (mp->fs.read_only)
- return EROFS;
-
EXT4_MP_LOCK(mp);
- ext4_trans_start(mp);
- r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DE_UNKNOWN, NULL, NULL);
+ r = ext4_generic_open2(&f, path, O_RDONLY, EXT4_DE_UNKNOWN, NULL, NULL);
if (r != EOK) {
- ext4_trans_abort(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
- ino = f.inode;
- ext4_fclose(&f);
- r = ext4_fs_get_inode_ref(&mp->fs, ino, &inode_ref);
+
+ /*Load parent*/
+ r = ext4_fs_get_inode_ref(&mp->fs, f.inode, &inode_ref);
if (r != EOK) {
- ext4_trans_abort(mp);
EXT4_MP_UNLOCK(mp);
return r;
}
- ext4_inode_set_uid(inode_ref.inode, uid);
- ext4_inode_set_gid(inode_ref.inode, gid);
- inode_ref.dirty = true;
-
- r = ext4_fs_put_inode_ref(&inode_ref);
- if (r != EOK)
- ext4_trans_abort(mp);
- else
- ext4_trans_stop(mp);
+ if (ret_ino)
+ *ret_ino = f.inode;
+ memcpy(inode, inode_ref.inode, sizeof(struct ext4_inode));
+ ext4_fs_put_inode_ref(&inode_ref);
EXT4_MP_UNLOCK(mp);
+
return r;
}
-int ext4_file_set_atime(const char *path, uint32_t atime)
+int ext4_inode_exist(const char *path, int type)
{
int r;
ext4_file f;
- uint32_t ino;
- struct ext4_inode_ref inode_ref;
+ struct ext4_mountpoint *mp = ext4_get_mount(path);
+
+ if (!mp)
+ return ENOENT;
+
+ EXT4_MP_LOCK(mp);
+ r = ext4_generic_open2(&f, path, O_RDONLY, type, NULL, NULL);
+ EXT4_MP_UNLOCK(mp);
+
+ return r;
+}
+
+int ext4_mode_set(const char *path, uint32_t mode)
+{
+ int r;
+ uint32_t orig_mode;
+ struct ext4_inode_ref inode_ref;
struct ext4_mountpoint *mp = ext4_get_mount(path);
if (!mp)
return EROFS;
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;
- }
- ino = f.inode;
- 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;
- }
+ r = ext4_trans_get_inode_ref(path, mp, &inode_ref);
+ if (r != EOK)
+ goto Finish;
+
+ orig_mode = ext4_inode_get_mode(&mp->fs.sb, inode_ref.inode);
+ orig_mode &= ~0xFFF;
+ orig_mode |= mode & 0xFFF;
+ ext4_inode_set_mode(&mp->fs.sb, inode_ref.inode, orig_mode);
- ext4_inode_set_access_time(inode_ref.inode, atime);
inode_ref.dirty = true;
+ r = ext4_trans_put_inode_ref(mp, &inode_ref);
- r = ext4_fs_put_inode_ref(&inode_ref);
+ Finish:
+ EXT4_MP_UNLOCK(mp);
+
+ return r;
+}
+
+int ext4_owner_set(const char *path, uint32_t uid, uint32_t gid)
+{
+ int r;
+ struct ext4_inode_ref inode_ref;
+ struct ext4_mountpoint *mp = ext4_get_mount(path);
+
+ if (!mp)
+ return ENOENT;
+
+ if (mp->fs.read_only)
+ return EROFS;
+
+ EXT4_MP_LOCK(mp);
+
+ r = ext4_trans_get_inode_ref(path, mp, &inode_ref);
if (r != EOK)
- ext4_trans_abort(mp);
- else
- ext4_trans_stop(mp);
+ goto Finish;
+ ext4_inode_set_uid(inode_ref.inode, uid);
+ ext4_inode_set_gid(inode_ref.inode, gid);
+
+ inode_ref.dirty = true;
+ r = ext4_trans_put_inode_ref(mp, &inode_ref);
+
+ Finish:
EXT4_MP_UNLOCK(mp);
+
return r;
}
-int ext4_file_set_mtime(const char *path, uint32_t mtime)
+int ext4_mode_get(const char *path, uint32_t *mode)
{
+ struct ext4_inode_ref inode_ref;
+ struct ext4_mountpoint *mp = ext4_get_mount(path);
+ ext4_file f;
int r;
+
+ if (!mp)
+ return ENOENT;
+
+ EXT4_MP_LOCK(mp);
+
+ r = ext4_generic_open2(&f, path, O_RDONLY, EXT4_DE_UNKNOWN, NULL, NULL);
+ if (r != EOK)
+ goto Finish;
+
+ r = ext4_fs_get_inode_ref(&mp->fs, f.inode, &inode_ref);
+ if (r != EOK)
+ goto Finish;
+
+ *mode = ext4_inode_get_mode(&mp->fs.sb, inode_ref.inode);
+ r = ext4_fs_put_inode_ref(&inode_ref);
+
+ Finish:
+ EXT4_MP_UNLOCK(mp);
+
+ return r;
+}
+
+int ext4_owner_get(const char *path, uint32_t *uid, uint32_t *gid)
+{
+ struct ext4_inode_ref inode_ref;
+ struct ext4_mountpoint *mp = ext4_get_mount(path);
ext4_file f;
- uint32_t ino;
+ int r;
+
+ if (!mp)
+ return ENOENT;
+
+ EXT4_MP_LOCK(mp);
+
+ r = ext4_generic_open2(&f, path, O_RDONLY, EXT4_DE_UNKNOWN, NULL, NULL);
+ if (r != EOK)
+ goto Finish;
+
+ r = ext4_fs_get_inode_ref(&mp->fs, f.inode, &inode_ref);
+ if (r != EOK)
+ goto Finish;
+
+ *uid = ext4_inode_get_uid(inode_ref.inode);
+ *gid = ext4_inode_get_gid(inode_ref.inode);
+ r = ext4_fs_put_inode_ref(&inode_ref);
+
+ Finish:
+ EXT4_MP_UNLOCK(mp);
+
+ return r;
+}
+
+int ext4_atime_set(const char *path, uint32_t atime)
+{
struct ext4_inode_ref inode_ref;
struct ext4_mountpoint *mp = ext4_get_mount(path);
+ int r;
if (!mp)
return ENOENT;
return EROFS;
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;
- }
- ino = f.inode;
- 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;
- }
+ r = ext4_trans_get_inode_ref(path, mp, &inode_ref);
+ if (r != EOK)
+ goto Finish;
- ext4_inode_set_modif_time(inode_ref.inode, mtime);
+ ext4_inode_set_access_time(inode_ref.inode, atime);
inode_ref.dirty = true;
+ r = ext4_trans_put_inode_ref(mp, &inode_ref);
- r = ext4_fs_put_inode_ref(&inode_ref);
+ Finish:
+ EXT4_MP_UNLOCK(mp);
+
+ return r;
+}
+
+int ext4_mtime_set(const char *path, uint32_t mtime)
+{
+ struct ext4_inode_ref inode_ref;
+ struct ext4_mountpoint *mp = ext4_get_mount(path);
+ int r;
+
+ if (!mp)
+ return ENOENT;
+
+ if (mp->fs.read_only)
+ return EROFS;
+
+ EXT4_MP_LOCK(mp);
+
+ r = ext4_trans_get_inode_ref(path, mp, &inode_ref);
if (r != EOK)
- ext4_trans_abort(mp);
- else
- ext4_trans_stop(mp);
+ goto Finish;
+
+ ext4_inode_set_modif_time(inode_ref.inode, mtime);
+ inode_ref.dirty = true;
+ r = ext4_trans_put_inode_ref(mp, &inode_ref);
+ Finish:
EXT4_MP_UNLOCK(mp);
+
return r;
}
-int ext4_file_set_ctime(const char *path, uint32_t ctime)
+int ext4_ctime_set(const char *path, uint32_t ctime)
{
- int r;
- ext4_file f;
- uint32_t ino;
struct ext4_inode_ref inode_ref;
struct ext4_mountpoint *mp = ext4_get_mount(path);
+ int r;
if (!mp)
return ENOENT;
return EROFS;
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;
- }
- ino = f.inode;
- 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;
- }
+ r = ext4_trans_get_inode_ref(path, mp, &inode_ref);
+ if (r != EOK)
+ goto Finish;
ext4_inode_set_change_inode_time(inode_ref.inode, ctime);
inode_ref.dirty = true;
+ r = ext4_trans_put_inode_ref(mp, &inode_ref);
+
+ Finish:
+ EXT4_MP_UNLOCK(mp);
+
+ return r;
+}
+
+int ext4_atime_get(const char *path, uint32_t *atime)
+{
+ struct ext4_inode_ref inode_ref;
+ struct ext4_mountpoint *mp = ext4_get_mount(path);
+ ext4_file f;
+ int r;
+
+ if (!mp)
+ return ENOENT;
+
+ EXT4_MP_LOCK(mp);
+
+ r = ext4_generic_open2(&f, path, O_RDONLY, EXT4_DE_UNKNOWN, NULL, NULL);
+ if (r != EOK)
+ goto Finish;
+ r = ext4_fs_get_inode_ref(&mp->fs, f.inode, &inode_ref);
+ if (r != EOK)
+ goto Finish;
+
+ *atime = ext4_inode_get_access_time(inode_ref.inode);
r = ext4_fs_put_inode_ref(&inode_ref);
+
+ Finish:
+ EXT4_MP_UNLOCK(mp);
+
+ return r;
+}
+
+int ext4_mtime_get(const char *path, uint32_t *mtime)
+{
+ struct ext4_inode_ref inode_ref;
+ struct ext4_mountpoint *mp = ext4_get_mount(path);
+ ext4_file f;
+ int r;
+
+ if (!mp)
+ return ENOENT;
+
+ EXT4_MP_LOCK(mp);
+
+ r = ext4_generic_open2(&f, path, O_RDONLY, EXT4_DE_UNKNOWN, NULL, NULL);
if (r != EOK)
- ext4_trans_abort(mp);
- else
- ext4_trans_stop(mp);
+ goto Finish;
+ r = ext4_fs_get_inode_ref(&mp->fs, f.inode, &inode_ref);
+ if (r != EOK)
+ goto Finish;
+
+ *mtime = ext4_inode_get_modif_time(inode_ref.inode);
+ r = ext4_fs_put_inode_ref(&inode_ref);
+
+ Finish:
EXT4_MP_UNLOCK(mp);
+
+ return r;
+}
+
+int ext4_ctime_get(const char *path, uint32_t *ctime)
+{
+ struct ext4_inode_ref inode_ref;
+ struct ext4_mountpoint *mp = ext4_get_mount(path);
+ ext4_file f;
+ int r;
+
+ if (!mp)
+ return ENOENT;
+
+ EXT4_MP_LOCK(mp);
+
+ r = ext4_generic_open2(&f, path, O_RDONLY, EXT4_DE_UNKNOWN, NULL, NULL);
+ if (r != EOK)
+ goto Finish;
+
+ r = ext4_fs_get_inode_ref(&mp->fs, f.inode, &inode_ref);
+ if (r != EOK)
+ goto Finish;
+
+ *ctime = ext4_inode_get_change_inode_time(inode_ref.inode);
+ r = ext4_fs_put_inode_ref(&inode_ref);
+
+ Finish:
+ EXT4_MP_UNLOCK(mp);
+
return r;
}
memcpy(ref.inode->blocks, buf, size);
ext4_inode_clear_flag(ref.inode, EXT4_INODE_FLAG_EXTENTS);
} else {
+ uint64_t off;
ext4_fs_inode_blocks_init(&f->mp->fs, &ref);
r = ext4_fs_append_inode_dblk(&ref, &fblock, &sblock);
if (r != EOK)
goto Finish;
- r = ext4_block_writebytes(f->mp->fs.bdev, 0, buf, size);
+ off = fblock * block_size;
+ r = ext4_block_writebytes(f->mp->fs.bdev, off, buf, size);
if (r != EOK)
goto Finish;
-
}
/*Stop write back cache mode*/
filetype = EXT4_DE_SYMLINK;
EXT4_MP_LOCK(mp);
+ ext4_block_cache_write_back(mp->fs.bdev, 1);
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);
+ r = ext4_generic_open2(&f, path, O_RDWR | O_CREAT, filetype, NULL, NULL);
if (r == EOK)
r = ext4_fsymlink_set(&f, target, strlen(target));
else
ext4_fclose(&f);
Finish:
- ext4_block_cache_write_back(mp->fs.bdev, 0);
-
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;
}
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_block_cache_write_back(mp->fs.bdev, 1);
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);
+ r = ext4_generic_open2(&f, path, O_RDWR | O_CREAT, filetype, NULL, NULL);
if (r == EOK) {
if (filetype == EXT4_DE_CHRDEV ||
filetype == EXT4_DE_BLKDEV)
r = ext4_mknod_set(&f, dev);
- } else
+ } else {
goto Finish;
+ }
ext4_fclose(&f);
Finish:
- ext4_block_cache_write_back(mp->fs.bdev, 0);
-
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;
}
int ext4_setxattr(const char *path, const char *name, size_t name_len,
- const void *data, size_t data_size, bool replace __unused)
+ const void *data, size_t data_size)
{
bool found;
int r = EOK;
return EINVAL;
EXT4_MP_LOCK(mp);
- ext4_trans_start(mp);
+ r = ext4_generic_open2(&f, path, O_RDONLY, EXT4_DE_UNKNOWN, NULL, NULL);
+ if (r != EOK) {
+ EXT4_MP_UNLOCK(mp);
+ return r;
+ }
- r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DE_UNKNOWN, NULL, NULL);
- if (r != EOK)
- goto Finish;
inode = f.inode;
ext4_fclose(&f);
+ ext4_trans_start(mp);
r = ext4_fs_get_inode_ref(&mp->fs, inode, &inode_ref);
if (r != EOK)
return EINVAL;
EXT4_MP_LOCK(mp);
- r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DE_UNKNOWN, NULL, NULL);
+ r = ext4_generic_open2(&f, path, O_RDONLY, EXT4_DE_UNKNOWN, NULL, NULL);
if (r != EOK)
goto Finish;
+
inode = f.inode;
ext4_fclose(&f);
return ENOENT;
EXT4_MP_LOCK(mp);
- r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DE_UNKNOWN, NULL, NULL);
+ r = ext4_generic_open2(&f, path, O_RDONLY, EXT4_DE_UNKNOWN, NULL, NULL);
if (r != EOK)
goto Finish;
inode = f.inode;
return EINVAL;
EXT4_MP_LOCK(mp);
- ext4_trans_start(mp);
+ r = ext4_generic_open2(&f, path, O_RDONLY, EXT4_DE_UNKNOWN, NULL, NULL);
+ if (r != EOK) {
+ EXT4_MP_LOCK(mp);
+ return r;
+ }
- r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DE_UNKNOWN, NULL, NULL);
- if (r != EOK)
- goto Finish;
inode = f.inode;
ext4_fclose(&f);
+ ext4_trans_start(mp);
r = ext4_fs_get_inode_ref(&mp->fs, inode, &inode_ref);
if (r != EOK)
/*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;
}
path += name_off;
len = ext4_path_check(path, &is_goal);
-
inode_current = f.inode;
ext4_block_cache_write_back(mp->fs.bdev, 1);
{
int r;
ext4_file f;
-
struct ext4_mountpoint *mp = ext4_get_mount(path);
if (!mp)
return EROFS;
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;
- }
+ if (r == EOK)
+ goto Finish;
- /*Create new dir*/
+ /*Create new directory.*/
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);
+Finish:
EXT4_MP_UNLOCK(mp);
return r;
}
-int ext4_dir_open(ext4_dir *d, const char *path)
+int ext4_dir_open(ext4_dir *dir, const char *path)
{
struct ext4_mountpoint *mp = ext4_get_mount(path);
int r;
return ENOENT;
EXT4_MP_LOCK(mp);
- r = ext4_generic_open(&d->f, path, "r", false, 0, 0);
- d->next_off = 0;
+ r = ext4_generic_open(&dir->f, path, "r", false, 0, 0);
+ dir->next_off = 0;
EXT4_MP_UNLOCK(mp);
return r;
}
-int ext4_dir_close(ext4_dir *d)
+int ext4_dir_close(ext4_dir *dir)
{
- return ext4_fclose(&d->f);
+ return ext4_fclose(&dir->f);
}
-const ext4_direntry *ext4_dir_entry_next(ext4_dir *d)
+const ext4_direntry *ext4_dir_entry_next(ext4_dir *dir)
{
#define EXT4_DIR_ENTRY_OFFSET_TERM (uint64_t)(-1)
int r;
uint16_t name_length;
ext4_direntry *de = 0;
- struct ext4_inode_ref dir;
+ struct ext4_inode_ref dir_inode;
struct ext4_dir_iter it;
- EXT4_MP_LOCK(d->f.mp);
+ EXT4_MP_LOCK(dir->f.mp);
- if (d->next_off == EXT4_DIR_ENTRY_OFFSET_TERM) {
- EXT4_MP_UNLOCK(d->f.mp);
+ if (dir->next_off == EXT4_DIR_ENTRY_OFFSET_TERM) {
+ EXT4_MP_UNLOCK(dir->f.mp);
return 0;
}
- r = ext4_fs_get_inode_ref(&d->f.mp->fs, d->f.inode, &dir);
+ r = ext4_fs_get_inode_ref(&dir->f.mp->fs, dir->f.inode, &dir_inode);
if (r != EOK) {
goto Finish;
}
- r = ext4_dir_iterator_init(&it, &dir, d->next_off);
+ r = ext4_dir_iterator_init(&it, &dir_inode, dir->next_off);
if (r != EOK) {
- ext4_fs_put_inode_ref(&dir);
+ ext4_fs_put_inode_ref(&dir_inode);
goto Finish;
}
- memset(&d->de.name, 0, sizeof(d->de.name));
- name_length = ext4_dir_en_get_name_len(&d->f.mp->fs.sb,
+ memset(&dir->de.name, 0, sizeof(dir->de.name));
+ name_length = ext4_dir_en_get_name_len(&dir->f.mp->fs.sb,
it.curr);
- memcpy(&d->de.name, it.curr->name, name_length);
+ memcpy(&dir->de.name, it.curr->name, name_length);
/* Directly copying the content isn't safe for Big-endian targets*/
- d->de.inode = ext4_dir_en_get_inode(it.curr);
- d->de.entry_length = ext4_dir_en_get_entry_len(it.curr);
- d->de.name_length = name_length;
- d->de.inode_type = ext4_dir_en_get_inode_type(&d->f.mp->fs.sb,
+ dir->de.inode = ext4_dir_en_get_inode(it.curr);
+ dir->de.entry_length = ext4_dir_en_get_entry_len(it.curr);
+ dir->de.name_length = name_length;
+ dir->de.inode_type = ext4_dir_en_get_inode_type(&dir->f.mp->fs.sb,
it.curr);
- de = &d->de;
+ de = &dir->de;
ext4_dir_iterator_next(&it);
- d->next_off = it.curr ? it.curr_off : EXT4_DIR_ENTRY_OFFSET_TERM;
+ dir->next_off = it.curr ? it.curr_off : EXT4_DIR_ENTRY_OFFSET_TERM;
ext4_dir_iterator_fini(&it);
- ext4_fs_put_inode_ref(&dir);
+ ext4_fs_put_inode_ref(&dir_inode);
Finish:
- EXT4_MP_UNLOCK(d->f.mp);
+ EXT4_MP_UNLOCK(dir->f.mp);
return de;
}
-void ext4_dir_entry_rewind(ext4_dir *d)
+void ext4_dir_entry_rewind(ext4_dir *dir)
{
- d->next_off = 0;
+ dir->next_off = 0;
}
/**
projects / lwext4.git / blobdiff