]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ubifs: Fix double unlock around orphan_delete()
authorRichard Weinberger <richard@nod.at>
Tue, 13 Aug 2019 21:50:51 +0000 (23:50 +0200)
committerRichard Weinberger <richard@nod.at>
Thu, 22 Aug 2019 15:24:58 +0000 (17:24 +0200)
We unlock after orphan_delete(), so no need to unlock
in the function too.

Reported-by: Han Xu <han.xu@nxp.com>
Fixes: 8009ce956c3d ("ubifs: Don't leak orphans on memory during commit")
Signed-off-by: Richard Weinberger <richard@nod.at>
fs/ubifs/orphan.c

index b52624e28fa1198b938f232322526861114c7be4..3b4b4114f208bfb6bdc1f94803e6d7b5b79bd372 100644 (file)
@@ -129,7 +129,6 @@ static void __orphan_drop(struct ubifs_info *c, struct ubifs_orphan *o)
 static void orphan_delete(struct ubifs_info *c, struct ubifs_orphan *orph)
 {
        if (orph->del) {
-               spin_unlock(&c->orphan_lock);
                dbg_gen("deleted twice ino %lu", orph->inum);
                return;
        }
@@ -138,7 +137,6 @@ static void orphan_delete(struct ubifs_info *c, struct ubifs_orphan *orph)
                orph->del = 1;
                orph->dnext = c->orph_dnext;
                c->orph_dnext = orph;
-               spin_unlock(&c->orphan_lock);
                dbg_gen("delete later ino %lu", orph->inum);
                return;
        }