diff --git a/[refs] b/[refs] index f2f02b245227..bf6579b7212f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d62ff2c396470bb62a3853f14d3962eac1da974 +refs/heads/master: f769108424a19c7758546d1d7d19f098b1a33759 diff --git a/trunk/fs/ubifs/journal.c b/trunk/fs/ubifs/journal.c index 25de6fde383f..acdae00aaa54 100644 --- a/trunk/fs/ubifs/journal.c +++ b/trunk/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; }