Skip to content
Snippets Groups Projects
Commit 805e3e00 authored by Stefan Brüns's avatar Stefan Brüns Committed by Tom Rini
Browse files

ext4: Only write journal entries for modified blocks in unlink_filename


Instead of creating a journal entry for each directory block, even
if the block is unmodified, only log the modified block.

Signed-off-by: default avatarStefan Brüns <stefan.bruens@rwth-aachen.de>
Reviewed-by: default avatarTom Rini <trini@konsulko.com>
Reviewed-by: default avatarLukasz Majewski <l.majewski@samsung.com>
parent d1bdf224
No related branches found
No related tags found
No related merge requests found
...@@ -874,8 +874,6 @@ static int unlink_filename(char *filename, unsigned int blknr) ...@@ -874,8 +874,6 @@ static int unlink_filename(char *filename, unsigned int blknr)
if (status == 0) if (status == 0)
goto fail; goto fail;
if (ext4fs_log_journal(block_buffer, blknr))
goto fail;
offset = 0; offset = 0;
do { do {
previous_dir = dir; previous_dir = dir;
...@@ -889,14 +887,6 @@ static int unlink_filename(char *filename, unsigned int blknr) ...@@ -889,14 +887,6 @@ static int unlink_filename(char *filename, unsigned int blknr)
if (dir->inode && (strlen(filename) == dir->namelen) && if (dir->inode && (strlen(filename) == dir->namelen) &&
(strncmp(direntname, filename, dir->namelen) == 0)) { (strncmp(direntname, filename, dir->namelen) == 0)) {
inodeno = le32_to_cpu(dir->inode); inodeno = le32_to_cpu(dir->inode);
if (previous_dir) {
uint16_t new_len;
new_len = le16_to_cpu(previous_dir->direntlen);
new_len += le16_to_cpu(dir->direntlen);
previous_dir->direntlen = cpu_to_le16(new_len);
} else {
dir->inode = 0;
}
break; break;
} }
...@@ -905,7 +895,20 @@ static int unlink_filename(char *filename, unsigned int blknr) ...@@ -905,7 +895,20 @@ static int unlink_filename(char *filename, unsigned int blknr)
} while (offset < fs->blksz); } while (offset < fs->blksz);
if (inodeno > 0) { if (inodeno > 0) {
printf("file found, deleting\n");
if (ext4fs_log_journal(block_buffer, blknr))
goto fail;
if (previous_dir) {
/* merge dir entry with predecessor */
uint16_t new_len;
new_len = le16_to_cpu(previous_dir->direntlen);
new_len += le16_to_cpu(dir->direntlen);
previous_dir->direntlen = cpu_to_le16(new_len);
} else {
/* invalidate dir entry */
dir->inode = 0;
}
if (ext4fs_put_metadata(block_buffer, blknr)) if (ext4fs_put_metadata(block_buffer, blknr))
goto fail; goto fail;
ret = inodeno; ret = inodeno;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment