Merge branch 'next' into for-linus

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

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 1df94fabe4eba015bba7e6681e5c17638a27d3df..b96bd8076b70609c767ea4cc9703201d9b99070e 100644 (file)
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -1714,8 +1714,7 @@ int jbd2_journal_destroy(journal_t *journal)
 
        if (journal->j_proc_entry)
                jbd2_stats_proc_exit(journal);
-       if (journal->j_inode)
-               iput(journal->j_inode);
+       iput(journal->j_inode);
        if (journal->j_revoke)
                jbd2_journal_destroy_revoke(journal);
        if (journal->j_chksum_driver)