Commit 58f8bcff authored May 04, 2021 by Jeff Layton Committed by Greg Kroah-Hartman Jul 20, 2021

ceph: remove bogus checks and WARN_ONs from ceph_set_page_dirty



[ 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 <willy@infradead.org>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 2307ca3d

fs/ceph/addr.c

+1 −9

Original line number	Diff line number	Diff line
		@@ -72,10 +72,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",
		@@ -121,11 +117,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);
		}

		/*