1 files changed, 15 insertions, 15 deletions

diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c
index 10297f7a89ba..00d2601407c5 100644
--- a/net/ceph/pagevec.c
+++ b/net/ceph/pagevec.c
@@ -95,19 +95,19 @@ int ceph_copy_user_to_page_vector(struct page **pages,
                                          loff_t off, size_t len)
 {
         int i = 0;
-        int po = off & ~PAGE_CACHE_MASK;
+        int po = off & ~PAGE_MASK;
         int left = len;
         int l, bad;
 
         while (left > 0) {
-                l = min_t(int, PAGE_CACHE_SIZE-po, left);
+                l = min_t(int, PAGE_SIZE-po, left);
                 bad = copy_from_user(page_address(pages[i]) + po, data, l);
                 if (bad == l)
                         return -EFAULT;
                 data += l - bad;
                 left -= l - bad;
                 po += l - bad;
-                if (po == PAGE_CACHE_SIZE) {
+                if (po == PAGE_SIZE) {
                         po = 0;
                         i++;
                 }
@@ -121,17 +121,17 @@ void ceph_copy_to_page_vector(struct page **pages,
                                     loff_t off, size_t len)
 {
         int i = 0;
-        size_t po = off & ~PAGE_CACHE_MASK;
+        size_t po = off & ~PAGE_MASK;
         size_t left = len;
 
         while (left > 0) {
-                size_t l = min_t(size_t, PAGE_CACHE_SIZE-po, left);
+                size_t l = min_t(size_t, PAGE_SIZE-po, left);
 
                 memcpy(page_address(pages[i]) + po, data, l);
                 data += l;
                 left -= l;
                 po += l;
-                if (po == PAGE_CACHE_SIZE) {
+                if (po == PAGE_SIZE) {
                         po = 0;
                         i++;
                 }
@@ -144,17 +144,17 @@ void ceph_copy_from_page_vector(struct page **pages,
                                     loff_t off, size_t len)
 {
         int i = 0;
-        size_t po = off & ~PAGE_CACHE_MASK;
+        size_t po = off & ~PAGE_MASK;
         size_t left = len;
 
         while (left > 0) {
-                size_t l = min_t(size_t, PAGE_CACHE_SIZE-po, left);
+                size_t l = min_t(size_t, PAGE_SIZE-po, left);
 
                 memcpy(data, page_address(pages[i]) + po, l);
                 data += l;
                 left -= l;
                 po += l;
-                if (po == PAGE_CACHE_SIZE) {
+                if (po == PAGE_SIZE) {
                         po = 0;
                         i++;
                 }
@@ -168,25 +168,25 @@ EXPORT_SYMBOL(ceph_copy_from_page_vector);
  */
 void ceph_zero_page_vector_range(int off, int len, struct page **pages)
 {
-        int i = off >> PAGE_CACHE_SHIFT;
+        int i = off >> PAGE_SHIFT;
 
-        off &= ~PAGE_CACHE_MASK;
+        off &= ~PAGE_MASK;
 
         dout("zero_page_vector_page %u~%u\n", off, len);
 
         /* leading partial page? */
         if (off) {
-                int end = min((int)PAGE_CACHE_SIZE, off + len);
+                int end = min((int)PAGE_SIZE, off + len);
                 dout("zeroing %d %p head from %d\n", i, pages[i],
                      (int)off);
                 zero_user_segment(pages[i], off, end);
                 len -= (end - off);
                 i++;
         }
-        while (len >= PAGE_CACHE_SIZE) {
+        while (len >= PAGE_SIZE) {
                 dout("zeroing %d %p len=%d\n", i, pages[i], len);
-                zero_user_segment(pages[i], 0, PAGE_CACHE_SIZE);
-                len -= PAGE_CACHE_SIZE;
+                zero_user_segment(pages[i], 0, PAGE_SIZE);
+                len -= PAGE_SIZE;
                 i++;
         }
         /* trailing partial page? */