netfs: Remove deprecated use of PG_private_2 as a second writeback flag

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

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 18ddacb00511bbba82f4ec897e8218790924387a..74bfd10b1b1a3027cb30d04da6e4fa54f511dea9 100644 (file)
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -498,11 +498,6 @@ const struct netfs_request_ops ceph_netfs_ops = {
 };
 
 #ifdef CONFIG_CEPH_FSCACHE
-static void ceph_set_page_fscache(struct page *page)
-{
-       folio_start_private_2(page_folio(page)); /* [DEPRECATED] */
-}
-
 static void ceph_fscache_write_terminated(void *priv, ssize_t error, bool was_async)
 {
        struct inode *inode = priv;
@@ -520,10 +515,6 @@ static void ceph_fscache_write_to_cache(struct inode *inode, u64 off, u64 len, b
                               ceph_fscache_write_terminated, inode, true, caching);
 }
 #else
-static inline void ceph_set_page_fscache(struct page *page)
-{
-}
-
 static inline void ceph_fscache_write_to_cache(struct inode *inode, u64 off, u64 len, bool caching)
 {
 }
@@ -715,8 +706,6 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc)
                len = wlen;
 
        set_page_writeback(page);
-       if (caching)
-               ceph_set_page_fscache(page);
        ceph_fscache_write_to_cache(inode, page_off, len, caching);
 
        if (IS_ENCRYPTED(inode)) {
@@ -800,8 +789,6 @@ static int ceph_writepage(struct page *page, struct writeback_control *wbc)
                return AOP_WRITEPAGE_ACTIVATE;
        }
 
-       folio_wait_private_2(page_folio(page)); /* [DEPRECATED] */
-
        err = writepage_nounlock(page, wbc);
        if (err == -ERESTARTSYS) {
                /* direct memory reclaimer was killed by SIGKILL. return 0
@@ -1075,8 +1062,7 @@ get_more_pages:
                                unlock_page(page);
                                break;
                        }
-                       if (PageWriteback(page) ||
-                           PagePrivate2(page) /* [DEPRECATED] */) {
+                       if (PageWriteback(page)) {
                                if (wbc->sync_mode == WB_SYNC_NONE) {
                                        doutc(cl, "%p under writeback\n", page);
                                        unlock_page(page);
@@ -1084,7 +1070,6 @@ get_more_pages:
                                }
                                doutc(cl, "waiting on writeback %p\n", page);
                                wait_on_page_writeback(page);
-                               folio_wait_private_2(page_folio(page)); /* [DEPRECATED] */
                        }
 
                        if (!clear_page_dirty_for_io(page)) {
@@ -1269,8 +1254,6 @@ new_request:
                        }
 
                        set_page_writeback(page);
-                       if (caching)
-                               ceph_set_page_fscache(page);
                        len += thp_size(page);
                }
                ceph_fscache_write_to_cache(inode, offset, len, caching);