}
/*
- * NOTICE: if filetype is equal to EXT4_DIRECTORY_FILETYPE_UNKNOWN,
+ * NOTICE: if filetype is equal to EXT4_DIRENTRY_UNKNOWN,
* any filetype of the target dir entry will be accepted.
*/
static int ext4_generic_open2(ext4_file *f, const char *path, int flags,
if (!len) {
/*If root open was request.*/
if (is_goal &&
- ((filetype == EXT4_DIRECTORY_FILETYPE_DIR) ||
- (filetype == EXT4_DIRECTORY_FILETYPE_UNKNOWN)))
+ ((filetype == EXT4_DIRENTRY_DIR) ||
+ (filetype == EXT4_DIRENTRY_UNKNOWN)))
break;
r = ENOENT;
r = ext4_fs_alloc_inode(
&mp->fs, &child_ref,
is_goal ? filetype
- : EXT4_DIRECTORY_FILETYPE_DIR);
+ : EXT4_DIRENTRY_DIR);
if (r != EOK)
break;
break;
/*If expected file error*/
- if (inode_type != EXT4_DIRECTORY_FILETYPE_DIR && !is_goal) {
+ if (inode_type != EXT4_DIRENTRY_DIR && !is_goal) {
r = ENOENT;
break;
}
- if (filetype != EXT4_DIRECTORY_FILETYPE_UNKNOWN) {
+ if (filetype != EXT4_DIRENTRY_UNKNOWN) {
if ((inode_type != filetype) && is_goal) {
r = ENOENT;
break;
if (is_goal) {
if ((f->flags & O_TRUNC) &&
- (inode_type == EXT4_DIRECTORY_FILETYPE_REG_FILE)) {
+ (inode_type == EXT4_DIRENTRY_REG_FILE)) {
r = ext4_fs_truncate_inode(&ref, 0);
if (r != EOK) {
return EINVAL;
if (file_expect == true)
- filetype = EXT4_DIRECTORY_FILETYPE_REG_FILE;
+ filetype = EXT4_DIRENTRY_REG_FILE;
else
- filetype = EXT4_DIRECTORY_FILETYPE_DIR;
+ filetype = EXT4_DIRENTRY_DIR;
return ext4_generic_open2(f, path, iflags, filetype, parent_inode,
name_off);
struct ext4_inode_ref *child_ref)
{
bool is_goal = false;
- uint8_t inode_type = EXT4_DIRECTORY_FILETYPE_DIR;
+ uint8_t inode_type = EXT4_DIRENTRY_DIR;
uint32_t next_inode;
int r;
if (r != EOK)
break;
- if (inode_type == EXT4_DIRECTORY_FILETYPE_REG_FILE) {
+ if (inode_type == EXT4_DIRENTRY_REG_FILE) {
if (is_goal)
r = EEXIST;
else
EXT4_MP_LOCK(mp);
r = ext4_generic_open2(&f, path, O_RDONLY,
- EXT4_DIRECTORY_FILETYPE_UNKNOWN,
+ EXT4_DIRENTRY_UNKNOWN,
&parent_inode, &name_off);
if (r != EOK)
goto Finish;
EXT4_MP_LOCK(mp);
r = ext4_generic_open2(&f, path, O_RDONLY,
- EXT4_DIRECTORY_FILETYPE_UNKNOWN,
+ EXT4_DIRENTRY_UNKNOWN,
&parent_inode, &name_off);
if (r != EOK)
goto Finish;
EXT4_MP_LOCK(mp);
r = ext4_generic_open2(&f, path, O_RDWR,
- EXT4_DIRECTORY_FILETYPE_UNKNOWN,
+ EXT4_DIRENTRY_UNKNOWN,
&parent_inode, &name_off);
if (r != EOK) {
EXT4_MP_UNLOCK(mp);
EXT4_MP_LOCK(mp);
r = ext4_generic_open2(&f, path, O_RDONLY,
- EXT4_DIRECTORY_FILETYPE_UNKNOWN,
+ EXT4_DIRENTRY_UNKNOWN,
NULL, NULL);
if (r != EOK) {
EXT4_MP_UNLOCK(mp);
if (!mp)
return ENOENT;
- filetype = EXT4_DIRECTORY_FILETYPE_REG_FILE;
+ filetype = EXT4_DIRENTRY_REG_FILE;
EXT4_MP_LOCK(mp);
ext4_block_cache_write_back(mp->fs.bdev, 1);
EXT4_MP_LOCK(mp);
- r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DIRECTORY_FILETYPE_UNKNOWN, 0, 0);
+ r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DIRENTRY_UNKNOWN, 0, 0);
if (r != EOK) {
EXT4_MP_UNLOCK(mp);
return r;
EXT4_MP_LOCK(mp);
- r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DIRECTORY_FILETYPE_UNKNOWN, 0, 0);
+ r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DIRENTRY_UNKNOWN, 0, 0);
if (r != EOK) {
EXT4_MP_UNLOCK(mp);
return r;
EXT4_MP_LOCK(mp);
- r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DIRECTORY_FILETYPE_UNKNOWN, 0, 0);
+ r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DIRENTRY_UNKNOWN, 0, 0);
if (r != EOK) {
EXT4_MP_UNLOCK(mp);
return r;
EXT4_MP_LOCK(mp);
- r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DIRECTORY_FILETYPE_UNKNOWN, 0, 0);
+ r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DIRENTRY_UNKNOWN, 0, 0);
if (r != EOK) {
EXT4_MP_UNLOCK(mp);
return r;
EXT4_MP_LOCK(mp);
- r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DIRECTORY_FILETYPE_UNKNOWN, 0, 0);
+ r = ext4_generic_open2(&f, path, O_RDWR, EXT4_DIRENTRY_UNKNOWN, 0, 0);
if (r != EOK) {
EXT4_MP_UNLOCK(mp);
return r;
if (!mp)
return ENOENT;
- filetype = EXT4_DIRECTORY_FILETYPE_SYMLINK;
+ filetype = EXT4_DIRENTRY_SYMLINK;
EXT4_MP_LOCK(mp);
ext4_block_cache_write_back(mp->fs.bdev, 1);
memset(buf, 0, sizeof(bufsize));
- filetype = EXT4_DIRECTORY_FILETYPE_SYMLINK;
+ filetype = EXT4_DIRENTRY_SYMLINK;
EXT4_MP_LOCK(mp);
ext4_block_cache_write_back(mp->fs.bdev, 1);