mm: Remove the PG_fscache alias for PG_private_2

[linux-2.6-block.git] / fs / ceph / addr.c

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 28ae4976a4f988ce62a47591a9582731b2158ed0..18ddacb00511bbba82f4ec897e8218790924387a 100644 (file)
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -500,7 +500,7 @@ const struct netfs_request_ops ceph_netfs_ops = {
 #ifdef CONFIG_CEPH_FSCACHE
 static void ceph_set_page_fscache(struct page *page)
 {
-       set_page_fscache(page);
+       folio_start_private_2(page_folio(page)); /* [DEPRECATED] */
 }
 
 static void ceph_fscache_write_terminated(void *priv, ssize_t error, bool was_async)
@@ -800,7 +800,7 @@ static int ceph_writepage(struct page *page, struct writeback_control *wbc)
                return AOP_WRITEPAGE_ACTIVATE;
        }
 
-       wait_on_page_fscache(page);
+       folio_wait_private_2(page_folio(page)); /* [DEPRECATED] */
 
        err = writepage_nounlock(page, wbc);
        if (err == -ERESTARTSYS) {
@@ -1075,7 +1075,8 @@ get_more_pages:
                                unlock_page(page);
                                break;
                        }
-                       if (PageWriteback(page) || PageFsCache(page)) {
+                       if (PageWriteback(page) ||
+                           PagePrivate2(page) /* [DEPRECATED] */) {
                                if (wbc->sync_mode == WB_SYNC_NONE) {
                                        doutc(cl, "%p under writeback\n", page);
                                        unlock_page(page);
@@ -1083,7 +1084,7 @@ get_more_pages:
                                }
                                doutc(cl, "waiting on writeback %p\n", page);
                                wait_on_page_writeback(page);
-                               wait_on_page_fscache(page);
+                               folio_wait_private_2(page_folio(page)); /* [DEPRECATED] */
                        }
 
                        if (!clear_page_dirty_for_io(page)) {
@@ -1513,7 +1514,7 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,
        if (r < 0)
                return r;
 
-       folio_wait_fscache(folio);
+       folio_wait_private_2(folio); /* [DEPRECATED] */
        WARN_ON_ONCE(!folio_test_locked(folio));
        *pagep = &folio->page;
        return 0;