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

fs: ext4: simplify ext4fs_iterate_dir()

Browse Source 
Remove copying a pointer with a cast to the very same type.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Heinrich Schuchardt
2024-10-26 08:40:44 +02:00
committed by Tom Rini
parent 8963d433eb
commit a1a86a1784
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
fs/ext4/ext4_common.c
View File

@@ -2046,24 +2046,23 @@ int ext4fs_iterate_dir(struct ext2fs_node *dir, char *name,
unsigned int fpos = 0; unsigned int fpos = 0;
int status; int status;
loff_t actread; loff_t actread;
struct ext2fs_node *diro = (struct ext2fs_node *) dir;
#ifdef DEBUG #ifdef DEBUG
if (name != NULL) if (name != NULL)
printf("Iterate dir %s\n", name); printf("Iterate dir %s\n", name);
#endif /* of DEBUG */ #endif /* of DEBUG */
if (!diro->inode_read) { if (!dir->inode_read) {
status = ext4fs_read_inode(diro->data, diro->ino, &diro->inode); status = ext4fs_read_inode(dir->data, dir->ino, &dir->inode);
if (status == 0) if (status == 0)
return 0; return 0;
} }
/* Search the file. */ /* Search the file. */
while (fpos < le32_to_cpu(diro->inode.size)) { while (fpos < le32_to_cpu(dir->inode.size)) {
struct ext2_dirent dirent; struct ext2_dirent dirent;
status = ext4fs_read_file(diro, fpos, status = ext4fs_read_file(dir, fpos,
sizeof(struct ext2_dirent), sizeof(struct ext2_dirent),
(char *)&dirent, &actread); (char *)&dirent, &actread);
if (status < 0) if (status < 0)
return 0; return 0;
@@ -2077,7 +2076,7 @@ int ext4fs_iterate_dir(struct ext2fs_node *dir, char *name,
struct ext2fs_node *fdiro; struct ext2fs_node *fdiro;
int type = FILETYPE_UNKNOWN; int type = FILETYPE_UNKNOWN;
status = ext4fs_read_file(diro, status = ext4fs_read_file(dir,
fpos + fpos +
sizeof(struct ext2_dirent), sizeof(struct ext2_dirent),
dirent.namelen, filename, dirent.namelen, filename,
@@ -2089,7 +2088,7 @@ int ext4fs_iterate_dir(struct ext2fs_node *dir, char *name,
if (!fdiro) if (!fdiro)
return 0; return 0;
fdiro->data = diro->data; fdiro->data = dir->data;
fdiro->ino = le32_to_cpu(dirent.inode); fdiro->ino = le32_to_cpu(dirent.inode);
filename[dirent.namelen] = '\0'; filename[dirent.namelen] = '\0';
@@ -2104,7 +2103,7 @@ int ext4fs_iterate_dir(struct ext2fs_node *dir, char *name,
else if (dirent.filetype == FILETYPE_REG) else if (dirent.filetype == FILETYPE_REG)
type = FILETYPE_REG; type = FILETYPE_REG;
} else { } else {
status = ext4fs_read_inode(diro->data, status = ext4fs_read_inode(dir->data,
le32_to_cpu le32_to_cpu
(dirent.inode), (dirent.inode),
&fdiro->inode); &fdiro->inode);
@@ -2140,10 +2139,10 @@ int ext4fs_iterate_dir(struct ext2fs_node *dir, char *name,
} }
} else { } else {
if (fdiro->inode_read == 0) { if (fdiro->inode_read == 0) {
status = ext4fs_read_inode(diro->data, status = ext4fs_read_inode(dir->data,
le32_to_cpu( le32_to_cpu(
dirent.inode), dirent.inode),
&fdiro->inode); &fdiro->inode);
if (status == 0) { if (status == 0) {
free(fdiro); free(fdiro);
return 0; return 0;