Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[firefly-linux-kernel-4.4.55.git] / fs / ocfs2 / journal.c

diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 2dd36af79e262f8de2051525e1baf8585786cba8..8eccfabcd12ed7a4b229499445585e662a977479 100644 (file)
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -1234,11 +1234,8 @@ static void ocfs2_queue_recovery_completion(struct ocfs2_journal *journal,
                /* Though we wish to avoid it, we are in fact safe in
                 * skipping local alloc cleanup as fsck.ocfs2 is more
                 * than capable of reclaiming unused space. */
-               if (la_dinode)
-                       kfree(la_dinode);
-
-               if (tl_dinode)
-                       kfree(tl_dinode);
+               kfree(la_dinode);
+               kfree(tl_dinode);
 
                if (qrec)
                        ocfs2_free_quota_recovery(qrec);
@@ -1408,8 +1405,7 @@ bail:
 
        mutex_unlock(&osb->recovery_lock);
 
-       if (rm_quota)
-               kfree(rm_quota);
+       kfree(rm_quota);
 
        /* no one is callint kthread_stop() for us so the kthread() api
         * requires that we call do_exit().  And it isn't exported, but