1 files changed, 17 insertions, 17 deletions

diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c
index 3014a36a255b..37b2501caaa4 100644
--- a/fs/ntfs/mft.c
+++ b/fs/ntfs/mft.c
@@ -61,16 +61,16 @@ static inline MFT_RECORD *map_mft_record_page(ntfs_inode *ni)
          * here if the volume was that big...
          */
         index = (u64)ni->mft_no << vol->mft_record_size_bits >>
-                        PAGE_CACHE_SHIFT;
-        ofs = (ni->mft_no << vol->mft_record_size_bits) & ~PAGE_CACHE_MASK;
+                        PAGE_SHIFT;
+        ofs = (ni->mft_no << vol->mft_record_size_bits) & ~PAGE_MASK;
 
         i_size = i_size_read(mft_vi);
         /* The maximum valid index into the page cache for $MFT's data. */
-        end_index = i_size >> PAGE_CACHE_SHIFT;
+        end_index = i_size >> PAGE_SHIFT;
 
         /* If the wanted index is out of bounds the mft record doesn't exist. */
         if (unlikely(index >= end_index)) {
-                if (index > end_index || (i_size & ~PAGE_CACHE_MASK) < ofs +
+                if (index > end_index || (i_size & ~PAGE_MASK) < ofs +
                                 vol->mft_record_size) {
                         page = ERR_PTR(-ENOENT);
                         ntfs_error(vol->sb, "Attempt to read mft record 0x%lx, "
@@ -487,7 +487,7 @@ int ntfs_sync_mft_mirror(ntfs_volume *vol, const unsigned long mft_no,
         }
         /* Get the page containing the mirror copy of the mft record @m. */
         page = ntfs_map_page(vol->mftmirr_ino->i_mapping, mft_no >>
-                        (PAGE_CACHE_SHIFT - vol->mft_record_size_bits));
+                        (PAGE_SHIFT - vol->mft_record_size_bits));
         if (IS_ERR(page)) {
                 ntfs_error(vol->sb, "Failed to map mft mirror page.");
                 err = PTR_ERR(page);
@@ -497,7 +497,7 @@ int ntfs_sync_mft_mirror(ntfs_volume *vol, const unsigned long mft_no,
         BUG_ON(!PageUptodate(page));
         ClearPageUptodate(page);
         /* Offset of the mft mirror record inside the page. */
-        page_ofs = (mft_no << vol->mft_record_size_bits) & ~PAGE_CACHE_MASK;
+        page_ofs = (mft_no << vol->mft_record_size_bits) & ~PAGE_MASK;
         /* The address in the page of the mirror copy of the mft record @m. */
         kmirr = page_address(page) + page_ofs;
         /* Copy the mst protected mft record to the mirror. */
@@ -1178,8 +1178,8 @@ static int ntfs_mft_bitmap_find_and_alloc_free_rec_nolock(ntfs_volume *vol,
         for (; pass <= 2;) {
                 /* Cap size to pass_end. */
                 ofs = data_pos >> 3;
-                page_ofs = ofs & ~PAGE_CACHE_MASK;
-                size = PAGE_CACHE_SIZE - page_ofs;
+                page_ofs = ofs & ~PAGE_MASK;
+                size = PAGE_SIZE - page_ofs;
                 ll = ((pass_end + 7) >> 3) - ofs;
                 if (size > ll)
                         size = ll;
@@ -1190,7 +1190,7 @@ static int ntfs_mft_bitmap_find_and_alloc_free_rec_nolock(ntfs_volume *vol,
                  */
                 if (size) {
                         page = ntfs_map_page(mftbmp_mapping,
-                                        ofs >> PAGE_CACHE_SHIFT);
+                                        ofs >> PAGE_SHIFT);
                         if (IS_ERR(page)) {
                                 ntfs_error(vol->sb, "Failed to read mft "
                                                 "bitmap, aborting.");
@@ -1328,13 +1328,13 @@ static int ntfs_mft_bitmap_extend_allocation_nolock(ntfs_volume *vol)
          */
         ll = lcn >> 3;
         page = ntfs_map_page(vol->lcnbmp_ino->i_mapping,
-                        ll >> PAGE_CACHE_SHIFT);
+                        ll >> PAGE_SHIFT);
         if (IS_ERR(page)) {
                 up_write(&mftbmp_ni->runlist.lock);
                 ntfs_error(vol->sb, "Failed to read from lcn bitmap.");
                 return PTR_ERR(page);
         }
-        b = (u8*)page_address(page) + (ll & ~PAGE_CACHE_MASK);
+        b = (u8*)page_address(page) + (ll & ~PAGE_MASK);
         tb = 1 << (lcn & 7ull);
         down_write(&vol->lcnbmp_lock);
         if (*b != 0xff && !(*b & tb)) {
@@ -2103,14 +2103,14 @@ static int ntfs_mft_record_format(const ntfs_volume *vol, const s64 mft_no)
          * The index into the page cache and the offset within the page cache
          * page of the wanted mft record.
          */
-        index = mft_no << vol->mft_record_size_bits >> PAGE_CACHE_SHIFT;
-        ofs = (mft_no << vol->mft_record_size_bits) & ~PAGE_CACHE_MASK;
+        index = mft_no << vol->mft_record_size_bits >> PAGE_SHIFT;
+        ofs = (mft_no << vol->mft_record_size_bits) & ~PAGE_MASK;
         /* The maximum valid index into the page cache for $MFT's data. */
         i_size = i_size_read(mft_vi);
-        end_index = i_size >> PAGE_CACHE_SHIFT;
+        end_index = i_size >> PAGE_SHIFT;
         if (unlikely(index >= end_index)) {
                 if (unlikely(index > end_index || ofs + vol->mft_record_size >=
-                                (i_size & ~PAGE_CACHE_MASK))) {
+                                (i_size & ~PAGE_MASK))) {
                         ntfs_error(vol->sb, "Tried to format non-existing mft "
                                         "record 0x%llx.", (long long)mft_no);
                         return -ENOENT;
@@ -2515,8 +2515,8 @@ mft_rec_already_initialized:
          * We now have allocated and initialized the mft record.  Calculate the
          * index of and the offset within the page cache page the record is in.
          */
-        index = bit << vol->mft_record_size_bits >> PAGE_CACHE_SHIFT;
-        ofs = (bit << vol->mft_record_size_bits) & ~PAGE_CACHE_MASK;
+        index = bit << vol->mft_record_size_bits >> PAGE_SHIFT;
+        ofs = (bit << vol->mft_record_size_bits) & ~PAGE_MASK;
         /* Read, map, and pin the page containing the mft record. */
         page = ntfs_map_page(vol->mft_ino->i_mapping, index);
         if (IS_ERR(page)) {