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=-19.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 31E55C07E95 for ; Sat, 10 Jul 2021 23:55:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1B94761400 for ; Sat, 10 Jul 2021 23:55:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233166AbhGJX6J (ORCPT ); Sat, 10 Jul 2021 19:58:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:41452 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233824AbhGJX4q (ORCPT ); Sat, 10 Jul 2021 19:56:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B159D6140F; Sat, 10 Jul 2021 23:52:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625961148; bh=29/d8iHVTKTqMfAj+ImN5vbWDiKq9zh5EN7smpYH6Ys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VKIYb1sc/BHj8tcZ4qjcTn458D74g7nX4FyG3f/Uh+hLFpspFrj7vbiY6MHfqXPmf 1UltA2mTNdCDqM98xz5nTjVZVAu0ixLVfDziQ3NTg56/XXLK5aEoThieHx1LeL/H/7 PvjirlRmWflNai7/QuDsWr0aqQwelew3OKZs//JMlhDd5uYt8LhNvHRdwudhkTSg3T 2nAdhw48L/1BzsxfyCouNu5lz60OorvPvI3v5YW6la2gUyFOZYjx7CaF//9c/g2maY 8vVv3KFrp90m59drs6qGMA2n7YoyWDgioK1JIXQHS+dZQxsc3/N0YPk5Omf7je5VE8 96aSbZj2VfJyQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jeff Layton , Matthew Wilcox , Ilya Dryomov , Sasha Levin , ceph-devel@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 12/21] ceph: remove bogus checks and WARN_ONs from ceph_set_page_dirty Date: Sat, 10 Jul 2021 19:52:03 -0400 Message-Id: <20210710235212.3222375-12-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210710235212.3222375-1-sashal@kernel.org> References: <20210710235212.3222375-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeff Layton [ Upstream commit 22d41cdcd3cfd467a4af074165357fcbea1c37f5 ] The checks for page->mapping are odd, as set_page_dirty is an address_space operation, and I don't see where it would be called on a non-pagecache page. The warning about the page lock also seems bogus. The comment over set_page_dirty() says that it can be called without the page lock in some rare cases. I don't think we want to warn if that's the case. Reported-by: Matthew Wilcox Signed-off-by: Jeff Layton Signed-off-by: Ilya Dryomov Signed-off-by: Sasha Levin --- fs/ceph/addr.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index ae1435c12d2b..1dba2b95fe8e 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -74,10 +74,6 @@ static int ceph_set_page_dirty(struct page *page) struct inode *inode; struct ceph_inode_info *ci; struct ceph_snap_context *snapc; - int ret; - - if (unlikely(!mapping)) - return !TestSetPageDirty(page); if (PageDirty(page)) { dout("%p set_page_dirty %p idx %lu -- already dirty\n", @@ -123,11 +119,7 @@ static int ceph_set_page_dirty(struct page *page) page->private = (unsigned long)snapc; SetPagePrivate(page); - ret = __set_page_dirty_nobuffers(page); - WARN_ON(!PageLocked(page)); - WARN_ON(!page->mapping); - - return ret; + return __set_page_dirty_nobuffers(page); } /* -- 2.30.2