diff options
| author | Adrian Hunter <ext-adrian.hunter@nokia.com> | 2008-07-23 16:55:55 +0300 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2008-08-13 11:32:53 +0300 |
| commit | f769108424a19c7758546d1d7d19f098b1a33759 (patch) | |
| tree | 324e0ac92b5f02e274f87dd6271c211a127a9b99 /fs/ubifs | |
| parent | 7d62ff2c396470bb62a3853f14d3962eac1da974 (diff) | |
| download | linux-f769108424a19c7758546d1d7d19f098b1a33759.tar.gz linux-f769108424a19c7758546d1d7d19f098b1a33759.tar.bz2 linux-f769108424a19c7758546d1d7d19f098b1a33759.zip | |
UBIFS: correct orphan deletion order
The debug function that checks orphans, does so using the
TNC mutex. That means it will not see a correct picture
if the inode is removed from the orphan tree before it is
removed from TNC.
Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/journal.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index 25de6fde383f..acdae00aaa54 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c @@ -871,10 +871,11 @@ int ubifs_jnl_delete_inode(struct ubifs_info *c, const struct inode *inode) return ubifs_jnl_write_inode(c, inode); } - ubifs_delete_orphan(c, inode->i_ino); err = ubifs_tnc_remove_ino(c, inode->i_ino); if (err) ubifs_ro_mode(c, err); + else + ubifs_delete_orphan(c, inode->i_ino); up_read(&c->commit_sem); return err; } |