diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index d14b98aa1c3ebeae654d669d736137908cce98c4..9820aad4b19a85d8202efa0ec87f0d0279733831 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -1412,6 +1412,14 @@ static void gfs2_evict_inode(struct inode *inode)
 	if (inode->i_nlink || sb_rdonly(sb))
 		goto out;
 
+	/*
+	 * In case of an incomplete mount, gfs2_evict_inode() may be called for
+	 * system files without having an active journal to write to.  In that
+	 * case, skip the filesystem evict.
+	 */
+	if (!sdp->sd_jdesc)
+		goto out;
+
 	gfs2_holder_mark_uninitialized(&gh);
 	ret = evict_should_delete(inode, &gh);
 	if (ret == SHOULD_DEFER_EVICTION)