#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"
if (!bc) {
/*Automatic block cache alloc.*/
mp->cache_dynamic = 1;
- bc = malloc(sizeof(struct ext4_bcache));
+ bc = ext4_malloc(sizeof(struct ext4_bcache));
r = ext4_bcache_init_dynamic(bc, CONFIG_BLOCK_DEV_CACHE_SIZE,
bsize);
if (r != EOK) {
- free(bc);
+ ext4_free(bc);
ext4_block_fini(bd);
return r;
}
ext4_block_fini(bd);
if (mp->cache_dynamic) {
ext4_bcache_fini_dynamic(bc);
- free(bc);
+ ext4_free(bc);
}
return r;
}
ext4_bcache_cleanup(mp->fs.bdev->bc);
if (mp->cache_dynamic) {
ext4_bcache_fini_dynamic(mp->fs.bdev->bc);
- free(mp->fs.bdev->bc);
+ ext4_free(mp->fs.bdev->bc);
}
r = ext4_block_fini(mp->fs.bdev);
Finish:
int r = ENOTSUP;
EXT4_MP_LOCK(mp);
if (ext4_sb_feature_com(&mp->fs.sb, EXT4_FCOM_HAS_JOURNAL)) {
- struct jbd_fs *jbd_fs = calloc(1, sizeof(struct jbd_fs));
+ struct jbd_fs *jbd_fs = ext4_calloc(1, sizeof(struct jbd_fs));
if (!jbd_fs) {
r = ENOMEM;
goto Finish;
r = jbd_get_fs(&mp->fs, jbd_fs);
if (r != EOK) {
- free(jbd_fs);
+ ext4_free(jbd_fs);
goto Finish;
}
r = jbd_recover(jbd_fs);
jbd_put_fs(jbd_fs);
- free(jbd_fs);
+ ext4_free(jbd_fs);
}
+ if (r == EOK && !mp->fs.read_only) {
+ uint32_t bgid;
+ uint64_t free_blocks_count = 0;
+ uint32_t free_inodes_count = 0;
+ struct ext4_block_group_ref bg_ref;
+ /* Update superblock's stats */
+ for (bgid = 0;bgid < ext4_block_group_cnt(&mp->fs.sb);bgid++) {
+ r = ext4_fs_get_block_group_ref(&mp->fs, bgid, &bg_ref);
+ if (r != EOK)
+ goto Finish;
+
+ free_blocks_count +=
+ ext4_bg_get_free_blocks_count(bg_ref.block_group,
+ &mp->fs.sb);
+ free_inodes_count +=
+ ext4_bg_get_free_inodes_count(bg_ref.block_group,
+ &mp->fs.sb);
+
+ ext4_fs_put_block_group_ref(&bg_ref);
+ }
+ ext4_sb_set_free_blocks_cnt(&mp->fs.sb, free_blocks_count);
+ ext4_set32(&mp->fs.sb, free_inodes_count, free_inodes_count);
+ /* We don't need to save the superblock stats immediately. */
+ }
Finish:
EXT4_MP_UNLOCK(mp);
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)
return f->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;
-
- 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);
+ 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 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)
+ 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);
+
+ inode_ref.dirty = true;
+ r = ext4_trans_put_inode_ref(mp, &inode_ref);
+
+ Finish:
EXT4_MP_UNLOCK(mp);
+
return r;
}
-int ext4_chown(const char *path, uint32_t uid, uint32_t gid)
+int ext4_owner_set(const char *path, uint32_t uid, uint32_t gid)
{
int r;
- ext4_file f;
- uint32_t ino;
struct ext4_inode_ref inode_ref;
struct ext4_mountpoint *mp = ext4_get_mount(path);
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_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);
- r = ext4_fs_put_inode_ref(&inode_ref);
+ Finish:
+ EXT4_MP_UNLOCK(mp);
+
+ return r;
+}
+
+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;
+
+ if (mp->fs.read_only)
+ return EROFS;
+
+ 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;
+ *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_file_set_atime(const char *path, uint32_t atime)
+int ext4_owner_get(const char *path, uint32_t *uid, uint32_t *gid)
{
- int r;
- ext4_file f;
- uint32_t ino;
struct ext4_inode_ref inode_ref;
struct ext4_mountpoint *mp = ext4_get_mount(path);
+ ext4_file f;
+ 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_generic_open2(&f, path, O_RDONLY, EXT4_DE_UNKNOWN, NULL, NULL);
+ if (r != EOK)
+ goto Finish;
- ext4_inode_set_access_time(inode_ref.inode, atime);
- inode_ref.dirty = true;
+ 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);
- if (r != EOK)
- ext4_trans_abort(mp);
- else
- ext4_trans_stop(mp);
+ Finish:
EXT4_MP_UNLOCK(mp);
+
return r;
}
-int ext4_file_set_mtime(const char *path, uint32_t mtime)
+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;
- ext4_file f;
- uint32_t ino;
+
+ 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)
+ goto Finish;
+
+ ext4_inode_set_access_time(inode_ref.inode, atime);
+ inode_ref.dirty = true;
+ r = ext4_trans_put_inode_ref(mp, &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;
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);
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_ctime_set(const char *path, uint32_t ctime)
+{
+ 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_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_file_set_ctime(const char *path, uint32_t ctime)
+int ext4_atime_get(const char *path, uint32_t *atime)
{
- int r;
+ 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;
+
+ if (mp->fs.read_only)
+ return EROFS;
+
+ 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;
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_generic_open2(&f, path, O_RDONLY, EXT4_DE_UNKNOWN, NULL, NULL);
+ if (r != EOK)
+ goto Finish;
- ext4_inode_set_change_inode_time(inode_ref.inode, ctime);
- inode_ref.dirty = true;
+ 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;
+
+ if (mp->fs.read_only)
+ return EROFS;
+
+ 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;
+
+ *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;
}
return r;
}
+static int ext4_mknod_set(ext4_file *f, uint32_t dev)
+{
+ struct ext4_inode_ref ref;
+ int r;
+
+ ext4_assert(f && f->mp);
+
+ r = ext4_fs_get_inode_ref(&f->mp->fs, f->inode, &ref);
+ if (r != EOK)
+ return r;
+
+ ext4_inode_set_dev(ref.inode, dev);
+
+ ext4_inode_set_size(ref.inode, 0);
+ ref.dirty = true;
+
+ f->fsize = 0;
+ f->fpos = 0;
+
+ r = ext4_fs_put_inode_ref(&ref);
+ return r;
+}
+
+int ext4_mknod(const char *path, int filetype, uint32_t dev)
+{
+ struct ext4_mountpoint *mp = ext4_get_mount(path);
+ int r;
+ ext4_file f;
+
+ if (!mp)
+ return ENOENT;
+
+ if (mp->fs.read_only)
+ return EROFS;
+
+ /*
+ * The filetype shouldn't be normal file, directory or
+ * unknown.
+ */
+ if (filetype == EXT4_DE_UNKNOWN ||
+ filetype == EXT4_DE_REG_FILE ||
+ filetype == EXT4_DE_DIR ||
+ filetype == EXT4_DE_SYMLINK)
+ return EINVAL;
+
+ /*
+ * Nor should it be any bogus value.
+ */
+ if (filetype != EXT4_DE_CHRDEV &&
+ filetype != EXT4_DE_BLKDEV &&
+ filetype != EXT4_DE_FIFO &&
+ filetype != EXT4_DE_SOCK)
+ return EINVAL;
+
+ 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) {
+ if (filetype == EXT4_DE_CHRDEV ||
+ filetype == EXT4_DE_BLKDEV)
+ r = ext4_mknod_set(&f, dev);
+ } 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_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)
+ const void *data, size_t data_size, bool replace __unused)
{
bool found;
int r = EOK;
uint8_t name_index;
const char *dissected_name = NULL;
size_t dissected_len = 0;
- struct ext4_xattr_ref xattr_ref;
struct ext4_inode_ref inode_ref;
struct ext4_mountpoint *mp = ext4_get_mount(path);
if (!mp)
if (r != EOK)
goto Finish;
- r = ext4_fs_get_xattr_ref(&mp->fs, &inode_ref, &xattr_ref);
- if (r != EOK) {
- ext4_fs_put_inode_ref(&inode_ref);
- goto Finish;
- }
-
- r = ext4_fs_set_xattr(&xattr_ref, name_index, dissected_name,
- dissected_len, data, data_size, replace);
+ r = ext4_xattr_set(&inode_ref, name_index, dissected_name,
+ dissected_len, data, data_size);
- ext4_fs_put_xattr_ref(&xattr_ref);
ext4_fs_put_inode_ref(&inode_ref);
Finish:
if (r != EOK)
uint8_t name_index;
const char *dissected_name = NULL;
size_t dissected_len = 0;
- struct ext4_xattr_ref xattr_ref;
struct ext4_inode_ref inode_ref;
struct ext4_mountpoint *mp = ext4_get_mount(path);
if (!mp)
if (r != EOK)
goto Finish;
- r = ext4_fs_get_xattr_ref(&mp->fs, &inode_ref, &xattr_ref);
- if (r != EOK) {
- ext4_fs_put_inode_ref(&inode_ref);
- goto Finish;
- }
-
- r = ext4_fs_get_xattr(&xattr_ref, name_index, dissected_name,
+ r = ext4_xattr_get(&inode_ref, name_index, dissected_name,
dissected_len, buf, buf_size, data_size);
- ext4_fs_put_xattr_ref(&xattr_ref);
ext4_fs_put_inode_ref(&inode_ref);
Finish:
EXT4_MP_UNLOCK(mp);
return r;
}
-struct ext4_listxattr_iterator {
- char *list;
- char *list_ptr;
- size_t size;
- size_t ret_size;
- bool list_too_small;
- bool get_required_size;
-};
-
-static int ext4_iterate_ea_list(struct ext4_xattr_ref *ref,
- struct ext4_xattr_item *item)
-{
- struct ext4_listxattr_iterator *lxi;
- lxi = ref->iter_arg;
- if (!lxi->get_required_size) {
- size_t plen;
- const char *prefix;
- prefix = ext4_get_xattr_name_prefix(item->name_index, &plen);
- if (lxi->ret_size + plen + item->name_len + 1 > lxi->size) {
- lxi->list_too_small = 1;
- return EXT4_XATTR_ITERATE_STOP;
- }
- if (prefix) {
- memcpy(lxi->list_ptr, prefix, plen);
- lxi->list_ptr += plen;
- lxi->ret_size += plen;
- }
- memcpy(lxi->list_ptr, item->name, item->name_len);
- lxi->list_ptr[item->name_len] = 0;
- lxi->list_ptr += item->name_len + 1;
- }
- lxi->ret_size += item->name_len + 1;
- return EXT4_XATTR_ITERATE_CONT;
-}
-
int ext4_listxattr(const char *path, char *list, size_t size, size_t *ret_size)
{
int r = EOK;
ext4_file f;
uint32_t inode;
- struct ext4_xattr_ref xattr_ref;
+ size_t list_len, list_size = 0;
struct ext4_inode_ref inode_ref;
- struct ext4_listxattr_iterator lxi;
+ struct ext4_xattr_list_entry *xattr_list = NULL,
+ *entry = NULL;
struct ext4_mountpoint *mp = ext4_get_mount(path);
if (!mp)
return ENOENT;
- lxi.list = list;
- lxi.list_ptr = list;
- lxi.size = size;
- lxi.ret_size = 0;
- lxi.list_too_small = false;
- lxi.get_required_size = (!size) ? true : false;
-
EXT4_MP_LOCK(mp);
r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DE_UNKNOWN, NULL, NULL);
if (r != EOK)
if (r != EOK)
goto Finish;
- r = ext4_fs_get_xattr_ref(&mp->fs, &inode_ref, &xattr_ref);
- if (r != EOK) {
- ext4_fs_put_inode_ref(&inode_ref);
- goto Finish;
- }
+ r = ext4_xattr_list(&inode_ref, NULL, &list_len);
+ if (r == EOK && list_len) {
+ xattr_list = ext4_malloc(list_len);
+ if (!xattr_list) {
+ ext4_fs_put_inode_ref(&inode_ref);
+ r = ENOMEM;
+ goto Finish;
+ }
+ entry = xattr_list;
+ r = ext4_xattr_list(&inode_ref, entry, &list_len);
+ if (r != EOK) {
+ ext4_fs_put_inode_ref(&inode_ref);
+ goto Finish;
+ }
+
+ for (;entry;entry = entry->next) {
+ size_t prefix_len;
+ const char *prefix =
+ ext4_get_xattr_name_prefix(entry->name_index,
+ &prefix_len);
+ if (size) {
+ if (prefix_len + entry->name_len + 1 > size) {
+ ext4_fs_put_inode_ref(&inode_ref);
+ r = ERANGE;
+ goto Finish;
+ }
+ }
- xattr_ref.iter_arg = &lxi;
- ext4_fs_xattr_iterate(&xattr_ref, ext4_iterate_ea_list);
- if (lxi.list_too_small)
- r = ERANGE;
+ if (list && size) {
+ memcpy(list, prefix, prefix_len);
+ list += prefix_len;
+ memcpy(list, entry->name,
+ entry->name_len);
+ list[entry->name_len] = 0;
+ list += entry->name_len + 1;
- if (r == EOK) {
+ size -= prefix_len + entry->name_len + 1;
+ }
+
+ list_size += prefix_len + entry->name_len + 1;
+ }
if (ret_size)
- *ret_size = lxi.ret_size;
+ *ret_size = list_size;
}
- ext4_fs_put_xattr_ref(&xattr_ref);
ext4_fs_put_inode_ref(&inode_ref);
Finish:
EXT4_MP_UNLOCK(mp);
+ if (xattr_list)
+ ext4_free(xattr_list);
+
return r;
}
uint8_t name_index;
const char *dissected_name = NULL;
size_t dissected_len = 0;
- struct ext4_xattr_ref xattr_ref;
struct ext4_inode_ref inode_ref;
struct ext4_mountpoint *mp = ext4_get_mount(path);
if (!mp)
if (r != EOK)
goto Finish;
- r = ext4_fs_get_xattr_ref(&mp->fs, &inode_ref, &xattr_ref);
- if (r != EOK) {
- ext4_fs_put_inode_ref(&inode_ref);
- goto Finish;
- }
+ r = ext4_xattr_remove(&inode_ref, name_index, dissected_name,
+ dissected_len);
- r = ext4_fs_remove_xattr(&xattr_ref, name_index, dissected_name,
- dissected_len);
-
- ext4_fs_put_xattr_ref(&xattr_ref);
ext4_fs_put_inode_ref(&inode_ref);
Finish:
if (r != EOK)
#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_dir_iter it;
goto Finish;
}
- memcpy(&d->de, it.curr, sizeof(ext4_direntry));
+ memset(&d->de.name, 0, sizeof(d->de.name));
+ name_length = ext4_dir_en_get_name_len(&d->f.mp->fs.sb,
+ it.curr);
+ memcpy(&d->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,
+ it.curr);
+
de = &d->de;
ext4_dir_iterator_next(&it);