1 files changed, 15 insertions, 15 deletions

diff --git a/fs/btrfs/reada.c b/fs/btrfs/reada.c
index b892914968c1..298631eaee78 100644
--- a/fs/btrfs/reada.c
+++ b/fs/btrfs/reada.c
@@ -226,7 +226,7 @@ int btree_readahead_hook(struct btrfs_fs_info *fs_info,
         /* find extent */
         spin_lock(&fs_info->reada_lock);
         re = radix_tree_lookup(&fs_info->reada_tree,
-                               start >> PAGE_CACHE_SHIFT);
+                               start >> PAGE_SHIFT);
         if (re)
                 re->refcnt++;
         spin_unlock(&fs_info->reada_lock);
@@ -257,7 +257,7 @@ static struct reada_zone *reada_find_zone(struct btrfs_fs_info *fs_info,
         zone = NULL;
         spin_lock(&fs_info->reada_lock);
         ret = radix_tree_gang_lookup(&dev->reada_zones, (void **)&zone,
-                                     logical >> PAGE_CACHE_SHIFT, 1);
+                                     logical >> PAGE_SHIFT, 1);
         if (ret == 1 && logical >= zone->start && logical <= zone->end) {
                 kref_get(&zone->refcnt);
                 spin_unlock(&fs_info->reada_lock);
@@ -294,13 +294,13 @@ static struct reada_zone *reada_find_zone(struct btrfs_fs_info *fs_info,
 
         spin_lock(&fs_info->reada_lock);
         ret = radix_tree_insert(&dev->reada_zones,
-                                (unsigned long)(zone->end >> PAGE_CACHE_SHIFT),
+                                (unsigned long)(zone->end >> PAGE_SHIFT),
                                 zone);
 
         if (ret == -EEXIST) {
                 kfree(zone);
                 ret = radix_tree_gang_lookup(&dev->reada_zones, (void **)&zone,
-                                             logical >> PAGE_CACHE_SHIFT, 1);
+                                             logical >> PAGE_SHIFT, 1);
                 if (ret == 1 && logical >= zone->start && logical <= zone->end)
                         kref_get(&zone->refcnt);
                 else
@@ -326,7 +326,7 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root,
         u64 length;
         int real_stripes;
         int nzones = 0;
-        unsigned long index = logical >> PAGE_CACHE_SHIFT;
+        unsigned long index = logical >> PAGE_SHIFT;
         int dev_replace_is_ongoing;
         int have_zone = 0;
 
@@ -495,7 +495,7 @@ static void reada_extent_put(struct btrfs_fs_info *fs_info,
                              struct reada_extent *re)
 {
         int i;
-        unsigned long index = re->logical >> PAGE_CACHE_SHIFT;
+        unsigned long index = re->logical >> PAGE_SHIFT;
 
         spin_lock(&fs_info->reada_lock);
         if (--re->refcnt) {
@@ -538,7 +538,7 @@ static void reada_zone_release(struct kref *kref)
         struct reada_zone *zone = container_of(kref, struct reada_zone, refcnt);
 
         radix_tree_delete(&zone->device->reada_zones,
-                          zone->end >> PAGE_CACHE_SHIFT);
+                          zone->end >> PAGE_SHIFT);
 
         kfree(zone);
 }
@@ -587,7 +587,7 @@ static int reada_add_block(struct reada_control *rc, u64 logical,
 static void reada_peer_zones_set_lock(struct reada_zone *zone, int lock)
 {
         int i;
-        unsigned long index = zone->end >> PAGE_CACHE_SHIFT;
+        unsigned long index = zone->end >> PAGE_SHIFT;
 
         for (i = 0; i < zone->ndevs; ++i) {
                 struct reada_zone *peer;
@@ -622,7 +622,7 @@ static int reada_pick_zone(struct btrfs_device *dev)
                                              (void **)&zone, index, 1);
                 if (ret == 0)
                         break;
-                index = (zone->end >> PAGE_CACHE_SHIFT) + 1;
+                index = (zone->end >> PAGE_SHIFT) + 1;
                 if (zone->locked) {
                         if (zone->elems > top_locked_elems) {
                                 top_locked_elems = zone->elems;
@@ -673,7 +673,7 @@ static int reada_start_machine_dev(struct btrfs_fs_info *fs_info,
          * plugging to speed things up
          */
         ret = radix_tree_gang_lookup(&dev->reada_extents, (void **)&re,
-                                     dev->reada_next >> PAGE_CACHE_SHIFT, 1);
+                                     dev->reada_next >> PAGE_SHIFT, 1);
         if (ret == 0 || re->logical > dev->reada_curr_zone->end) {
                 ret = reada_pick_zone(dev);
                 if (!ret) {
@@ -682,7 +682,7 @@ static int reada_start_machine_dev(struct btrfs_fs_info *fs_info,
                 }
                 re = NULL;
                 ret = radix_tree_gang_lookup(&dev->reada_extents, (void **)&re,
-                                        dev->reada_next >> PAGE_CACHE_SHIFT, 1);
+                                        dev->reada_next >> PAGE_SHIFT, 1);
         }
         if (ret == 0) {
                 spin_unlock(&fs_info->reada_lock);
@@ -838,7 +838,7 @@ static void dump_devs(struct btrfs_fs_info *fs_info, int all)
                                 printk(KERN_CONT " curr off %llu",
                                         device->reada_next - zone->start);
                         printk(KERN_CONT "\n");
-                        index = (zone->end >> PAGE_CACHE_SHIFT) + 1;
+                        index = (zone->end >> PAGE_SHIFT) + 1;
                 }
                 cnt = 0;
                 index = 0;
@@ -864,7 +864,7 @@ static void dump_devs(struct btrfs_fs_info *fs_info, int all)
                                 }
                         }
                         printk(KERN_CONT "\n");
-                        index = (re->logical >> PAGE_CACHE_SHIFT) + 1;
+                        index = (re->logical >> PAGE_SHIFT) + 1;
                         if (++cnt > 15)
                                 break;
                 }
@@ -880,7 +880,7 @@ static void dump_devs(struct btrfs_fs_info *fs_info, int all)
                 if (ret == 0)
                         break;
                 if (!re->scheduled) {
-                        index = (re->logical >> PAGE_CACHE_SHIFT) + 1;
+                        index = (re->logical >> PAGE_SHIFT) + 1;
                         continue;
                 }
                 printk(KERN_DEBUG
@@ -897,7 +897,7 @@ static void dump_devs(struct btrfs_fs_info *fs_info, int all)
                         }
                 }
                 printk(KERN_CONT "\n");
-                index = (re->logical >> PAGE_CACHE_SHIFT) + 1;
+                index = (re->logical >> PAGE_SHIFT) + 1;
         }
         spin_unlock(&fs_info->reada_lock);
 }