Merge branches 'pm-opp', 'pm-cpufreq' and 'pm-tools'

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

diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index aab8549591e7ad7143e41a9957338cb8f5583fd6..c46a79adb6adf0fe74dec7173f3c1fc7b33e5002 100644 (file)
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -1373,8 +1373,7 @@ int journal_destroy(journal_t *journal)
        }
        mutex_unlock(&journal->j_checkpoint_mutex);
 
-       if (journal->j_inode)
-               iput(journal->j_inode);
+       iput(journal->j_inode);
        if (journal->j_revoke)
                journal_destroy_revoke(journal);
        kfree(journal->j_wbuf);