diff options
| author | Artem Bityutskiy | 2008-07-22 12:06:20 +0200 |
|---|---|---|
| committer | Artem Bityutskiy | 2008-08-13 10:28:44 +0200 |
| commit | de94eb558b542873d3f6f9ede1b8575fb5662248 (patch) | |
| tree | 3ba858a1c87870e22886ac3d4774287bbf367131 /fs/ubifs/super.c | |
| parent | UBIFS: increment commit number earlier (diff) | |
| download | kernel-qcow2-linux-de94eb558b542873d3f6f9ede1b8575fb5662248.tar.gz kernel-qcow2-linux-de94eb558b542873d3f6f9ede1b8575fb5662248.tar.xz kernel-qcow2-linux-de94eb558b542873d3f6f9ede1b8575fb5662248.zip | |
UBIFS: optimize deletions
Every time anything is deleted, UBIFS writes the deletion inode
node twice - once in 'ubifs_jnl_update()' and the second time in
'ubifs_jnl_write_inode()'. However, the second write is not needed
if no commit happened after 'ubifs_jnl_update()'. This patch
checks that condition and avoids writing the deletion inode for
the second time.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'fs/ubifs/super.c')
| -rw-r--r-- | fs/ubifs/super.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index cf1fb6cffa09..6cc4175f23c1 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -341,13 +341,15 @@ static void ubifs_delete_inode(struct inode *inode) goto out; ui->ui_size = inode->i_size = 0; - err = ubifs_jnl_write_inode(c, inode); + err = ubifs_jnl_delete_inode(c, inode); if (err) /* * Worst case we have a lost orphan inode wasting space, so a * simple error message is ok here. */ - ubifs_err("can't write inode %lu, error %d", inode->i_ino, err); + ubifs_err("can't delete inode %lu, error %d", + inode->i_ino, err); + out: if (ui->dirty) ubifs_release_dirty_inode_budget(c, ui); |