diff options
| author | Adrian Hunter <adrian.hunter@nokia.com> | 2009-04-08 14:07:57 +0200 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2009-05-06 10:37:56 +0300 |
| commit | 6d6cb0d688d0f262cb4fd5771648b0ac01d4f82c (patch) | |
| tree | b4e0f50358029650f0047ffe1f9c48e24c420584 /fs/ubifs | |
| parent | 091438dd5668396328a3419abcbc6591159eb8d1 (diff) | |
| download | linux-6d6cb0d688d0f262cb4fd5771648b0ac01d4f82c.tar.bz2 | |
UBIFS: reset no_space flag after inode deletion
When UBIFS runs out of space it spends a lot of time trying to
find more space before returning ENOSPC. As there is no point
repeating that unless something has changed, UBIFS has an
optimization to record that the file system is 100% full and not
try to find space. That flag was not being reset when a pending
deletion was finally done.
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Reviewed-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/budget.c | 3 | ||||
| -rw-r--r-- | fs/ubifs/super.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c index af1914462f02..d0231ba783df 100644 --- a/fs/ubifs/budget.c +++ b/fs/ubifs/budget.c @@ -628,7 +628,7 @@ void ubifs_convert_page_budget(struct ubifs_info *c) * * This function releases budget corresponding to a dirty inode. It is usually * called when after the inode has been written to the media and marked as - * clean. + * clean. It also causes the "no space" flags to be cleared. */ void ubifs_release_dirty_inode_budget(struct ubifs_info *c, struct ubifs_inode *ui) @@ -636,6 +636,7 @@ void ubifs_release_dirty_inode_budget(struct ubifs_info *c, struct ubifs_budget_req req; memset(&req, 0, sizeof(struct ubifs_budget_req)); + /* The "no space" flags will be cleared because dd_growth is > 0 */ req.dd_growth = c->inode_budget + ALIGN(ui->data_len, 8); ubifs_release_budget(c, &req); } diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index faa44f90608a..f2c1c0b79f66 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -360,6 +360,11 @@ static void ubifs_delete_inode(struct inode *inode) out: if (ui->dirty) ubifs_release_dirty_inode_budget(c, ui); + else { + /* We've deleted something - clean the "no space" flags */ + c->nospace = c->nospace_rp = 0; + smp_wmb(); + } clear_inode(inode); } |