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>

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index ae1435c12d2be13ddf5ea9976e0d56cd5c4832a4..1dba2b95fe8eb55b3163cfcdddc0131064fc0a97 100644 (file)
--- 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);
 }
 
 /*