Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp3387775ybl; Sun, 15 Dec 2019 08:47:26 -0800 (PST) X-Google-Smtp-Source: APXvYqwZy0kKuCyEu8+Ll5xE7+qjEXulhVA/c2h3tAEV+bpFke0f70xOTIQ2/ZxqpxsmrVRoHPQM X-Received: by 2002:a9d:22a8:: with SMTP id y37mr15487825ota.359.1576428446630; Sun, 15 Dec 2019 08:47:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576428446; cv=none; d=google.com; s=arc-20160816; b=G2rZ6XC0DJ9HqexB82QdBotlmZGfdHcgeSyrXKga25tdxyKWCEt22lAZjxbKN7tx+A ofCwcAMidou6aZaiiXcgj4RZcbMH+IGhbvwGf+2iWiKURZmnveb1wRO///I4D7qOKRta EvW4rbLxPppc6w6zhPBzPmjO/8gMHeDYxgHWiiE/ryco0SUZzRbTFXJGz7oXLkX79nBB bwTsIw9YehqIF6hsNuxLvPCgm7N7W5TajTjd8WKfJm+wbmqVZH3aEE+kcss3aZkP1/kZ aFsvUc9hlWBY4yb7zyyfvSh4fjKv62Ryq/zEbfIy7jmV6WdrLS9PXebH0Fkjdtjww65g Aryw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=qe+Uav0n6Sb4lk25AgUnese0gA+AsOsF8bWtX8C1yxg=; b=LYNf0ftAPgIIcMw1vMQgQwq1s7g2QbqdMhsSjHEJct/4cvWTDuXRYy/YYZtnwOrrfq JvOYHnhWGx8Kd0L0OCGC8qeyH+SqDr0U8DBIeeJzRwRfi+Lh/Sog0EikbWnDJqQNPJGw fVsg1/YwQr9bjfcfU9nUIUkJGAx1Pubwftpji93QSFpa4w/a2Tmd9dmQdQzmbC+UE+Mw l0+Jw5uqHYx7HL45Pu/q4oRO+5fdH95dQZqCPtVrsV0M5BgAovQ1Gmzm+URIZGLb2+/8 tmMPNiM+Re/SkZv3lHHkO0lAo7IlaqzlAz0i+ouiyK7bCRrgLc+S9cPtEkw68MVcRIeZ 0/WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@umn.edu header.s=google header.b=geLxmcZC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=umn.edu Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h9si9884465otb.49.2019.12.15.08.47.13; Sun, 15 Dec 2019 08:47:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@umn.edu header.s=google header.b=geLxmcZC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=umn.edu Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726207AbfLOQq0 (ORCPT + 99 others); Sun, 15 Dec 2019 11:46:26 -0500 Received: from mta-p8.oit.umn.edu ([134.84.196.208]:55074 "EHLO mta-p8.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726130AbfLOQq0 (ORCPT ); Sun, 15 Dec 2019 11:46:26 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-p8.oit.umn.edu (Postfix) with ESMTP id 47bVfT5cKxz9vKZD for ; Sun, 15 Dec 2019 16:46:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p8.oit.umn.edu ([127.0.0.1]) by localhost (mta-p8.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3XO2GuLoB92c for ; Sun, 15 Dec 2019 10:46:25 -0600 (CST) Received: from mail-yb1-f197.google.com (mail-yb1-f197.google.com [209.85.219.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p8.oit.umn.edu (Postfix) with ESMTPS id 47bVfT4TFxz9vKZ4 for ; Sun, 15 Dec 2019 10:46:25 -0600 (CST) Received: by mail-yb1-f197.google.com with SMTP id x186so4648642yba.6 for ; Sun, 15 Dec 2019 08:46:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qe+Uav0n6Sb4lk25AgUnese0gA+AsOsF8bWtX8C1yxg=; b=geLxmcZCOawsEqsPRQUBN+/+zKoVbXdbZUPrh4w0BeJxhJLLy4PkzAZgGBIxCmGrhI BC5kuVlKVF6URRzJ3kvupYBS7s+u6TShLmsEd7NObNdnM1/aDvX6YlORBzvP+pE0C3Kz OJVgjLIhA/BxACFlDbIAagX68/bLyW69AqNwrFjMGJJFC1XcLSMB4khfN4Y656nGVGTK dmaXkSzj5uyj2pGDfw/9nxMA8g4J4/O0AVxfUcARKwfGdObnLbA4/jcTKkr5edBj+kSM lt/iYPNozm1BziQe3yK17ASpFOCRgocFxOk0y2jpGNV8eBIM2JHTZ+70mBRal9lmyX7P 7s2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qe+Uav0n6Sb4lk25AgUnese0gA+AsOsF8bWtX8C1yxg=; b=b7FDehXmLT7Alnr+vMFzGnERx4GU4iMZgqn0e9ZjouxZoBQACLiqZTbcOrNzNZXvST OVvK8YPOcUku3oAqFGH8rJ4ODKO7DgFD5JDphLl8ibYCGJYRkNbqXMT6RW0Kq2qZ3wVu LAyHtaIqHkmVBCj2Pe6aJ18T/qj45soz3Z8LI74dI76nGUYyvGLCoZnlOfVBLT7mIGI3 xSzvXb2AUqJGHjGo3DlOQFtJqMtijXDL1rEw0IMm1q+OxTsJNecCAsCn3Y8rKbABh3um 6dUkLGITUnQT+cnGfFCU6cM082Lyl/56QyN1JaSq6QOQvtSrbwKWrrjQQ7curb/ROD4l w50Q== X-Gm-Message-State: APjAAAVADvZJYW/aM58YCjgKjnWSyDroH1GszGmDExscJ31M3Fl5YdoK MPXxlw+dtHdl/4etF2i1sgh8j584w/FbUJS4XMEzpYMD9NXr/LpzXc5q4XgKVR9/uDFoG51UcQJ PaK4NP+FTXZQ6lC1lP8Y+YI1nY5CQ X-Received: by 2002:a81:3a0b:: with SMTP id h11mr16718848ywa.217.1576428385132; Sun, 15 Dec 2019 08:46:25 -0800 (PST) X-Received: by 2002:a81:3a0b:: with SMTP id h11mr16718840ywa.217.1576428384872; Sun, 15 Dec 2019 08:46:24 -0800 (PST) Received: from cs-u-syssec1.dtc.umn.edu (cs-u-syssec1.cs.umn.edu. [128.101.106.66]) by smtp.gmail.com with ESMTPSA id i81sm6961408ywa.103.2019.12.15.08.46.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 08:46:24 -0800 (PST) From: Aditya Pakki To: pakki001@umn.edu Cc: kjlu@umn.edu, Bob Peterson , Andreas Gruenbacher , cluster-devel@redhat.com, linux-kernel@vger.kernel.org Subject: [PATCH] gfs2: remove assertion when journal_info is not empty Date: Sun, 15 Dec 2019 10:46:21 -0600 Message-Id: <20191215164621.25828-1-pakki001@umn.edu> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In gfs2_trans_begin, avoid crashing when current->journal_info is not empty. The patch fixes the error by returning -EINVAL instead of crashing. Signed-off-by: Aditya Pakki --- fs/gfs2/trans.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c index 9d4227330de4..cef8816ae0b4 100644 --- a/fs/gfs2/trans.c +++ b/fs/gfs2/trans.c @@ -31,7 +31,9 @@ int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks, struct gfs2_trans *tr; int error; - BUG_ON(current->journal_info); + if (current->journal_info) + return -EINVAL; + BUG_ON(blocks == 0 && revokes == 0); if (!test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags)) -- 2.20.1