Embedded_Projects/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ext4: detect directories in ext4fs_exists()

Browse Source 
While fat_exists() reports directories and files as existing
ext4fs_exists() only recognizes files. This lead to errors
when using systemd-boot with an ext4 file-system.

Change ext4fs_exists() to find any type of inode:
files, directories, symbolic links.

Fixes: a1596438a6 ("ext4fs ls load support")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Heinrich Schuchardt 2024-02-20 12:54:23 +01:00 committed by Tom Rini
parent 3766a249a3
commit e70f04fb8d
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/ext4/ext4_common.c
View File

@ -2214,9 +2214,8 @@ static char *ext4fs_read_symlink(struct ext2fs_node *node)
return symlink;
}
static int ext4fs_find_file1(const char *currpath,
struct ext2fs_node *currroot,
struct ext2fs_node **currfound, int *foundtype)
int ext4fs_find_file1(const char *currpath, struct ext2fs_node *currroot,
struct ext2fs_node **currfound, int *foundtype)
{
char fpath[strlen(currpath) + 1];
char *name = fpath;

2
fs/ext4/ext4_common.h
View File

@ -54,6 +54,8 @@ int ext4fs_read_file(struct ext2fs_node *node, loff_t pos, loff_t len,
char *buf, loff_t *actread);
int ext4fs_find_file(const char *path, struct ext2fs_node *rootnode,
struct ext2fs_node **foundnode, int expecttype);
int ext4fs_find_file1(const char *currpath, struct ext2fs_node *currroot,
struct ext2fs_node **currfound, int *foundtype);
int ext4fs_iterate_dir(struct ext2fs_node *dir, char *name,
struct ext2fs_node **fnode, int *ftype);

11
fs/ext4/ext4fs.c
View File

@ -208,11 +208,14 @@ int ext4fs_ls(const char *dirname)
int ext4fs_exists(const char *filename)
{
loff_t file_len;
int ret;
struct ext2fs_node *dirnode = NULL;
int filetype;
ret = ext4fs_open(filename, &file_len);
return ret == 0;
if (!filename)
return 0;
return ext4fs_find_file1(filename, &ext4fs_root->diropen, &dirnode,
&filetype);
}
int ext4fs_size(const char *filename, loff_t *size)