diff options
| author | Erqi Chen <chenerqi@gmail.com> | 2019-07-24 10:26:09 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-29 08:30:21 +0200 |
| commit | a927f8a9dfd526ff80bb20249af478a194a2d974 (patch) | |
| tree | 24086f517ec0e91f7ad8981d20679f74aa44d1a4 /fs/ceph | |
| parent | e9e5f8e96fe63dbf4b023e1d9ff7cd4fd5fd810e (diff) | |
| download | linux-stable-a927f8a9dfd526ff80bb20249af478a194a2d974.tar.gz linux-stable-a927f8a9dfd526ff80bb20249af478a194a2d974.tar.bz2 linux-stable-a927f8a9dfd526ff80bb20249af478a194a2d974.zip | |
ceph: clear page dirty before invalidate page
commit c95f1c5f436badb9bb87e9b30fd573f6b3d59423 upstream.
clear_page_dirty_for_io(page) before mapping->a_ops->invalidatepage().
invalidatepage() clears page's private flag, if dirty flag is not
cleared, the page may cause BUG_ON failure in ceph_set_page_dirty().
Cc: stable@vger.kernel.org
Link: https://tracker.ceph.com/issues/40862
Signed-off-by: Erqi Chen <chenerqi@gmail.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/addr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index a47c541f8006..ba30f4f33e7c 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -912,8 +912,9 @@ get_more_pages: if (page_offset(page) >= ceph_wbc.i_size) { dout("%p page eof %llu\n", page, ceph_wbc.i_size); - if (ceph_wbc.size_stable || - page_offset(page) >= i_size_read(inode)) + if ((ceph_wbc.size_stable || + page_offset(page) >= i_size_read(inode)) && + clear_page_dirty_for_io(page)) mapping->a_ops->invalidatepage(page, 0, PAGE_SIZE); unlock_page(page); |