From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5E78C432C3 for ; Fri, 22 Nov 2019 06:18:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7466B20708 for ; Fri, 22 Nov 2019 06:18:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574403485; bh=dC4Kdk5BlL5mVfoX77m9Qqd+m+VvEAHhCbrDMAN3XLc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pg/GdvkN/wrgUVneHDg1QWgFF5cDiFoInH91UKjJyra2EJZee+CUH0kEFTZ8ErzcC BXGgqCymcCT4lqEi/4M+ypcygS0bkLgPP9bv/J3IJqIYm24/TKlrYj7MRU2jAARsfm IhXwnl0oDLm0iN+qMzrPdqYmugyn0XhYiHDZj87I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729028AbfKVGNS (ORCPT ); Fri, 22 Nov 2019 01:13:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:50488 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729220AbfKVGNS (ORCPT ); Fri, 22 Nov 2019 01:13:18 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DCED620707; Fri, 22 Nov 2019 06:13:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574403197; bh=dC4Kdk5BlL5mVfoX77m9Qqd+m+VvEAHhCbrDMAN3XLc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kxxZVPy+2FRRN8qP4YzERUPPgJtEkmD1/ZtDPcdnoX8E+M6N4X39K70zLcDYDFGaI IGlYQryj3H30K2xIxCyZmqmBVu97RLQZGWticP9EQaSdHhhDg77CnJWb8Q7Gn4EAUQ JSWlM85uUeeO5+eDCuI26aYU5BeCEN2l8HeH9Zpc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Darrick J. Wong" , Bill O'Donnell , Sasha Levin , linux-xfs@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 14/68] xfs: require both realtime inodes to mount Date: Fri, 22 Nov 2019 01:12:07 -0500 Message-Id: <20191122061301.4947-13-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122061301.4947-1-sashal@kernel.org> References: <20191122061301.4947-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: "Darrick J. Wong" [ Upstream commit 64bafd2f1e484e27071e7584642005d56516cb77 ] Since mkfs always formats the filesystem with the realtime bitmap and summary inodes immediately after the root directory, we should expect that both of them are present and loadable, even if there isn't a realtime volume attached. There's no reason to skip this if rbmino == NULLFSINO; in fact, this causes an immediate crash if the there /is/ a realtime volume and someone writes to it. Signed-off-by: Darrick J. Wong Reviewed-by: Bill O'Donnell Signed-off-by: Sasha Levin --- fs/xfs/xfs_rtalloc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index ab1bac6a3a1c0..919b6544b61a3 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c @@ -1225,13 +1225,11 @@ xfs_rtmount_inodes( xfs_sb_t *sbp; sbp = &mp->m_sb; - if (sbp->sb_rbmino == NULLFSINO) - return 0; error = xfs_iget(mp, NULL, sbp->sb_rbmino, 0, 0, &mp->m_rbmip); if (error) return error; ASSERT(mp->m_rbmip != NULL); - ASSERT(sbp->sb_rsumino != NULLFSINO); + error = xfs_iget(mp, NULL, sbp->sb_rsumino, 0, 0, &mp->m_rsumip); if (error) { IRELE(mp->m_rbmip); -- 2.20.1