brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

ext4: cleanup unlink_filename function

Browse Source 
Use the same variable names as in search_dir, to make purpose of variables
more obvious.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Stefan Brüns 2016-10-09 20:15:26 +02:00 committed by Tom Rini
parent 6637cb7691
commit 15bf8c4f93
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fs/ext4/ext4_common.c
View File

@ -854,34 +854,35 @@ fail:
static int unlink_filename(char *filename, unsigned int blknr) static int unlink_filename(char *filename, unsigned int blknr)
{ {
int totalbytes = 0;
int templength = 0; int templength = 0;
int status, inodeno; int status, inodeno;
int found = 0; int found = 0;
char *root_first_block_buffer = NULL; int offset;
char *block_buffer = NULL;
struct ext2_dirent *dir = NULL; struct ext2_dirent *dir = NULL;
struct ext2_dirent *previous_dir = NULL; struct ext2_dirent *previous_dir = NULL;
char *ptr = NULL; char *ptr = NULL;
struct ext_filesystem *fs = get_fs(); struct ext_filesystem *fs = get_fs();
int ret = -1; int ret = -1;
/* get the first block of root */ block_buffer = zalloc(fs->blksz);
root_first_block_buffer = zalloc(fs->blksz); if (!block_buffer)
if (!root_first_block_buffer)
return -ENOMEM; return -ENOMEM;
/* read the directory block */
status = ext4fs_devread((lbaint_t)blknr * fs->sect_perblk, 0, status = ext4fs_devread((lbaint_t)blknr * fs->sect_perblk, 0,
fs->blksz, root_first_block_buffer); fs->blksz, block_buffer);
if (status == 0) if (status == 0)
goto fail; goto fail;
if (ext4fs_log_journal(root_first_block_buffer, blknr)) if (ext4fs_log_journal(block_buffer, blknr))
goto fail; goto fail;
dir = (struct ext2_dirent *)root_first_block_buffer; dir = (struct ext2_dirent *)block_buffer;
ptr = (char *)dir; ptr = (char *)dir;
totalbytes = 0; offset = 0;
while (le16_to_cpu(dir->direntlen) >= 0) { while (le16_to_cpu(dir->direntlen) >= 0) {
/* /*
* blocksize-totalbytes because last * blocksize-offset because last
* directory length i.e., *dir->direntlen * directory length i.e., *dir->direntlen
* is free availble space in the block that * is free availble space in the block that
* means it is a last entry of directory entry * means it is a last entry of directory entry
@ -903,12 +904,12 @@ static int unlink_filename(char *filename, unsigned int blknr)
break; break;
} }
if (fs->blksz - totalbytes == le16_to_cpu(dir->direntlen)) if (fs->blksz - offset == le16_to_cpu(dir->direntlen))
break; break;
/* traversing the each directory entry */ /* traversing the each directory entry */
templength = le16_to_cpu(dir->direntlen); templength = le16_to_cpu(dir->direntlen);
totalbytes = totalbytes + templength; offset = offset + templength;
previous_dir = dir; previous_dir = dir;
dir = (struct ext2_dirent *)((char *)dir + templength); dir = (struct ext2_dirent *)((char *)dir + templength);
ptr = (char *)dir; ptr = (char *)dir;
@ -916,12 +917,12 @@ static int unlink_filename(char *filename, unsigned int blknr)
if (found == 1) { if (found == 1) {
if (ext4fs_put_metadata(root_first_block_buffer, blknr)) if (ext4fs_put_metadata(block_buffer, blknr))
goto fail; goto fail;
ret = inodeno; ret = inodeno;
} }
fail: fail:
free(root_first_block_buffer); free(block_buffer);
return ret; return ret;
} }