diff for duplicates of <20160320190714.GA1907@black.fi.intel.com> diff --git a/a/1.txt b/N1/1.txt index 17fa3cf..8081747 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,22612 +4,3 @@ On Sun, Mar 20, 2016 at 11:54:56AM -0700, Linus Torvalds wrote: > It doesn't help legibility or testing, so let's just do it in one big go. Okay, here's folded version of the patchset. - ->From f54a8ec6a451f343306d6bd17a7258d4e589c673 Mon Sep 17 00:00:00 2001 -From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> -Date: Sat, 19 Mar 2016 19:57:17 +0300 -Subject: [PATCH] mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} - macros - -PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time ago -with promise that one day it will be possible to implement page cache with -bigger chunks than PAGE_SIZE. - -This promise never materialized. And unlikely will. - -We have many places where PAGE_CACHE_SIZE assumed to be equal to -PAGE_SIZE. And it's constant source of confusion on whether PAGE_CACHE_* -or PAGE_* constant should be used in a particular case, especially on the -border between fs and mm. - -Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much -breakage to be doable. - -Let's stop pretending that pages in page cache are special. They are not. - -The changes are pretty straight-forward: - - - <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>; - - - PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN}; - - - page_cache_get() -> get_page(); - - - page_cache_release() -> put_page(); - -Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> ---- - Documentation/filesystems/cramfs.txt | 2 +- - Documentation/filesystems/tmpfs.txt | 2 +- - Documentation/filesystems/vfs.txt | 4 +- - arch/arc/mm/cache.c | 2 +- - arch/arm/mm/flush.c | 4 +- - arch/parisc/kernel/cache.c | 2 +- - arch/parisc/mm/init.c | 2 +- - arch/powerpc/platforms/cell/spufs/inode.c | 4 +- - arch/s390/hypfs/inode.c | 4 +- - block/bio.c | 12 +- - block/blk-core.c | 2 +- - block/blk-settings.c | 12 +- - block/blk-sysfs.c | 8 +- - block/cfq-iosched.c | 2 +- - block/compat_ioctl.c | 4 +- - block/ioctl.c | 4 +- - block/partition-generic.c | 8 +- - drivers/block/aoe/aoeblk.c | 2 +- - drivers/block/brd.c | 2 +- - drivers/block/drbd/drbd_int.h | 4 +- - drivers/block/drbd/drbd_nl.c | 2 +- - drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- - drivers/gpu/drm/armada/armada_gem.c | 4 +- - drivers/gpu/drm/drm_gem.c | 4 +- - drivers/gpu/drm/i915/i915_gem.c | 8 +- - drivers/gpu/drm/i915/i915_gem_userptr.c | 2 +- - drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- - drivers/gpu/drm/ttm/ttm_tt.c | 4 +- - drivers/gpu/drm/via/via_dmablit.c | 2 +- - drivers/md/bitmap.c | 2 +- - drivers/media/v4l2-core/videobuf-dma-sg.c | 2 +- - drivers/misc/ibmasm/ibmasmfs.c | 4 +- - drivers/misc/vmw_vmci/vmci_queue_pair.c | 2 +- - drivers/mmc/core/host.c | 6 +- - drivers/mmc/host/sh_mmcif.c | 2 +- - drivers/mmc/host/tmio_mmc_dma.c | 4 +- - drivers/mmc/host/tmio_mmc_pio.c | 2 +- - drivers/mmc/host/usdhi6rol0.c | 2 +- - drivers/mtd/devices/block2mtd.c | 6 +- - drivers/mtd/nand/nandsim.c | 6 +- - drivers/nvdimm/btt.c | 2 +- - drivers/nvdimm/pmem.c | 2 +- - drivers/oprofile/oprofilefs.c | 4 +- - drivers/scsi/sd.c | 2 +- - drivers/scsi/st.c | 4 +- - .../lustre/include/linux/libcfs/libcfs_private.h | 2 +- - .../lustre/include/linux/libcfs/linux/linux-mem.h | 4 +- - drivers/staging/lustre/include/linux/lnet/types.h | 2 +- - .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 2 +- - drivers/staging/lustre/lnet/libcfs/debug.c | 2 +- - drivers/staging/lustre/lnet/libcfs/tracefile.c | 16 +- - drivers/staging/lustre/lnet/libcfs/tracefile.h | 6 +- - drivers/staging/lustre/lnet/lnet/lib-md.c | 2 +- - drivers/staging/lustre/lnet/lnet/lib-move.c | 6 +- - drivers/staging/lustre/lnet/lnet/lib-socket.c | 4 +- - drivers/staging/lustre/lnet/lnet/router.c | 6 +- - drivers/staging/lustre/lnet/selftest/brw_test.c | 20 +- - drivers/staging/lustre/lnet/selftest/conctl.c | 4 +- - drivers/staging/lustre/lnet/selftest/conrpc.c | 10 +- - drivers/staging/lustre/lnet/selftest/framework.c | 2 +- - drivers/staging/lustre/lnet/selftest/rpc.c | 2 +- - drivers/staging/lustre/lnet/selftest/selftest.h | 4 +- - .../lustre/include/linux/lustre_patchless_compat.h | 2 +- - drivers/staging/lustre/lustre/include/lu_object.h | 2 +- - .../lustre/lustre/include/lustre/lustre_idl.h | 6 +- - drivers/staging/lustre/lustre/include/lustre_mdc.h | 4 +- - drivers/staging/lustre/lustre/include/lustre_net.h | 10 +- - drivers/staging/lustre/lustre/include/obd.h | 4 +- - .../staging/lustre/lustre/include/obd_support.h | 2 +- - drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 4 +- - drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 12 +- - drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 2 +- - drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 2 +- - drivers/staging/lustre/lustre/llite/dir.c | 20 +- - .../staging/lustre/lustre/llite/llite_internal.h | 8 +- - drivers/staging/lustre/lustre/llite/llite_lib.c | 8 +- - drivers/staging/lustre/lustre/llite/llite_mmap.c | 8 +- - drivers/staging/lustre/lustre/llite/lloop.c | 12 +- - drivers/staging/lustre/lustre/llite/lproc_llite.c | 18 +- - drivers/staging/lustre/lustre/llite/rw.c | 24 +- - drivers/staging/lustre/lustre/llite/rw26.c | 28 +-- - drivers/staging/lustre/lustre/llite/vvp_io.c | 11 +- - drivers/staging/lustre/lustre/llite/vvp_page.c | 8 +- - drivers/staging/lustre/lustre/lmv/lmv_obd.c | 12 +- - drivers/staging/lustre/lustre/mdc/mdc_request.c | 6 +- - drivers/staging/lustre/lustre/mgc/mgc_request.c | 22 +- - drivers/staging/lustre/lustre/obdclass/cl_page.c | 6 +- - drivers/staging/lustre/lustre/obdclass/class_obd.c | 6 +- - .../lustre/lustre/obdclass/linux/linux-obdo.c | 5 +- - .../lustre/lustre/obdclass/linux/linux-sysctl.c | 6 +- - drivers/staging/lustre/lustre/obdclass/lu_object.c | 6 +- - .../staging/lustre/lustre/obdecho/echo_client.c | 30 +-- - drivers/staging/lustre/lustre/osc/lproc_osc.c | 16 +- - drivers/staging/lustre/lustre/osc/osc_cache.c | 44 ++-- - drivers/staging/lustre/lustre/osc/osc_page.c | 6 +- - drivers/staging/lustre/lustre/osc/osc_request.c | 26 +- - drivers/staging/lustre/lustre/ptlrpc/client.c | 6 +- - drivers/staging/lustre/lustre/ptlrpc/import.c | 2 +- - .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 4 +- - drivers/staging/lustre/lustre/ptlrpc/recover.c | 2 +- - drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 2 +- - drivers/usb/gadget/function/f_fs.c | 4 +- - drivers/usb/gadget/legacy/inode.c | 4 +- - drivers/usb/storage/scsiglue.c | 2 +- - drivers/video/fbdev/pvr2fb.c | 2 +- - fs/9p/vfs_addr.c | 18 +- - fs/9p/vfs_file.c | 4 +- - fs/9p/vfs_super.c | 2 +- - fs/affs/file.c | 26 +- - fs/afs/dir.c | 2 +- - fs/afs/file.c | 4 +- - fs/afs/mntpt.c | 6 +- - fs/afs/super.c | 4 +- - fs/afs/write.c | 26 +- - fs/binfmt_elf.c | 2 +- - fs/binfmt_elf_fdpic.c | 2 +- - fs/block_dev.c | 4 +- - fs/btrfs/check-integrity.c | 64 ++--- - fs/btrfs/compression.c | 84 +++---- - fs/btrfs/ctree.c | 8 +- - fs/btrfs/disk-io.c | 14 +- - fs/btrfs/extent-tree.c | 4 +- - fs/btrfs/extent_io.c | 262 ++++++++++----------- - fs/btrfs/extent_io.h | 6 +- - fs/btrfs/file-item.c | 4 +- - fs/btrfs/file.c | 62 ++--- - fs/btrfs/free-space-cache.c | 30 +-- - fs/btrfs/inode-map.c | 10 +- - fs/btrfs/inode.c | 120 +++++----- - fs/btrfs/ioctl.c | 82 +++---- - fs/btrfs/lzo.c | 32 +-- - fs/btrfs/raid56.c | 28 +-- - fs/btrfs/reada.c | 30 +-- - fs/btrfs/relocation.c | 16 +- - fs/btrfs/scrub.c | 24 +- - fs/btrfs/send.c | 16 +- - fs/btrfs/struct-funcs.c | 4 +- - fs/btrfs/tests/extent-io-tests.c | 44 ++-- - fs/btrfs/tests/free-space-tests.c | 2 +- - fs/btrfs/volumes.c | 14 +- - fs/btrfs/zlib.c | 38 +-- - fs/buffer.c | 100 ++++---- - fs/cachefiles/rdwr.c | 38 +-- - fs/ceph/addr.c | 106 ++++----- - fs/ceph/caps.c | 2 +- - fs/ceph/dir.c | 4 +- - fs/ceph/file.c | 32 +-- - fs/ceph/inode.c | 4 +- - fs/ceph/mds_client.c | 2 +- - fs/ceph/mds_client.h | 2 +- - fs/ceph/super.c | 8 +- - fs/cifs/cifsfs.c | 2 +- - fs/cifs/cifsglob.h | 4 +- - fs/cifs/cifssmb.c | 16 +- - fs/cifs/connect.c | 2 +- - fs/cifs/file.c | 96 ++++---- - fs/cifs/inode.c | 10 +- - fs/configfs/mount.c | 4 +- - fs/cramfs/README | 26 +- - fs/cramfs/inode.c | 32 +-- - fs/dax.c | 34 +-- - fs/direct-io.c | 26 +- - fs/dlm/lowcomms.c | 8 +- - fs/ecryptfs/crypto.c | 22 +- - fs/ecryptfs/inode.c | 8 +- - fs/ecryptfs/keystore.c | 2 +- - fs/ecryptfs/main.c | 8 +- - fs/ecryptfs/mmap.c | 44 ++-- - fs/ecryptfs/read_write.c | 14 +- - fs/efivarfs/super.c | 4 +- - fs/exofs/dir.c | 30 +-- - fs/exofs/inode.c | 34 +-- - fs/exofs/namei.c | 4 +- - fs/ext2/dir.c | 36 +-- - fs/ext2/namei.c | 6 +- - fs/ext4/crypto.c | 8 +- - fs/ext4/dir.c | 4 +- - fs/ext4/ext4.h | 4 +- - fs/ext4/file.c | 4 +- - fs/ext4/inline.c | 18 +- - fs/ext4/inode.c | 118 +++++----- - fs/ext4/mballoc.c | 40 ++-- - fs/ext4/move_extent.c | 16 +- - fs/ext4/page-io.c | 4 +- - fs/ext4/readpage.c | 12 +- - fs/ext4/super.c | 4 +- - fs/ext4/symlink.c | 4 +- - fs/f2fs/crypto.c | 6 +- - fs/f2fs/data.c | 50 ++-- - fs/f2fs/debug.c | 6 +- - fs/f2fs/dir.c | 4 +- - fs/f2fs/f2fs.h | 2 +- - fs/f2fs/file.c | 74 +++--- - fs/f2fs/inline.c | 12 +- - fs/f2fs/namei.c | 4 +- - fs/f2fs/node.c | 10 +- - fs/f2fs/recovery.c | 2 +- - fs/f2fs/segment.c | 18 +- - fs/f2fs/super.c | 4 +- - fs/freevxfs/vxfs_immed.c | 4 +- - fs/freevxfs/vxfs_lookup.c | 12 +- - fs/freevxfs/vxfs_subr.c | 2 +- - fs/fs-writeback.c | 2 +- - fs/fscache/page.c | 10 +- - fs/fuse/dev.c | 26 +- - fs/fuse/file.c | 72 +++--- - fs/fuse/inode.c | 16 +- - fs/gfs2/aops.c | 44 ++-- - fs/gfs2/bmap.c | 12 +- - fs/gfs2/file.c | 16 +- - fs/gfs2/meta_io.c | 4 +- - fs/gfs2/quota.c | 14 +- - fs/gfs2/rgrp.c | 5 +- - fs/hfs/bnode.c | 12 +- - fs/hfs/btree.c | 20 +- - fs/hfs/inode.c | 8 +- - fs/hfsplus/bitmap.c | 2 +- - fs/hfsplus/bnode.c | 90 +++---- - fs/hfsplus/btree.c | 22 +- - fs/hfsplus/inode.c | 8 +- - fs/hfsplus/super.c | 2 +- - fs/hfsplus/xattr.c | 6 +- - fs/hostfs/hostfs_kern.c | 18 +- - fs/hugetlbfs/inode.c | 10 +- - fs/isofs/compress.c | 36 +-- - fs/isofs/inode.c | 2 +- - fs/jbd2/commit.c | 4 +- - fs/jbd2/journal.c | 2 +- - fs/jbd2/transaction.c | 4 +- - fs/jffs2/debug.c | 8 +- - fs/jffs2/file.c | 23 +- - fs/jffs2/fs.c | 8 +- - fs/jffs2/gc.c | 8 +- - fs/jffs2/nodelist.c | 8 +- - fs/jffs2/write.c | 7 +- - fs/jfs/jfs_metapage.c | 42 ++-- - fs/jfs/jfs_metapage.h | 4 +- - fs/jfs/super.c | 2 +- - fs/kernfs/mount.c | 4 +- - fs/libfs.c | 24 +- - fs/logfs/dev_bdev.c | 2 +- - fs/logfs/dev_mtd.c | 10 +- - fs/logfs/dir.c | 12 +- - fs/logfs/file.c | 26 +- - fs/logfs/readwrite.c | 20 +- - fs/logfs/segment.c | 28 +-- - fs/logfs/super.c | 16 +- - fs/minix/dir.c | 18 +- - fs/minix/namei.c | 4 +- - fs/mpage.c | 22 +- - fs/ncpfs/dir.c | 10 +- - fs/ncpfs/ncplib_kernel.h | 2 +- - fs/nfs/blocklayout/blocklayout.c | 24 +- - fs/nfs/blocklayout/blocklayout.h | 4 +- - fs/nfs/client.c | 8 +- - fs/nfs/dir.c | 4 +- - fs/nfs/direct.c | 8 +- - fs/nfs/file.c | 20 +- - fs/nfs/internal.h | 6 +- - fs/nfs/nfs4xdr.c | 2 +- - fs/nfs/objlayout/objio_osd.c | 2 +- - fs/nfs/pagelist.c | 6 +- - fs/nfs/pnfs.c | 6 +- - fs/nfs/read.c | 16 +- - fs/nfs/write.c | 4 +- - fs/nilfs2/bmap.c | 2 +- - fs/nilfs2/btnode.c | 10 +- - fs/nilfs2/dir.c | 32 +-- - fs/nilfs2/gcinode.c | 2 +- - fs/nilfs2/inode.c | 4 +- - fs/nilfs2/mdt.c | 14 +- - fs/nilfs2/namei.c | 4 +- - fs/nilfs2/page.c | 18 +- - fs/nilfs2/recovery.c | 4 +- - fs/nilfs2/segment.c | 2 +- - fs/ntfs/aops.c | 50 ++-- - fs/ntfs/aops.h | 4 +- - fs/ntfs/attrib.c | 28 +-- - fs/ntfs/bitmap.c | 10 +- - fs/ntfs/compress.c | 77 +++--- - fs/ntfs/dir.c | 56 ++--- - fs/ntfs/file.c | 56 ++--- - fs/ntfs/index.c | 14 +- - fs/ntfs/inode.c | 12 +- - fs/ntfs/lcnalloc.c | 6 +- - fs/ntfs/logfile.c | 16 +- - fs/ntfs/mft.c | 34 +-- - fs/ntfs/ntfs.h | 2 +- - fs/ntfs/super.c | 72 +++--- - fs/ocfs2/alloc.c | 28 +-- - fs/ocfs2/aops.c | 48 ++-- - fs/ocfs2/cluster/heartbeat.c | 10 +- - fs/ocfs2/dlmfs/dlmfs.c | 4 +- - fs/ocfs2/file.c | 14 +- - fs/ocfs2/mmap.c | 6 +- - fs/ocfs2/ocfs2.h | 20 +- - fs/ocfs2/refcounttree.c | 24 +- - fs/ocfs2/super.c | 4 +- - fs/pipe.c | 6 +- - fs/proc/task_mmu.c | 2 +- - fs/proc/vmcore.c | 4 +- - fs/pstore/inode.c | 4 +- - fs/qnx6/dir.c | 16 +- - fs/qnx6/inode.c | 4 +- - fs/qnx6/qnx6.h | 2 +- - fs/ramfs/inode.c | 4 +- - fs/reiserfs/file.c | 4 +- - fs/reiserfs/inode.c | 44 ++-- - fs/reiserfs/ioctl.c | 4 +- - fs/reiserfs/journal.c | 6 +- - fs/reiserfs/stree.c | 4 +- - fs/reiserfs/tail_conversion.c | 4 +- - fs/reiserfs/xattr.c | 18 +- - fs/splice.c | 32 +-- - fs/squashfs/block.c | 4 +- - fs/squashfs/cache.c | 18 +- - fs/squashfs/decompressor.c | 2 +- - fs/squashfs/file.c | 24 +- - fs/squashfs/file_direct.c | 22 +- - fs/squashfs/lz4_wrapper.c | 8 +- - fs/squashfs/lzo_wrapper.c | 8 +- - fs/squashfs/page_actor.c | 4 +- - fs/squashfs/page_actor.h | 2 +- - fs/squashfs/super.c | 2 +- - fs/squashfs/symlink.c | 6 +- - fs/squashfs/xz_wrapper.c | 4 +- - fs/squashfs/zlib_wrapper.c | 4 +- - fs/sync.c | 4 +- - fs/sysv/dir.c | 18 +- - fs/sysv/namei.c | 4 +- - fs/ubifs/file.c | 54 ++--- - fs/ubifs/super.c | 6 +- - fs/ubifs/ubifs.h | 4 +- - fs/udf/file.c | 6 +- - fs/udf/inode.c | 4 +- - fs/ufs/balloc.c | 6 +- - fs/ufs/dir.c | 32 +-- - fs/ufs/inode.c | 4 +- - fs/ufs/namei.c | 6 +- - fs/ufs/util.c | 4 +- - fs/ufs/util.h | 2 +- - fs/xfs/libxfs/xfs_bmap.c | 4 +- - fs/xfs/xfs_aops.c | 38 +-- - fs/xfs/xfs_bmap_util.c | 4 +- - fs/xfs/xfs_file.c | 12 +- - fs/xfs/xfs_linux.h | 2 +- - fs/xfs/xfs_mount.c | 2 +- - fs/xfs/xfs_mount.h | 4 +- - fs/xfs/xfs_pnfs.c | 4 +- - fs/xfs/xfs_super.c | 8 +- - include/linux/backing-dev-defs.h | 2 +- - include/linux/bio.h | 2 +- - include/linux/blkdev.h | 2 +- - include/linux/buffer_head.h | 4 +- - include/linux/ceph/libceph.h | 4 +- - include/linux/f2fs_fs.h | 4 +- - include/linux/fs.h | 4 +- - include/linux/mm.h | 2 +- - include/linux/mm_types.h | 2 +- - include/linux/nfs_page.h | 6 +- - include/linux/nilfs2_fs.h | 4 +- - include/linux/pagemap.h | 31 +-- - include/linux/sunrpc/svc.h | 2 +- - include/linux/swap.h | 4 +- - ipc/mqueue.c | 4 +- - kernel/events/uprobes.c | 8 +- - mm/fadvise.c | 8 +- - mm/filemap.c | 126 +++++----- - mm/gup.c | 2 +- - mm/hugetlb.c | 8 +- - mm/madvise.c | 6 +- - mm/memory-failure.c | 2 +- - mm/memory.c | 55 +++-- - mm/mincore.c | 8 +- - mm/nommu.c | 2 +- - mm/page-writeback.c | 12 +- - mm/page_io.c | 2 +- - mm/readahead.c | 20 +- - mm/rmap.c | 2 +- - mm/shmem.c | 130 +++++----- - mm/swap.c | 14 +- - mm/swap_state.c | 12 +- - mm/swapfile.c | 12 +- - mm/truncate.c | 40 ++-- - mm/userfaultfd.c | 4 +- - mm/zswap.c | 4 +- - net/ceph/messenger.c | 6 +- - net/ceph/pagelist.c | 4 +- - net/ceph/pagevec.c | 30 +-- - net/sunrpc/auth_gss/auth_gss.c | 8 +- - net/sunrpc/auth_gss/gss_krb5_crypto.c | 2 +- - net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 +- - net/sunrpc/cache.c | 4 +- - net/sunrpc/rpc_pipe.c | 4 +- - net/sunrpc/socklib.c | 6 +- - net/sunrpc/xdr.c | 50 ++-- - 396 files changed, 2851 insertions(+), 2881 deletions(-) - -diff --git a/Documentation/filesystems/cramfs.txt b/Documentation/filesystems/cramfs.txt -index 31f53f0ab957..4006298f6707 100644 ---- a/Documentation/filesystems/cramfs.txt -+++ b/Documentation/filesystems/cramfs.txt -@@ -38,7 +38,7 @@ the update lasts only as long as the inode is cached in memory, after - which the timestamp reverts to 1970, i.e. moves backwards in time. - - Currently, cramfs must be written and read with architectures of the --same endianness, and can be read only by kernels with PAGE_CACHE_SIZE -+same endianness, and can be read only by kernels with PAGE_SIZE - == 4096. At least the latter of these is a bug, but it hasn't been - decided what the best fix is. For the moment if you have larger pages - you can just change the #define in mkcramfs.c, so long as you don't -diff --git a/Documentation/filesystems/tmpfs.txt b/Documentation/filesystems/tmpfs.txt -index d392e1505f17..d9c11d25bf02 100644 ---- a/Documentation/filesystems/tmpfs.txt -+++ b/Documentation/filesystems/tmpfs.txt -@@ -60,7 +60,7 @@ size: The limit of allocated bytes for this tmpfs instance. The - default is half of your physical RAM without swap. If you - oversize your tmpfs instances the machine will deadlock - since the OOM handler will not be able to free that memory. --nr_blocks: The same as size, but in blocks of PAGE_CACHE_SIZE. -+nr_blocks: The same as size, but in blocks of PAGE_SIZE. - nr_inodes: The maximum number of inodes for this instance. The default - is half of the number of your physical RAM pages, or (on a - machine with highmem) the number of lowmem RAM pages, -diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt -index b02a7d598258..4164bd6397a2 100644 ---- a/Documentation/filesystems/vfs.txt -+++ b/Documentation/filesystems/vfs.txt -@@ -708,9 +708,9 @@ struct address_space_operations { - from the address space. This generally corresponds to either a - truncation, punch hole or a complete invalidation of the address - space (in the latter case 'offset' will always be 0 and 'length' -- will be PAGE_CACHE_SIZE). Any private data associated with the page -+ will be PAGE_SIZE). Any private data associated with the page - should be updated to reflect this truncation. If offset is 0 and -- length is PAGE_CACHE_SIZE, then the private data should be released, -+ length is PAGE_SIZE, then the private data should be released, - because the page must be able to be completely discarded. This may - be done by calling the ->releasepage function, but in this case the - release MUST succeed. -diff --git a/arch/arc/mm/cache.c b/arch/arc/mm/cache.c -index b65f797e9ad6..d9bacb4199ea 100644 ---- a/arch/arc/mm/cache.c -+++ b/arch/arc/mm/cache.c -@@ -621,7 +621,7 @@ void flush_dcache_page(struct page *page) - - /* kernel reading from page with U-mapping */ - phys_addr_t paddr = (unsigned long)page_address(page); -- unsigned long vaddr = page->index << PAGE_CACHE_SHIFT; -+ unsigned long vaddr = page->index << PAGE_SHIFT; - - if (addr_not_cache_congruent(paddr, vaddr)) - __flush_dcache_page(paddr, vaddr); -diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c -index d0ba3551d49a..3cced8455727 100644 ---- a/arch/arm/mm/flush.c -+++ b/arch/arm/mm/flush.c -@@ -235,7 +235,7 @@ void __flush_dcache_page(struct address_space *mapping, struct page *page) - */ - if (mapping && cache_is_vipt_aliasing()) - flush_pfn_alias(page_to_pfn(page), -- page->index << PAGE_CACHE_SHIFT); -+ page->index << PAGE_SHIFT); - } - - static void __flush_dcache_aliases(struct address_space *mapping, struct page *page) -@@ -250,7 +250,7 @@ static void __flush_dcache_aliases(struct address_space *mapping, struct page *p - * data in the current VM view associated with this page. - * - aliasing VIPT: we only need to find one mapping of this page. - */ -- pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); -+ pgoff = page->index; - - flush_dcache_mmap_lock(mapping); - vma_interval_tree_foreach(mpnt, &mapping->i_mmap, pgoff, pgoff) { -diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c -index 91c2a39cd5aa..67001277256c 100644 ---- a/arch/parisc/kernel/cache.c -+++ b/arch/parisc/kernel/cache.c -@@ -319,7 +319,7 @@ void flush_dcache_page(struct page *page) - if (!mapping) - return; - -- pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); -+ pgoff = page->index; - - /* We have carefully arranged in arch_get_unmapped_area() that - * *any* mappings of a file are always congruently mapped (whether -diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c -index 3c07d6b96877..6b3e7c6ee096 100644 ---- a/arch/parisc/mm/init.c -+++ b/arch/parisc/mm/init.c -@@ -22,7 +22,7 @@ - #include <linux/swap.h> - #include <linux/unistd.h> - #include <linux/nodemask.h> /* for node_online_map */ --#include <linux/pagemap.h> /* for release_pages and page_cache_release */ -+#include <linux/pagemap.h> /* for release_pages */ - #include <linux/compat.h> - - #include <asm/pgalloc.h> -diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c -index dfa863876778..6ca5f0525e57 100644 ---- a/arch/powerpc/platforms/cell/spufs/inode.c -+++ b/arch/powerpc/platforms/cell/spufs/inode.c -@@ -732,8 +732,8 @@ spufs_fill_super(struct super_block *sb, void *data, int silent) - return -ENOMEM; - - sb->s_maxbytes = MAX_LFS_FILESIZE; -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ sb->s_blocksize = PAGE_SIZE; -+ sb->s_blocksize_bits = PAGE_SHIFT; - sb->s_magic = SPUFS_MAGIC; - sb->s_op = &s_ops; - sb->s_fs_info = info; -diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c -index 0f3da2cb2bd6..255c7eec4481 100644 ---- a/arch/s390/hypfs/inode.c -+++ b/arch/s390/hypfs/inode.c -@@ -278,8 +278,8 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent) - sbi->uid = current_uid(); - sbi->gid = current_gid(); - sb->s_fs_info = sbi; -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ sb->s_blocksize = PAGE_SIZE; -+ sb->s_blocksize_bits = PAGE_SHIFT; - sb->s_magic = HYPFS_MAGIC; - sb->s_op = &hypfs_s_ops; - if (hypfs_parse_options(data, sb)) -diff --git a/block/bio.c b/block/bio.c -index f124a0a624fc..807d25e466ec 100644 ---- a/block/bio.c -+++ b/block/bio.c -@@ -1339,7 +1339,7 @@ struct bio *bio_map_user_iov(struct request_queue *q, - * release the pages we didn't map into the bio, if any - */ - while (j < page_limit) -- page_cache_release(pages[j++]); -+ put_page(pages[j++]); - } - - kfree(pages); -@@ -1365,7 +1365,7 @@ struct bio *bio_map_user_iov(struct request_queue *q, - for (j = 0; j < nr_pages; j++) { - if (!pages[j]) - break; -- page_cache_release(pages[j]); -+ put_page(pages[j]); - } - out: - kfree(pages); -@@ -1385,7 +1385,7 @@ static void __bio_unmap_user(struct bio *bio) - if (bio_data_dir(bio) == READ) - set_page_dirty_lock(bvec->bv_page); - -- page_cache_release(bvec->bv_page); -+ put_page(bvec->bv_page); - } - - bio_put(bio); -@@ -1615,8 +1615,8 @@ static void bio_release_pages(struct bio *bio) - * the BIO and the offending pages and re-dirty the pages in process context. - * - * It is expected that bio_check_pages_dirty() will wholly own the BIO from -- * here on. It will run one page_cache_release() against each page and will -- * run one bio_put() against the BIO. -+ * here on. It will run one put_page() against each page and will run one -+ * bio_put() against the BIO. - */ - - static void bio_dirty_fn(struct work_struct *work); -@@ -1658,7 +1658,7 @@ void bio_check_pages_dirty(struct bio *bio) - struct page *page = bvec->bv_page; - - if (PageDirty(page) || PageCompound(page)) { -- page_cache_release(page); -+ put_page(page); - bvec->bv_page = NULL; - } else { - nr_clean_pages++; -diff --git a/block/blk-core.c b/block/blk-core.c -index 827f8badd143..b60537b2c35b 100644 ---- a/block/blk-core.c -+++ b/block/blk-core.c -@@ -706,7 +706,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) - goto fail_id; - - q->backing_dev_info.ra_pages = -- (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE; -+ (VM_MAX_READAHEAD * 1024) / PAGE_SIZE; - q->backing_dev_info.capabilities = BDI_CAP_CGROUP_WRITEBACK; - q->backing_dev_info.name = "block"; - q->node = node_id; -diff --git a/block/blk-settings.c b/block/blk-settings.c -index c7bb666aafd1..331e4eee0dda 100644 ---- a/block/blk-settings.c -+++ b/block/blk-settings.c -@@ -239,8 +239,8 @@ void blk_queue_max_hw_sectors(struct request_queue *q, unsigned int max_hw_secto - struct queue_limits *limits = &q->limits; - unsigned int max_sectors; - -- if ((max_hw_sectors << 9) < PAGE_CACHE_SIZE) { -- max_hw_sectors = 1 << (PAGE_CACHE_SHIFT - 9); -+ if ((max_hw_sectors << 9) < PAGE_SIZE) { -+ max_hw_sectors = 1 << (PAGE_SHIFT - 9); - printk(KERN_INFO "%s: set to minimum %d\n", - __func__, max_hw_sectors); - } -@@ -329,8 +329,8 @@ EXPORT_SYMBOL(blk_queue_max_segments); - **/ - void blk_queue_max_segment_size(struct request_queue *q, unsigned int max_size) - { -- if (max_size < PAGE_CACHE_SIZE) { -- max_size = PAGE_CACHE_SIZE; -+ if (max_size < PAGE_SIZE) { -+ max_size = PAGE_SIZE; - printk(KERN_INFO "%s: set to minimum %d\n", - __func__, max_size); - } -@@ -760,8 +760,8 @@ EXPORT_SYMBOL_GPL(blk_queue_dma_drain); - **/ - void blk_queue_segment_boundary(struct request_queue *q, unsigned long mask) - { -- if (mask < PAGE_CACHE_SIZE - 1) { -- mask = PAGE_CACHE_SIZE - 1; -+ if (mask < PAGE_SIZE - 1) { -+ mask = PAGE_SIZE - 1; - printk(KERN_INFO "%s: set to minimum %lx\n", - __func__, mask); - } -diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c -index dd93763057ce..995b58d46ed1 100644 ---- a/block/blk-sysfs.c -+++ b/block/blk-sysfs.c -@@ -76,7 +76,7 @@ queue_requests_store(struct request_queue *q, const char *page, size_t count) - static ssize_t queue_ra_show(struct request_queue *q, char *page) - { - unsigned long ra_kb = q->backing_dev_info.ra_pages << -- (PAGE_CACHE_SHIFT - 10); -+ (PAGE_SHIFT - 10); - - return queue_var_show(ra_kb, (page)); - } -@@ -90,7 +90,7 @@ queue_ra_store(struct request_queue *q, const char *page, size_t count) - if (ret < 0) - return ret; - -- q->backing_dev_info.ra_pages = ra_kb >> (PAGE_CACHE_SHIFT - 10); -+ q->backing_dev_info.ra_pages = ra_kb >> (PAGE_SHIFT - 10); - - return ret; - } -@@ -117,7 +117,7 @@ static ssize_t queue_max_segment_size_show(struct request_queue *q, char *page) - if (blk_queue_cluster(q)) - return queue_var_show(queue_max_segment_size(q), (page)); - -- return queue_var_show(PAGE_CACHE_SIZE, (page)); -+ return queue_var_show(PAGE_SIZE, (page)); - } - - static ssize_t queue_logical_block_size_show(struct request_queue *q, char *page) -@@ -198,7 +198,7 @@ queue_max_sectors_store(struct request_queue *q, const char *page, size_t count) - { - unsigned long max_sectors_kb, - max_hw_sectors_kb = queue_max_hw_sectors(q) >> 1, -- page_kb = 1 << (PAGE_CACHE_SHIFT - 10); -+ page_kb = 1 << (PAGE_SHIFT - 10); - ssize_t ret = queue_var_store(&max_sectors_kb, page, count); - - if (ret < 0) -diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c -index e3c591dd8f19..4a349787bc62 100644 ---- a/block/cfq-iosched.c -+++ b/block/cfq-iosched.c -@@ -4075,7 +4075,7 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq, - * idle timer unplug to continue working. - */ - if (cfq_cfqq_wait_request(cfqq)) { -- if (blk_rq_bytes(rq) > PAGE_CACHE_SIZE || -+ if (blk_rq_bytes(rq) > PAGE_SIZE || - cfqd->busy_queues > 1) { - cfq_del_timer(cfqd, cfqq); - cfq_clear_cfqq_wait_request(cfqq); -diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c -index f678c733df40..556826ac7cb4 100644 ---- a/block/compat_ioctl.c -+++ b/block/compat_ioctl.c -@@ -710,7 +710,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) - return -EINVAL; - bdi = blk_get_backing_dev_info(bdev); - return compat_put_long(arg, -- (bdi->ra_pages * PAGE_CACHE_SIZE) / 512); -+ (bdi->ra_pages * PAGE_SIZE) / 512); - case BLKROGET: /* compatible */ - return compat_put_int(arg, bdev_read_only(bdev) != 0); - case BLKBSZGET_32: /* get the logical block size (cf. BLKSSZGET) */ -@@ -729,7 +729,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) - if (!capable(CAP_SYS_ADMIN)) - return -EACCES; - bdi = blk_get_backing_dev_info(bdev); -- bdi->ra_pages = (arg * 512) / PAGE_CACHE_SIZE; -+ bdi->ra_pages = (arg * 512) / PAGE_SIZE; - return 0; - case BLKGETSIZE: - size = i_size_read(bdev->bd_inode); -diff --git a/block/ioctl.c b/block/ioctl.c -index d8996bbd7f12..4ff1f92f89ca 100644 ---- a/block/ioctl.c -+++ b/block/ioctl.c -@@ -550,7 +550,7 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, - if (!arg) - return -EINVAL; - bdi = blk_get_backing_dev_info(bdev); -- return put_long(arg, (bdi->ra_pages * PAGE_CACHE_SIZE) / 512); -+ return put_long(arg, (bdi->ra_pages * PAGE_SIZE) / 512); - case BLKROGET: - return put_int(arg, bdev_read_only(bdev) != 0); - case BLKBSZGET: /* get block device soft block size (cf. BLKSSZGET) */ -@@ -578,7 +578,7 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, - if(!capable(CAP_SYS_ADMIN)) - return -EACCES; - bdi = blk_get_backing_dev_info(bdev); -- bdi->ra_pages = (arg * 512) / PAGE_CACHE_SIZE; -+ bdi->ra_pages = (arg * 512) / PAGE_SIZE; - return 0; - case BLKBSZSET: - return blkdev_bszset(bdev, mode, argp); -diff --git a/block/partition-generic.c b/block/partition-generic.c -index 5d8701941054..2c6ae2aed2c4 100644 ---- a/block/partition-generic.c -+++ b/block/partition-generic.c -@@ -566,8 +566,8 @@ static struct page *read_pagecache_sector(struct block_device *bdev, sector_t n) - { - struct address_space *mapping = bdev->bd_inode->i_mapping; - -- return read_mapping_page(mapping, (pgoff_t)(n >> (PAGE_CACHE_SHIFT-9)), -- NULL); -+ return read_mapping_page(mapping, (pgoff_t)(n >> (PAGE_SHIFT-9)), -+ NULL); - } - - unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p) -@@ -584,9 +584,9 @@ unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p) - if (PageError(page)) - goto fail; - p->v = page; -- return (unsigned char *)page_address(page) + ((n & ((1 << (PAGE_CACHE_SHIFT - 9)) - 1)) << 9); -+ return (unsigned char *)page_address(page) + ((n & ((1 << (PAGE_SHIFT - 9)) - 1)) << 9); - fail: -- page_cache_release(page); -+ put_page(page); - } - p->v = NULL; - return NULL; -diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c -index dd73e1ff1759..ec9d8610b25f 100644 ---- a/drivers/block/aoe/aoeblk.c -+++ b/drivers/block/aoe/aoeblk.c -@@ -397,7 +397,7 @@ aoeblk_gdalloc(void *vp) - WARN_ON(d->flags & DEVFL_UP); - blk_queue_max_hw_sectors(q, BLK_DEF_MAX_SECTORS); - q->backing_dev_info.name = "aoe"; -- q->backing_dev_info.ra_pages = READ_AHEAD / PAGE_CACHE_SIZE; -+ q->backing_dev_info.ra_pages = READ_AHEAD / PAGE_SIZE; - d->bufpool = mp; - d->blkq = gd->queue = q; - q->queuedata = d; -diff --git a/drivers/block/brd.c b/drivers/block/brd.c -index f7ecc287d733..51a071e32221 100644 ---- a/drivers/block/brd.c -+++ b/drivers/block/brd.c -@@ -374,7 +374,7 @@ static int brd_rw_page(struct block_device *bdev, sector_t sector, - struct page *page, int rw) - { - struct brd_device *brd = bdev->bd_disk->private_data; -- int err = brd_do_bvec(brd, page, PAGE_CACHE_SIZE, 0, rw, sector); -+ int err = brd_do_bvec(brd, page, PAGE_SIZE, 0, rw, sector); - page_endio(page, rw & WRITE, err); - return err; - } -diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h -index c227fd4cad75..7a1cf7eaa71d 100644 ---- a/drivers/block/drbd/drbd_int.h -+++ b/drivers/block/drbd/drbd_int.h -@@ -1327,8 +1327,8 @@ struct bm_extent { - #endif - #endif - --/* BIO_MAX_SIZE is 256 * PAGE_CACHE_SIZE, -- * so for typical PAGE_CACHE_SIZE of 4k, that is (1<<20) Byte. -+/* BIO_MAX_SIZE is 256 * PAGE_SIZE, -+ * so for typical PAGE_SIZE of 4k, that is (1<<20) Byte. - * Since we may live in a mixed-platform cluster, - * we limit us to a platform agnostic constant here for now. - * A followup commit may allow even bigger BIO sizes, -diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c -index 226eb0c9f0fb..1fd1dccebb6b 100644 ---- a/drivers/block/drbd/drbd_nl.c -+++ b/drivers/block/drbd/drbd_nl.c -@@ -1178,7 +1178,7 @@ static void drbd_setup_queue_param(struct drbd_device *device, struct drbd_backi - blk_queue_max_hw_sectors(q, max_hw_sectors); - /* This is the workaround for "bio would need to, but cannot, be split" */ - blk_queue_max_segments(q, max_segments ? max_segments : BLK_MAX_SEGMENTS); -- blk_queue_segment_boundary(q, PAGE_CACHE_SIZE-1); -+ blk_queue_segment_boundary(q, PAGE_SIZE-1); - - if (b) { - struct drbd_connection *connection = first_peer_device(device)->connection; -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c -index 1cbb16e15307..d20a485c3aac 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c -@@ -574,7 +574,7 @@ static void amdgpu_ttm_tt_unpin_userptr(struct ttm_tt *ttm) - set_page_dirty(page); - - mark_page_accessed(page); -- page_cache_release(page); -+ put_page(page); - } - - sg_free_table(ttm->sg); -diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c -index 6e731db31aa4..aca7f9cc6109 100644 ---- a/drivers/gpu/drm/armada/armada_gem.c -+++ b/drivers/gpu/drm/armada/armada_gem.c -@@ -481,7 +481,7 @@ armada_gem_prime_map_dma_buf(struct dma_buf_attachment *attach, - - release: - for_each_sg(sgt->sgl, sg, num, i) -- page_cache_release(sg_page(sg)); -+ put_page(sg_page(sg)); - free_table: - sg_free_table(sgt); - free_sgt: -@@ -502,7 +502,7 @@ static void armada_gem_prime_unmap_dma_buf(struct dma_buf_attachment *attach, - if (dobj->obj.filp) { - struct scatterlist *sg; - for_each_sg(sgt->sgl, sg, sgt->nents, i) -- page_cache_release(sg_page(sg)); -+ put_page(sg_page(sg)); - } - - sg_free_table(sgt); -diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c -index 2e8c77e71e1f..da0c5320789f 100644 ---- a/drivers/gpu/drm/drm_gem.c -+++ b/drivers/gpu/drm/drm_gem.c -@@ -534,7 +534,7 @@ struct page **drm_gem_get_pages(struct drm_gem_object *obj) - - fail: - while (i--) -- page_cache_release(pages[i]); -+ put_page(pages[i]); - - drm_free_large(pages); - return ERR_CAST(p); -@@ -569,7 +569,7 @@ void drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages, - mark_page_accessed(pages[i]); - - /* Undo the reference we took when populating the table */ -- page_cache_release(pages[i]); -+ put_page(pages[i]); - } - - drm_free_large(pages); -diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c -index bb44bad15403..7d6468407fd6 100644 ---- a/drivers/gpu/drm/i915/i915_gem.c -+++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -177,7 +177,7 @@ i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj) - drm_clflush_virt_range(vaddr, PAGE_SIZE); - kunmap_atomic(src); - -- page_cache_release(page); -+ put_page(page); - vaddr += PAGE_SIZE; - } - -@@ -243,7 +243,7 @@ i915_gem_object_put_pages_phys(struct drm_i915_gem_object *obj) - set_page_dirty(page); - if (obj->madv == I915_MADV_WILLNEED) - mark_page_accessed(page); -- page_cache_release(page); -+ put_page(page); - vaddr += PAGE_SIZE; - } - obj->dirty = 0; -@@ -2204,7 +2204,7 @@ i915_gem_object_put_pages_gtt(struct drm_i915_gem_object *obj) - if (obj->madv == I915_MADV_WILLNEED) - mark_page_accessed(page); - -- page_cache_release(page); -+ put_page(page); - } - obj->dirty = 0; - -@@ -2344,7 +2344,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) - err_pages: - sg_mark_end(sg); - for_each_sg_page(st->sgl, &sg_iter, st->nents, 0) -- page_cache_release(sg_page_iter_page(&sg_iter)); -+ put_page(sg_page_iter_page(&sg_iter)); - sg_free_table(st); - kfree(st); - -diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c -index 59e45b3a6937..7b5b6091bfdc 100644 ---- a/drivers/gpu/drm/i915/i915_gem_userptr.c -+++ b/drivers/gpu/drm/i915/i915_gem_userptr.c -@@ -764,7 +764,7 @@ i915_gem_userptr_put_pages(struct drm_i915_gem_object *obj) - set_page_dirty(page); - - mark_page_accessed(page); -- page_cache_release(page); -+ put_page(page); - } - obj->dirty = 0; - -diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c -index e06ac546a90f..19fdacb6cf75 100644 ---- a/drivers/gpu/drm/radeon/radeon_ttm.c -+++ b/drivers/gpu/drm/radeon/radeon_ttm.c -@@ -610,7 +610,7 @@ static void radeon_ttm_tt_unpin_userptr(struct ttm_tt *ttm) - set_page_dirty(page); - - mark_page_accessed(page); -- page_cache_release(page); -+ put_page(page); - } - - sg_free_table(ttm->sg); -diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c -index 4e19d0f9cc30..077ae9b2865d 100644 ---- a/drivers/gpu/drm/ttm/ttm_tt.c -+++ b/drivers/gpu/drm/ttm/ttm_tt.c -@@ -311,7 +311,7 @@ int ttm_tt_swapin(struct ttm_tt *ttm) - goto out_err; - - copy_highpage(to_page, from_page); -- page_cache_release(from_page); -+ put_page(from_page); - } - - if (!(ttm->page_flags & TTM_PAGE_FLAG_PERSISTENT_SWAP)) -@@ -361,7 +361,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage) - copy_highpage(to_page, from_page); - set_page_dirty(to_page); - mark_page_accessed(to_page); -- page_cache_release(to_page); -+ put_page(to_page); - } - - ttm_tt_unpopulate(ttm); -diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c -index d0cbd5ecd7f0..0c76a4d429f2 100644 ---- a/drivers/gpu/drm/via/via_dmablit.c -+++ b/drivers/gpu/drm/via/via_dmablit.c -@@ -188,7 +188,7 @@ via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg) - if (NULL != (page = vsg->pages[i])) { - if (!PageReserved(page) && (DMA_FROM_DEVICE == vsg->direction)) - SetPageDirty(page); -- page_cache_release(page); -+ put_page(page); - } - } - case dr_via_pages_alloc: -diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c -index d80cce499a56..df77ddc96467 100644 ---- a/drivers/md/bitmap.c -+++ b/drivers/md/bitmap.c -@@ -323,7 +323,7 @@ __clear_page_buffers(struct page *page) - { - ClearPagePrivate(page); - set_page_private(page, 0); -- page_cache_release(page); -+ put_page(page); - } - static void free_buffers(struct page *page) - { -diff --git a/drivers/media/v4l2-core/videobuf-dma-sg.c b/drivers/media/v4l2-core/videobuf-dma-sg.c -index f669cedca8bd..f4c212911b44 100644 ---- a/drivers/media/v4l2-core/videobuf-dma-sg.c -+++ b/drivers/media/v4l2-core/videobuf-dma-sg.c -@@ -350,7 +350,7 @@ int videobuf_dma_free(struct videobuf_dmabuf *dma) - - if (dma->pages) { - for (i = 0; i < dma->nr_pages; i++) -- page_cache_release(dma->pages[i]); -+ put_page(dma->pages[i]); - kfree(dma->pages); - dma->pages = NULL; - } -diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c -index e8b933111e0d..9c677f3f3c26 100644 ---- a/drivers/misc/ibmasm/ibmasmfs.c -+++ b/drivers/misc/ibmasm/ibmasmfs.c -@@ -116,8 +116,8 @@ static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent) - { - struct inode *root; - -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ sb->s_blocksize = PAGE_SIZE; -+ sb->s_blocksize_bits = PAGE_SHIFT; - sb->s_magic = IBMASMFS_MAGIC; - sb->s_op = &ibmasmfs_s_ops; - sb->s_time_gran = 1; -diff --git a/drivers/misc/vmw_vmci/vmci_queue_pair.c b/drivers/misc/vmw_vmci/vmci_queue_pair.c -index f42d9c4e4561..f84a4275ca29 100644 ---- a/drivers/misc/vmw_vmci/vmci_queue_pair.c -+++ b/drivers/misc/vmw_vmci/vmci_queue_pair.c -@@ -728,7 +728,7 @@ static void qp_release_pages(struct page **pages, - if (dirty) - set_page_dirty(pages[i]); - -- page_cache_release(pages[i]); -+ put_page(pages[i]); - pages[i] = NULL; - } - } -diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c -index 0aecd5c00b86..8f86feff3e3a 100644 ---- a/drivers/mmc/core/host.c -+++ b/drivers/mmc/core/host.c -@@ -355,11 +355,11 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) - * They have to set these according to their abilities. - */ - host->max_segs = 1; -- host->max_seg_size = PAGE_CACHE_SIZE; -+ host->max_seg_size = PAGE_SIZE; - -- host->max_req_size = PAGE_CACHE_SIZE; -+ host->max_req_size = PAGE_SIZE; - host->max_blk_size = 512; -- host->max_blk_count = PAGE_CACHE_SIZE / 512; -+ host->max_blk_count = PAGE_SIZE / 512; - - return host; - } -diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c -index 6234eab38ff3..a8f001d44683 100644 ---- a/drivers/mmc/host/sh_mmcif.c -+++ b/drivers/mmc/host/sh_mmcif.c -@@ -1513,7 +1513,7 @@ static int sh_mmcif_probe(struct platform_device *pdev) - mmc->caps |= pd->caps; - mmc->max_segs = 32; - mmc->max_blk_size = 512; -- mmc->max_req_size = PAGE_CACHE_SIZE * mmc->max_segs; -+ mmc->max_req_size = PAGE_SIZE * mmc->max_segs; - mmc->max_blk_count = mmc->max_req_size / mmc->max_blk_size; - mmc->max_seg_size = mmc->max_req_size; - -diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c -index 4a0d6b80eaa3..c3122c9e468f 100644 ---- a/drivers/mmc/host/tmio_mmc_dma.c -+++ b/drivers/mmc/host/tmio_mmc_dma.c -@@ -63,7 +63,7 @@ static void tmio_mmc_start_dma_rx(struct tmio_mmc_host *host) - } - } - -- if ((!aligned && (host->sg_len > 1 || sg->length > PAGE_CACHE_SIZE || -+ if ((!aligned && (host->sg_len > 1 || sg->length > PAGE_SIZE || - (align & PAGE_MASK))) || !multiple) { - ret = -EINVAL; - goto pio; -@@ -139,7 +139,7 @@ static void tmio_mmc_start_dma_tx(struct tmio_mmc_host *host) - } - } - -- if ((!aligned && (host->sg_len > 1 || sg->length > PAGE_CACHE_SIZE || -+ if ((!aligned && (host->sg_len > 1 || sg->length > PAGE_SIZE || - (align & PAGE_MASK))) || !multiple) { - ret = -EINVAL; - goto pio; -diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c -index a10fde40b6c3..233627e20299 100644 ---- a/drivers/mmc/host/tmio_mmc_pio.c -+++ b/drivers/mmc/host/tmio_mmc_pio.c -@@ -1122,7 +1122,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, - mmc->caps2 |= pdata->capabilities2; - mmc->max_segs = 32; - mmc->max_blk_size = 512; -- mmc->max_blk_count = (PAGE_CACHE_SIZE / mmc->max_blk_size) * -+ mmc->max_blk_count = (PAGE_SIZE / mmc->max_blk_size) * - mmc->max_segs; - mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; - mmc->max_seg_size = mmc->max_req_size; -diff --git a/drivers/mmc/host/usdhi6rol0.c b/drivers/mmc/host/usdhi6rol0.c -index b47122d3e8d8..8eeca2b0f34a 100644 ---- a/drivers/mmc/host/usdhi6rol0.c -+++ b/drivers/mmc/host/usdhi6rol0.c -@@ -1789,7 +1789,7 @@ static int usdhi6_probe(struct platform_device *pdev) - /* Set .max_segs to some random number. Feel free to adjust. */ - mmc->max_segs = 32; - mmc->max_blk_size = 512; -- mmc->max_req_size = PAGE_CACHE_SIZE * mmc->max_segs; -+ mmc->max_req_size = PAGE_SIZE * mmc->max_segs; - mmc->max_blk_count = mmc->max_req_size / mmc->max_blk_size; - /* - * Setting .max_seg_size to 1 page would simplify our page-mapping code, -diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c -index e2c0057737e6..7c887f111a7d 100644 ---- a/drivers/mtd/devices/block2mtd.c -+++ b/drivers/mtd/devices/block2mtd.c -@@ -75,7 +75,7 @@ static int _block2mtd_erase(struct block2mtd_dev *dev, loff_t to, size_t len) - break; - } - -- page_cache_release(page); -+ put_page(page); - pages--; - index++; - } -@@ -124,7 +124,7 @@ static int block2mtd_read(struct mtd_info *mtd, loff_t from, size_t len, - return PTR_ERR(page); - - memcpy(buf, page_address(page) + offset, cpylen); -- page_cache_release(page); -+ put_page(page); - - if (retlen) - *retlen += cpylen; -@@ -164,7 +164,7 @@ static int _block2mtd_write(struct block2mtd_dev *dev, const u_char *buf, - unlock_page(page); - balance_dirty_pages_ratelimited(mapping); - } -- page_cache_release(page); -+ put_page(page); - - if (retlen) - *retlen += cpylen; -diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c -index 1fd519503bb1..a58169a28741 100644 ---- a/drivers/mtd/nand/nandsim.c -+++ b/drivers/mtd/nand/nandsim.c -@@ -1339,7 +1339,7 @@ static void put_pages(struct nandsim *ns) - int i; - - for (i = 0; i < ns->held_cnt; i++) -- page_cache_release(ns->held_pages[i]); -+ put_page(ns->held_pages[i]); - } - - /* Get page cache pages in advance to provide NOFS memory allocation */ -@@ -1349,8 +1349,8 @@ static int get_pages(struct nandsim *ns, struct file *file, size_t count, loff_t - struct page *page; - struct address_space *mapping = file->f_mapping; - -- start_index = pos >> PAGE_CACHE_SHIFT; -- end_index = (pos + count - 1) >> PAGE_CACHE_SHIFT; -+ start_index = pos >> PAGE_SHIFT; -+ end_index = (pos + count - 1) >> PAGE_SHIFT; - if (end_index - start_index + 1 > NS_MAX_HELD_PAGES) - return -EINVAL; - ns->held_cnt = 0; -diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c -index c32cbb593600..f068b6513cd2 100644 ---- a/drivers/nvdimm/btt.c -+++ b/drivers/nvdimm/btt.c -@@ -1204,7 +1204,7 @@ static int btt_rw_page(struct block_device *bdev, sector_t sector, - { - struct btt *btt = bdev->bd_disk->private_data; - -- btt_do_bvec(btt, NULL, page, PAGE_CACHE_SIZE, 0, rw, sector); -+ btt_do_bvec(btt, NULL, page, PAGE_SIZE, 0, rw, sector); - page_endio(page, rw & WRITE, 0); - return 0; - } -diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c -index ca5721c306bb..a1a29c711532 100644 ---- a/drivers/nvdimm/pmem.c -+++ b/drivers/nvdimm/pmem.c -@@ -151,7 +151,7 @@ static int pmem_rw_page(struct block_device *bdev, sector_t sector, - struct pmem_device *pmem = bdev->bd_disk->private_data; - int rc; - -- rc = pmem_do_bvec(pmem, page, PAGE_CACHE_SIZE, 0, rw, sector); -+ rc = pmem_do_bvec(pmem, page, PAGE_SIZE, 0, rw, sector); - if (rw & WRITE) - wmb_pmem(); - -diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c -index b48ac6300c79..a0e5260bd006 100644 ---- a/drivers/oprofile/oprofilefs.c -+++ b/drivers/oprofile/oprofilefs.c -@@ -239,8 +239,8 @@ static int oprofilefs_fill_super(struct super_block *sb, void *data, int silent) - { - struct inode *root_inode; - -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ sb->s_blocksize = PAGE_SIZE; -+ sb->s_blocksize_bits = PAGE_SHIFT; - sb->s_magic = OPROFILEFS_MAGIC; - sb->s_op = &s_ops; - sb->s_time_gran = 1; -diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 5a5457ac9cdb..1bd0753f678a 100644 ---- a/drivers/scsi/sd.c -+++ b/drivers/scsi/sd.c -@@ -2891,7 +2891,7 @@ static int sd_revalidate_disk(struct gendisk *disk) - if (sdkp->opt_xfer_blocks && - sdkp->opt_xfer_blocks <= dev_max && - sdkp->opt_xfer_blocks <= SD_DEF_XFER_BLOCKS && -- sdkp->opt_xfer_blocks * sdp->sector_size >= PAGE_CACHE_SIZE) -+ sdkp->opt_xfer_blocks * sdp->sector_size >= PAGE_SIZE) - rw_max = q->limits.io_opt = - sdkp->opt_xfer_blocks * sdp->sector_size; - else -diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c -index 607b0a505844..0177a9a4849f 100644 ---- a/drivers/scsi/st.c -+++ b/drivers/scsi/st.c -@@ -4943,7 +4943,7 @@ static int sgl_map_user_pages(struct st_buffer *STbp, - out_unmap: - if (res > 0) { - for (j=0; j < res; j++) -- page_cache_release(pages[j]); -+ put_page(pages[j]); - res = 0; - } - kfree(pages); -@@ -4965,7 +4965,7 @@ static int sgl_unmap_user_pages(struct st_buffer *STbp, - /* FIXME: cache flush missing for rw==READ - * FIXME: call the correct reference counting function - */ -- page_cache_release(page); -+ put_page(page); - } - kfree(STbp->mapped_pages); - STbp->mapped_pages = NULL; -diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h -index dab486261154..13335437c69c 100644 ---- a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h -+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h -@@ -88,7 +88,7 @@ do { \ - } while (0) - - #ifndef LIBCFS_VMALLOC_SIZE --#define LIBCFS_VMALLOC_SIZE (2 << PAGE_CACHE_SHIFT) /* 2 pages */ -+#define LIBCFS_VMALLOC_SIZE (2 << PAGE_SHIFT) /* 2 pages */ - #endif - - #define LIBCFS_ALLOC_PRE(size, mask) \ -diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h -index 0f2fd79e5ec8..837eb22749c3 100644 ---- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h -+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h -@@ -57,7 +57,7 @@ - #include "../libcfs_cpu.h" - #endif - --#define CFS_PAGE_MASK (~((__u64)PAGE_CACHE_SIZE-1)) -+#define CFS_PAGE_MASK (~((__u64)PAGE_SIZE-1)) - #define page_index(p) ((p)->index) - - #define memory_pressure_get() (current->flags & PF_MEMALLOC) -@@ -67,7 +67,7 @@ - #if BITS_PER_LONG == 32 - /* limit to lowmem on 32-bit systems */ - #define NUM_CACHEPAGES \ -- min(totalram_pages, 1UL << (30 - PAGE_CACHE_SHIFT) * 3 / 4) -+ min(totalram_pages, 1UL << (30 - PAGE_SHIFT) * 3 / 4) - #else - #define NUM_CACHEPAGES totalram_pages - #endif -diff --git a/drivers/staging/lustre/include/linux/lnet/types.h b/drivers/staging/lustre/include/linux/lnet/types.h -index 08f193c341c5..1c679cb72785 100644 ---- a/drivers/staging/lustre/include/linux/lnet/types.h -+++ b/drivers/staging/lustre/include/linux/lnet/types.h -@@ -514,7 +514,7 @@ typedef struct { - /** - * Starting offset of the fragment within the page. Note that the - * end of the fragment must not pass the end of the page; i.e., -- * kiov_len + kiov_offset <= PAGE_CACHE_SIZE. -+ * kiov_len + kiov_offset <= PAGE_SIZE. - */ - unsigned int kiov_offset; - } lnet_kiov_t; -diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c -index 3e1f24e77f64..d4ce06d0aeeb 100644 ---- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c -+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c -@@ -291,7 +291,7 @@ ksocknal_lib_kiov_vmap(lnet_kiov_t *kiov, int niov, - - for (nob = i = 0; i < niov; i++) { - if ((kiov[i].kiov_offset && i > 0) || -- (kiov[i].kiov_offset + kiov[i].kiov_len != PAGE_CACHE_SIZE && i < niov - 1)) -+ (kiov[i].kiov_offset + kiov[i].kiov_len != PAGE_SIZE && i < niov - 1)) - return NULL; - - pages[i] = kiov[i].kiov_page; -diff --git a/drivers/staging/lustre/lnet/libcfs/debug.c b/drivers/staging/lustre/lnet/libcfs/debug.c -index c90e5102fe06..c3d628bac5b8 100644 ---- a/drivers/staging/lustre/lnet/libcfs/debug.c -+++ b/drivers/staging/lustre/lnet/libcfs/debug.c -@@ -517,7 +517,7 @@ int libcfs_debug_init(unsigned long bufsize) - max = TCD_MAX_PAGES; - } else { - max = max / num_possible_cpus(); -- max <<= (20 - PAGE_CACHE_SHIFT); -+ max <<= (20 - PAGE_SHIFT); - } - rc = cfs_tracefile_init(max); - -diff --git a/drivers/staging/lustre/lnet/libcfs/tracefile.c b/drivers/staging/lustre/lnet/libcfs/tracefile.c -index ec3bc04bd89f..244eb89eef68 100644 ---- a/drivers/staging/lustre/lnet/libcfs/tracefile.c -+++ b/drivers/staging/lustre/lnet/libcfs/tracefile.c -@@ -182,7 +182,7 @@ cfs_trace_get_tage_try(struct cfs_trace_cpu_data *tcd, unsigned long len) - if (tcd->tcd_cur_pages > 0) { - __LASSERT(!list_empty(&tcd->tcd_pages)); - tage = cfs_tage_from_list(tcd->tcd_pages.prev); -- if (tage->used + len <= PAGE_CACHE_SIZE) -+ if (tage->used + len <= PAGE_SIZE) - return tage; - } - -@@ -260,7 +260,7 @@ static struct cfs_trace_page *cfs_trace_get_tage(struct cfs_trace_cpu_data *tcd, - * from here: this will lead to infinite recursion. - */ - -- if (len > PAGE_CACHE_SIZE) { -+ if (len > PAGE_SIZE) { - pr_err("cowardly refusing to write %lu bytes in a page\n", len); - return NULL; - } -@@ -349,7 +349,7 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata, - for (i = 0; i < 2; i++) { - tage = cfs_trace_get_tage(tcd, needed + known_size + 1); - if (!tage) { -- if (needed + known_size > PAGE_CACHE_SIZE) -+ if (needed + known_size > PAGE_SIZE) - mask |= D_ERROR; - - cfs_trace_put_tcd(tcd); -@@ -360,7 +360,7 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata, - string_buf = (char *)page_address(tage->page) + - tage->used + known_size; - -- max_nob = PAGE_CACHE_SIZE - tage->used - known_size; -+ max_nob = PAGE_SIZE - tage->used - known_size; - if (max_nob <= 0) { - printk(KERN_EMERG "negative max_nob: %d\n", - max_nob); -@@ -424,7 +424,7 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata, - __LASSERT(debug_buf == string_buf); - - tage->used += needed; -- __LASSERT(tage->used <= PAGE_CACHE_SIZE); -+ __LASSERT(tage->used <= PAGE_SIZE); - - console: - if ((mask & libcfs_printk) == 0) { -@@ -835,7 +835,7 @@ EXPORT_SYMBOL(cfs_trace_copyout_string); - - int cfs_trace_allocate_string_buffer(char **str, int nob) - { -- if (nob > 2 * PAGE_CACHE_SIZE) /* string must be "sensible" */ -+ if (nob > 2 * PAGE_SIZE) /* string must be "sensible" */ - return -EINVAL; - - *str = kmalloc(nob, GFP_KERNEL | __GFP_ZERO); -@@ -951,7 +951,7 @@ int cfs_trace_set_debug_mb(int mb) - } - - mb /= num_possible_cpus(); -- pages = mb << (20 - PAGE_CACHE_SHIFT); -+ pages = mb << (20 - PAGE_SHIFT); - - cfs_tracefile_write_lock(); - -@@ -977,7 +977,7 @@ int cfs_trace_get_debug_mb(void) - - cfs_tracefile_read_unlock(); - -- return (total_pages >> (20 - PAGE_CACHE_SHIFT)) + 1; -+ return (total_pages >> (20 - PAGE_SHIFT)) + 1; - } - - static int tracefiled(void *arg) -diff --git a/drivers/staging/lustre/lnet/libcfs/tracefile.h b/drivers/staging/lustre/lnet/libcfs/tracefile.h -index 4c77f9044dd3..ac84e7f4c859 100644 ---- a/drivers/staging/lustre/lnet/libcfs/tracefile.h -+++ b/drivers/staging/lustre/lnet/libcfs/tracefile.h -@@ -87,7 +87,7 @@ void libcfs_unregister_panic_notifier(void); - extern int libcfs_panic_in_progress; - int cfs_trace_max_debug_mb(void); - --#define TCD_MAX_PAGES (5 << (20 - PAGE_CACHE_SHIFT)) -+#define TCD_MAX_PAGES (5 << (20 - PAGE_SHIFT)) - #define TCD_STOCK_PAGES (TCD_MAX_PAGES) - #define CFS_TRACEFILE_SIZE (500 << 20) - -@@ -96,7 +96,7 @@ int cfs_trace_max_debug_mb(void); - /* - * Private declare for tracefile - */ --#define TCD_MAX_PAGES (5 << (20 - PAGE_CACHE_SHIFT)) -+#define TCD_MAX_PAGES (5 << (20 - PAGE_SHIFT)) - #define TCD_STOCK_PAGES (TCD_MAX_PAGES) - - #define CFS_TRACEFILE_SIZE (500 << 20) -@@ -257,7 +257,7 @@ do { \ - do { \ - __LASSERT(tage); \ - __LASSERT(tage->page); \ -- __LASSERT(tage->used <= PAGE_CACHE_SIZE); \ -+ __LASSERT(tage->used <= PAGE_SIZE); \ - __LASSERT(page_count(tage->page) > 0); \ - } while (0) - -diff --git a/drivers/staging/lustre/lnet/lnet/lib-md.c b/drivers/staging/lustre/lnet/lnet/lib-md.c -index c74514f99f90..75d31217bf92 100644 ---- a/drivers/staging/lustre/lnet/lnet/lib-md.c -+++ b/drivers/staging/lustre/lnet/lnet/lib-md.c -@@ -139,7 +139,7 @@ lnet_md_build(lnet_libmd_t *lmd, lnet_md_t *umd, int unlink) - for (i = 0; i < (int)niov; i++) { - /* We take the page pointer on trust */ - if (lmd->md_iov.kiov[i].kiov_offset + -- lmd->md_iov.kiov[i].kiov_len > PAGE_CACHE_SIZE) -+ lmd->md_iov.kiov[i].kiov_len > PAGE_SIZE) - return -EINVAL; /* invalid length */ - - total_length += lmd->md_iov.kiov[i].kiov_len; -diff --git a/drivers/staging/lustre/lnet/lnet/lib-move.c b/drivers/staging/lustre/lnet/lnet/lib-move.c -index 0009a8de77d5..f19aa9320e34 100644 ---- a/drivers/staging/lustre/lnet/lnet/lib-move.c -+++ b/drivers/staging/lustre/lnet/lnet/lib-move.c -@@ -549,12 +549,12 @@ lnet_extract_kiov(int dst_niov, lnet_kiov_t *dst, - if (len <= frag_len) { - dst->kiov_len = len; - LASSERT(dst->kiov_offset + dst->kiov_len -- <= PAGE_CACHE_SIZE); -+ <= PAGE_SIZE); - return niov; - } - - dst->kiov_len = frag_len; -- LASSERT(dst->kiov_offset + dst->kiov_len <= PAGE_CACHE_SIZE); -+ LASSERT(dst->kiov_offset + dst->kiov_len <= PAGE_SIZE); - - len -= frag_len; - dst++; -@@ -887,7 +887,7 @@ lnet_msg2bufpool(lnet_msg_t *msg) - rbp = &the_lnet.ln_rtrpools[cpt][0]; - - LASSERT(msg->msg_len <= LNET_MTU); -- while (msg->msg_len > (unsigned int)rbp->rbp_npages * PAGE_CACHE_SIZE) { -+ while (msg->msg_len > (unsigned int)rbp->rbp_npages * PAGE_SIZE) { - rbp++; - LASSERT(rbp < &the_lnet.ln_rtrpools[cpt][LNET_NRBPOOLS]); - } -diff --git a/drivers/staging/lustre/lnet/lnet/lib-socket.c b/drivers/staging/lustre/lnet/lnet/lib-socket.c -index cc0c2753dd63..891fd59401d7 100644 ---- a/drivers/staging/lustre/lnet/lnet/lib-socket.c -+++ b/drivers/staging/lustre/lnet/lnet/lib-socket.c -@@ -166,9 +166,9 @@ lnet_ipif_enumerate(char ***namesp) - nalloc = 16; /* first guess at max interfaces */ - toobig = 0; - for (;;) { -- if (nalloc * sizeof(*ifr) > PAGE_CACHE_SIZE) { -+ if (nalloc * sizeof(*ifr) > PAGE_SIZE) { - toobig = 1; -- nalloc = PAGE_CACHE_SIZE / sizeof(*ifr); -+ nalloc = PAGE_SIZE / sizeof(*ifr); - CWARN("Too many interfaces: only enumerating first %d\n", - nalloc); - } -diff --git a/drivers/staging/lustre/lnet/lnet/router.c b/drivers/staging/lustre/lnet/lnet/router.c -index 61459cf9d58f..b01dc424c514 100644 ---- a/drivers/staging/lustre/lnet/lnet/router.c -+++ b/drivers/staging/lustre/lnet/lnet/router.c -@@ -27,8 +27,8 @@ - #define LNET_NRB_SMALL_PAGES 1 - #define LNET_NRB_LARGE_MIN 256 /* min value for each CPT */ - #define LNET_NRB_LARGE (LNET_NRB_LARGE_MIN * 4) --#define LNET_NRB_LARGE_PAGES ((LNET_MTU + PAGE_CACHE_SIZE - 1) >> \ -- PAGE_CACHE_SHIFT) -+#define LNET_NRB_LARGE_PAGES ((LNET_MTU + PAGE_SIZE - 1) >> \ -+ PAGE_SHIFT) - - static char *forwarding = ""; - module_param(forwarding, charp, 0444); -@@ -1338,7 +1338,7 @@ lnet_new_rtrbuf(lnet_rtrbufpool_t *rbp, int cpt) - return NULL; - } - -- rb->rb_kiov[i].kiov_len = PAGE_CACHE_SIZE; -+ rb->rb_kiov[i].kiov_len = PAGE_SIZE; - rb->rb_kiov[i].kiov_offset = 0; - rb->rb_kiov[i].kiov_page = page; - } -diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c -index eebc92412061..dcb6e506f592 100644 ---- a/drivers/staging/lustre/lnet/selftest/brw_test.c -+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c -@@ -90,7 +90,7 @@ brw_client_init(sfw_test_instance_t *tsi) - * NB: this is not going to work for variable page size, - * but we have to keep it for compatibility - */ -- len = npg * PAGE_CACHE_SIZE; -+ len = npg * PAGE_SIZE; - - } else { - test_bulk_req_v1_t *breq = &tsi->tsi_u.bulk_v1; -@@ -104,7 +104,7 @@ brw_client_init(sfw_test_instance_t *tsi) - opc = breq->blk_opc; - flags = breq->blk_flags; - len = breq->blk_len; -- npg = (len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -+ npg = (len + PAGE_SIZE - 1) >> PAGE_SHIFT; - } - - if (npg > LNET_MAX_IOV || npg <= 0) -@@ -167,13 +167,13 @@ brw_fill_page(struct page *pg, int pattern, __u64 magic) - - if (pattern == LST_BRW_CHECK_SIMPLE) { - memcpy(addr, &magic, BRW_MSIZE); -- addr += PAGE_CACHE_SIZE - BRW_MSIZE; -+ addr += PAGE_SIZE - BRW_MSIZE; - memcpy(addr, &magic, BRW_MSIZE); - return; - } - - if (pattern == LST_BRW_CHECK_FULL) { -- for (i = 0; i < PAGE_CACHE_SIZE / BRW_MSIZE; i++) -+ for (i = 0; i < PAGE_SIZE / BRW_MSIZE; i++) - memcpy(addr + i * BRW_MSIZE, &magic, BRW_MSIZE); - return; - } -@@ -198,7 +198,7 @@ brw_check_page(struct page *pg, int pattern, __u64 magic) - if (data != magic) - goto bad_data; - -- addr += PAGE_CACHE_SIZE - BRW_MSIZE; -+ addr += PAGE_SIZE - BRW_MSIZE; - data = *((__u64 *)addr); - if (data != magic) - goto bad_data; -@@ -207,7 +207,7 @@ brw_check_page(struct page *pg, int pattern, __u64 magic) - } - - if (pattern == LST_BRW_CHECK_FULL) { -- for (i = 0; i < PAGE_CACHE_SIZE / BRW_MSIZE; i++) { -+ for (i = 0; i < PAGE_SIZE / BRW_MSIZE; i++) { - data = *(((__u64 *)addr) + i); - if (data != magic) - goto bad_data; -@@ -278,7 +278,7 @@ brw_client_prep_rpc(sfw_test_unit_t *tsu, - opc = breq->blk_opc; - flags = breq->blk_flags; - npg = breq->blk_npg; -- len = npg * PAGE_CACHE_SIZE; -+ len = npg * PAGE_SIZE; - - } else { - test_bulk_req_v1_t *breq = &tsi->tsi_u.bulk_v1; -@@ -292,7 +292,7 @@ brw_client_prep_rpc(sfw_test_unit_t *tsu, - opc = breq->blk_opc; - flags = breq->blk_flags; - len = breq->blk_len; -- npg = (len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -+ npg = (len + PAGE_SIZE - 1) >> PAGE_SHIFT; - } - - rc = sfw_create_test_rpc(tsu, dest, sn->sn_features, npg, len, &rpc); -@@ -463,10 +463,10 @@ brw_server_handle(struct srpc_server_rpc *rpc) - reply->brw_status = EINVAL; - return 0; - } -- npg = reqst->brw_len >> PAGE_CACHE_SHIFT; -+ npg = reqst->brw_len >> PAGE_SHIFT; - - } else { -- npg = (reqst->brw_len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -+ npg = (reqst->brw_len + PAGE_SIZE - 1) >> PAGE_SHIFT; - } - - replymsg->msg_ses_feats = reqstmsg->msg_ses_feats; -diff --git a/drivers/staging/lustre/lnet/selftest/conctl.c b/drivers/staging/lustre/lnet/selftest/conctl.c -index 5c7cb72eac9a..79ee6c0bf7c1 100644 ---- a/drivers/staging/lustre/lnet/selftest/conctl.c -+++ b/drivers/staging/lustre/lnet/selftest/conctl.c -@@ -743,7 +743,7 @@ static int lst_test_add_ioctl(lstio_test_args_t *args) - if (args->lstio_tes_param && - (args->lstio_tes_param_len <= 0 || - args->lstio_tes_param_len > -- PAGE_CACHE_SIZE - sizeof(lstcon_test_t))) -+ PAGE_SIZE - sizeof(lstcon_test_t))) - return -EINVAL; - - LIBCFS_ALLOC(batch_name, args->lstio_tes_bat_nmlen + 1); -@@ -819,7 +819,7 @@ lstcon_ioctl_entry(unsigned int cmd, struct libcfs_ioctl_hdr *hdr) - - opc = data->ioc_u32[0]; - -- if (data->ioc_plen1 > PAGE_CACHE_SIZE) -+ if (data->ioc_plen1 > PAGE_SIZE) - return -EINVAL; - - LIBCFS_ALLOC(buf, data->ioc_plen1); -diff --git a/drivers/staging/lustre/lnet/selftest/conrpc.c b/drivers/staging/lustre/lnet/selftest/conrpc.c -index bcd78888f9cc..35a227d0c657 100644 ---- a/drivers/staging/lustre/lnet/selftest/conrpc.c -+++ b/drivers/staging/lustre/lnet/selftest/conrpc.c -@@ -786,8 +786,8 @@ lstcon_bulkrpc_v0_prep(lst_test_bulk_param_t *param, srpc_test_reqst_t *req) - test_bulk_req_t *brq = &req->tsr_u.bulk_v0; - - brq->blk_opc = param->blk_opc; -- brq->blk_npg = (param->blk_size + PAGE_CACHE_SIZE - 1) / -- PAGE_CACHE_SIZE; -+ brq->blk_npg = (param->blk_size + PAGE_SIZE - 1) / -+ PAGE_SIZE; - brq->blk_flags = param->blk_flags; - - return 0; -@@ -822,7 +822,7 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, unsigned feats, - if (transop == LST_TRANS_TSBCLIADD) { - npg = sfw_id_pages(test->tes_span); - nob = !(feats & LST_FEAT_BULK_LEN) ? -- npg * PAGE_CACHE_SIZE : -+ npg * PAGE_SIZE : - sizeof(lnet_process_id_packed_t) * test->tes_span; - } - -@@ -851,8 +851,8 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, unsigned feats, - LASSERT(nob > 0); - - len = !(feats & LST_FEAT_BULK_LEN) ? -- PAGE_CACHE_SIZE : -- min_t(int, nob, PAGE_CACHE_SIZE); -+ PAGE_SIZE : -+ min_t(int, nob, PAGE_SIZE); - nob -= len; - - bulk->bk_iovs[i].kiov_offset = 0; -diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c -index 926c3970c498..e2c532399366 100644 ---- a/drivers/staging/lustre/lnet/selftest/framework.c -+++ b/drivers/staging/lustre/lnet/selftest/framework.c -@@ -1161,7 +1161,7 @@ sfw_add_test(struct srpc_server_rpc *rpc) - int len; - - if (!(sn->sn_features & LST_FEAT_BULK_LEN)) { -- len = npg * PAGE_CACHE_SIZE; -+ len = npg * PAGE_SIZE; - - } else { - len = sizeof(lnet_process_id_packed_t) * -diff --git a/drivers/staging/lustre/lnet/selftest/rpc.c b/drivers/staging/lustre/lnet/selftest/rpc.c -index 69be7d6f48fa..7d7748d96332 100644 ---- a/drivers/staging/lustre/lnet/selftest/rpc.c -+++ b/drivers/staging/lustre/lnet/selftest/rpc.c -@@ -90,7 +90,7 @@ void srpc_set_counters(const srpc_counters_t *cnt) - static int - srpc_add_bulk_page(srpc_bulk_t *bk, struct page *pg, int i, int nob) - { -- nob = min_t(int, nob, PAGE_CACHE_SIZE); -+ nob = min_t(int, nob, PAGE_SIZE); - - LASSERT(nob > 0); - LASSERT(i >= 0 && i < bk->bk_niov); -diff --git a/drivers/staging/lustre/lnet/selftest/selftest.h b/drivers/staging/lustre/lnet/selftest/selftest.h -index 288522d4d7b9..c85b52e2da13 100644 ---- a/drivers/staging/lustre/lnet/selftest/selftest.h -+++ b/drivers/staging/lustre/lnet/selftest/selftest.h -@@ -390,10 +390,10 @@ typedef struct sfw_test_instance { - } tsi_u; - } sfw_test_instance_t; - --/* XXX: trailing (PAGE_CACHE_SIZE % sizeof(lnet_process_id_t)) bytes at -+/* XXX: trailing (PAGE_SIZE % sizeof(lnet_process_id_t)) bytes at - * the end of pages are not used */ - #define SFW_MAX_CONCUR LST_MAX_CONCUR --#define SFW_ID_PER_PAGE (PAGE_CACHE_SIZE / sizeof(lnet_process_id_packed_t)) -+#define SFW_ID_PER_PAGE (PAGE_SIZE / sizeof(lnet_process_id_packed_t)) - #define SFW_MAX_NDESTS (LNET_MAX_IOV * SFW_ID_PER_PAGE) - #define sfw_id_pages(n) (((n) + SFW_ID_PER_PAGE - 1) / SFW_ID_PER_PAGE) - -diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h b/drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h -index 33e0b99e1fb4..c6c7f54637fb 100644 ---- a/drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h -+++ b/drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h -@@ -52,7 +52,7 @@ truncate_complete_page(struct address_space *mapping, struct page *page) - return; - - if (PagePrivate(page)) -- page->mapping->a_ops->invalidatepage(page, 0, PAGE_CACHE_SIZE); -+ page->mapping->a_ops->invalidatepage(page, 0, PAGE_SIZE); - - cancel_dirty_page(page); - ClearPageMappedToDisk(page); -diff --git a/drivers/staging/lustre/lustre/include/lu_object.h b/drivers/staging/lustre/lustre/include/lu_object.h -index b5088b13a305..242bb1ef6245 100644 ---- a/drivers/staging/lustre/lustre/include/lu_object.h -+++ b/drivers/staging/lustre/lustre/include/lu_object.h -@@ -1118,7 +1118,7 @@ struct lu_context_key { - { \ - type *value; \ - \ -- CLASSERT(PAGE_CACHE_SIZE >= sizeof (*value)); \ -+ CLASSERT(PAGE_SIZE >= sizeof (*value)); \ - \ - value = kzalloc(sizeof(*value), GFP_NOFS); \ - if (!value) \ -diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h -index da8bc6eadd13..5aae1d06a5fa 100644 ---- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h -+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h -@@ -1022,16 +1022,16 @@ static inline int lu_dirent_size(struct lu_dirent *ent) - * MDS_READPAGE page size - * - * This is the directory page size packed in MDS_READPAGE RPC. -- * It's different than PAGE_CACHE_SIZE because the client needs to -+ * It's different than PAGE_SIZE because the client needs to - * access the struct lu_dirpage header packed at the beginning of - * the "page" and without this there isn't any way to know find the -- * lu_dirpage header is if client and server PAGE_CACHE_SIZE differ. -+ * lu_dirpage header is if client and server PAGE_SIZE differ. - */ - #define LU_PAGE_SHIFT 12 - #define LU_PAGE_SIZE (1UL << LU_PAGE_SHIFT) - #define LU_PAGE_MASK (~(LU_PAGE_SIZE - 1)) - --#define LU_PAGE_COUNT (1 << (PAGE_CACHE_SHIFT - LU_PAGE_SHIFT)) -+#define LU_PAGE_COUNT (1 << (PAGE_SHIFT - LU_PAGE_SHIFT)) - - /** @} lu_dir */ - -diff --git a/drivers/staging/lustre/lustre/include/lustre_mdc.h b/drivers/staging/lustre/lustre/include/lustre_mdc.h -index df94f9f3bef2..af77eb359c43 100644 ---- a/drivers/staging/lustre/lustre/include/lustre_mdc.h -+++ b/drivers/staging/lustre/lustre/include/lustre_mdc.h -@@ -155,12 +155,12 @@ static inline void mdc_update_max_ea_from_body(struct obd_export *exp, - if (cli->cl_max_mds_easize < body->max_mdsize) { - cli->cl_max_mds_easize = body->max_mdsize; - cli->cl_default_mds_easize = -- min_t(__u32, body->max_mdsize, PAGE_CACHE_SIZE); -+ min_t(__u32, body->max_mdsize, PAGE_SIZE); - } - if (cli->cl_max_mds_cookiesize < body->max_cookiesize) { - cli->cl_max_mds_cookiesize = body->max_cookiesize; - cli->cl_default_mds_cookiesize = -- min_t(__u32, body->max_cookiesize, PAGE_CACHE_SIZE); -+ min_t(__u32, body->max_cookiesize, PAGE_SIZE); - } - } - } -diff --git a/drivers/staging/lustre/lustre/include/lustre_net.h b/drivers/staging/lustre/lustre/include/lustre_net.h -index 4fa1a18b7d15..69586a522eb7 100644 ---- a/drivers/staging/lustre/lustre/include/lustre_net.h -+++ b/drivers/staging/lustre/lustre/include/lustre_net.h -@@ -99,21 +99,21 @@ - */ - #define PTLRPC_MAX_BRW_BITS (LNET_MTU_BITS + PTLRPC_BULK_OPS_BITS) - #define PTLRPC_MAX_BRW_SIZE (1 << PTLRPC_MAX_BRW_BITS) --#define PTLRPC_MAX_BRW_PAGES (PTLRPC_MAX_BRW_SIZE >> PAGE_CACHE_SHIFT) -+#define PTLRPC_MAX_BRW_PAGES (PTLRPC_MAX_BRW_SIZE >> PAGE_SHIFT) - - #define ONE_MB_BRW_SIZE (1 << LNET_MTU_BITS) - #define MD_MAX_BRW_SIZE (1 << LNET_MTU_BITS) --#define MD_MAX_BRW_PAGES (MD_MAX_BRW_SIZE >> PAGE_CACHE_SHIFT) -+#define MD_MAX_BRW_PAGES (MD_MAX_BRW_SIZE >> PAGE_SHIFT) - #define DT_MAX_BRW_SIZE PTLRPC_MAX_BRW_SIZE --#define DT_MAX_BRW_PAGES (DT_MAX_BRW_SIZE >> PAGE_CACHE_SHIFT) -+#define DT_MAX_BRW_PAGES (DT_MAX_BRW_SIZE >> PAGE_SHIFT) - #define OFD_MAX_BRW_SIZE (1 << LNET_MTU_BITS) - - /* When PAGE_SIZE is a constant, we can check our arithmetic here with cpp! */ - # if ((PTLRPC_MAX_BRW_PAGES & (PTLRPC_MAX_BRW_PAGES - 1)) != 0) - # error "PTLRPC_MAX_BRW_PAGES isn't a power of two" - # endif --# if (PTLRPC_MAX_BRW_SIZE != (PTLRPC_MAX_BRW_PAGES * PAGE_CACHE_SIZE)) --# error "PTLRPC_MAX_BRW_SIZE isn't PTLRPC_MAX_BRW_PAGES * PAGE_CACHE_SIZE" -+# if (PTLRPC_MAX_BRW_SIZE != (PTLRPC_MAX_BRW_PAGES * PAGE_SIZE)) -+# error "PTLRPC_MAX_BRW_SIZE isn't PTLRPC_MAX_BRW_PAGES * PAGE_SIZE" - # endif - # if (PTLRPC_MAX_BRW_SIZE > LNET_MTU * PTLRPC_BULK_OPS_COUNT) - # error "PTLRPC_MAX_BRW_SIZE too big" -diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h -index 4a0f2e8b19f6..4264d97650ec 100644 ---- a/drivers/staging/lustre/lustre/include/obd.h -+++ b/drivers/staging/lustre/lustre/include/obd.h -@@ -272,7 +272,7 @@ struct client_obd { - int cl_grant_shrink_interval; /* seconds */ - - /* A chunk is an optimal size used by osc_extent to determine -- * the extent size. A chunk is max(PAGE_CACHE_SIZE, OST block size) -+ * the extent size. A chunk is max(PAGE_SIZE, OST block size) - */ - int cl_chunkbits; - int cl_chunk; -@@ -1318,7 +1318,7 @@ bad_format: - - static inline int cli_brw_size(struct obd_device *obd) - { -- return obd->u.cli.cl_max_pages_per_rpc << PAGE_CACHE_SHIFT; -+ return obd->u.cli.cl_max_pages_per_rpc << PAGE_SHIFT; - } - - #endif /* __OBD_H */ -diff --git a/drivers/staging/lustre/lustre/include/obd_support.h b/drivers/staging/lustre/lustre/include/obd_support.h -index 225262fa67b6..f8ee3a3254ba 100644 ---- a/drivers/staging/lustre/lustre/include/obd_support.h -+++ b/drivers/staging/lustre/lustre/include/obd_support.h -@@ -500,7 +500,7 @@ extern char obd_jobid_var[]; - - #ifdef POISON_BULK - #define POISON_PAGE(page, val) do { \ -- memset(kmap(page), val, PAGE_CACHE_SIZE); \ -+ memset(kmap(page), val, PAGE_SIZE); \ - kunmap(page); \ - } while (0) - #else -diff --git a/drivers/staging/lustre/lustre/lclient/lcommon_cl.c b/drivers/staging/lustre/lustre/lclient/lcommon_cl.c -index aced41ab93a1..96141d17d07f 100644 ---- a/drivers/staging/lustre/lustre/lclient/lcommon_cl.c -+++ b/drivers/staging/lustre/lustre/lclient/lcommon_cl.c -@@ -758,9 +758,9 @@ int ccc_prep_size(const struct lu_env *env, struct cl_object *obj, - * --bug 17336 - */ - loff_t size = cl_isize_read(inode); -- loff_t cur_index = start >> PAGE_CACHE_SHIFT; -+ loff_t cur_index = start >> PAGE_SHIFT; - loff_t size_index = (size - 1) >> -- PAGE_CACHE_SHIFT; -+ PAGE_SHIFT; - - if ((size == 0 && cur_index != 0) || - size_index < cur_index) -diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c -index b586d5a88d00..7dd7df59aa1f 100644 ---- a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c -+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c -@@ -307,8 +307,8 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) - cli->cl_avail_grant = 0; - /* FIXME: Should limit this for the sum of all cl_dirty_max. */ - cli->cl_dirty_max = OSC_MAX_DIRTY_DEFAULT * 1024 * 1024; -- if (cli->cl_dirty_max >> PAGE_CACHE_SHIFT > totalram_pages / 8) -- cli->cl_dirty_max = totalram_pages << (PAGE_CACHE_SHIFT - 3); -+ if (cli->cl_dirty_max >> PAGE_SHIFT > totalram_pages / 8) -+ cli->cl_dirty_max = totalram_pages << (PAGE_SHIFT - 3); - INIT_LIST_HEAD(&cli->cl_cache_waiters); - INIT_LIST_HEAD(&cli->cl_loi_ready_list); - INIT_LIST_HEAD(&cli->cl_loi_hp_ready_list); -@@ -353,15 +353,15 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) - * In the future this should likely be increased. LU-1431 - */ - cli->cl_max_pages_per_rpc = min_t(int, PTLRPC_MAX_BRW_PAGES, -- LNET_MTU >> PAGE_CACHE_SHIFT); -+ LNET_MTU >> PAGE_SHIFT); - - if (!strcmp(name, LUSTRE_MDC_NAME)) { - cli->cl_max_rpcs_in_flight = MDC_MAX_RIF_DEFAULT; -- } else if (totalram_pages >> (20 - PAGE_CACHE_SHIFT) <= 128 /* MB */) { -+ } else if (totalram_pages >> (20 - PAGE_SHIFT) <= 128 /* MB */) { - cli->cl_max_rpcs_in_flight = 2; -- } else if (totalram_pages >> (20 - PAGE_CACHE_SHIFT) <= 256 /* MB */) { -+ } else if (totalram_pages >> (20 - PAGE_SHIFT) <= 256 /* MB */) { - cli->cl_max_rpcs_in_flight = 3; -- } else if (totalram_pages >> (20 - PAGE_CACHE_SHIFT) <= 512 /* MB */) { -+ } else if (totalram_pages >> (20 - PAGE_SHIFT) <= 512 /* MB */) { - cli->cl_max_rpcs_in_flight = 4; - } else { - cli->cl_max_rpcs_in_flight = OSC_MAX_RIF_DEFAULT; -diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c -index 3e937b050203..b913ba9cf97c 100644 ---- a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c -+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c -@@ -107,7 +107,7 @@ - /* - * 50 ldlm locks for 1MB of RAM. - */ --#define LDLM_POOL_HOST_L ((NUM_CACHEPAGES >> (20 - PAGE_CACHE_SHIFT)) * 50) -+#define LDLM_POOL_HOST_L ((NUM_CACHEPAGES >> (20 - PAGE_SHIFT)) * 50) - - /* - * Maximal possible grant step plan in %. -diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c -index c7904a96f9af..74e193e52cd6 100644 ---- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c -+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c -@@ -546,7 +546,7 @@ static inline int ldlm_req_handles_avail(int req_size, int off) - { - int avail; - -- avail = min_t(int, LDLM_MAXREQSIZE, PAGE_CACHE_SIZE - 512) - req_size; -+ avail = min_t(int, LDLM_MAXREQSIZE, PAGE_SIZE - 512) - req_size; - if (likely(avail >= 0)) - avail /= (int)sizeof(struct lustre_handle); - else -diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c -index 4e0a3e583330..ed66b844aa5d 100644 ---- a/drivers/staging/lustre/lustre/llite/dir.c -+++ b/drivers/staging/lustre/lustre/llite/dir.c -@@ -134,7 +134,7 @@ - * a header lu_dirpage which describes the start/end hash, and whether this - * page is empty (contains no dir entry) or hash collide with next page. - * After client receives reply, several pages will be integrated into dir page -- * in PAGE_CACHE_SIZE (if PAGE_CACHE_SIZE greater than LU_PAGE_SIZE), and the -+ * in PAGE_SIZE (if PAGE_SIZE greater than LU_PAGE_SIZE), and the - * lu_dirpage for this integrated page will be adjusted. See - * lmv_adjust_dirpages(). - * -@@ -153,7 +153,7 @@ static int ll_dir_filler(void *_hash, struct page *page0) - struct page **page_pool; - struct page *page; - struct lu_dirpage *dp; -- int max_pages = ll_i2sbi(inode)->ll_md_brw_size >> PAGE_CACHE_SHIFT; -+ int max_pages = ll_i2sbi(inode)->ll_md_brw_size >> PAGE_SHIFT; - int nrdpgs = 0; /* number of pages read actually */ - int npages; - int i; -@@ -193,8 +193,8 @@ static int ll_dir_filler(void *_hash, struct page *page0) - if (body->valid & OBD_MD_FLSIZE) - cl_isize_write(inode, body->size); - -- nrdpgs = (request->rq_bulk->bd_nob_transferred+PAGE_CACHE_SIZE-1) -- >> PAGE_CACHE_SHIFT; -+ nrdpgs = (request->rq_bulk->bd_nob_transferred+PAGE_SIZE-1) -+ >> PAGE_SHIFT; - SetPageUptodate(page0); - } - unlock_page(page0); -@@ -209,7 +209,7 @@ static int ll_dir_filler(void *_hash, struct page *page0) - page = page_pool[i]; - - if (rc < 0 || i >= nrdpgs) { -- page_cache_release(page); -+ put_page(page); - continue; - } - -@@ -230,7 +230,7 @@ static int ll_dir_filler(void *_hash, struct page *page0) - CDEBUG(D_VFSTRACE, "page %lu add to page cache failed: %d\n", - offset, ret); - } -- page_cache_release(page); -+ put_page(page); - } - - if (page_pool != &page0) -@@ -247,7 +247,7 @@ void ll_release_page(struct page *page, int remove) - truncate_complete_page(page->mapping, page); - unlock_page(page); - } -- page_cache_release(page); -+ put_page(page); - } - - /* -@@ -273,7 +273,7 @@ static struct page *ll_dir_page_locate(struct inode *dir, __u64 *hash, - if (found > 0 && !radix_tree_exceptional_entry(page)) { - struct lu_dirpage *dp; - -- page_cache_get(page); -+ get_page(page); - spin_unlock_irq(&mapping->tree_lock); - /* - * In contrast to find_lock_page() we are sure that directory -@@ -313,7 +313,7 @@ static struct page *ll_dir_page_locate(struct inode *dir, __u64 *hash, - page = NULL; - } - } else { -- page_cache_release(page); -+ put_page(page); - page = ERR_PTR(-EIO); - } - -@@ -1507,7 +1507,7 @@ skip_lmm: - st.st_gid = body->gid; - st.st_rdev = body->rdev; - st.st_size = body->size; -- st.st_blksize = PAGE_CACHE_SIZE; -+ st.st_blksize = PAGE_SIZE; - st.st_blocks = body->blocks; - st.st_atime = body->atime; - st.st_mtime = body->mtime; -diff --git a/drivers/staging/lustre/lustre/llite/llite_internal.h b/drivers/staging/lustre/lustre/llite/llite_internal.h -index 973f5cdec192..5394365cc595 100644 ---- a/drivers/staging/lustre/lustre/llite/llite_internal.h -+++ b/drivers/staging/lustre/lustre/llite/llite_internal.h -@@ -310,10 +310,10 @@ static inline struct ll_inode_info *ll_i2info(struct inode *inode) - /* default to about 40meg of readahead on a given system. That much tied - * up in 512k readahead requests serviced at 40ms each is about 1GB/s. - */ --#define SBI_DEFAULT_READAHEAD_MAX (40UL << (20 - PAGE_CACHE_SHIFT)) -+#define SBI_DEFAULT_READAHEAD_MAX (40UL << (20 - PAGE_SHIFT)) - - /* default to read-ahead full files smaller than 2MB on the second read */ --#define SBI_DEFAULT_READAHEAD_WHOLE_MAX (2UL << (20 - PAGE_CACHE_SHIFT)) -+#define SBI_DEFAULT_READAHEAD_WHOLE_MAX (2UL << (20 - PAGE_SHIFT)) - - enum ra_stat { - RA_STAT_HIT = 0, -@@ -975,13 +975,13 @@ struct vm_area_struct *our_vma(struct mm_struct *mm, unsigned long addr, - static inline void ll_invalidate_page(struct page *vmpage) - { - struct address_space *mapping = vmpage->mapping; -- loff_t offset = vmpage->index << PAGE_CACHE_SHIFT; -+ loff_t offset = vmpage->index << PAGE_SHIFT; - - LASSERT(PageLocked(vmpage)); - if (!mapping) - return; - -- ll_teardown_mmaps(mapping, offset, offset + PAGE_CACHE_SIZE); -+ ll_teardown_mmaps(mapping, offset, offset + PAGE_SIZE); - truncate_complete_page(mapping, vmpage); - } - -diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c -index 6d6bb33e3655..b57a992688a8 100644 ---- a/drivers/staging/lustre/lustre/llite/llite_lib.c -+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c -@@ -85,7 +85,7 @@ static struct ll_sb_info *ll_init_sbi(struct super_block *sb) - - si_meminfo(&si); - pages = si.totalram - si.totalhigh; -- if (pages >> (20 - PAGE_CACHE_SHIFT) < 512) -+ if (pages >> (20 - PAGE_SHIFT) < 512) - lru_page_max = pages / 2; - else - lru_page_max = (pages / 4) * 3; -@@ -272,12 +272,12 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt, - valid != CLIENT_CONNECT_MDT_REQD) { - char *buf; - -- buf = kzalloc(PAGE_CACHE_SIZE, GFP_KERNEL); -+ buf = kzalloc(PAGE_SIZE, GFP_KERNEL); - if (!buf) { - err = -ENOMEM; - goto out_md_fid; - } -- obd_connect_flags2str(buf, PAGE_CACHE_SIZE, -+ obd_connect_flags2str(buf, PAGE_SIZE, - valid ^ CLIENT_CONNECT_MDT_REQD, ","); - LCONSOLE_ERROR_MSG(0x170, "Server %s does not support feature(s) needed for correct operation of this client (%s). Please upgrade server or downgrade client.\n", - sbi->ll_md_exp->exp_obd->obd_name, buf); -@@ -335,7 +335,7 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt, - if (data->ocd_connect_flags & OBD_CONNECT_BRW_SIZE) - sbi->ll_md_brw_size = data->ocd_brw_size; - else -- sbi->ll_md_brw_size = PAGE_CACHE_SIZE; -+ sbi->ll_md_brw_size = PAGE_SIZE; - - if (data->ocd_connect_flags & OBD_CONNECT_LAYOUTLOCK) { - LCONSOLE_INFO("Layout lock feature supported.\n"); -diff --git a/drivers/staging/lustre/lustre/llite/llite_mmap.c b/drivers/staging/lustre/lustre/llite/llite_mmap.c -index 69445a9f2011..5b484e62ffd0 100644 ---- a/drivers/staging/lustre/lustre/llite/llite_mmap.c -+++ b/drivers/staging/lustre/lustre/llite/llite_mmap.c -@@ -58,7 +58,7 @@ void policy_from_vma(ldlm_policy_data_t *policy, - size_t count) - { - policy->l_extent.start = ((addr - vma->vm_start) & CFS_PAGE_MASK) + -- (vma->vm_pgoff << PAGE_CACHE_SHIFT); -+ (vma->vm_pgoff << PAGE_SHIFT); - policy->l_extent.end = (policy->l_extent.start + count - 1) | - ~CFS_PAGE_MASK; - } -@@ -321,7 +321,7 @@ static int ll_fault0(struct vm_area_struct *vma, struct vm_fault *vmf) - - vmpage = vio->u.fault.ft_vmpage; - if (result != 0 && vmpage) { -- page_cache_release(vmpage); -+ put_page(vmpage); - vmf->page = NULL; - } - } -@@ -360,7 +360,7 @@ restart: - lock_page(vmpage); - if (unlikely(!vmpage->mapping)) { /* unlucky */ - unlock_page(vmpage); -- page_cache_release(vmpage); -+ put_page(vmpage); - vmf->page = NULL; - - if (!printed && ++count > 16) { -@@ -457,7 +457,7 @@ int ll_teardown_mmaps(struct address_space *mapping, __u64 first, __u64 last) - LASSERTF(last > first, "last %llu first %llu\n", last, first); - if (mapping_mapped(mapping)) { - rc = 0; -- unmap_mapping_range(mapping, first + PAGE_CACHE_SIZE - 1, -+ unmap_mapping_range(mapping, first + PAGE_SIZE - 1, - last - first + 1, 0); - } - -diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c -index b725fc16cf49..f169c0db63b4 100644 ---- a/drivers/staging/lustre/lustre/llite/lloop.c -+++ b/drivers/staging/lustre/lustre/llite/lloop.c -@@ -218,7 +218,7 @@ static int do_bio_lustrebacked(struct lloop_device *lo, struct bio *head) - offset = (pgoff_t)(bio->bi_iter.bi_sector << 9) + lo->lo_offset; - bio_for_each_segment(bvec, bio, iter) { - BUG_ON(bvec.bv_offset != 0); -- BUG_ON(bvec.bv_len != PAGE_CACHE_SIZE); -+ BUG_ON(bvec.bv_len != PAGE_SIZE); - - pages[page_count] = bvec.bv_page; - offsets[page_count] = offset; -@@ -232,7 +232,7 @@ static int do_bio_lustrebacked(struct lloop_device *lo, struct bio *head) - (rw == WRITE) ? LPROC_LL_BRW_WRITE : LPROC_LL_BRW_READ, - page_count); - -- pvec->ldp_size = page_count << PAGE_CACHE_SHIFT; -+ pvec->ldp_size = page_count << PAGE_SHIFT; - pvec->ldp_nr = page_count; - - /* FIXME: in ll_direct_rw_pages, it has to allocate many cl_page{}s to -@@ -507,7 +507,7 @@ static int loop_set_fd(struct lloop_device *lo, struct file *unused, - - set_device_ro(bdev, (lo_flags & LO_FLAGS_READ_ONLY) != 0); - -- lo->lo_blocksize = PAGE_CACHE_SIZE; -+ lo->lo_blocksize = PAGE_SIZE; - lo->lo_device = bdev; - lo->lo_flags = lo_flags; - lo->lo_backing_file = file; -@@ -525,11 +525,11 @@ static int loop_set_fd(struct lloop_device *lo, struct file *unused, - lo->lo_queue->queuedata = lo; - - /* queue parameters */ -- CLASSERT(PAGE_CACHE_SIZE < (1 << (sizeof(unsigned short) * 8))); -+ CLASSERT(PAGE_SIZE < (1 << (sizeof(unsigned short) * 8))); - blk_queue_logical_block_size(lo->lo_queue, -- (unsigned short)PAGE_CACHE_SIZE); -+ (unsigned short)PAGE_SIZE); - blk_queue_max_hw_sectors(lo->lo_queue, -- LLOOP_MAX_SEGMENTS << (PAGE_CACHE_SHIFT - 9)); -+ LLOOP_MAX_SEGMENTS << (PAGE_SHIFT - 9)); - blk_queue_max_segments(lo->lo_queue, LLOOP_MAX_SEGMENTS); - - set_capacity(disks[lo->lo_number], size); -diff --git a/drivers/staging/lustre/lustre/llite/lproc_llite.c b/drivers/staging/lustre/lustre/llite/lproc_llite.c -index 45941a6600fe..27ab1261400e 100644 ---- a/drivers/staging/lustre/lustre/llite/lproc_llite.c -+++ b/drivers/staging/lustre/lustre/llite/lproc_llite.c -@@ -233,7 +233,7 @@ static ssize_t max_read_ahead_mb_show(struct kobject *kobj, - pages_number = sbi->ll_ra_info.ra_max_pages; - spin_unlock(&sbi->ll_lock); - -- mult = 1 << (20 - PAGE_CACHE_SHIFT); -+ mult = 1 << (20 - PAGE_SHIFT); - return lprocfs_read_frac_helper(buf, PAGE_SIZE, pages_number, mult); - } - -@@ -251,12 +251,12 @@ static ssize_t max_read_ahead_mb_store(struct kobject *kobj, - if (rc) - return rc; - -- pages_number *= 1 << (20 - PAGE_CACHE_SHIFT); /* MB -> pages */ -+ pages_number *= 1 << (20 - PAGE_SHIFT); /* MB -> pages */ - - if (pages_number > totalram_pages / 2) { - - CERROR("can't set file readahead more than %lu MB\n", -- totalram_pages >> (20 - PAGE_CACHE_SHIFT + 1)); /*1/2 of RAM*/ -+ totalram_pages >> (20 - PAGE_SHIFT + 1)); /*1/2 of RAM*/ - return -ERANGE; - } - -@@ -281,7 +281,7 @@ static ssize_t max_read_ahead_per_file_mb_show(struct kobject *kobj, - pages_number = sbi->ll_ra_info.ra_max_pages_per_file; - spin_unlock(&sbi->ll_lock); - -- mult = 1 << (20 - PAGE_CACHE_SHIFT); -+ mult = 1 << (20 - PAGE_SHIFT); - return lprocfs_read_frac_helper(buf, PAGE_SIZE, pages_number, mult); - } - -@@ -326,7 +326,7 @@ static ssize_t max_read_ahead_whole_mb_show(struct kobject *kobj, - pages_number = sbi->ll_ra_info.ra_max_read_ahead_whole_pages; - spin_unlock(&sbi->ll_lock); - -- mult = 1 << (20 - PAGE_CACHE_SHIFT); -+ mult = 1 << (20 - PAGE_SHIFT); - return lprocfs_read_frac_helper(buf, PAGE_SIZE, pages_number, mult); - } - -@@ -349,7 +349,7 @@ static ssize_t max_read_ahead_whole_mb_store(struct kobject *kobj, - */ - if (pages_number > sbi->ll_ra_info.ra_max_pages_per_file) { - CERROR("can't set max_read_ahead_whole_mb more than max_read_ahead_per_file_mb: %lu\n", -- sbi->ll_ra_info.ra_max_pages_per_file >> (20 - PAGE_CACHE_SHIFT)); -+ sbi->ll_ra_info.ra_max_pages_per_file >> (20 - PAGE_SHIFT)); - return -ERANGE; - } - -@@ -366,7 +366,7 @@ static int ll_max_cached_mb_seq_show(struct seq_file *m, void *v) - struct super_block *sb = m->private; - struct ll_sb_info *sbi = ll_s2sbi(sb); - struct cl_client_cache *cache = &sbi->ll_cache; -- int shift = 20 - PAGE_CACHE_SHIFT; -+ int shift = 20 - PAGE_SHIFT; - int max_cached_mb; - int unused_mb; - -@@ -405,7 +405,7 @@ static ssize_t ll_max_cached_mb_seq_write(struct file *file, - return -EFAULT; - kernbuf[count] = 0; - -- mult = 1 << (20 - PAGE_CACHE_SHIFT); -+ mult = 1 << (20 - PAGE_SHIFT); - buffer += lprocfs_find_named_value(kernbuf, "max_cached_mb:", &count) - - kernbuf; - rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult); -@@ -415,7 +415,7 @@ static ssize_t ll_max_cached_mb_seq_write(struct file *file, - if (pages_number < 0 || pages_number > totalram_pages) { - CERROR("%s: can't set max cache more than %lu MB\n", - ll_get_fsname(sb, NULL, 0), -- totalram_pages >> (20 - PAGE_CACHE_SHIFT)); -+ totalram_pages >> (20 - PAGE_SHIFT)); - return -ERANGE; - } - -diff --git a/drivers/staging/lustre/lustre/llite/rw.c b/drivers/staging/lustre/lustre/llite/rw.c -index 34614acf3f8e..edab6c5b7e50 100644 ---- a/drivers/staging/lustre/lustre/llite/rw.c -+++ b/drivers/staging/lustre/lustre/llite/rw.c -@@ -146,10 +146,10 @@ static struct ll_cl_context *ll_cl_init(struct file *file, - */ - io->ci_lockreq = CILR_NEVER; - -- pos = vmpage->index << PAGE_CACHE_SHIFT; -+ pos = vmpage->index << PAGE_SHIFT; - - /* Create a temp IO to serve write. */ -- result = cl_io_rw_init(env, io, CIT_WRITE, pos, PAGE_CACHE_SIZE); -+ result = cl_io_rw_init(env, io, CIT_WRITE, pos, PAGE_SIZE); - if (result == 0) { - cio->cui_fd = LUSTRE_FPRIVATE(file); - cio->cui_iter = NULL; -@@ -498,7 +498,7 @@ static int ll_read_ahead_page(const struct lu_env *env, struct cl_io *io, - } - if (rc != 1) - unlock_page(vmpage); -- page_cache_release(vmpage); -+ put_page(vmpage); - } else { - which = RA_STAT_FAILED_GRAB_PAGE; - msg = "g_c_p_n failed"; -@@ -521,13 +521,13 @@ static int ll_read_ahead_page(const struct lu_env *env, struct cl_io *io, - * striped over, rather than having a constant value for all files here. - */ - --/* RAS_INCREASE_STEP should be (1UL << (inode->i_blkbits - PAGE_CACHE_SHIFT)). -+/* RAS_INCREASE_STEP should be (1UL << (inode->i_blkbits - PAGE_SHIFT)). - * Temporarily set RAS_INCREASE_STEP to 1MB. After 4MB RPC is enabled - * by default, this should be adjusted corresponding with max_read_ahead_mb - * and max_read_ahead_per_file_mb otherwise the readahead budget can be used - * up quickly which will affect read performance significantly. See LU-2816 - */ --#define RAS_INCREASE_STEP(inode) (ONE_MB_BRW_SIZE >> PAGE_CACHE_SHIFT) -+#define RAS_INCREASE_STEP(inode) (ONE_MB_BRW_SIZE >> PAGE_SHIFT) - - static inline int stride_io_mode(struct ll_readahead_state *ras) - { -@@ -739,7 +739,7 @@ int ll_readahead(const struct lu_env *env, struct cl_io *io, - end = rpc_boundary; - - /* Truncate RA window to end of file */ -- end = min(end, (unsigned long)((kms - 1) >> PAGE_CACHE_SHIFT)); -+ end = min(end, (unsigned long)((kms - 1) >> PAGE_SHIFT)); - - ras->ras_next_readahead = max(end, end + 1); - RAS_CDEBUG(ras); -@@ -776,7 +776,7 @@ int ll_readahead(const struct lu_env *env, struct cl_io *io, - if (reserved != 0) - ll_ra_count_put(ll_i2sbi(inode), reserved); - -- if (ra_end == end + 1 && ra_end == (kms >> PAGE_CACHE_SHIFT)) -+ if (ra_end == end + 1 && ra_end == (kms >> PAGE_SHIFT)) - ll_ra_stats_inc(mapping, RA_STAT_EOF); - - /* if we didn't get to the end of the region we reserved from -@@ -985,8 +985,8 @@ void ras_update(struct ll_sb_info *sbi, struct inode *inode, - if (ras->ras_requests == 2 && !ras->ras_request_index) { - __u64 kms_pages; - -- kms_pages = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> -- PAGE_CACHE_SHIFT; -+ kms_pages = (i_size_read(inode) + PAGE_SIZE - 1) >> -+ PAGE_SHIFT; - - CDEBUG(D_READA, "kmsp %llu mwp %lu mp %lu\n", kms_pages, - ra->ra_max_read_ahead_whole_pages, ra->ra_max_pages_per_file); -@@ -1173,7 +1173,7 @@ int ll_writepage(struct page *vmpage, struct writeback_control *wbc) - * PageWriteback or clean the page. - */ - result = cl_sync_file_range(inode, offset, -- offset + PAGE_CACHE_SIZE - 1, -+ offset + PAGE_SIZE - 1, - CL_FSYNC_LOCAL, 1); - if (result > 0) { - /* actually we may have written more than one page. -@@ -1211,7 +1211,7 @@ int ll_writepages(struct address_space *mapping, struct writeback_control *wbc) - int ignore_layout = 0; - - if (wbc->range_cyclic) { -- start = mapping->writeback_index << PAGE_CACHE_SHIFT; -+ start = mapping->writeback_index << PAGE_SHIFT; - end = OBD_OBJECT_EOF; - } else { - start = wbc->range_start; -@@ -1241,7 +1241,7 @@ int ll_writepages(struct address_space *mapping, struct writeback_control *wbc) - if (wbc->range_cyclic || (range_whole && wbc->nr_to_write > 0)) { - if (end == OBD_OBJECT_EOF) - end = i_size_read(inode); -- mapping->writeback_index = (end >> PAGE_CACHE_SHIFT) + 1; -+ mapping->writeback_index = (end >> PAGE_SHIFT) + 1; - } - return result; - } -diff --git a/drivers/staging/lustre/lustre/llite/rw26.c b/drivers/staging/lustre/lustre/llite/rw26.c -index 7a5db67bc680..69aa15e8e3ef 100644 ---- a/drivers/staging/lustre/lustre/llite/rw26.c -+++ b/drivers/staging/lustre/lustre/llite/rw26.c -@@ -87,7 +87,7 @@ static void ll_invalidatepage(struct page *vmpage, unsigned int offset, - * below because they are run with page locked and all our io is - * happening with locked page too - */ -- if (offset == 0 && length == PAGE_CACHE_SIZE) { -+ if (offset == 0 && length == PAGE_SIZE) { - env = cl_env_get(&refcheck); - if (!IS_ERR(env)) { - inode = vmpage->mapping->host; -@@ -193,8 +193,8 @@ static inline int ll_get_user_pages(int rw, unsigned long user_addr, - return -EFBIG; - } - -- *max_pages = (user_addr + size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -- *max_pages -= user_addr >> PAGE_CACHE_SHIFT; -+ *max_pages = (user_addr + size + PAGE_SIZE - 1) >> PAGE_SHIFT; -+ *max_pages -= user_addr >> PAGE_SHIFT; - - *pages = libcfs_kvzalloc(*max_pages * sizeof(**pages), GFP_NOFS); - if (*pages) { -@@ -217,7 +217,7 @@ static void ll_free_user_pages(struct page **pages, int npages, int do_dirty) - for (i = 0; i < npages; i++) { - if (do_dirty) - set_page_dirty_lock(pages[i]); -- page_cache_release(pages[i]); -+ put_page(pages[i]); - } - kvfree(pages); - } -@@ -357,7 +357,7 @@ static ssize_t ll_direct_IO_26_seg(const struct lu_env *env, struct cl_io *io, - * up to 22MB for 128kB kmalloc and up to 682MB for 4MB kmalloc. - */ - #define MAX_DIO_SIZE ((KMALLOC_MAX_SIZE / sizeof(struct brw_page) * \ -- PAGE_CACHE_SIZE) & ~(DT_MAX_BRW_SIZE - 1)) -+ PAGE_SIZE) & ~(DT_MAX_BRW_SIZE - 1)) - static ssize_t ll_direct_IO_26(struct kiocb *iocb, struct iov_iter *iter, - loff_t file_offset) - { -@@ -382,8 +382,8 @@ static ssize_t ll_direct_IO_26(struct kiocb *iocb, struct iov_iter *iter, - CDEBUG(D_VFSTRACE, - "VFS Op:inode=%lu/%u(%p), size=%zd (max %lu), offset=%lld=%llx, pages %zd (max %lu)\n", - inode->i_ino, inode->i_generation, inode, count, MAX_DIO_SIZE, -- file_offset, file_offset, count >> PAGE_CACHE_SHIFT, -- MAX_DIO_SIZE >> PAGE_CACHE_SHIFT); -+ file_offset, file_offset, count >> PAGE_SHIFT, -+ MAX_DIO_SIZE >> PAGE_SHIFT); - - /* Check that all user buffers are aligned as well */ - if (iov_iter_alignment(iter) & ~CFS_PAGE_MASK) -@@ -432,8 +432,8 @@ static ssize_t ll_direct_IO_26(struct kiocb *iocb, struct iov_iter *iter, - * page worth of page pointers = 4MB on i386. - */ - if (result == -ENOMEM && -- size > (PAGE_CACHE_SIZE / sizeof(*pages)) * -- PAGE_CACHE_SIZE) { -+ size > (PAGE_SIZE / sizeof(*pages)) * -+ PAGE_SIZE) { - size = ((((size / 2) - 1) | - ~CFS_PAGE_MASK) + 1) & - CFS_PAGE_MASK; -@@ -474,10 +474,10 @@ static int ll_write_begin(struct file *file, struct address_space *mapping, - loff_t pos, unsigned len, unsigned flags, - struct page **pagep, void **fsdata) - { -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -+ pgoff_t index = pos >> PAGE_SHIFT; - struct page *page; - int rc; -- unsigned from = pos & (PAGE_CACHE_SIZE - 1); -+ unsigned from = pos & (PAGE_SIZE - 1); - - page = grab_cache_page_write_begin(mapping, index, flags); - if (!page) -@@ -488,7 +488,7 @@ static int ll_write_begin(struct file *file, struct address_space *mapping, - rc = ll_prepare_write(file, page, from, from + len); - if (rc) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - return rc; - } -@@ -497,12 +497,12 @@ static int ll_write_end(struct file *file, struct address_space *mapping, - loff_t pos, unsigned len, unsigned copied, - struct page *page, void *fsdata) - { -- unsigned from = pos & (PAGE_CACHE_SIZE - 1); -+ unsigned from = pos & (PAGE_SIZE - 1); - int rc; - - rc = ll_commit_write(file, page, from, from + copied); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - return rc ?: copied; - } -diff --git a/drivers/staging/lustre/lustre/llite/vvp_io.c b/drivers/staging/lustre/lustre/llite/vvp_io.c -index fb0c26ee7ff3..0eb905e4fe40 100644 ---- a/drivers/staging/lustre/lustre/llite/vvp_io.c -+++ b/drivers/staging/lustre/lustre/llite/vvp_io.c -@@ -511,10 +511,7 @@ static int vvp_io_read_start(const struct lu_env *env, - if (!vio->cui_ra_window_set) { - vio->cui_ra_window_set = 1; - bead->lrr_start = cl_index(obj, pos); -- /* -- * XXX: explicit PAGE_CACHE_SIZE -- */ -- bead->lrr_count = cl_index(obj, tot + PAGE_CACHE_SIZE - 1); -+ bead->lrr_count = cl_index(obj, tot + PAGE_SIZE - 1); - ll_ra_read_in(file, bead); - } - -@@ -959,7 +956,7 @@ static int vvp_io_prepare_write(const struct lu_env *env, - * We're completely overwriting an existing page, so _don't_ - * set it up to date until commit_write - */ -- if (from == 0 && to == PAGE_CACHE_SIZE) { -+ if (from == 0 && to == PAGE_SIZE) { - CL_PAGE_HEADER(D_PAGE, env, pg, "full page write\n"); - POISON_PAGE(page, 0x11); - } else -@@ -1022,7 +1019,7 @@ static int vvp_io_commit_write(const struct lu_env *env, - set_page_dirty(vmpage); - vvp_write_pending(cl2ccc(obj), cp); - } else if (result == -EDQUOT) { -- pgoff_t last_index = i_size_read(inode) >> PAGE_CACHE_SHIFT; -+ pgoff_t last_index = i_size_read(inode) >> PAGE_SHIFT; - bool need_clip = true; - - /* -@@ -1040,7 +1037,7 @@ static int vvp_io_commit_write(const struct lu_env *env, - * being. - */ - if (last_index > pg->cp_index) { -- to = PAGE_CACHE_SIZE; -+ to = PAGE_SIZE; - need_clip = false; - } else if (last_index == pg->cp_index) { - int size_to = i_size_read(inode) & ~CFS_PAGE_MASK; -diff --git a/drivers/staging/lustre/lustre/llite/vvp_page.c b/drivers/staging/lustre/lustre/llite/vvp_page.c -index 850bae734075..33ca3eb34965 100644 ---- a/drivers/staging/lustre/lustre/llite/vvp_page.c -+++ b/drivers/staging/lustre/lustre/llite/vvp_page.c -@@ -57,7 +57,7 @@ static void vvp_page_fini_common(struct ccc_page *cp) - struct page *vmpage = cp->cpg_page; - - LASSERT(vmpage); -- page_cache_release(vmpage); -+ put_page(vmpage); - } - - static void vvp_page_fini(const struct lu_env *env, -@@ -164,12 +164,12 @@ static int vvp_page_unmap(const struct lu_env *env, - LASSERT(vmpage); - LASSERT(PageLocked(vmpage)); - -- offset = vmpage->index << PAGE_CACHE_SHIFT; -+ offset = vmpage->index << PAGE_SHIFT; - - /* - * XXX is it safe to call this with the page lock held? - */ -- ll_teardown_mmaps(vmpage->mapping, offset, offset + PAGE_CACHE_SIZE); -+ ll_teardown_mmaps(vmpage->mapping, offset, offset + PAGE_SIZE); - return 0; - } - -@@ -537,7 +537,7 @@ int vvp_page_init(const struct lu_env *env, struct cl_object *obj, - CLOBINVRNT(env, obj, ccc_object_invariant(obj)); - - cpg->cpg_page = vmpage; -- page_cache_get(vmpage); -+ get_page(vmpage); - - INIT_LIST_HEAD(&cpg->cpg_pending_linkage); - if (page->cp_type == CPT_CACHEABLE) { -diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c b/drivers/staging/lustre/lustre/lmv/lmv_obd.c -index 0f776cf8a5aa..9abb7c2b9231 100644 ---- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c -+++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c -@@ -2017,7 +2017,7 @@ static int lmv_sync(struct obd_export *exp, const struct lu_fid *fid, - * |s|e|f|p|ent| 0 | ... | 0 | - * '----------------- -----' - * -- * However, on hosts where the native VM page size (PAGE_CACHE_SIZE) is -+ * However, on hosts where the native VM page size (PAGE_SIZE) is - * larger than LU_PAGE_SIZE, a single host page may contain multiple - * lu_dirpages. After reading the lu_dirpages from the MDS, the - * ldp_hash_end of the first lu_dirpage refers to the one immediately -@@ -2048,7 +2048,7 @@ static int lmv_sync(struct obd_export *exp, const struct lu_fid *fid, - * - Adjust the lde_reclen of the ending entry of each lu_dirpage to span - * to the first entry of the next lu_dirpage. - */ --#if PAGE_CACHE_SIZE > LU_PAGE_SIZE -+#if PAGE_SIZE > LU_PAGE_SIZE - static void lmv_adjust_dirpages(struct page **pages, int ncfspgs, int nlupgs) - { - int i; -@@ -2101,7 +2101,7 @@ static void lmv_adjust_dirpages(struct page **pages, int ncfspgs, int nlupgs) - } - #else - #define lmv_adjust_dirpages(pages, ncfspgs, nlupgs) do {} while (0) --#endif /* PAGE_CACHE_SIZE > LU_PAGE_SIZE */ -+#endif /* PAGE_SIZE > LU_PAGE_SIZE */ - - static int lmv_readpage(struct obd_export *exp, struct md_op_data *op_data, - struct page **pages, struct ptlrpc_request **request) -@@ -2110,7 +2110,7 @@ static int lmv_readpage(struct obd_export *exp, struct md_op_data *op_data, - struct lmv_obd *lmv = &obd->u.lmv; - __u64 offset = op_data->op_offset; - int rc; -- int ncfspgs; /* pages read in PAGE_CACHE_SIZE */ -+ int ncfspgs; /* pages read in PAGE_SIZE */ - int nlupgs; /* pages read in LU_PAGE_SIZE */ - struct lmv_tgt_desc *tgt; - -@@ -2129,8 +2129,8 @@ static int lmv_readpage(struct obd_export *exp, struct md_op_data *op_data, - if (rc != 0) - return rc; - -- ncfspgs = ((*request)->rq_bulk->bd_nob_transferred + PAGE_CACHE_SIZE - 1) -- >> PAGE_CACHE_SHIFT; -+ ncfspgs = ((*request)->rq_bulk->bd_nob_transferred + PAGE_SIZE - 1) -+ >> PAGE_SHIFT; - nlupgs = (*request)->rq_bulk->bd_nob_transferred >> LU_PAGE_SHIFT; - LASSERT(!((*request)->rq_bulk->bd_nob_transferred & ~LU_PAGE_MASK)); - LASSERT(ncfspgs > 0 && ncfspgs <= op_data->op_npages); -diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c -index 55dd8ef9525b..b91d3ff18b02 100644 ---- a/drivers/staging/lustre/lustre/mdc/mdc_request.c -+++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c -@@ -1002,10 +1002,10 @@ restart_bulk: - - /* NB req now owns desc and will free it when it gets freed */ - for (i = 0; i < op_data->op_npages; i++) -- ptlrpc_prep_bulk_page_pin(desc, pages[i], 0, PAGE_CACHE_SIZE); -+ ptlrpc_prep_bulk_page_pin(desc, pages[i], 0, PAGE_SIZE); - - mdc_readdir_pack(req, op_data->op_offset, -- PAGE_CACHE_SIZE * op_data->op_npages, -+ PAGE_SIZE * op_data->op_npages, - &op_data->op_fid1); - - ptlrpc_request_set_replen(req); -@@ -1037,7 +1037,7 @@ restart_bulk: - if (req->rq_bulk->bd_nob_transferred & ~LU_PAGE_MASK) { - CERROR("Unexpected # bytes transferred: %d (%ld expected)\n", - req->rq_bulk->bd_nob_transferred, -- PAGE_CACHE_SIZE * op_data->op_npages); -+ PAGE_SIZE * op_data->op_npages); - ptlrpc_req_finished(req); - return -EPROTO; - } -diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c -index 65caffe8c42e..830ca10507d4 100644 ---- a/drivers/staging/lustre/lustre/mgc/mgc_request.c -+++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c -@@ -1113,7 +1113,7 @@ static int mgc_import_event(struct obd_device *obd, - } - - enum { -- CONFIG_READ_NRPAGES_INIT = 1 << (20 - PAGE_CACHE_SHIFT), -+ CONFIG_READ_NRPAGES_INIT = 1 << (20 - PAGE_SHIFT), - CONFIG_READ_NRPAGES = 4 - }; - -@@ -1137,19 +1137,19 @@ static int mgc_apply_recover_logs(struct obd_device *mgc, - LASSERT(cfg->cfg_instance); - LASSERT(cfg->cfg_sb == cfg->cfg_instance); - -- inst = kzalloc(PAGE_CACHE_SIZE, GFP_KERNEL); -+ inst = kzalloc(PAGE_SIZE, GFP_KERNEL); - if (!inst) - return -ENOMEM; - -- pos = snprintf(inst, PAGE_CACHE_SIZE, "%p", cfg->cfg_instance); -- if (pos >= PAGE_CACHE_SIZE) { -+ pos = snprintf(inst, PAGE_SIZE, "%p", cfg->cfg_instance); -+ if (pos >= PAGE_SIZE) { - kfree(inst); - return -E2BIG; - } - - ++pos; - buf = inst + pos; -- bufsz = PAGE_CACHE_SIZE - pos; -+ bufsz = PAGE_SIZE - pos; - - while (datalen > 0) { - int entry_len = sizeof(*entry); -@@ -1181,7 +1181,7 @@ static int mgc_apply_recover_logs(struct obd_device *mgc, - /* Keep this swab for normal mixed endian handling. LU-1644 */ - if (mne_swab) - lustre_swab_mgs_nidtbl_entry(entry); -- if (entry->mne_length > PAGE_CACHE_SIZE) { -+ if (entry->mne_length > PAGE_SIZE) { - CERROR("MNE too large (%u)\n", entry->mne_length); - break; - } -@@ -1371,7 +1371,7 @@ again: - } - body->mcb_offset = cfg->cfg_last_idx + 1; - body->mcb_type = cld->cld_type; -- body->mcb_bits = PAGE_CACHE_SHIFT; -+ body->mcb_bits = PAGE_SHIFT; - body->mcb_units = nrpages; - - /* allocate bulk transfer descriptor */ -@@ -1383,7 +1383,7 @@ again: - } - - for (i = 0; i < nrpages; i++) -- ptlrpc_prep_bulk_page_pin(desc, pages[i], 0, PAGE_CACHE_SIZE); -+ ptlrpc_prep_bulk_page_pin(desc, pages[i], 0, PAGE_SIZE); - - ptlrpc_request_set_replen(req); - rc = ptlrpc_queue_wait(req); -@@ -1411,7 +1411,7 @@ again: - goto out; - } - -- if (ealen > nrpages << PAGE_CACHE_SHIFT) { -+ if (ealen > nrpages << PAGE_SHIFT) { - rc = -EINVAL; - goto out; - } -@@ -1439,7 +1439,7 @@ again: - - ptr = kmap(pages[i]); - rc2 = mgc_apply_recover_logs(obd, cld, res->mcr_offset, ptr, -- min_t(int, ealen, PAGE_CACHE_SIZE), -+ min_t(int, ealen, PAGE_SIZE), - mne_swab); - kunmap(pages[i]); - if (rc2 < 0) { -@@ -1448,7 +1448,7 @@ again: - break; - } - -- ealen -= PAGE_CACHE_SIZE; -+ ealen -= PAGE_SIZE; - } - - out: -diff --git a/drivers/staging/lustre/lustre/obdclass/cl_page.c b/drivers/staging/lustre/lustre/obdclass/cl_page.c -index 231a2f26c693..394580016638 100644 ---- a/drivers/staging/lustre/lustre/obdclass/cl_page.c -+++ b/drivers/staging/lustre/lustre/obdclass/cl_page.c -@@ -1477,7 +1477,7 @@ loff_t cl_offset(const struct cl_object *obj, pgoff_t idx) - /* - * XXX for now. - */ -- return (loff_t)idx << PAGE_CACHE_SHIFT; -+ return (loff_t)idx << PAGE_SHIFT; - } - EXPORT_SYMBOL(cl_offset); - -@@ -1489,13 +1489,13 @@ pgoff_t cl_index(const struct cl_object *obj, loff_t offset) - /* - * XXX for now. - */ -- return offset >> PAGE_CACHE_SHIFT; -+ return offset >> PAGE_SHIFT; - } - EXPORT_SYMBOL(cl_index); - - int cl_page_size(const struct cl_object *obj) - { -- return 1 << PAGE_CACHE_SHIFT; -+ return 1 << PAGE_SHIFT; - } - EXPORT_SYMBOL(cl_page_size); - -diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c -index 1a938e1376f9..c2cf015962dd 100644 ---- a/drivers/staging/lustre/lustre/obdclass/class_obd.c -+++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c -@@ -461,9 +461,9 @@ static int obd_init_checks(void) - CWARN("LPD64 wrong length! strlen(%s)=%d != 2\n", buf, len); - ret = -EINVAL; - } -- if ((u64val & ~CFS_PAGE_MASK) >= PAGE_CACHE_SIZE) { -+ if ((u64val & ~CFS_PAGE_MASK) >= PAGE_SIZE) { - CWARN("mask failed: u64val %llu >= %llu\n", u64val, -- (__u64)PAGE_CACHE_SIZE); -+ (__u64)PAGE_SIZE); - ret = -EINVAL; - } - -@@ -509,7 +509,7 @@ static int __init obdclass_init(void) - * For clients with less memory, a larger fraction is needed - * for other purposes (mostly for BGL). - */ -- if (totalram_pages <= 512 << (20 - PAGE_CACHE_SHIFT)) -+ if (totalram_pages <= 512 << (20 - PAGE_SHIFT)) - obd_max_dirty_pages = totalram_pages / 4; - else - obd_max_dirty_pages = totalram_pages / 2; -diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c -index 9496c09b2b69..b41b65e2f021 100644 ---- a/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c -+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c -@@ -47,7 +47,6 @@ - #include "../../include/lustre/lustre_idl.h" - - #include <linux/fs.h> --#include <linux/pagemap.h> /* for PAGE_CACHE_SIZE */ - - void obdo_refresh_inode(struct inode *dst, struct obdo *src, u32 valid) - { -@@ -71,8 +70,8 @@ void obdo_refresh_inode(struct inode *dst, struct obdo *src, u32 valid) - if (valid & OBD_MD_FLBLKSZ && src->o_blksize > (1 << dst->i_blkbits)) - dst->i_blkbits = ffs(src->o_blksize) - 1; - -- if (dst->i_blkbits < PAGE_CACHE_SHIFT) -- dst->i_blkbits = PAGE_CACHE_SHIFT; -+ if (dst->i_blkbits < PAGE_SHIFT) -+ dst->i_blkbits = PAGE_SHIFT; - - /* allocation of space */ - if (valid & OBD_MD_FLBLOCKS && src->o_blocks > dst->i_blocks) -diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c -index fd333b9e968c..e6bf414a4444 100644 ---- a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c -+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c -@@ -100,7 +100,7 @@ static ssize_t max_dirty_mb_show(struct kobject *kobj, struct attribute *attr, - char *buf) - { - return sprintf(buf, "%ul\n", -- obd_max_dirty_pages / (1 << (20 - PAGE_CACHE_SHIFT))); -+ obd_max_dirty_pages / (1 << (20 - PAGE_SHIFT))); - } - - static ssize_t max_dirty_mb_store(struct kobject *kobj, struct attribute *attr, -@@ -113,14 +113,14 @@ static ssize_t max_dirty_mb_store(struct kobject *kobj, struct attribute *attr, - if (rc) - return rc; - -- val *= 1 << (20 - PAGE_CACHE_SHIFT); /* convert to pages */ -+ val *= 1 << (20 - PAGE_SHIFT); /* convert to pages */ - - if (val > ((totalram_pages / 10) * 9)) { - /* Somebody wants to assign too much memory to dirty pages */ - return -EINVAL; - } - -- if (val < 4 << (20 - PAGE_CACHE_SHIFT)) { -+ if (val < 4 << (20 - PAGE_SHIFT)) { - /* Less than 4 Mb for dirty cache is also bad */ - return -EINVAL; - } -diff --git a/drivers/staging/lustre/lustre/obdclass/lu_object.c b/drivers/staging/lustre/lustre/obdclass/lu_object.c -index 65a4746c89ca..978568ada8e9 100644 ---- a/drivers/staging/lustre/lustre/obdclass/lu_object.c -+++ b/drivers/staging/lustre/lustre/obdclass/lu_object.c -@@ -840,8 +840,8 @@ static int lu_htable_order(void) - - #if BITS_PER_LONG == 32 - /* limit hashtable size for lowmem systems to low RAM */ -- if (cache_size > 1 << (30 - PAGE_CACHE_SHIFT)) -- cache_size = 1 << (30 - PAGE_CACHE_SHIFT) * 3 / 4; -+ if (cache_size > 1 << (30 - PAGE_SHIFT)) -+ cache_size = 1 << (30 - PAGE_SHIFT) * 3 / 4; - #endif - - /* clear off unreasonable cache setting. */ -@@ -853,7 +853,7 @@ static int lu_htable_order(void) - lu_cache_percent = LU_CACHE_PERCENT_DEFAULT; - } - cache_size = cache_size / 100 * lu_cache_percent * -- (PAGE_CACHE_SIZE / 1024); -+ (PAGE_SIZE / 1024); - - for (bits = 1; (1 << bits) < cache_size; ++bits) { - ; -diff --git a/drivers/staging/lustre/lustre/obdecho/echo_client.c b/drivers/staging/lustre/lustre/obdecho/echo_client.c -index 64ffe243f870..1e83669c204d 100644 ---- a/drivers/staging/lustre/lustre/obdecho/echo_client.c -+++ b/drivers/staging/lustre/lustre/obdecho/echo_client.c -@@ -278,7 +278,7 @@ static void echo_page_fini(const struct lu_env *env, - struct page *vmpage = ep->ep_vmpage; - - atomic_dec(&eco->eo_npages); -- page_cache_release(vmpage); -+ put_page(vmpage); - } - - static int echo_page_prep(const struct lu_env *env, -@@ -373,7 +373,7 @@ static int echo_page_init(const struct lu_env *env, struct cl_object *obj, - struct echo_object *eco = cl2echo_obj(obj); - - ep->ep_vmpage = vmpage; -- page_cache_get(vmpage); -+ get_page(vmpage); - mutex_init(&ep->ep_lock); - cl_page_slice_add(page, &ep->ep_cl, obj, &echo_page_ops); - atomic_inc(&eco->eo_npages); -@@ -1138,7 +1138,7 @@ static int cl_echo_object_brw(struct echo_object *eco, int rw, u64 offset, - LASSERT(rc == 0); - - rc = cl_echo_enqueue0(env, eco, offset, -- offset + npages * PAGE_CACHE_SIZE - 1, -+ offset + npages * PAGE_SIZE - 1, - rw == READ ? LCK_PR : LCK_PW, &lh.cookie, - CEF_NEVER); - if (rc < 0) -@@ -1311,11 +1311,11 @@ echo_client_page_debug_setup(struct page *page, int rw, u64 id, - int delta; - - /* no partial pages on the client */ -- LASSERT(count == PAGE_CACHE_SIZE); -+ LASSERT(count == PAGE_SIZE); - - addr = kmap(page); - -- for (delta = 0; delta < PAGE_CACHE_SIZE; delta += OBD_ECHO_BLOCK_SIZE) { -+ for (delta = 0; delta < PAGE_SIZE; delta += OBD_ECHO_BLOCK_SIZE) { - if (rw == OBD_BRW_WRITE) { - stripe_off = offset + delta; - stripe_id = id; -@@ -1341,11 +1341,11 @@ static int echo_client_page_debug_check(struct page *page, u64 id, - int rc2; - - /* no partial pages on the client */ -- LASSERT(count == PAGE_CACHE_SIZE); -+ LASSERT(count == PAGE_SIZE); - - addr = kmap(page); - -- for (rc = delta = 0; delta < PAGE_CACHE_SIZE; delta += OBD_ECHO_BLOCK_SIZE) { -+ for (rc = delta = 0; delta < PAGE_SIZE; delta += OBD_ECHO_BLOCK_SIZE) { - stripe_off = offset + delta; - stripe_id = id; - -@@ -1391,7 +1391,7 @@ static int echo_client_kbrw(struct echo_device *ed, int rw, struct obdo *oa, - return -EINVAL; - - /* XXX think again with misaligned I/O */ -- npages = count >> PAGE_CACHE_SHIFT; -+ npages = count >> PAGE_SHIFT; - - if (rw == OBD_BRW_WRITE) - brw_flags = OBD_BRW_ASYNC; -@@ -1408,7 +1408,7 @@ static int echo_client_kbrw(struct echo_device *ed, int rw, struct obdo *oa, - - for (i = 0, pgp = pga, off = offset; - i < npages; -- i++, pgp++, off += PAGE_CACHE_SIZE) { -+ i++, pgp++, off += PAGE_SIZE) { - - LASSERT(!pgp->pg); /* for cleanup */ - -@@ -1418,7 +1418,7 @@ static int echo_client_kbrw(struct echo_device *ed, int rw, struct obdo *oa, - goto out; - - pages[i] = pgp->pg; -- pgp->count = PAGE_CACHE_SIZE; -+ pgp->count = PAGE_SIZE; - pgp->off = off; - pgp->flag = brw_flags; - -@@ -1473,8 +1473,8 @@ static int echo_client_prep_commit(const struct lu_env *env, - if (count <= 0 || (count & (~CFS_PAGE_MASK)) != 0) - return -EINVAL; - -- npages = batch >> PAGE_CACHE_SHIFT; -- tot_pages = count >> PAGE_CACHE_SHIFT; -+ npages = batch >> PAGE_SHIFT; -+ tot_pages = count >> PAGE_SHIFT; - - lnb = kcalloc(npages, sizeof(struct niobuf_local), GFP_NOFS); - rnb = kcalloc(npages, sizeof(struct niobuf_remote), GFP_NOFS); -@@ -1497,9 +1497,9 @@ static int echo_client_prep_commit(const struct lu_env *env, - if (tot_pages < npages) - npages = tot_pages; - -- for (i = 0; i < npages; i++, off += PAGE_CACHE_SIZE) { -+ for (i = 0; i < npages; i++, off += PAGE_SIZE) { - rnb[i].offset = off; -- rnb[i].len = PAGE_CACHE_SIZE; -+ rnb[i].len = PAGE_SIZE; - rnb[i].flags = brw_flags; - } - -@@ -1878,7 +1878,7 @@ static int __init obdecho_init(void) - { - LCONSOLE_INFO("Echo OBD driver; http://www.lustre.org/\n"); - -- LASSERT(PAGE_CACHE_SIZE % OBD_ECHO_BLOCK_SIZE == 0); -+ LASSERT(PAGE_SIZE % OBD_ECHO_BLOCK_SIZE == 0); - - return echo_client_init(); - } -diff --git a/drivers/staging/lustre/lustre/osc/lproc_osc.c b/drivers/staging/lustre/lustre/osc/lproc_osc.c -index 57c43c506ef2..a3358c39b2f1 100644 ---- a/drivers/staging/lustre/lustre/osc/lproc_osc.c -+++ b/drivers/staging/lustre/lustre/osc/lproc_osc.c -@@ -162,15 +162,15 @@ static ssize_t max_dirty_mb_store(struct kobject *kobj, - if (rc) - return rc; - -- pages_number *= 1 << (20 - PAGE_CACHE_SHIFT); /* MB -> pages */ -+ pages_number *= 1 << (20 - PAGE_SHIFT); /* MB -> pages */ - - if (pages_number <= 0 || -- pages_number > OSC_MAX_DIRTY_MB_MAX << (20 - PAGE_CACHE_SHIFT) || -+ pages_number > OSC_MAX_DIRTY_MB_MAX << (20 - PAGE_SHIFT) || - pages_number > totalram_pages / 4) /* 1/4 of RAM */ - return -ERANGE; - - client_obd_list_lock(&cli->cl_loi_list_lock); -- cli->cl_dirty_max = (u32)(pages_number << PAGE_CACHE_SHIFT); -+ cli->cl_dirty_max = (u32)(pages_number << PAGE_SHIFT); - osc_wake_cache_waiters(cli); - client_obd_list_unlock(&cli->cl_loi_list_lock); - -@@ -182,7 +182,7 @@ static int osc_cached_mb_seq_show(struct seq_file *m, void *v) - { - struct obd_device *dev = m->private; - struct client_obd *cli = &dev->u.cli; -- int shift = 20 - PAGE_CACHE_SHIFT; -+ int shift = 20 - PAGE_SHIFT; - - seq_printf(m, - "used_mb: %d\n" -@@ -211,7 +211,7 @@ static ssize_t osc_cached_mb_seq_write(struct file *file, - return -EFAULT; - kernbuf[count] = 0; - -- mult = 1 << (20 - PAGE_CACHE_SHIFT); -+ mult = 1 << (20 - PAGE_SHIFT); - buffer += lprocfs_find_named_value(kernbuf, "used_mb:", &count) - - kernbuf; - rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult); -@@ -569,12 +569,12 @@ static ssize_t max_pages_per_rpc_store(struct kobject *kobj, - - /* if the max_pages is specified in bytes, convert to pages */ - if (val >= ONE_MB_BRW_SIZE) -- val >>= PAGE_CACHE_SHIFT; -+ val >>= PAGE_SHIFT; - -- chunk_mask = ~((1 << (cli->cl_chunkbits - PAGE_CACHE_SHIFT)) - 1); -+ chunk_mask = ~((1 << (cli->cl_chunkbits - PAGE_SHIFT)) - 1); - /* max_pages_per_rpc must be chunk aligned */ - val = (val + ~chunk_mask) & chunk_mask; -- if (val == 0 || val > ocd->ocd_brw_size >> PAGE_CACHE_SHIFT) { -+ if (val == 0 || val > ocd->ocd_brw_size >> PAGE_SHIFT) { - return -ERANGE; - } - client_obd_list_lock(&cli->cl_loi_list_lock); -diff --git a/drivers/staging/lustre/lustre/osc/osc_cache.c b/drivers/staging/lustre/lustre/osc/osc_cache.c -index 63363111380c..5f25bf83dcfc 100644 ---- a/drivers/staging/lustre/lustre/osc/osc_cache.c -+++ b/drivers/staging/lustre/lustre/osc/osc_cache.c -@@ -544,7 +544,7 @@ static int osc_extent_merge(const struct lu_env *env, struct osc_extent *cur, - return -ERANGE; - - LASSERT(cur->oe_osclock == victim->oe_osclock); -- ppc_bits = osc_cli(obj)->cl_chunkbits - PAGE_CACHE_SHIFT; -+ ppc_bits = osc_cli(obj)->cl_chunkbits - PAGE_SHIFT; - chunk_start = cur->oe_start >> ppc_bits; - chunk_end = cur->oe_end >> ppc_bits; - if (chunk_start != (victim->oe_end >> ppc_bits) + 1 && -@@ -647,8 +647,8 @@ static struct osc_extent *osc_extent_find(const struct lu_env *env, - lock = cl_lock_at_pgoff(env, osc2cl(obj), index, NULL, 1, 0); - LASSERT(lock->cll_descr.cld_mode >= CLM_WRITE); - -- LASSERT(cli->cl_chunkbits >= PAGE_CACHE_SHIFT); -- ppc_bits = cli->cl_chunkbits - PAGE_CACHE_SHIFT; -+ LASSERT(cli->cl_chunkbits >= PAGE_SHIFT); -+ ppc_bits = cli->cl_chunkbits - PAGE_SHIFT; - chunk_mask = ~((1 << ppc_bits) - 1); - chunksize = 1 << cli->cl_chunkbits; - chunk = index >> ppc_bits; -@@ -871,8 +871,8 @@ int osc_extent_finish(const struct lu_env *env, struct osc_extent *ext, - - if (!sent) { - lost_grant = ext->oe_grants; -- } else if (blocksize < PAGE_CACHE_SIZE && -- last_count != PAGE_CACHE_SIZE) { -+ } else if (blocksize < PAGE_SIZE && -+ last_count != PAGE_SIZE) { - /* For short writes we shouldn't count parts of pages that - * span a whole chunk on the OST side, or our accounting goes - * wrong. Should match the code in filter_grant_check. -@@ -884,7 +884,7 @@ int osc_extent_finish(const struct lu_env *env, struct osc_extent *ext, - if (end) - count += blocksize - end; - -- lost_grant = PAGE_CACHE_SIZE - count; -+ lost_grant = PAGE_SIZE - count; - } - if (ext->oe_grants > 0) - osc_free_grant(cli, nr_pages, lost_grant); -@@ -967,7 +967,7 @@ static int osc_extent_truncate(struct osc_extent *ext, pgoff_t trunc_index, - struct osc_async_page *oap; - struct osc_async_page *tmp; - int pages_in_chunk = 0; -- int ppc_bits = cli->cl_chunkbits - PAGE_CACHE_SHIFT; -+ int ppc_bits = cli->cl_chunkbits - PAGE_SHIFT; - __u64 trunc_chunk = trunc_index >> ppc_bits; - int grants = 0; - int nr_pages = 0; -@@ -1125,7 +1125,7 @@ static int osc_extent_make_ready(const struct lu_env *env, - if (!(last->oap_async_flags & ASYNC_COUNT_STABLE)) { - last->oap_count = osc_refresh_count(env, last, OBD_BRW_WRITE); - LASSERT(last->oap_count > 0); -- LASSERT(last->oap_page_off + last->oap_count <= PAGE_CACHE_SIZE); -+ LASSERT(last->oap_page_off + last->oap_count <= PAGE_SIZE); - last->oap_async_flags |= ASYNC_COUNT_STABLE; - } - -@@ -1134,7 +1134,7 @@ static int osc_extent_make_ready(const struct lu_env *env, - */ - list_for_each_entry(oap, &ext->oe_pages, oap_pending_item) { - if (!(oap->oap_async_flags & ASYNC_COUNT_STABLE)) { -- oap->oap_count = PAGE_CACHE_SIZE - oap->oap_page_off; -+ oap->oap_count = PAGE_SIZE - oap->oap_page_off; - oap->oap_async_flags |= ASYNC_COUNT_STABLE; - } - } -@@ -1158,7 +1158,7 @@ static int osc_extent_expand(struct osc_extent *ext, pgoff_t index, int *grants) - struct osc_object *obj = ext->oe_obj; - struct client_obd *cli = osc_cli(obj); - struct osc_extent *next; -- int ppc_bits = cli->cl_chunkbits - PAGE_CACHE_SHIFT; -+ int ppc_bits = cli->cl_chunkbits - PAGE_SHIFT; - pgoff_t chunk = index >> ppc_bits; - pgoff_t end_chunk; - pgoff_t end_index; -@@ -1293,9 +1293,9 @@ static int osc_refresh_count(const struct lu_env *env, - return 0; - else if (cl_offset(obj, page->cp_index + 1) > kms) - /* catch sub-page write at end of file */ -- return kms % PAGE_CACHE_SIZE; -+ return kms % PAGE_SIZE; - else -- return PAGE_CACHE_SIZE; -+ return PAGE_SIZE; - } - - static int osc_completion(const struct lu_env *env, struct osc_async_page *oap, -@@ -1376,10 +1376,10 @@ static void osc_consume_write_grant(struct client_obd *cli, - assert_spin_locked(&cli->cl_loi_list_lock.lock); - LASSERT(!(pga->flag & OBD_BRW_FROM_GRANT)); - atomic_inc(&obd_dirty_pages); -- cli->cl_dirty += PAGE_CACHE_SIZE; -+ cli->cl_dirty += PAGE_SIZE; - pga->flag |= OBD_BRW_FROM_GRANT; - CDEBUG(D_CACHE, "using %lu grant credits for brw %p page %p\n", -- PAGE_CACHE_SIZE, pga, pga->pg); -+ PAGE_SIZE, pga, pga->pg); - osc_update_next_shrink(cli); - } - -@@ -1396,11 +1396,11 @@ static void osc_release_write_grant(struct client_obd *cli, - - pga->flag &= ~OBD_BRW_FROM_GRANT; - atomic_dec(&obd_dirty_pages); -- cli->cl_dirty -= PAGE_CACHE_SIZE; -+ cli->cl_dirty -= PAGE_SIZE; - if (pga->flag & OBD_BRW_NOCACHE) { - pga->flag &= ~OBD_BRW_NOCACHE; - atomic_dec(&obd_dirty_transit_pages); -- cli->cl_dirty_transit -= PAGE_CACHE_SIZE; -+ cli->cl_dirty_transit -= PAGE_SIZE; - } - } - -@@ -1456,7 +1456,7 @@ static void osc_unreserve_grant(struct client_obd *cli, - * used, we should return these grants to OST. There're two cases where grants - * can be lost: - * 1. truncate; -- * 2. blocksize at OST is less than PAGE_CACHE_SIZE and a partial page was -+ * 2. blocksize at OST is less than PAGE_SIZE and a partial page was - * written. In this case OST may use less chunks to serve this partial - * write. OSTs don't actually know the page size on the client side. so - * clients have to calculate lost grant by the blocksize on the OST. -@@ -1469,7 +1469,7 @@ static void osc_free_grant(struct client_obd *cli, unsigned int nr_pages, - - client_obd_list_lock(&cli->cl_loi_list_lock); - atomic_sub(nr_pages, &obd_dirty_pages); -- cli->cl_dirty -= nr_pages << PAGE_CACHE_SHIFT; -+ cli->cl_dirty -= nr_pages << PAGE_SHIFT; - cli->cl_lost_grant += lost_grant; - if (cli->cl_avail_grant < grant && cli->cl_lost_grant >= grant) { - /* borrow some grant from truncate to avoid the case that -@@ -1512,11 +1512,11 @@ static int osc_enter_cache_try(struct client_obd *cli, - if (rc < 0) - return 0; - -- if (cli->cl_dirty + PAGE_CACHE_SIZE <= cli->cl_dirty_max && -+ if (cli->cl_dirty + PAGE_SIZE <= cli->cl_dirty_max && - atomic_read(&obd_dirty_pages) + 1 <= obd_max_dirty_pages) { - osc_consume_write_grant(cli, &oap->oap_brw_page); - if (transient) { -- cli->cl_dirty_transit += PAGE_CACHE_SIZE; -+ cli->cl_dirty_transit += PAGE_SIZE; - atomic_inc(&obd_dirty_transit_pages); - oap->oap_brw_flags |= OBD_BRW_NOCACHE; - } -@@ -1562,7 +1562,7 @@ static int osc_enter_cache(const struct lu_env *env, struct client_obd *cli, - * of queued writes and create a discontiguous rpc stream - */ - if (OBD_FAIL_CHECK(OBD_FAIL_OSC_NO_GRANT) || -- cli->cl_dirty_max < PAGE_CACHE_SIZE || -+ cli->cl_dirty_max < PAGE_SIZE || - cli->cl_ar.ar_force_sync || loi->loi_ar.ar_force_sync) { - rc = -EDQUOT; - goto out; -@@ -1632,7 +1632,7 @@ void osc_wake_cache_waiters(struct client_obd *cli) - - ocw->ocw_rc = -EDQUOT; - /* we can't dirty more */ -- if ((cli->cl_dirty + PAGE_CACHE_SIZE > cli->cl_dirty_max) || -+ if ((cli->cl_dirty + PAGE_SIZE > cli->cl_dirty_max) || - (atomic_read(&obd_dirty_pages) + 1 > - obd_max_dirty_pages)) { - CDEBUG(D_CACHE, "no dirty room: dirty: %ld osc max %ld, sys max %d\n", -diff --git a/drivers/staging/lustre/lustre/osc/osc_page.c b/drivers/staging/lustre/lustre/osc/osc_page.c -index d720b1a1c18c..ce9ddd515f64 100644 ---- a/drivers/staging/lustre/lustre/osc/osc_page.c -+++ b/drivers/staging/lustre/lustre/osc/osc_page.c -@@ -410,7 +410,7 @@ int osc_page_init(const struct lu_env *env, struct cl_object *obj, - int result; - - opg->ops_from = 0; -- opg->ops_to = PAGE_CACHE_SIZE; -+ opg->ops_to = PAGE_SIZE; - - result = osc_prep_async_page(osc, opg, vmpage, - cl_offset(obj, page->cp_index)); -@@ -487,9 +487,9 @@ static atomic_t osc_lru_waiters = ATOMIC_INIT(0); - /* LRU pages are freed in batch mode. OSC should at least free this - * number of pages to avoid running out of LRU budget, and.. - */ --static const int lru_shrink_min = 2 << (20 - PAGE_CACHE_SHIFT); /* 2M */ -+static const int lru_shrink_min = 2 << (20 - PAGE_SHIFT); /* 2M */ - /* free this number at most otherwise it will take too long time to finish. */ --static const int lru_shrink_max = 32 << (20 - PAGE_CACHE_SHIFT); /* 32M */ -+static const int lru_shrink_max = 32 << (20 - PAGE_SHIFT); /* 32M */ - - /* Check if we can free LRU slots from this OSC. If there exists LRU waiters, - * we should free slots aggressively. In this way, slots are freed in a steady -diff --git a/drivers/staging/lustre/lustre/osc/osc_request.c b/drivers/staging/lustre/lustre/osc/osc_request.c -index 74805f1ae888..30526ebcad04 100644 ---- a/drivers/staging/lustre/lustre/osc/osc_request.c -+++ b/drivers/staging/lustre/lustre/osc/osc_request.c -@@ -826,7 +826,7 @@ static void osc_announce_cached(struct client_obd *cli, struct obdo *oa, - oa->o_undirty = 0; - } else { - long max_in_flight = (cli->cl_max_pages_per_rpc << -- PAGE_CACHE_SHIFT)* -+ PAGE_SHIFT)* - (cli->cl_max_rpcs_in_flight + 1); - oa->o_undirty = max(cli->cl_dirty_max, max_in_flight); - } -@@ -909,11 +909,11 @@ static void osc_shrink_grant_local(struct client_obd *cli, struct obdo *oa) - static int osc_shrink_grant(struct client_obd *cli) - { - __u64 target_bytes = (cli->cl_max_rpcs_in_flight + 1) * -- (cli->cl_max_pages_per_rpc << PAGE_CACHE_SHIFT); -+ (cli->cl_max_pages_per_rpc << PAGE_SHIFT); - - client_obd_list_lock(&cli->cl_loi_list_lock); - if (cli->cl_avail_grant <= target_bytes) -- target_bytes = cli->cl_max_pages_per_rpc << PAGE_CACHE_SHIFT; -+ target_bytes = cli->cl_max_pages_per_rpc << PAGE_SHIFT; - client_obd_list_unlock(&cli->cl_loi_list_lock); - - return osc_shrink_grant_to_target(cli, target_bytes); -@@ -929,8 +929,8 @@ int osc_shrink_grant_to_target(struct client_obd *cli, __u64 target_bytes) - * We don't want to shrink below a single RPC, as that will negatively - * impact block allocation and long-term performance. - */ -- if (target_bytes < cli->cl_max_pages_per_rpc << PAGE_CACHE_SHIFT) -- target_bytes = cli->cl_max_pages_per_rpc << PAGE_CACHE_SHIFT; -+ if (target_bytes < cli->cl_max_pages_per_rpc << PAGE_SHIFT) -+ target_bytes = cli->cl_max_pages_per_rpc << PAGE_SHIFT; - - if (target_bytes >= cli->cl_avail_grant) { - client_obd_list_unlock(&cli->cl_loi_list_lock); -@@ -978,7 +978,7 @@ static int osc_should_shrink_grant(struct client_obd *client) - * cli_brw_size(obd->u.cli.cl_import->imp_obd->obd_self_export) - * Keep comment here so that it can be found by searching. - */ -- int brw_size = client->cl_max_pages_per_rpc << PAGE_CACHE_SHIFT; -+ int brw_size = client->cl_max_pages_per_rpc << PAGE_SHIFT; - - if (client->cl_import->imp_state == LUSTRE_IMP_FULL && - client->cl_avail_grant > brw_size) -@@ -1052,7 +1052,7 @@ static void osc_init_grant(struct client_obd *cli, struct obd_connect_data *ocd) - } - - /* determine the appropriate chunk size used by osc_extent. */ -- cli->cl_chunkbits = max_t(int, PAGE_CACHE_SHIFT, ocd->ocd_blocksize); -+ cli->cl_chunkbits = max_t(int, PAGE_SHIFT, ocd->ocd_blocksize); - client_obd_list_unlock(&cli->cl_loi_list_lock); - - CDEBUG(D_CACHE, "%s, setting cl_avail_grant: %ld cl_lost_grant: %ld chunk bits: %d\n", -@@ -1317,9 +1317,9 @@ static int osc_brw_prep_request(int cmd, struct client_obd *cli, - LASSERT(pg->count > 0); - /* make sure there is no gap in the middle of page array */ - LASSERTF(page_count == 1 || -- (ergo(i == 0, poff + pg->count == PAGE_CACHE_SIZE) && -+ (ergo(i == 0, poff + pg->count == PAGE_SIZE) && - ergo(i > 0 && i < page_count - 1, -- poff == 0 && pg->count == PAGE_CACHE_SIZE) && -+ poff == 0 && pg->count == PAGE_SIZE) && - ergo(i == page_count - 1, poff == 0)), - "i: %d/%d pg: %p off: %llu, count: %u\n", - i, page_count, pg, pg->off, pg->count); -@@ -1877,7 +1877,7 @@ int osc_build_rpc(const struct lu_env *env, struct client_obd *cli, - oap->oap_count; - else - LASSERT(oap->oap_page_off + oap->oap_count == -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - } - } - -@@ -1993,7 +1993,7 @@ int osc_build_rpc(const struct lu_env *env, struct client_obd *cli, - tmp->oap_request = ptlrpc_request_addref(req); - - client_obd_list_lock(&cli->cl_loi_list_lock); -- starting_offset >>= PAGE_CACHE_SHIFT; -+ starting_offset >>= PAGE_SHIFT; - if (cmd == OBD_BRW_READ) { - cli->cl_r_in_flight++; - lprocfs_oh_tally_log2(&cli->cl_read_page_hist, page_count); -@@ -2790,12 +2790,12 @@ out: - CFS_PAGE_MASK; - - if (OBD_OBJECT_EOF - fm_key->fiemap.fm_length <= -- fm_key->fiemap.fm_start + PAGE_CACHE_SIZE - 1) -+ fm_key->fiemap.fm_start + PAGE_SIZE - 1) - policy.l_extent.end = OBD_OBJECT_EOF; - else - policy.l_extent.end = (fm_key->fiemap.fm_start + - fm_key->fiemap.fm_length + -- PAGE_CACHE_SIZE - 1) & CFS_PAGE_MASK; -+ PAGE_SIZE - 1) & CFS_PAGE_MASK; - - ostid_build_res_name(&fm_key->oa.o_oi, &res_id); - mode = ldlm_lock_match(exp->exp_obd->obd_namespace, -diff --git a/drivers/staging/lustre/lustre/ptlrpc/client.c b/drivers/staging/lustre/lustre/ptlrpc/client.c -index 1b7673eec4d7..cf3ac8eee9ee 100644 ---- a/drivers/staging/lustre/lustre/ptlrpc/client.c -+++ b/drivers/staging/lustre/lustre/ptlrpc/client.c -@@ -174,12 +174,12 @@ void __ptlrpc_prep_bulk_page(struct ptlrpc_bulk_desc *desc, - LASSERT(page); - LASSERT(pageoffset >= 0); - LASSERT(len > 0); -- LASSERT(pageoffset + len <= PAGE_CACHE_SIZE); -+ LASSERT(pageoffset + len <= PAGE_SIZE); - - desc->bd_nob += len; - - if (pin) -- page_cache_get(page); -+ get_page(page); - - ptlrpc_add_bulk_page(desc, page, pageoffset, len); - } -@@ -206,7 +206,7 @@ void __ptlrpc_free_bulk(struct ptlrpc_bulk_desc *desc, int unpin) - - if (unpin) { - for (i = 0; i < desc->bd_iov_count; i++) -- page_cache_release(desc->bd_iov[i].kiov_page); -+ put_page(desc->bd_iov[i].kiov_page); - } - - kfree(desc); -diff --git a/drivers/staging/lustre/lustre/ptlrpc/import.c b/drivers/staging/lustre/lustre/ptlrpc/import.c -index b4eddf291269..cd94fed0ffdf 100644 ---- a/drivers/staging/lustre/lustre/ptlrpc/import.c -+++ b/drivers/staging/lustre/lustre/ptlrpc/import.c -@@ -1092,7 +1092,7 @@ finish: - - if (ocd->ocd_connect_flags & OBD_CONNECT_BRW_SIZE) - cli->cl_max_pages_per_rpc = -- min(ocd->ocd_brw_size >> PAGE_CACHE_SHIFT, -+ min(ocd->ocd_brw_size >> PAGE_SHIFT, - cli->cl_max_pages_per_rpc); - else if (imp->imp_connect_op == MDS_CONNECT || - imp->imp_connect_op == MGS_CONNECT) -diff --git a/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c b/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c -index cee04efb6fb5..c95a91ce26c9 100644 ---- a/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c -+++ b/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c -@@ -308,7 +308,7 @@ ptlrpc_lprocfs_req_history_max_seq_write(struct file *file, - * hose a kernel by allowing the request history to grow too - * far. - */ -- bufpages = (svc->srv_buf_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -+ bufpages = (svc->srv_buf_size + PAGE_SIZE - 1) >> PAGE_SHIFT; - if (val > totalram_pages / (2 * bufpages)) - return -ERANGE; - -@@ -1226,7 +1226,7 @@ int lprocfs_wr_import(struct file *file, const char __user *buffer, - const char prefix[] = "connection="; - const int prefix_len = sizeof(prefix) - 1; - -- if (count > PAGE_CACHE_SIZE - 1 || count <= prefix_len) -+ if (count > PAGE_SIZE - 1 || count <= prefix_len) - return -EINVAL; - - kbuf = kzalloc(count + 1, GFP_NOFS); -diff --git a/drivers/staging/lustre/lustre/ptlrpc/recover.c b/drivers/staging/lustre/lustre/ptlrpc/recover.c -index 5f27d9c2e4ef..30d9a164e52d 100644 ---- a/drivers/staging/lustre/lustre/ptlrpc/recover.c -+++ b/drivers/staging/lustre/lustre/ptlrpc/recover.c -@@ -195,7 +195,7 @@ int ptlrpc_resend(struct obd_import *imp) - } - - list_for_each_entry_safe(req, next, &imp->imp_sending_list, rq_list) { -- LASSERTF((long)req > PAGE_CACHE_SIZE && req != LP_POISON, -+ LASSERTF((long)req > PAGE_SIZE && req != LP_POISON, - "req %p bad\n", req); - LASSERTF(req->rq_type != LI_POISON, "req %p freed\n", req); - if (!ptlrpc_no_resend(req)) -diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c -index 72d5b9bf5b29..d3872b8c9a6e 100644 ---- a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c -+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c -@@ -58,7 +58,7 @@ - * bulk encryption page pools * - ****************************************/ - --#define POINTERS_PER_PAGE (PAGE_CACHE_SIZE / sizeof(void *)) -+#define POINTERS_PER_PAGE (PAGE_SIZE / sizeof(void *)) - #define PAGES_PER_POOL (POINTERS_PER_PAGE) - - #define IDLE_IDX_MAX (100) -diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c -index 8cfce105c7ee..e21ca2bd6839 100644 ---- a/drivers/usb/gadget/function/f_fs.c -+++ b/drivers/usb/gadget/function/f_fs.c -@@ -1147,8 +1147,8 @@ static int ffs_sb_fill(struct super_block *sb, void *_data, int silent) - ffs->sb = sb; - data->ffs_data = NULL; - sb->s_fs_info = ffs; -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ sb->s_blocksize = PAGE_SIZE; -+ sb->s_blocksize_bits = PAGE_SHIFT; - sb->s_magic = FUNCTIONFS_MAGIC; - sb->s_op = &ffs_sb_operations; - sb->s_time_gran = 1; -diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c -index 5cdaf0150a4e..e64479f882a5 100644 ---- a/drivers/usb/gadget/legacy/inode.c -+++ b/drivers/usb/gadget/legacy/inode.c -@@ -1954,8 +1954,8 @@ gadgetfs_fill_super (struct super_block *sb, void *opts, int silent) - return -ENODEV; - - /* superblock */ -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ sb->s_blocksize = PAGE_SIZE; -+ sb->s_blocksize_bits = PAGE_SHIFT; - sb->s_magic = GADGETFS_MAGIC; - sb->s_op = &gadget_fs_operations; - sb->s_time_gran = 1; -diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c -index dba51362d2e2..90901861bfc0 100644 ---- a/drivers/usb/storage/scsiglue.c -+++ b/drivers/usb/storage/scsiglue.c -@@ -123,7 +123,7 @@ static int slave_configure(struct scsi_device *sdev) - unsigned int max_sectors = 64; - - if (us->fflags & US_FL_MAX_SECTORS_MIN) -- max_sectors = PAGE_CACHE_SIZE >> 9; -+ max_sectors = PAGE_SIZE >> 9; - if (queue_max_hw_sectors(sdev->request_queue) > max_sectors) - blk_queue_max_hw_sectors(sdev->request_queue, - max_sectors); -diff --git a/drivers/video/fbdev/pvr2fb.c b/drivers/video/fbdev/pvr2fb.c -index 0e24eb9c219c..580311e6bb03 100644 ---- a/drivers/video/fbdev/pvr2fb.c -+++ b/drivers/video/fbdev/pvr2fb.c -@@ -735,7 +735,7 @@ out: - - out_unmap: - for (i = 0; i < nr_pages; i++) -- page_cache_release(pages[i]); -+ put_page(pages[i]); - - kfree(pages); - -diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c -index e9e04376c52c..ac9225e86bf3 100644 ---- a/fs/9p/vfs_addr.c -+++ b/fs/9p/vfs_addr.c -@@ -153,7 +153,7 @@ static void v9fs_invalidate_page(struct page *page, unsigned int offset, - * If called with zero offset, we should release - * the private state assocated with the page - */ -- if (offset == 0 && length == PAGE_CACHE_SIZE) -+ if (offset == 0 && length == PAGE_SIZE) - v9fs_fscache_invalidate_page(page); - } - -@@ -166,10 +166,10 @@ static int v9fs_vfs_writepage_locked(struct page *page) - struct bio_vec bvec; - int err, len; - -- if (page->index == size >> PAGE_CACHE_SHIFT) -- len = size & ~PAGE_CACHE_MASK; -+ if (page->index == size >> PAGE_SHIFT) -+ len = size & ~PAGE_MASK; - else -- len = PAGE_CACHE_SIZE; -+ len = PAGE_SIZE; - - bvec.bv_page = page; - bvec.bv_offset = 0; -@@ -271,7 +271,7 @@ static int v9fs_write_begin(struct file *filp, struct address_space *mapping, - int retval = 0; - struct page *page; - struct v9fs_inode *v9inode; -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -+ pgoff_t index = pos >> PAGE_SHIFT; - struct inode *inode = mapping->host; - - -@@ -288,11 +288,11 @@ start: - if (PageUptodate(page)) - goto out; - -- if (len == PAGE_CACHE_SIZE) -+ if (len == PAGE_SIZE) - goto out; - - retval = v9fs_fid_readpage(v9inode->writeback_fid, page); -- page_cache_release(page); -+ put_page(page); - if (!retval) - goto start; - out: -@@ -313,7 +313,7 @@ static int v9fs_write_end(struct file *filp, struct address_space *mapping, - /* - * zero out the rest of the area - */ -- unsigned from = pos & (PAGE_CACHE_SIZE - 1); -+ unsigned from = pos & (PAGE_SIZE - 1); - - zero_user(page, from + copied, len - copied); - flush_dcache_page(page); -@@ -331,7 +331,7 @@ static int v9fs_write_end(struct file *filp, struct address_space *mapping, - } - set_page_dirty(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - return copied; - } -diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c -index eadc894faea2..b84c291ba1eb 100644 ---- a/fs/9p/vfs_file.c -+++ b/fs/9p/vfs_file.c -@@ -421,8 +421,8 @@ v9fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) - struct inode *inode = file_inode(file); - loff_t i_size; - unsigned long pg_start, pg_end; -- pg_start = origin >> PAGE_CACHE_SHIFT; -- pg_end = (origin + retval - 1) >> PAGE_CACHE_SHIFT; -+ pg_start = origin >> PAGE_SHIFT; -+ pg_end = (origin + retval - 1) >> PAGE_SHIFT; - if (inode->i_mapping && inode->i_mapping->nrpages) - invalidate_inode_pages2_range(inode->i_mapping, - pg_start, pg_end); -diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c -index bf495cedec26..de3ed8629196 100644 ---- a/fs/9p/vfs_super.c -+++ b/fs/9p/vfs_super.c -@@ -87,7 +87,7 @@ v9fs_fill_super(struct super_block *sb, struct v9fs_session_info *v9ses, - sb->s_op = &v9fs_super_ops; - sb->s_bdi = &v9ses->bdi; - if (v9ses->cache) -- sb->s_bdi->ra_pages = (VM_MAX_READAHEAD * 1024)/PAGE_CACHE_SIZE; -+ sb->s_bdi->ra_pages = (VM_MAX_READAHEAD * 1024)/PAGE_SIZE; - - sb->s_flags |= MS_ACTIVE | MS_DIRSYNC | MS_NOATIME; - if (!v9ses->cache) -diff --git a/fs/affs/file.c b/fs/affs/file.c -index 22fc7c802d69..0cde550050e8 100644 ---- a/fs/affs/file.c -+++ b/fs/affs/file.c -@@ -510,9 +510,9 @@ affs_do_readpage_ofs(struct page *page, unsigned to) - - pr_debug("%s(%lu, %ld, 0, %d)\n", __func__, inode->i_ino, - page->index, to); -- BUG_ON(to > PAGE_CACHE_SIZE); -+ BUG_ON(to > PAGE_SIZE); - bsize = AFFS_SB(sb)->s_data_blksize; -- tmp = page->index << PAGE_CACHE_SHIFT; -+ tmp = page->index << PAGE_SHIFT; - bidx = tmp / bsize; - boff = tmp % bsize; - -@@ -613,10 +613,10 @@ affs_readpage_ofs(struct file *file, struct page *page) - int err; - - pr_debug("%s(%lu, %ld)\n", __func__, inode->i_ino, page->index); -- to = PAGE_CACHE_SIZE; -- if (((page->index + 1) << PAGE_CACHE_SHIFT) > inode->i_size) { -- to = inode->i_size & ~PAGE_CACHE_MASK; -- memset(page_address(page) + to, 0, PAGE_CACHE_SIZE - to); -+ to = PAGE_SIZE; -+ if (((page->index + 1) << PAGE_SHIFT) > inode->i_size) { -+ to = inode->i_size & ~PAGE_MASK; -+ memset(page_address(page) + to, 0, PAGE_SIZE - to); - } - - err = affs_do_readpage_ofs(page, to); -@@ -646,7 +646,7 @@ static int affs_write_begin_ofs(struct file *file, struct address_space *mapping - return err; - } - -- index = pos >> PAGE_CACHE_SHIFT; -+ index = pos >> PAGE_SHIFT; - page = grab_cache_page_write_begin(mapping, index, flags); - if (!page) - return -ENOMEM; -@@ -656,10 +656,10 @@ static int affs_write_begin_ofs(struct file *file, struct address_space *mapping - return 0; - - /* XXX: inefficient but safe in the face of short writes */ -- err = affs_do_readpage_ofs(page, PAGE_CACHE_SIZE); -+ err = affs_do_readpage_ofs(page, PAGE_SIZE); - if (err) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - return err; - } -@@ -677,7 +677,7 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping, - u32 tmp; - int written; - -- from = pos & (PAGE_CACHE_SIZE - 1); -+ from = pos & (PAGE_SIZE - 1); - to = pos + len; - /* - * XXX: not sure if this can handle short copies (len < copied), but -@@ -692,7 +692,7 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping, - - bh = NULL; - written = 0; -- tmp = (page->index << PAGE_CACHE_SHIFT) + from; -+ tmp = (page->index << PAGE_SHIFT) + from; - bidx = tmp / bsize; - boff = tmp % bsize; - if (boff) { -@@ -788,13 +788,13 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping, - - done: - affs_brelse(bh); -- tmp = (page->index << PAGE_CACHE_SHIFT) + from; -+ tmp = (page->index << PAGE_SHIFT) + from; - if (tmp > inode->i_size) - inode->i_size = AFFS_I(inode)->mmu_private = tmp; - - err_first_bh: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - return written; - -diff --git a/fs/afs/dir.c b/fs/afs/dir.c -index e10e17788f06..5fda2bc53cd7 100644 ---- a/fs/afs/dir.c -+++ b/fs/afs/dir.c -@@ -181,7 +181,7 @@ error: - static inline void afs_dir_put_page(struct page *page) - { - kunmap(page); -- page_cache_release(page); -+ put_page(page); - } - - /* -diff --git a/fs/afs/file.c b/fs/afs/file.c -index 999bc3caec92..6344aee4ac4b 100644 ---- a/fs/afs/file.c -+++ b/fs/afs/file.c -@@ -164,7 +164,7 @@ int afs_page_filler(void *data, struct page *page) - _debug("cache said ENOBUFS"); - default: - go_on: -- offset = page->index << PAGE_CACHE_SHIFT; -+ offset = page->index << PAGE_SHIFT; - len = min_t(size_t, i_size_read(inode) - offset, PAGE_SIZE); - - /* read the contents of the file from the server into the -@@ -319,7 +319,7 @@ static void afs_invalidatepage(struct page *page, unsigned int offset, - BUG_ON(!PageLocked(page)); - - /* we clean up only if the entire page is being invalidated */ -- if (offset == 0 && length == PAGE_CACHE_SIZE) { -+ if (offset == 0 && length == PAGE_SIZE) { - #ifdef CONFIG_AFS_FSCACHE - if (PageFsCache(page)) { - struct afs_vnode *vnode = AFS_FS_I(page->mapping->host); -diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c -index ccd0b212e82a..81dd075356b9 100644 ---- a/fs/afs/mntpt.c -+++ b/fs/afs/mntpt.c -@@ -93,7 +93,7 @@ int afs_mntpt_check_symlink(struct afs_vnode *vnode, struct key *key) - - kunmap(page); - out_free: -- page_cache_release(page); -+ put_page(page); - out: - _leave(" = %d", ret); - return ret; -@@ -189,7 +189,7 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt) - buf = kmap_atomic(page); - memcpy(devname, buf, size); - kunmap_atomic(buf); -- page_cache_release(page); -+ put_page(page); - page = NULL; - } - -@@ -211,7 +211,7 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt) - return mnt; - - error: -- page_cache_release(page); -+ put_page(page); - error_no_page: - free_page((unsigned long) options); - error_no_options: -diff --git a/fs/afs/super.c b/fs/afs/super.c -index 81afefe7d8a6..fbdb022b75a2 100644 ---- a/fs/afs/super.c -+++ b/fs/afs/super.c -@@ -315,8 +315,8 @@ static int afs_fill_super(struct super_block *sb, - _enter(""); - - /* fill in the superblock */ -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ sb->s_blocksize = PAGE_SIZE; -+ sb->s_blocksize_bits = PAGE_SHIFT; - sb->s_magic = AFS_FS_MAGIC; - sb->s_op = &afs_super_ops; - sb->s_bdi = &as->volume->bdi; -diff --git a/fs/afs/write.c b/fs/afs/write.c -index dfef94f70667..65de439bdc4f 100644 ---- a/fs/afs/write.c -+++ b/fs/afs/write.c -@@ -93,10 +93,10 @@ static int afs_fill_page(struct afs_vnode *vnode, struct key *key, - _enter(",,%llu", (unsigned long long)pos); - - i_size = i_size_read(&vnode->vfs_inode); -- if (pos + PAGE_CACHE_SIZE > i_size) -+ if (pos + PAGE_SIZE > i_size) - len = i_size - pos; - else -- len = PAGE_CACHE_SIZE; -+ len = PAGE_SIZE; - - ret = afs_vnode_fetch_data(vnode, key, pos, len, page); - if (ret < 0) { -@@ -123,9 +123,9 @@ int afs_write_begin(struct file *file, struct address_space *mapping, - struct afs_vnode *vnode = AFS_FS_I(file_inode(file)); - struct page *page; - struct key *key = file->private_data; -- unsigned from = pos & (PAGE_CACHE_SIZE - 1); -+ unsigned from = pos & (PAGE_SIZE - 1); - unsigned to = from + len; -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -+ pgoff_t index = pos >> PAGE_SHIFT; - int ret; - - _enter("{%x:%u},{%lx},%u,%u", -@@ -151,8 +151,8 @@ int afs_write_begin(struct file *file, struct address_space *mapping, - *pagep = page; - /* page won't leak in error case: it eventually gets cleaned off LRU */ - -- if (!PageUptodate(page) && len != PAGE_CACHE_SIZE) { -- ret = afs_fill_page(vnode, key, index << PAGE_CACHE_SHIFT, page); -+ if (!PageUptodate(page) && len != PAGE_SIZE) { -+ ret = afs_fill_page(vnode, key, index << PAGE_SHIFT, page); - if (ret < 0) { - kfree(candidate); - _leave(" = %d [prep]", ret); -@@ -266,7 +266,7 @@ int afs_write_end(struct file *file, struct address_space *mapping, - if (PageDirty(page)) - _debug("dirtied"); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - return copied; - } -@@ -480,7 +480,7 @@ static int afs_writepages_region(struct address_space *mapping, - - if (page->index > end) { - *_next = index; -- page_cache_release(page); -+ put_page(page); - _leave(" = 0 [%lx]", *_next); - return 0; - } -@@ -494,7 +494,7 @@ static int afs_writepages_region(struct address_space *mapping, - - if (page->mapping != mapping) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - continue; - } - -@@ -515,7 +515,7 @@ static int afs_writepages_region(struct address_space *mapping, - - ret = afs_write_back_from_locked_page(wb, page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - if (ret < 0) { - _leave(" = %d", ret); - return ret; -@@ -551,13 +551,13 @@ int afs_writepages(struct address_space *mapping, - &next); - mapping->writeback_index = next; - } else if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) { -- end = (pgoff_t)(LLONG_MAX >> PAGE_CACHE_SHIFT); -+ end = (pgoff_t)(LLONG_MAX >> PAGE_SHIFT); - ret = afs_writepages_region(mapping, wbc, 0, end, &next); - if (wbc->nr_to_write > 0) - mapping->writeback_index = next; - } else { -- start = wbc->range_start >> PAGE_CACHE_SHIFT; -- end = wbc->range_end >> PAGE_CACHE_SHIFT; -+ start = wbc->range_start >> PAGE_SHIFT; -+ end = wbc->range_end >> PAGE_SHIFT; - ret = afs_writepages_region(mapping, wbc, start, end, &next); - } - -diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c -index 7d914c67a9d0..81381cc0dd17 100644 ---- a/fs/binfmt_elf.c -+++ b/fs/binfmt_elf.c -@@ -2292,7 +2292,7 @@ static int elf_core_dump(struct coredump_params *cprm) - void *kaddr = kmap(page); - stop = !dump_emit(cprm, kaddr, PAGE_SIZE); - kunmap(page); -- page_cache_release(page); -+ put_page(page); - } else - stop = !dump_skip(cprm, PAGE_SIZE); - if (stop) -diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c -index b1adb92e69de..083ea2bc60ab 100644 ---- a/fs/binfmt_elf_fdpic.c -+++ b/fs/binfmt_elf_fdpic.c -@@ -1533,7 +1533,7 @@ static bool elf_fdpic_dump_segments(struct coredump_params *cprm) - void *kaddr = kmap(page); - res = dump_emit(cprm, kaddr, PAGE_SIZE); - kunmap(page); -- page_cache_release(page); -+ put_page(page); - } else { - res = dump_skip(cprm, PAGE_SIZE); - } -diff --git a/fs/block_dev.c b/fs/block_dev.c -index 3172c4e2f502..20a2c02b77c4 100644 ---- a/fs/block_dev.c -+++ b/fs/block_dev.c -@@ -331,7 +331,7 @@ static int blkdev_write_end(struct file *file, struct address_space *mapping, - ret = block_write_end(file, mapping, pos, len, copied, page, fsdata); - - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - return ret; - } -@@ -1149,7 +1149,7 @@ void bd_set_size(struct block_device *bdev, loff_t size) - inode_lock(bdev->bd_inode); - i_size_write(bdev->bd_inode, size); - inode_unlock(bdev->bd_inode); -- while (bsize < PAGE_CACHE_SIZE) { -+ while (bsize < PAGE_SIZE) { - if (size & bsize) - break; - bsize <<= 1; -diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c -index 861d472564c1..e17b46805aa1 100644 ---- a/fs/btrfs/check-integrity.c -+++ b/fs/btrfs/check-integrity.c -@@ -755,7 +755,7 @@ static int btrfsic_process_superblock(struct btrfsic_state *state, - BUG_ON(NULL == l); - - ret = btrfsic_read_block(state, &tmp_next_block_ctx); -- if (ret < (int)PAGE_CACHE_SIZE) { -+ if (ret < (int)PAGE_SIZE) { - printk(KERN_INFO - "btrfsic: read @logical %llu failed!\n", - tmp_next_block_ctx.start); -@@ -1229,15 +1229,15 @@ static void btrfsic_read_from_block_data( - size_t offset_in_page; - char *kaddr; - char *dst = (char *)dstv; -- size_t start_offset = block_ctx->start & ((u64)PAGE_CACHE_SIZE - 1); -- unsigned long i = (start_offset + offset) >> PAGE_CACHE_SHIFT; -+ size_t start_offset = block_ctx->start & ((u64)PAGE_SIZE - 1); -+ unsigned long i = (start_offset + offset) >> PAGE_SHIFT; - - WARN_ON(offset + len > block_ctx->len); -- offset_in_page = (start_offset + offset) & (PAGE_CACHE_SIZE - 1); -+ offset_in_page = (start_offset + offset) & (PAGE_SIZE - 1); - - while (len > 0) { -- cur = min(len, ((size_t)PAGE_CACHE_SIZE - offset_in_page)); -- BUG_ON(i >= DIV_ROUND_UP(block_ctx->len, PAGE_CACHE_SIZE)); -+ cur = min(len, ((size_t)PAGE_SIZE - offset_in_page)); -+ BUG_ON(i >= DIV_ROUND_UP(block_ctx->len, PAGE_SIZE)); - kaddr = block_ctx->datav[i]; - memcpy(dst, kaddr + offset_in_page, cur); - -@@ -1603,8 +1603,8 @@ static void btrfsic_release_block_ctx(struct btrfsic_block_data_ctx *block_ctx) - - BUG_ON(!block_ctx->datav); - BUG_ON(!block_ctx->pagev); -- num_pages = (block_ctx->len + (u64)PAGE_CACHE_SIZE - 1) >> -- PAGE_CACHE_SHIFT; -+ num_pages = (block_ctx->len + (u64)PAGE_SIZE - 1) >> -+ PAGE_SHIFT; - while (num_pages > 0) { - num_pages--; - if (block_ctx->datav[num_pages]) { -@@ -1635,15 +1635,15 @@ static int btrfsic_read_block(struct btrfsic_state *state, - BUG_ON(block_ctx->datav); - BUG_ON(block_ctx->pagev); - BUG_ON(block_ctx->mem_to_free); -- if (block_ctx->dev_bytenr & ((u64)PAGE_CACHE_SIZE - 1)) { -+ if (block_ctx->dev_bytenr & ((u64)PAGE_SIZE - 1)) { - printk(KERN_INFO - "btrfsic: read_block() with unaligned bytenr %llu\n", - block_ctx->dev_bytenr); - return -1; - } - -- num_pages = (block_ctx->len + (u64)PAGE_CACHE_SIZE - 1) >> -- PAGE_CACHE_SHIFT; -+ num_pages = (block_ctx->len + (u64)PAGE_SIZE - 1) >> -+ PAGE_SHIFT; - block_ctx->mem_to_free = kzalloc((sizeof(*block_ctx->datav) + - sizeof(*block_ctx->pagev)) * - num_pages, GFP_NOFS); -@@ -1674,8 +1674,8 @@ static int btrfsic_read_block(struct btrfsic_state *state, - - for (j = i; j < num_pages; j++) { - ret = bio_add_page(bio, block_ctx->pagev[j], -- PAGE_CACHE_SIZE, 0); -- if (PAGE_CACHE_SIZE != ret) -+ PAGE_SIZE, 0); -+ if (PAGE_SIZE != ret) - break; - } - if (j == i) { -@@ -1691,7 +1691,7 @@ static int btrfsic_read_block(struct btrfsic_state *state, - return -1; - } - bio_put(bio); -- dev_bytenr += (j - i) * PAGE_CACHE_SIZE; -+ dev_bytenr += (j - i) * PAGE_SIZE; - i = j; - } - for (i = 0; i < num_pages; i++) { -@@ -1767,9 +1767,9 @@ static int btrfsic_test_for_metadata(struct btrfsic_state *state, - u32 crc = ~(u32)0; - unsigned int i; - -- if (num_pages * PAGE_CACHE_SIZE < state->metablock_size) -+ if (num_pages * PAGE_SIZE < state->metablock_size) - return 1; /* not metadata */ -- num_pages = state->metablock_size >> PAGE_CACHE_SHIFT; -+ num_pages = state->metablock_size >> PAGE_SHIFT; - h = (struct btrfs_header *)datav[0]; - - if (memcmp(h->fsid, state->root->fs_info->fsid, BTRFS_UUID_SIZE)) -@@ -1777,8 +1777,8 @@ static int btrfsic_test_for_metadata(struct btrfsic_state *state, - - for (i = 0; i < num_pages; i++) { - u8 *data = i ? datav[i] : (datav[i] + BTRFS_CSUM_SIZE); -- size_t sublen = i ? PAGE_CACHE_SIZE : -- (PAGE_CACHE_SIZE - BTRFS_CSUM_SIZE); -+ size_t sublen = i ? PAGE_SIZE : -+ (PAGE_SIZE - BTRFS_CSUM_SIZE); - - crc = btrfs_crc32c(crc, data, sublen); - } -@@ -1824,14 +1824,14 @@ again: - if (block->is_superblock) { - bytenr = btrfs_super_bytenr((struct btrfs_super_block *) - mapped_datav[0]); -- if (num_pages * PAGE_CACHE_SIZE < -+ if (num_pages * PAGE_SIZE < - BTRFS_SUPER_INFO_SIZE) { - printk(KERN_INFO - "btrfsic: cannot work with too short bios!\n"); - return; - } - is_metadata = 1; -- BUG_ON(BTRFS_SUPER_INFO_SIZE & (PAGE_CACHE_SIZE - 1)); -+ BUG_ON(BTRFS_SUPER_INFO_SIZE & (PAGE_SIZE - 1)); - processed_len = BTRFS_SUPER_INFO_SIZE; - if (state->print_mask & - BTRFSIC_PRINT_MASK_TREE_BEFORE_SB_WRITE) { -@@ -1842,7 +1842,7 @@ again: - } - if (is_metadata) { - if (!block->is_superblock) { -- if (num_pages * PAGE_CACHE_SIZE < -+ if (num_pages * PAGE_SIZE < - state->metablock_size) { - printk(KERN_INFO - "btrfsic: cannot work with too short bios!\n"); -@@ -1878,7 +1878,7 @@ again: - } - block->logical_bytenr = bytenr; - } else { -- if (num_pages * PAGE_CACHE_SIZE < -+ if (num_pages * PAGE_SIZE < - state->datablock_size) { - printk(KERN_INFO - "btrfsic: cannot work with too short bios!\n"); -@@ -2011,7 +2011,7 @@ again: - block->logical_bytenr = bytenr; - block->is_metadata = 1; - if (block->is_superblock) { -- BUG_ON(PAGE_CACHE_SIZE != -+ BUG_ON(PAGE_SIZE != - BTRFS_SUPER_INFO_SIZE); - ret = btrfsic_process_written_superblock( - state, -@@ -2170,8 +2170,8 @@ again: - continue_loop: - BUG_ON(!processed_len); - dev_bytenr += processed_len; -- mapped_datav += processed_len >> PAGE_CACHE_SHIFT; -- num_pages -= processed_len >> PAGE_CACHE_SHIFT; -+ mapped_datav += processed_len >> PAGE_SHIFT; -+ num_pages -= processed_len >> PAGE_SHIFT; - goto again; - } - -@@ -2952,7 +2952,7 @@ static void __btrfsic_submit_bio(int rw, struct bio *bio) - goto leave; - cur_bytenr = dev_bytenr; - for (i = 0; i < bio->bi_vcnt; i++) { -- BUG_ON(bio->bi_io_vec[i].bv_len != PAGE_CACHE_SIZE); -+ BUG_ON(bio->bi_io_vec[i].bv_len != PAGE_SIZE); - mapped_datav[i] = kmap(bio->bi_io_vec[i].bv_page); - if (!mapped_datav[i]) { - while (i > 0) { -@@ -3035,16 +3035,16 @@ int btrfsic_mount(struct btrfs_root *root, - struct list_head *dev_head = &fs_devices->devices; - struct btrfs_device *device; - -- if (root->nodesize & ((u64)PAGE_CACHE_SIZE - 1)) { -+ if (root->nodesize & ((u64)PAGE_SIZE - 1)) { - printk(KERN_INFO -- "btrfsic: cannot handle nodesize %d not being a multiple of PAGE_CACHE_SIZE %ld!\n", -- root->nodesize, PAGE_CACHE_SIZE); -+ "btrfsic: cannot handle nodesize %d not being a multiple of PAGE_SIZE %ld!\n", -+ root->nodesize, PAGE_SIZE); - return -1; - } -- if (root->sectorsize & ((u64)PAGE_CACHE_SIZE - 1)) { -+ if (root->sectorsize & ((u64)PAGE_SIZE - 1)) { - printk(KERN_INFO -- "btrfsic: cannot handle sectorsize %d not being a multiple of PAGE_CACHE_SIZE %ld!\n", -- root->sectorsize, PAGE_CACHE_SIZE); -+ "btrfsic: cannot handle sectorsize %d not being a multiple of PAGE_SIZE %ld!\n", -+ root->sectorsize, PAGE_SIZE); - return -1; - } - state = kzalloc(sizeof(*state), GFP_KERNEL | __GFP_NOWARN | __GFP_REPEAT); -diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c -index 3346cd8f9910..ff61a41ac90b 100644 ---- a/fs/btrfs/compression.c -+++ b/fs/btrfs/compression.c -@@ -119,7 +119,7 @@ static int check_compressed_csum(struct inode *inode, - csum = ~(u32)0; - - kaddr = kmap_atomic(page); -- csum = btrfs_csum_data(kaddr, csum, PAGE_CACHE_SIZE); -+ csum = btrfs_csum_data(kaddr, csum, PAGE_SIZE); - btrfs_csum_final(csum, (char *)&csum); - kunmap_atomic(kaddr); - -@@ -190,7 +190,7 @@ csum_failed: - for (index = 0; index < cb->nr_pages; index++) { - page = cb->compressed_pages[index]; - page->mapping = NULL; -- page_cache_release(page); -+ put_page(page); - } - - /* do io completion on the original bio */ -@@ -224,8 +224,8 @@ out: - static noinline void end_compressed_writeback(struct inode *inode, - const struct compressed_bio *cb) - { -- unsigned long index = cb->start >> PAGE_CACHE_SHIFT; -- unsigned long end_index = (cb->start + cb->len - 1) >> PAGE_CACHE_SHIFT; -+ unsigned long index = cb->start >> PAGE_SHIFT; -+ unsigned long end_index = (cb->start + cb->len - 1) >> PAGE_SHIFT; - struct page *pages[16]; - unsigned long nr_pages = end_index - index + 1; - int i; -@@ -247,7 +247,7 @@ static noinline void end_compressed_writeback(struct inode *inode, - if (cb->errors) - SetPageError(pages[i]); - end_page_writeback(pages[i]); -- page_cache_release(pages[i]); -+ put_page(pages[i]); - } - nr_pages -= ret; - index += ret; -@@ -304,7 +304,7 @@ static void end_compressed_bio_write(struct bio *bio) - for (index = 0; index < cb->nr_pages; index++) { - page = cb->compressed_pages[index]; - page->mapping = NULL; -- page_cache_release(page); -+ put_page(page); - } - - /* finally free the cb struct */ -@@ -341,7 +341,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, - int ret; - int skip_sum = BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM; - -- WARN_ON(start & ((u64)PAGE_CACHE_SIZE - 1)); -+ WARN_ON(start & ((u64)PAGE_SIZE - 1)); - cb = kmalloc(compressed_bio_size(root, compressed_len), GFP_NOFS); - if (!cb) - return -ENOMEM; -@@ -374,14 +374,14 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, - page->mapping = inode->i_mapping; - if (bio->bi_iter.bi_size) - ret = io_tree->ops->merge_bio_hook(WRITE, page, 0, -- PAGE_CACHE_SIZE, -+ PAGE_SIZE, - bio, 0); - else - ret = 0; - - page->mapping = NULL; -- if (ret || bio_add_page(bio, page, PAGE_CACHE_SIZE, 0) < -- PAGE_CACHE_SIZE) { -+ if (ret || bio_add_page(bio, page, PAGE_SIZE, 0) < -+ PAGE_SIZE) { - bio_get(bio); - - /* -@@ -410,15 +410,15 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, - BUG_ON(!bio); - bio->bi_private = cb; - bio->bi_end_io = end_compressed_bio_write; -- bio_add_page(bio, page, PAGE_CACHE_SIZE, 0); -+ bio_add_page(bio, page, PAGE_SIZE, 0); - } -- if (bytes_left < PAGE_CACHE_SIZE) { -+ if (bytes_left < PAGE_SIZE) { - btrfs_info(BTRFS_I(inode)->root->fs_info, - "bytes left %lu compress len %lu nr %lu", - bytes_left, cb->compressed_len, cb->nr_pages); - } -- bytes_left -= PAGE_CACHE_SIZE; -- first_byte += PAGE_CACHE_SIZE; -+ bytes_left -= PAGE_SIZE; -+ first_byte += PAGE_SIZE; - cond_resched(); - } - bio_get(bio); -@@ -457,17 +457,17 @@ static noinline int add_ra_bio_pages(struct inode *inode, - int misses = 0; - - page = cb->orig_bio->bi_io_vec[cb->orig_bio->bi_vcnt - 1].bv_page; -- last_offset = (page_offset(page) + PAGE_CACHE_SIZE); -+ last_offset = (page_offset(page) + PAGE_SIZE); - em_tree = &BTRFS_I(inode)->extent_tree; - tree = &BTRFS_I(inode)->io_tree; - - if (isize == 0) - return 0; - -- end_index = (i_size_read(inode) - 1) >> PAGE_CACHE_SHIFT; -+ end_index = (i_size_read(inode) - 1) >> PAGE_SHIFT; - - while (last_offset < compressed_end) { -- pg_index = last_offset >> PAGE_CACHE_SHIFT; -+ pg_index = last_offset >> PAGE_SHIFT; - - if (pg_index > end_index) - break; -@@ -488,11 +488,11 @@ static noinline int add_ra_bio_pages(struct inode *inode, - break; - - if (add_to_page_cache_lru(page, mapping, pg_index, GFP_NOFS)) { -- page_cache_release(page); -+ put_page(page); - goto next; - } - -- end = last_offset + PAGE_CACHE_SIZE - 1; -+ end = last_offset + PAGE_SIZE - 1; - /* - * at this point, we have a locked page in the page cache - * for these bytes in the file. But, we have to make -@@ -502,27 +502,27 @@ static noinline int add_ra_bio_pages(struct inode *inode, - lock_extent(tree, last_offset, end); - read_lock(&em_tree->lock); - em = lookup_extent_mapping(em_tree, last_offset, -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - read_unlock(&em_tree->lock); - - if (!em || last_offset < em->start || -- (last_offset + PAGE_CACHE_SIZE > extent_map_end(em)) || -+ (last_offset + PAGE_SIZE > extent_map_end(em)) || - (em->block_start >> 9) != cb->orig_bio->bi_iter.bi_sector) { - free_extent_map(em); - unlock_extent(tree, last_offset, end); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - break; - } - free_extent_map(em); - - if (page->index == end_index) { - char *userpage; -- size_t zero_offset = isize & (PAGE_CACHE_SIZE - 1); -+ size_t zero_offset = isize & (PAGE_SIZE - 1); - - if (zero_offset) { - int zeros; -- zeros = PAGE_CACHE_SIZE - zero_offset; -+ zeros = PAGE_SIZE - zero_offset; - userpage = kmap_atomic(page); - memset(userpage + zero_offset, 0, zeros); - flush_dcache_page(page); -@@ -531,19 +531,19 @@ static noinline int add_ra_bio_pages(struct inode *inode, - } - - ret = bio_add_page(cb->orig_bio, page, -- PAGE_CACHE_SIZE, 0); -+ PAGE_SIZE, 0); - -- if (ret == PAGE_CACHE_SIZE) { -+ if (ret == PAGE_SIZE) { - nr_pages++; -- page_cache_release(page); -+ put_page(page); - } else { - unlock_extent(tree, last_offset, end); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - break; - } - next: -- last_offset += PAGE_CACHE_SIZE; -+ last_offset += PAGE_SIZE; - } - return 0; - } -@@ -567,7 +567,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, - struct extent_map_tree *em_tree; - struct compressed_bio *cb; - struct btrfs_root *root = BTRFS_I(inode)->root; -- unsigned long uncompressed_len = bio->bi_vcnt * PAGE_CACHE_SIZE; -+ unsigned long uncompressed_len = bio->bi_vcnt * PAGE_SIZE; - unsigned long compressed_len; - unsigned long nr_pages; - unsigned long pg_index; -@@ -589,7 +589,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, - read_lock(&em_tree->lock); - em = lookup_extent_mapping(em_tree, - page_offset(bio->bi_io_vec->bv_page), -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - read_unlock(&em_tree->lock); - if (!em) - return -EIO; -@@ -617,7 +617,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, - cb->compress_type = extent_compress_type(bio_flags); - cb->orig_bio = bio; - -- nr_pages = DIV_ROUND_UP(compressed_len, PAGE_CACHE_SIZE); -+ nr_pages = DIV_ROUND_UP(compressed_len, PAGE_SIZE); - cb->compressed_pages = kcalloc(nr_pages, sizeof(struct page *), - GFP_NOFS); - if (!cb->compressed_pages) -@@ -640,7 +640,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, - add_ra_bio_pages(inode, em_start + em_len, cb); - - /* include any pages we added in add_ra-bio_pages */ -- uncompressed_len = bio->bi_vcnt * PAGE_CACHE_SIZE; -+ uncompressed_len = bio->bi_vcnt * PAGE_SIZE; - cb->len = uncompressed_len; - - comp_bio = compressed_bio_alloc(bdev, cur_disk_byte, GFP_NOFS); -@@ -653,18 +653,18 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, - for (pg_index = 0; pg_index < nr_pages; pg_index++) { - page = cb->compressed_pages[pg_index]; - page->mapping = inode->i_mapping; -- page->index = em_start >> PAGE_CACHE_SHIFT; -+ page->index = em_start >> PAGE_SHIFT; - - if (comp_bio->bi_iter.bi_size) - ret = tree->ops->merge_bio_hook(READ, page, 0, -- PAGE_CACHE_SIZE, -+ PAGE_SIZE, - comp_bio, 0); - else - ret = 0; - - page->mapping = NULL; -- if (ret || bio_add_page(comp_bio, page, PAGE_CACHE_SIZE, 0) < -- PAGE_CACHE_SIZE) { -+ if (ret || bio_add_page(comp_bio, page, PAGE_SIZE, 0) < -+ PAGE_SIZE) { - bio_get(comp_bio); - - ret = btrfs_bio_wq_end_io(root->fs_info, comp_bio, -@@ -702,9 +702,9 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, - comp_bio->bi_private = cb; - comp_bio->bi_end_io = end_compressed_bio_read; - -- bio_add_page(comp_bio, page, PAGE_CACHE_SIZE, 0); -+ bio_add_page(comp_bio, page, PAGE_SIZE, 0); - } -- cur_disk_byte += PAGE_CACHE_SIZE; -+ cur_disk_byte += PAGE_SIZE; - } - bio_get(comp_bio); - -@@ -1013,8 +1013,8 @@ int btrfs_decompress_buf2page(char *buf, unsigned long buf_start, - - /* copy bytes from the working buffer into the pages */ - while (working_bytes > 0) { -- bytes = min(PAGE_CACHE_SIZE - *pg_offset, -- PAGE_CACHE_SIZE - buf_offset); -+ bytes = min(PAGE_SIZE - *pg_offset, -+ PAGE_SIZE - buf_offset); - bytes = min(bytes, working_bytes); - kaddr = kmap_atomic(page_out); - memcpy(kaddr + *pg_offset, buf + buf_offset, bytes); -@@ -1027,7 +1027,7 @@ int btrfs_decompress_buf2page(char *buf, unsigned long buf_start, - current_buf_start += bytes; - - /* check if we need to pick another page */ -- if (*pg_offset == PAGE_CACHE_SIZE) { -+ if (*pg_offset == PAGE_SIZE) { - (*pg_index)++; - if (*pg_index >= vcnt) - return 0; -diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c -index 769e0ff1b4ce..1ef1c40d70f4 100644 ---- a/fs/btrfs/ctree.c -+++ b/fs/btrfs/ctree.c -@@ -523,7 +523,7 @@ alloc_tree_mod_elem(struct extent_buffer *eb, int slot, - if (!tm) - return NULL; - -- tm->index = eb->start >> PAGE_CACHE_SHIFT; -+ tm->index = eb->start >> PAGE_SHIFT; - if (op != MOD_LOG_KEY_ADD) { - btrfs_node_key(eb, &tm->key, slot); - tm->blockptr = btrfs_node_blockptr(eb, slot); -@@ -588,7 +588,7 @@ tree_mod_log_insert_move(struct btrfs_fs_info *fs_info, - goto free_tms; - } - -- tm->index = eb->start >> PAGE_CACHE_SHIFT; -+ tm->index = eb->start >> PAGE_SHIFT; - tm->slot = src_slot; - tm->move.dst_slot = dst_slot; - tm->move.nr_items = nr_items; -@@ -699,7 +699,7 @@ tree_mod_log_insert_root(struct btrfs_fs_info *fs_info, - goto free_tms; - } - -- tm->index = new_root->start >> PAGE_CACHE_SHIFT; -+ tm->index = new_root->start >> PAGE_SHIFT; - tm->old_root.logical = old_root->start; - tm->old_root.level = btrfs_header_level(old_root); - tm->generation = btrfs_header_generation(old_root); -@@ -739,7 +739,7 @@ __tree_mod_log_search(struct btrfs_fs_info *fs_info, u64 start, u64 min_seq, - struct rb_node *node; - struct tree_mod_elem *cur = NULL; - struct tree_mod_elem *found = NULL; -- u64 index = start >> PAGE_CACHE_SHIFT; -+ u64 index = start >> PAGE_SHIFT; - - tree_mod_log_read_lock(fs_info); - tm_root = &fs_info->tree_mod_log; -diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c -index 5699bbc23feb..20ce055700f5 100644 ---- a/fs/btrfs/disk-io.c -+++ b/fs/btrfs/disk-io.c -@@ -1055,7 +1055,7 @@ static void btree_invalidatepage(struct page *page, unsigned int offset, - (unsigned long long)page_offset(page)); - ClearPagePrivate(page); - set_page_private(page, 0); -- page_cache_release(page); -+ put_page(page); - } - } - -@@ -1756,7 +1756,7 @@ static int setup_bdi(struct btrfs_fs_info *info, struct backing_dev_info *bdi) - if (err) - return err; - -- bdi->ra_pages = VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE; -+ bdi->ra_pages = VM_MAX_READAHEAD * 1024 / PAGE_SIZE; - bdi->congested_fn = btrfs_congested_fn; - bdi->congested_data = info; - bdi->capabilities |= BDI_CAP_CGROUP_WRITEBACK; -@@ -2534,7 +2534,7 @@ int open_ctree(struct super_block *sb, - err = ret; - goto fail_bdi; - } -- fs_info->dirty_metadata_batch = PAGE_CACHE_SIZE * -+ fs_info->dirty_metadata_batch = PAGE_SIZE * - (1 + ilog2(nr_cpu_ids)); - - ret = percpu_counter_init(&fs_info->delalloc_bytes, 0, GFP_KERNEL); -@@ -2778,7 +2778,7 @@ int open_ctree(struct super_block *sb, - * flag our filesystem as having big metadata blocks if - * they are bigger than the page size - */ -- if (btrfs_super_nodesize(disk_super) > PAGE_CACHE_SIZE) { -+ if (btrfs_super_nodesize(disk_super) > PAGE_SIZE) { - if (!(features & BTRFS_FEATURE_INCOMPAT_BIG_METADATA)) - printk(KERN_INFO "BTRFS: flagging fs with big metadata feature\n"); - features |= BTRFS_FEATURE_INCOMPAT_BIG_METADATA; -@@ -2828,7 +2828,7 @@ int open_ctree(struct super_block *sb, - - fs_info->bdi.ra_pages *= btrfs_super_num_devices(disk_super); - fs_info->bdi.ra_pages = max(fs_info->bdi.ra_pages, -- SZ_4M / PAGE_CACHE_SIZE); -+ SZ_4M / PAGE_SIZE); - - tree_root->nodesize = nodesize; - tree_root->sectorsize = sectorsize; -@@ -4060,9 +4060,9 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info, - ret = -EINVAL; - } - /* Only PAGE SIZE is supported yet */ -- if (sectorsize != PAGE_CACHE_SIZE) { -+ if (sectorsize != PAGE_SIZE) { - printk(KERN_ERR "BTRFS: sectorsize %llu not supported yet, only support %lu\n", -- sectorsize, PAGE_CACHE_SIZE); -+ sectorsize, PAGE_SIZE); - ret = -EINVAL; - } - if (!is_power_of_2(nodesize) || nodesize < sectorsize || -diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c -index e2287c7c10be..e50a13ea4dd8 100644 ---- a/fs/btrfs/extent-tree.c -+++ b/fs/btrfs/extent-tree.c -@@ -3452,7 +3452,7 @@ again: - num_pages = 1; - - num_pages *= 16; -- num_pages *= PAGE_CACHE_SIZE; -+ num_pages *= PAGE_SIZE; - - ret = btrfs_check_data_free_space(inode, 0, num_pages); - if (ret) -@@ -4639,7 +4639,7 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig, - loops = 0; - while (delalloc_bytes && loops < 3) { - max_reclaim = min(delalloc_bytes, to_reclaim); -- nr_pages = max_reclaim >> PAGE_CACHE_SHIFT; -+ nr_pages = max_reclaim >> PAGE_SHIFT; - btrfs_writeback_inodes_sb_nr(root, nr_pages, items); - /* - * We need to wait for the async pages to actually start before -diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c -index 392592dc7010..b7608fa4ddc4 100644 ---- a/fs/btrfs/extent_io.c -+++ b/fs/btrfs/extent_io.c -@@ -1365,23 +1365,23 @@ int try_lock_extent(struct extent_io_tree *tree, u64 start, u64 end) - - void extent_range_clear_dirty_for_io(struct inode *inode, u64 start, u64 end) - { -- unsigned long index = start >> PAGE_CACHE_SHIFT; -- unsigned long end_index = end >> PAGE_CACHE_SHIFT; -+ unsigned long index = start >> PAGE_SHIFT; -+ unsigned long end_index = end >> PAGE_SHIFT; - struct page *page; - - while (index <= end_index) { - page = find_get_page(inode->i_mapping, index); - BUG_ON(!page); /* Pages should be in the extent_io_tree */ - clear_page_dirty_for_io(page); -- page_cache_release(page); -+ put_page(page); - index++; - } - } - - void extent_range_redirty_for_io(struct inode *inode, u64 start, u64 end) - { -- unsigned long index = start >> PAGE_CACHE_SHIFT; -- unsigned long end_index = end >> PAGE_CACHE_SHIFT; -+ unsigned long index = start >> PAGE_SHIFT; -+ unsigned long end_index = end >> PAGE_SHIFT; - struct page *page; - - while (index <= end_index) { -@@ -1389,7 +1389,7 @@ void extent_range_redirty_for_io(struct inode *inode, u64 start, u64 end) - BUG_ON(!page); /* Pages should be in the extent_io_tree */ - __set_page_dirty_nobuffers(page); - account_page_redirty(page); -- page_cache_release(page); -+ put_page(page); - index++; - } - } -@@ -1399,15 +1399,15 @@ void extent_range_redirty_for_io(struct inode *inode, u64 start, u64 end) - */ - static void set_range_writeback(struct extent_io_tree *tree, u64 start, u64 end) - { -- unsigned long index = start >> PAGE_CACHE_SHIFT; -- unsigned long end_index = end >> PAGE_CACHE_SHIFT; -+ unsigned long index = start >> PAGE_SHIFT; -+ unsigned long end_index = end >> PAGE_SHIFT; - struct page *page; - - while (index <= end_index) { - page = find_get_page(tree->mapping, index); - BUG_ON(!page); /* Pages should be in the extent_io_tree */ - set_page_writeback(page); -- page_cache_release(page); -+ put_page(page); - index++; - } - } -@@ -1558,8 +1558,8 @@ static noinline void __unlock_for_delalloc(struct inode *inode, - { - int ret; - struct page *pages[16]; -- unsigned long index = start >> PAGE_CACHE_SHIFT; -- unsigned long end_index = end >> PAGE_CACHE_SHIFT; -+ unsigned long index = start >> PAGE_SHIFT; -+ unsigned long end_index = end >> PAGE_SHIFT; - unsigned long nr_pages = end_index - index + 1; - int i; - -@@ -1573,7 +1573,7 @@ static noinline void __unlock_for_delalloc(struct inode *inode, - for (i = 0; i < ret; i++) { - if (pages[i] != locked_page) - unlock_page(pages[i]); -- page_cache_release(pages[i]); -+ put_page(pages[i]); - } - nr_pages -= ret; - index += ret; -@@ -1586,9 +1586,9 @@ static noinline int lock_delalloc_pages(struct inode *inode, - u64 delalloc_start, - u64 delalloc_end) - { -- unsigned long index = delalloc_start >> PAGE_CACHE_SHIFT; -+ unsigned long index = delalloc_start >> PAGE_SHIFT; - unsigned long start_index = index; -- unsigned long end_index = delalloc_end >> PAGE_CACHE_SHIFT; -+ unsigned long end_index = delalloc_end >> PAGE_SHIFT; - unsigned long pages_locked = 0; - struct page *pages[16]; - unsigned long nrpages; -@@ -1621,11 +1621,11 @@ static noinline int lock_delalloc_pages(struct inode *inode, - pages[i]->mapping != inode->i_mapping) { - ret = -EAGAIN; - unlock_page(pages[i]); -- page_cache_release(pages[i]); -+ put_page(pages[i]); - goto done; - } - } -- page_cache_release(pages[i]); -+ put_page(pages[i]); - pages_locked++; - } - nrpages -= ret; -@@ -1638,7 +1638,7 @@ done: - __unlock_for_delalloc(inode, locked_page, - delalloc_start, - ((u64)(start_index + pages_locked - 1)) << -- PAGE_CACHE_SHIFT); -+ PAGE_SHIFT); - } - return ret; - } -@@ -1698,7 +1698,7 @@ again: - free_extent_state(cached_state); - cached_state = NULL; - if (!loops) { -- max_bytes = PAGE_CACHE_SIZE; -+ max_bytes = PAGE_SIZE; - loops = 1; - goto again; - } else { -@@ -1737,8 +1737,8 @@ void extent_clear_unlock_delalloc(struct inode *inode, u64 start, u64 end, - struct extent_io_tree *tree = &BTRFS_I(inode)->io_tree; - int ret; - struct page *pages[16]; -- unsigned long index = start >> PAGE_CACHE_SHIFT; -- unsigned long end_index = end >> PAGE_CACHE_SHIFT; -+ unsigned long index = start >> PAGE_SHIFT; -+ unsigned long end_index = end >> PAGE_SHIFT; - unsigned long nr_pages = end_index - index + 1; - int i; - -@@ -1759,7 +1759,7 @@ void extent_clear_unlock_delalloc(struct inode *inode, u64 start, u64 end, - SetPagePrivate2(pages[i]); - - if (pages[i] == locked_page) { -- page_cache_release(pages[i]); -+ put_page(pages[i]); - continue; - } - if (page_ops & PAGE_CLEAR_DIRTY) -@@ -1772,7 +1772,7 @@ void extent_clear_unlock_delalloc(struct inode *inode, u64 start, u64 end, - end_page_writeback(pages[i]); - if (page_ops & PAGE_UNLOCK) - unlock_page(pages[i]); -- page_cache_release(pages[i]); -+ put_page(pages[i]); - } - nr_pages -= ret; - index += ret; -@@ -1961,7 +1961,7 @@ int test_range_bit(struct extent_io_tree *tree, u64 start, u64 end, - static void check_page_uptodate(struct extent_io_tree *tree, struct page *page) - { - u64 start = page_offset(page); -- u64 end = start + PAGE_CACHE_SIZE - 1; -+ u64 end = start + PAGE_SIZE - 1; - if (test_range_bit(tree, start, end, EXTENT_UPTODATE, 1, NULL)) - SetPageUptodate(page); - } -@@ -2071,11 +2071,11 @@ int repair_eb_io_failure(struct btrfs_root *root, struct extent_buffer *eb, - struct page *p = eb->pages[i]; - - ret = repair_io_failure(root->fs_info->btree_inode, start, -- PAGE_CACHE_SIZE, start, p, -+ PAGE_SIZE, start, p, - start - page_offset(p), mirror_num); - if (ret) - break; -- start += PAGE_CACHE_SIZE; -+ start += PAGE_SIZE; - } - - return ret; -@@ -2471,8 +2471,8 @@ static void end_bio_extent_writepage(struct bio *bio) - * advance bv_offset and adjust bv_len to compensate. - * Print a warning for nonzero offsets, and an error - * if they don't add up to a full page. */ -- if (bvec->bv_offset || bvec->bv_len != PAGE_CACHE_SIZE) { -- if (bvec->bv_offset + bvec->bv_len != PAGE_CACHE_SIZE) -+ if (bvec->bv_offset || bvec->bv_len != PAGE_SIZE) { -+ if (bvec->bv_offset + bvec->bv_len != PAGE_SIZE) - btrfs_err(BTRFS_I(page->mapping->host)->root->fs_info, - "partial page write in btrfs with offset %u and length %u", - bvec->bv_offset, bvec->bv_len); -@@ -2546,8 +2546,8 @@ static void end_bio_extent_readpage(struct bio *bio) - * advance bv_offset and adjust bv_len to compensate. - * Print a warning for nonzero offsets, and an error - * if they don't add up to a full page. */ -- if (bvec->bv_offset || bvec->bv_len != PAGE_CACHE_SIZE) { -- if (bvec->bv_offset + bvec->bv_len != PAGE_CACHE_SIZE) -+ if (bvec->bv_offset || bvec->bv_len != PAGE_SIZE) { -+ if (bvec->bv_offset + bvec->bv_len != PAGE_SIZE) - btrfs_err(BTRFS_I(page->mapping->host)->root->fs_info, - "partial page read in btrfs with offset %u and length %u", - bvec->bv_offset, bvec->bv_len); -@@ -2603,13 +2603,13 @@ static void end_bio_extent_readpage(struct bio *bio) - readpage_ok: - if (likely(uptodate)) { - loff_t i_size = i_size_read(inode); -- pgoff_t end_index = i_size >> PAGE_CACHE_SHIFT; -+ pgoff_t end_index = i_size >> PAGE_SHIFT; - unsigned off; - - /* Zero out the end if this page straddles i_size */ -- off = i_size & (PAGE_CACHE_SIZE-1); -+ off = i_size & (PAGE_SIZE-1); - if (page->index == end_index && off) -- zero_user_segment(page, off, PAGE_CACHE_SIZE); -+ zero_user_segment(page, off, PAGE_SIZE); - SetPageUptodate(page); - } else { - ClearPageUptodate(page); -@@ -2773,7 +2773,7 @@ static int submit_extent_page(int rw, struct extent_io_tree *tree, - struct bio *bio; - int contig = 0; - int old_compressed = prev_bio_flags & EXTENT_BIO_COMPRESSED; -- size_t page_size = min_t(size_t, size, PAGE_CACHE_SIZE); -+ size_t page_size = min_t(size_t, size, PAGE_SIZE); - - if (bio_ret && *bio_ret) { - bio = *bio_ret; -@@ -2826,7 +2826,7 @@ static void attach_extent_buffer_page(struct extent_buffer *eb, - { - if (!PagePrivate(page)) { - SetPagePrivate(page); -- page_cache_get(page); -+ get_page(page); - set_page_private(page, (unsigned long)eb); - } else { - WARN_ON(page->private != (unsigned long)eb); -@@ -2837,7 +2837,7 @@ void set_page_extent_mapped(struct page *page) - { - if (!PagePrivate(page)) { - SetPagePrivate(page); -- page_cache_get(page); -+ get_page(page); - set_page_private(page, EXTENT_PAGE_PRIVATE); - } - } -@@ -2885,7 +2885,7 @@ static int __do_readpage(struct extent_io_tree *tree, - { - struct inode *inode = page->mapping->host; - u64 start = page_offset(page); -- u64 page_end = start + PAGE_CACHE_SIZE - 1; -+ u64 page_end = start + PAGE_SIZE - 1; - u64 end; - u64 cur = start; - u64 extent_offset; -@@ -2914,12 +2914,12 @@ static int __do_readpage(struct extent_io_tree *tree, - } - } - -- if (page->index == last_byte >> PAGE_CACHE_SHIFT) { -+ if (page->index == last_byte >> PAGE_SHIFT) { - char *userpage; -- size_t zero_offset = last_byte & (PAGE_CACHE_SIZE - 1); -+ size_t zero_offset = last_byte & (PAGE_SIZE - 1); - - if (zero_offset) { -- iosize = PAGE_CACHE_SIZE - zero_offset; -+ iosize = PAGE_SIZE - zero_offset; - userpage = kmap_atomic(page); - memset(userpage + zero_offset, 0, iosize); - flush_dcache_page(page); -@@ -2927,14 +2927,14 @@ static int __do_readpage(struct extent_io_tree *tree, - } - } - while (cur <= end) { -- unsigned long pnr = (last_byte >> PAGE_CACHE_SHIFT) + 1; -+ unsigned long pnr = (last_byte >> PAGE_SHIFT) + 1; - bool force_bio_submit = false; - - if (cur >= last_byte) { - char *userpage; - struct extent_state *cached = NULL; - -- iosize = PAGE_CACHE_SIZE - pg_offset; -+ iosize = PAGE_SIZE - pg_offset; - userpage = kmap_atomic(page); - memset(userpage + pg_offset, 0, iosize); - flush_dcache_page(page); -@@ -3117,7 +3117,7 @@ static inline void __do_contiguous_readpages(struct extent_io_tree *tree, - for (index = 0; index < nr_pages; index++) { - __do_readpage(tree, pages[index], get_extent, em_cached, bio, - mirror_num, bio_flags, rw, prev_em_start); -- page_cache_release(pages[index]); -+ put_page(pages[index]); - } - } - -@@ -3139,10 +3139,10 @@ static void __extent_readpages(struct extent_io_tree *tree, - page_start = page_offset(pages[index]); - if (!end) { - start = page_start; -- end = start + PAGE_CACHE_SIZE - 1; -+ end = start + PAGE_SIZE - 1; - first_index = index; - } else if (end + 1 == page_start) { -- end += PAGE_CACHE_SIZE; -+ end += PAGE_SIZE; - } else { - __do_contiguous_readpages(tree, &pages[first_index], - index - first_index, start, -@@ -3150,7 +3150,7 @@ static void __extent_readpages(struct extent_io_tree *tree, - bio, mirror_num, bio_flags, - rw, prev_em_start); - start = page_start; -- end = start + PAGE_CACHE_SIZE - 1; -+ end = start + PAGE_SIZE - 1; - first_index = index; - } - } -@@ -3172,7 +3172,7 @@ static int __extent_read_full_page(struct extent_io_tree *tree, - struct inode *inode = page->mapping->host; - struct btrfs_ordered_extent *ordered; - u64 start = page_offset(page); -- u64 end = start + PAGE_CACHE_SIZE - 1; -+ u64 end = start + PAGE_SIZE - 1; - int ret; - - while (1) { -@@ -3231,7 +3231,7 @@ static noinline_for_stack int writepage_delalloc(struct inode *inode, - unsigned long *nr_written) - { - struct extent_io_tree *tree = epd->tree; -- u64 page_end = delalloc_start + PAGE_CACHE_SIZE - 1; -+ u64 page_end = delalloc_start + PAGE_SIZE - 1; - u64 nr_delalloc; - u64 delalloc_to_write = 0; - u64 delalloc_end = 0; -@@ -3270,11 +3270,11 @@ static noinline_for_stack int writepage_delalloc(struct inode *inode, - /* - * delalloc_end is already one less than the total - * length, so we don't subtract one from -- * PAGE_CACHE_SIZE -+ * PAGE_SIZE - */ - delalloc_to_write += (delalloc_end - delalloc_start + -- PAGE_CACHE_SIZE) >> -- PAGE_CACHE_SHIFT; -+ PAGE_SIZE) >> -+ PAGE_SHIFT; - delalloc_start = delalloc_end + 1; - } - if (wbc->nr_to_write < delalloc_to_write) { -@@ -3323,7 +3323,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode, - { - struct extent_io_tree *tree = epd->tree; - u64 start = page_offset(page); -- u64 page_end = start + PAGE_CACHE_SIZE - 1; -+ u64 page_end = start + PAGE_SIZE - 1; - u64 end; - u64 cur = start; - u64 extent_offset; -@@ -3438,7 +3438,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode, - if (ret) { - SetPageError(page); - } else { -- unsigned long max_nr = (i_size >> PAGE_CACHE_SHIFT) + 1; -+ unsigned long max_nr = (i_size >> PAGE_SHIFT) + 1; - - set_range_writeback(tree, cur, cur + iosize - 1); - if (!PageWriteback(page)) { -@@ -3481,12 +3481,12 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc, - struct inode *inode = page->mapping->host; - struct extent_page_data *epd = data; - u64 start = page_offset(page); -- u64 page_end = start + PAGE_CACHE_SIZE - 1; -+ u64 page_end = start + PAGE_SIZE - 1; - int ret; - int nr = 0; - size_t pg_offset = 0; - loff_t i_size = i_size_read(inode); -- unsigned long end_index = i_size >> PAGE_CACHE_SHIFT; -+ unsigned long end_index = i_size >> PAGE_SHIFT; - int write_flags; - unsigned long nr_written = 0; - -@@ -3501,10 +3501,10 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc, - - ClearPageError(page); - -- pg_offset = i_size & (PAGE_CACHE_SIZE - 1); -+ pg_offset = i_size & (PAGE_SIZE - 1); - if (page->index > end_index || - (page->index == end_index && !pg_offset)) { -- page->mapping->a_ops->invalidatepage(page, 0, PAGE_CACHE_SIZE); -+ page->mapping->a_ops->invalidatepage(page, 0, PAGE_SIZE); - unlock_page(page); - return 0; - } -@@ -3514,7 +3514,7 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc, - - userpage = kmap_atomic(page); - memset(userpage + pg_offset, 0, -- PAGE_CACHE_SIZE - pg_offset); -+ PAGE_SIZE - pg_offset); - kunmap_atomic(userpage); - flush_dcache_page(page); - } -@@ -3752,7 +3752,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb, - clear_page_dirty_for_io(p); - set_page_writeback(p); - ret = submit_extent_page(rw, tree, wbc, p, offset >> 9, -- PAGE_CACHE_SIZE, 0, bdev, &epd->bio, -+ PAGE_SIZE, 0, bdev, &epd->bio, - -1, end_bio_extent_buffer_writepage, - 0, epd->bio_flags, bio_flags, false); - epd->bio_flags = bio_flags; -@@ -3764,7 +3764,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb, - ret = -EIO; - break; - } -- offset += PAGE_CACHE_SIZE; -+ offset += PAGE_SIZE; - update_nr_written(p, wbc, 1); - unlock_page(p); - } -@@ -3808,8 +3808,8 @@ int btree_write_cache_pages(struct address_space *mapping, - index = mapping->writeback_index; /* Start from prev offset */ - end = -1; - } else { -- index = wbc->range_start >> PAGE_CACHE_SHIFT; -- end = wbc->range_end >> PAGE_CACHE_SHIFT; -+ index = wbc->range_start >> PAGE_SHIFT; -+ end = wbc->range_end >> PAGE_SHIFT; - scanned = 1; - } - if (wbc->sync_mode == WB_SYNC_ALL) -@@ -3952,8 +3952,8 @@ static int extent_write_cache_pages(struct extent_io_tree *tree, - index = mapping->writeback_index; /* Start from prev offset */ - end = -1; - } else { -- index = wbc->range_start >> PAGE_CACHE_SHIFT; -- end = wbc->range_end >> PAGE_CACHE_SHIFT; -+ index = wbc->range_start >> PAGE_SHIFT; -+ end = wbc->range_end >> PAGE_SHIFT; - scanned = 1; - } - if (wbc->sync_mode == WB_SYNC_ALL) -@@ -4087,8 +4087,8 @@ int extent_write_locked_range(struct extent_io_tree *tree, struct inode *inode, - int ret = 0; - struct address_space *mapping = inode->i_mapping; - struct page *page; -- unsigned long nr_pages = (end - start + PAGE_CACHE_SIZE) >> -- PAGE_CACHE_SHIFT; -+ unsigned long nr_pages = (end - start + PAGE_SIZE) >> -+ PAGE_SHIFT; - - struct extent_page_data epd = { - .bio = NULL, -@@ -4106,18 +4106,18 @@ int extent_write_locked_range(struct extent_io_tree *tree, struct inode *inode, - }; - - while (start <= end) { -- page = find_get_page(mapping, start >> PAGE_CACHE_SHIFT); -+ page = find_get_page(mapping, start >> PAGE_SHIFT); - if (clear_page_dirty_for_io(page)) - ret = __extent_writepage(page, &wbc_writepages, &epd); - else { - if (tree->ops && tree->ops->writepage_end_io_hook) - tree->ops->writepage_end_io_hook(page, start, -- start + PAGE_CACHE_SIZE - 1, -+ start + PAGE_SIZE - 1, - NULL, 1); - unlock_page(page); - } -- page_cache_release(page); -- start += PAGE_CACHE_SIZE; -+ put_page(page); -+ start += PAGE_SIZE; - } - - flush_epd_write_bio(&epd); -@@ -4167,7 +4167,7 @@ int extent_readpages(struct extent_io_tree *tree, - list_del(&page->lru); - if (add_to_page_cache_lru(page, mapping, - page->index, GFP_NOFS)) { -- page_cache_release(page); -+ put_page(page); - continue; - } - -@@ -4201,7 +4201,7 @@ int extent_invalidatepage(struct extent_io_tree *tree, - { - struct extent_state *cached_state = NULL; - u64 start = page_offset(page); -- u64 end = start + PAGE_CACHE_SIZE - 1; -+ u64 end = start + PAGE_SIZE - 1; - size_t blocksize = page->mapping->host->i_sb->s_blocksize; - - start += ALIGN(offset, blocksize); -@@ -4227,7 +4227,7 @@ static int try_release_extent_state(struct extent_map_tree *map, - struct page *page, gfp_t mask) - { - u64 start = page_offset(page); -- u64 end = start + PAGE_CACHE_SIZE - 1; -+ u64 end = start + PAGE_SIZE - 1; - int ret = 1; - - if (test_range_bit(tree, start, end, -@@ -4266,7 +4266,7 @@ int try_release_extent_mapping(struct extent_map_tree *map, - { - struct extent_map *em; - u64 start = page_offset(page); -- u64 end = start + PAGE_CACHE_SIZE - 1; -+ u64 end = start + PAGE_SIZE - 1; - - if (gfpflags_allow_blocking(mask) && - page->mapping->host->i_size > SZ_16M) { -@@ -4591,14 +4591,14 @@ static void btrfs_release_extent_buffer_page(struct extent_buffer *eb) - ClearPagePrivate(page); - set_page_private(page, 0); - /* One for the page private */ -- page_cache_release(page); -+ put_page(page); - } - - if (mapped) - spin_unlock(&page->mapping->private_lock); - - /* One for when we alloced the page */ -- page_cache_release(page); -+ put_page(page); - } while (index != 0); - } - -@@ -4783,7 +4783,7 @@ struct extent_buffer *find_extent_buffer(struct btrfs_fs_info *fs_info, - - rcu_read_lock(); - eb = radix_tree_lookup(&fs_info->buffer_radix, -- start >> PAGE_CACHE_SHIFT); -+ start >> PAGE_SHIFT); - if (eb && atomic_inc_not_zero(&eb->refs)) { - rcu_read_unlock(); - /* -@@ -4833,7 +4833,7 @@ again: - goto free_eb; - spin_lock(&fs_info->buffer_lock); - ret = radix_tree_insert(&fs_info->buffer_radix, -- start >> PAGE_CACHE_SHIFT, eb); -+ start >> PAGE_SHIFT, eb); - spin_unlock(&fs_info->buffer_lock); - radix_tree_preload_end(); - if (ret == -EEXIST) { -@@ -4866,7 +4866,7 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info, - unsigned long len = fs_info->tree_root->nodesize; - unsigned long num_pages = num_extent_pages(start, len); - unsigned long i; -- unsigned long index = start >> PAGE_CACHE_SHIFT; -+ unsigned long index = start >> PAGE_SHIFT; - struct extent_buffer *eb; - struct extent_buffer *exists = NULL; - struct page *p; -@@ -4900,7 +4900,7 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info, - if (atomic_inc_not_zero(&exists->refs)) { - spin_unlock(&mapping->private_lock); - unlock_page(p); -- page_cache_release(p); -+ put_page(p); - mark_extent_buffer_accessed(exists, p); - goto free_eb; - } -@@ -4912,7 +4912,7 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info, - */ - ClearPagePrivate(p); - WARN_ON(PageDirty(p)); -- page_cache_release(p); -+ put_page(p); - } - attach_extent_buffer_page(eb, p); - spin_unlock(&mapping->private_lock); -@@ -4935,7 +4935,7 @@ again: - - spin_lock(&fs_info->buffer_lock); - ret = radix_tree_insert(&fs_info->buffer_radix, -- start >> PAGE_CACHE_SHIFT, eb); -+ start >> PAGE_SHIFT, eb); - spin_unlock(&fs_info->buffer_lock); - radix_tree_preload_end(); - if (ret == -EEXIST) { -@@ -4998,7 +4998,7 @@ static int release_extent_buffer(struct extent_buffer *eb) - - spin_lock(&fs_info->buffer_lock); - radix_tree_delete(&fs_info->buffer_radix, -- eb->start >> PAGE_CACHE_SHIFT); -+ eb->start >> PAGE_SHIFT); - spin_unlock(&fs_info->buffer_lock); - } else { - spin_unlock(&eb->refs_lock); -@@ -5172,8 +5172,8 @@ int read_extent_buffer_pages(struct extent_io_tree *tree, - - if (start) { - WARN_ON(start < eb->start); -- start_i = (start >> PAGE_CACHE_SHIFT) - -- (eb->start >> PAGE_CACHE_SHIFT); -+ start_i = (start >> PAGE_SHIFT) - -+ (eb->start >> PAGE_SHIFT); - } else { - start_i = 0; - } -@@ -5256,18 +5256,18 @@ void read_extent_buffer(struct extent_buffer *eb, void *dstv, - struct page *page; - char *kaddr; - char *dst = (char *)dstv; -- size_t start_offset = eb->start & ((u64)PAGE_CACHE_SIZE - 1); -- unsigned long i = (start_offset + start) >> PAGE_CACHE_SHIFT; -+ size_t start_offset = eb->start & ((u64)PAGE_SIZE - 1); -+ unsigned long i = (start_offset + start) >> PAGE_SHIFT; - - WARN_ON(start > eb->len); - WARN_ON(start + len > eb->start + eb->len); - -- offset = (start_offset + start) & (PAGE_CACHE_SIZE - 1); -+ offset = (start_offset + start) & (PAGE_SIZE - 1); - - while (len > 0) { - page = eb->pages[i]; - -- cur = min(len, (PAGE_CACHE_SIZE - offset)); -+ cur = min(len, (PAGE_SIZE - offset)); - kaddr = page_address(page); - memcpy(dst, kaddr + offset, cur); - -@@ -5287,19 +5287,19 @@ int read_extent_buffer_to_user(struct extent_buffer *eb, void __user *dstv, - struct page *page; - char *kaddr; - char __user *dst = (char __user *)dstv; -- size_t start_offset = eb->start & ((u64)PAGE_CACHE_SIZE - 1); -- unsigned long i = (start_offset + start) >> PAGE_CACHE_SHIFT; -+ size_t start_offset = eb->start & ((u64)PAGE_SIZE - 1); -+ unsigned long i = (start_offset + start) >> PAGE_SHIFT; - int ret = 0; - - WARN_ON(start > eb->len); - WARN_ON(start + len > eb->start + eb->len); - -- offset = (start_offset + start) & (PAGE_CACHE_SIZE - 1); -+ offset = (start_offset + start) & (PAGE_SIZE - 1); - - while (len > 0) { - page = eb->pages[i]; - -- cur = min(len, (PAGE_CACHE_SIZE - offset)); -+ cur = min(len, (PAGE_SIZE - offset)); - kaddr = page_address(page); - if (copy_to_user(dst, kaddr + offset, cur)) { - ret = -EFAULT; -@@ -5320,13 +5320,13 @@ int map_private_extent_buffer(struct extent_buffer *eb, unsigned long start, - unsigned long *map_start, - unsigned long *map_len) - { -- size_t offset = start & (PAGE_CACHE_SIZE - 1); -+ size_t offset = start & (PAGE_SIZE - 1); - char *kaddr; - struct page *p; -- size_t start_offset = eb->start & ((u64)PAGE_CACHE_SIZE - 1); -- unsigned long i = (start_offset + start) >> PAGE_CACHE_SHIFT; -+ size_t start_offset = eb->start & ((u64)PAGE_SIZE - 1); -+ unsigned long i = (start_offset + start) >> PAGE_SHIFT; - unsigned long end_i = (start_offset + start + min_len - 1) >> -- PAGE_CACHE_SHIFT; -+ PAGE_SHIFT; - - if (i != end_i) - return -EINVAL; -@@ -5336,7 +5336,7 @@ int map_private_extent_buffer(struct extent_buffer *eb, unsigned long start, - *map_start = 0; - } else { - offset = 0; -- *map_start = ((u64)i << PAGE_CACHE_SHIFT) - start_offset; -+ *map_start = ((u64)i << PAGE_SHIFT) - start_offset; - } - - if (start + min_len > eb->len) { -@@ -5349,7 +5349,7 @@ int map_private_extent_buffer(struct extent_buffer *eb, unsigned long start, - p = eb->pages[i]; - kaddr = page_address(p); - *map = kaddr + offset; -- *map_len = PAGE_CACHE_SIZE - offset; -+ *map_len = PAGE_SIZE - offset; - return 0; - } - -@@ -5362,19 +5362,19 @@ int memcmp_extent_buffer(struct extent_buffer *eb, const void *ptrv, - struct page *page; - char *kaddr; - char *ptr = (char *)ptrv; -- size_t start_offset = eb->start & ((u64)PAGE_CACHE_SIZE - 1); -- unsigned long i = (start_offset + start) >> PAGE_CACHE_SHIFT; -+ size_t start_offset = eb->start & ((u64)PAGE_SIZE - 1); -+ unsigned long i = (start_offset + start) >> PAGE_SHIFT; - int ret = 0; - - WARN_ON(start > eb->len); - WARN_ON(start + len > eb->start + eb->len); - -- offset = (start_offset + start) & (PAGE_CACHE_SIZE - 1); -+ offset = (start_offset + start) & (PAGE_SIZE - 1); - - while (len > 0) { - page = eb->pages[i]; - -- cur = min(len, (PAGE_CACHE_SIZE - offset)); -+ cur = min(len, (PAGE_SIZE - offset)); - - kaddr = page_address(page); - ret = memcmp(ptr, kaddr + offset, cur); -@@ -5397,19 +5397,19 @@ void write_extent_buffer(struct extent_buffer *eb, const void *srcv, - struct page *page; - char *kaddr; - char *src = (char *)srcv; -- size_t start_offset = eb->start & ((u64)PAGE_CACHE_SIZE - 1); -- unsigned long i = (start_offset + start) >> PAGE_CACHE_SHIFT; -+ size_t start_offset = eb->start & ((u64)PAGE_SIZE - 1); -+ unsigned long i = (start_offset + start) >> PAGE_SHIFT; - - WARN_ON(start > eb->len); - WARN_ON(start + len > eb->start + eb->len); - -- offset = (start_offset + start) & (PAGE_CACHE_SIZE - 1); -+ offset = (start_offset + start) & (PAGE_SIZE - 1); - - while (len > 0) { - page = eb->pages[i]; - WARN_ON(!PageUptodate(page)); - -- cur = min(len, PAGE_CACHE_SIZE - offset); -+ cur = min(len, PAGE_SIZE - offset); - kaddr = page_address(page); - memcpy(kaddr + offset, src, cur); - -@@ -5427,19 +5427,19 @@ void memset_extent_buffer(struct extent_buffer *eb, char c, - size_t offset; - struct page *page; - char *kaddr; -- size_t start_offset = eb->start & ((u64)PAGE_CACHE_SIZE - 1); -- unsigned long i = (start_offset + start) >> PAGE_CACHE_SHIFT; -+ size_t start_offset = eb->start & ((u64)PAGE_SIZE - 1); -+ unsigned long i = (start_offset + start) >> PAGE_SHIFT; - - WARN_ON(start > eb->len); - WARN_ON(start + len > eb->start + eb->len); - -- offset = (start_offset + start) & (PAGE_CACHE_SIZE - 1); -+ offset = (start_offset + start) & (PAGE_SIZE - 1); - - while (len > 0) { - page = eb->pages[i]; - WARN_ON(!PageUptodate(page)); - -- cur = min(len, PAGE_CACHE_SIZE - offset); -+ cur = min(len, PAGE_SIZE - offset); - kaddr = page_address(page); - memset(kaddr + offset, c, cur); - -@@ -5458,19 +5458,19 @@ void copy_extent_buffer(struct extent_buffer *dst, struct extent_buffer *src, - size_t offset; - struct page *page; - char *kaddr; -- size_t start_offset = dst->start & ((u64)PAGE_CACHE_SIZE - 1); -- unsigned long i = (start_offset + dst_offset) >> PAGE_CACHE_SHIFT; -+ size_t start_offset = dst->start & ((u64)PAGE_SIZE - 1); -+ unsigned long i = (start_offset + dst_offset) >> PAGE_SHIFT; - - WARN_ON(src->len != dst_len); - - offset = (start_offset + dst_offset) & -- (PAGE_CACHE_SIZE - 1); -+ (PAGE_SIZE - 1); - - while (len > 0) { - page = dst->pages[i]; - WARN_ON(!PageUptodate(page)); - -- cur = min(len, (unsigned long)(PAGE_CACHE_SIZE - offset)); -+ cur = min(len, (unsigned long)(PAGE_SIZE - offset)); - - kaddr = page_address(page); - read_extent_buffer(src, kaddr + offset, src_offset, cur); -@@ -5512,7 +5512,7 @@ static inline void eb_bitmap_offset(struct extent_buffer *eb, - unsigned long *page_index, - size_t *page_offset) - { -- size_t start_offset = eb->start & ((u64)PAGE_CACHE_SIZE - 1); -+ size_t start_offset = eb->start & ((u64)PAGE_SIZE - 1); - size_t byte_offset = BIT_BYTE(nr); - size_t offset; - -@@ -5523,8 +5523,8 @@ static inline void eb_bitmap_offset(struct extent_buffer *eb, - */ - offset = start_offset + start + byte_offset; - -- *page_index = offset >> PAGE_CACHE_SHIFT; -- *page_offset = offset & (PAGE_CACHE_SIZE - 1); -+ *page_index = offset >> PAGE_SHIFT; -+ *page_offset = offset & (PAGE_SIZE - 1); - } - - /** -@@ -5576,7 +5576,7 @@ void extent_buffer_bitmap_set(struct extent_buffer *eb, unsigned long start, - len -= bits_to_set; - bits_to_set = BITS_PER_BYTE; - mask_to_set = ~0U; -- if (++offset >= PAGE_CACHE_SIZE && len > 0) { -+ if (++offset >= PAGE_SIZE && len > 0) { - offset = 0; - page = eb->pages[++i]; - WARN_ON(!PageUptodate(page)); -@@ -5618,7 +5618,7 @@ void extent_buffer_bitmap_clear(struct extent_buffer *eb, unsigned long start, - len -= bits_to_clear; - bits_to_clear = BITS_PER_BYTE; - mask_to_clear = ~0U; -- if (++offset >= PAGE_CACHE_SIZE && len > 0) { -+ if (++offset >= PAGE_SIZE && len > 0) { - offset = 0; - page = eb->pages[++i]; - WARN_ON(!PageUptodate(page)); -@@ -5665,7 +5665,7 @@ void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset, - size_t cur; - size_t dst_off_in_page; - size_t src_off_in_page; -- size_t start_offset = dst->start & ((u64)PAGE_CACHE_SIZE - 1); -+ size_t start_offset = dst->start & ((u64)PAGE_SIZE - 1); - unsigned long dst_i; - unsigned long src_i; - -@@ -5684,17 +5684,17 @@ void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset, - - while (len > 0) { - dst_off_in_page = (start_offset + dst_offset) & -- (PAGE_CACHE_SIZE - 1); -+ (PAGE_SIZE - 1); - src_off_in_page = (start_offset + src_offset) & -- (PAGE_CACHE_SIZE - 1); -+ (PAGE_SIZE - 1); - -- dst_i = (start_offset + dst_offset) >> PAGE_CACHE_SHIFT; -- src_i = (start_offset + src_offset) >> PAGE_CACHE_SHIFT; -+ dst_i = (start_offset + dst_offset) >> PAGE_SHIFT; -+ src_i = (start_offset + src_offset) >> PAGE_SHIFT; - -- cur = min(len, (unsigned long)(PAGE_CACHE_SIZE - -+ cur = min(len, (unsigned long)(PAGE_SIZE - - src_off_in_page)); - cur = min_t(unsigned long, cur, -- (unsigned long)(PAGE_CACHE_SIZE - dst_off_in_page)); -+ (unsigned long)(PAGE_SIZE - dst_off_in_page)); - - copy_pages(dst->pages[dst_i], dst->pages[src_i], - dst_off_in_page, src_off_in_page, cur); -@@ -5713,7 +5713,7 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset, - size_t src_off_in_page; - unsigned long dst_end = dst_offset + len - 1; - unsigned long src_end = src_offset + len - 1; -- size_t start_offset = dst->start & ((u64)PAGE_CACHE_SIZE - 1); -+ size_t start_offset = dst->start & ((u64)PAGE_SIZE - 1); - unsigned long dst_i; - unsigned long src_i; - -@@ -5732,13 +5732,13 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset, - return; - } - while (len > 0) { -- dst_i = (start_offset + dst_end) >> PAGE_CACHE_SHIFT; -- src_i = (start_offset + src_end) >> PAGE_CACHE_SHIFT; -+ dst_i = (start_offset + dst_end) >> PAGE_SHIFT; -+ src_i = (start_offset + src_end) >> PAGE_SHIFT; - - dst_off_in_page = (start_offset + dst_end) & -- (PAGE_CACHE_SIZE - 1); -+ (PAGE_SIZE - 1); - src_off_in_page = (start_offset + src_end) & -- (PAGE_CACHE_SIZE - 1); -+ (PAGE_SIZE - 1); - - cur = min_t(unsigned long, len, src_off_in_page + 1); - cur = min(cur, dst_off_in_page + 1); -diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h -index 880d5292e972..9c5abfac3338 100644 ---- a/fs/btrfs/extent_io.h -+++ b/fs/btrfs/extent_io.h -@@ -120,7 +120,7 @@ struct extent_state { - }; - - #define INLINE_EXTENT_BUFFER_PAGES 16 --#define MAX_INLINE_EXTENT_BUFFER_SIZE (INLINE_EXTENT_BUFFER_PAGES * PAGE_CACHE_SIZE) -+#define MAX_INLINE_EXTENT_BUFFER_SIZE (INLINE_EXTENT_BUFFER_PAGES * PAGE_SIZE) - struct extent_buffer { - u64 start; - unsigned long len; -@@ -366,8 +366,8 @@ void wait_on_extent_buffer_writeback(struct extent_buffer *eb); - - static inline unsigned long num_extent_pages(u64 start, u64 len) - { -- return ((start + len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT) - -- (start >> PAGE_CACHE_SHIFT); -+ return ((start + len + PAGE_SIZE - 1) >> PAGE_SHIFT) - -+ (start >> PAGE_SHIFT); - } - - static inline void extent_buffer_get(struct extent_buffer *eb) -diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c -index a67e1c828d0f..9311b524b1c1 100644 ---- a/fs/btrfs/file-item.c -+++ b/fs/btrfs/file-item.c -@@ -31,7 +31,7 @@ - size) - 1)) - - #define MAX_CSUM_ITEMS(r, size) (min_t(u32, __MAX_CSUM_ITEMS(r, size), \ -- PAGE_CACHE_SIZE)) -+ PAGE_SIZE)) - - #define MAX_ORDERED_SUM_BYTES(r) ((PAGE_SIZE - \ - sizeof(struct btrfs_ordered_sum)) / \ -@@ -201,7 +201,7 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root, - csum = (u8 *)dst; - } - -- if (bio->bi_iter.bi_size > PAGE_CACHE_SIZE * 8) -+ if (bio->bi_iter.bi_size > PAGE_SIZE * 8) - path->reada = READA_FORWARD; - - WARN_ON(bio->bi_vcnt <= 0); -diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c -index 098bb8f690c9..bbb4b4a618a6 100644 ---- a/fs/btrfs/file.c -+++ b/fs/btrfs/file.c -@@ -413,11 +413,11 @@ static noinline int btrfs_copy_from_user(loff_t pos, size_t write_bytes, - size_t copied = 0; - size_t total_copied = 0; - int pg = 0; -- int offset = pos & (PAGE_CACHE_SIZE - 1); -+ int offset = pos & (PAGE_SIZE - 1); - - while (write_bytes > 0) { - size_t count = min_t(size_t, -- PAGE_CACHE_SIZE - offset, write_bytes); -+ PAGE_SIZE - offset, write_bytes); - struct page *page = prepared_pages[pg]; - /* - * Copy data from userspace to the current page -@@ -447,7 +447,7 @@ static noinline int btrfs_copy_from_user(loff_t pos, size_t write_bytes, - if (unlikely(copied == 0)) - break; - -- if (copied < PAGE_CACHE_SIZE - offset) { -+ if (copied < PAGE_SIZE - offset) { - offset += copied; - } else { - pg++; -@@ -472,7 +472,7 @@ static void btrfs_drop_pages(struct page **pages, size_t num_pages) - */ - ClearPageChecked(pages[i]); - unlock_page(pages[i]); -- page_cache_release(pages[i]); -+ put_page(pages[i]); - } - } - -@@ -1296,7 +1296,7 @@ static int prepare_uptodate_page(struct inode *inode, - { - int ret = 0; - -- if (((pos & (PAGE_CACHE_SIZE - 1)) || force_uptodate) && -+ if (((pos & (PAGE_SIZE - 1)) || force_uptodate) && - !PageUptodate(page)) { - ret = btrfs_readpage(NULL, page); - if (ret) -@@ -1322,7 +1322,7 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages, - size_t write_bytes, bool force_uptodate) - { - int i; -- unsigned long index = pos >> PAGE_CACHE_SHIFT; -+ unsigned long index = pos >> PAGE_SHIFT; - gfp_t mask = btrfs_alloc_write_mask(inode->i_mapping); - int err = 0; - int faili; -@@ -1344,7 +1344,7 @@ again: - err = prepare_uptodate_page(inode, pages[i], - pos + write_bytes, false); - if (err) { -- page_cache_release(pages[i]); -+ put_page(pages[i]); - if (err == -EAGAIN) { - err = 0; - goto again; -@@ -1359,7 +1359,7 @@ again: - fail: - while (faili >= 0) { - unlock_page(pages[faili]); -- page_cache_release(pages[faili]); -+ put_page(pages[faili]); - faili--; - } - return err; -@@ -1387,8 +1387,8 @@ lock_and_cleanup_extent_if_need(struct inode *inode, struct page **pages, - int i; - int ret = 0; - -- start_pos = pos & ~((u64)PAGE_CACHE_SIZE - 1); -- last_pos = start_pos + ((u64)num_pages << PAGE_CACHE_SHIFT) - 1; -+ start_pos = pos & ~((u64)PAGE_SIZE - 1); -+ last_pos = start_pos + ((u64)num_pages << PAGE_SHIFT) - 1; - - if (start_pos < inode->i_size) { - struct btrfs_ordered_extent *ordered; -@@ -1404,7 +1404,7 @@ lock_and_cleanup_extent_if_need(struct inode *inode, struct page **pages, - cached_state, GFP_NOFS); - for (i = 0; i < num_pages; i++) { - unlock_page(pages[i]); -- page_cache_release(pages[i]); -+ put_page(pages[i]); - } - btrfs_start_ordered_extent(inode, ordered, 1); - btrfs_put_ordered_extent(ordered); -@@ -1493,8 +1493,8 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file, - bool force_page_uptodate = false; - bool need_unlock; - -- nrptrs = min(DIV_ROUND_UP(iov_iter_count(i), PAGE_CACHE_SIZE), -- PAGE_CACHE_SIZE / (sizeof(struct page *))); -+ nrptrs = min(DIV_ROUND_UP(iov_iter_count(i), PAGE_SIZE), -+ PAGE_SIZE / (sizeof(struct page *))); - nrptrs = min(nrptrs, current->nr_dirtied_pause - current->nr_dirtied); - nrptrs = max(nrptrs, 8); - pages = kmalloc_array(nrptrs, sizeof(struct page *), GFP_KERNEL); -@@ -1502,12 +1502,12 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file, - return -ENOMEM; - - while (iov_iter_count(i) > 0) { -- size_t offset = pos & (PAGE_CACHE_SIZE - 1); -+ size_t offset = pos & (PAGE_SIZE - 1); - size_t write_bytes = min(iov_iter_count(i), -- nrptrs * (size_t)PAGE_CACHE_SIZE - -+ nrptrs * (size_t)PAGE_SIZE - - offset); - size_t num_pages = DIV_ROUND_UP(write_bytes + offset, -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - size_t reserve_bytes; - size_t dirty_pages; - size_t copied; -@@ -1523,7 +1523,7 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file, - break; - } - -- reserve_bytes = num_pages << PAGE_CACHE_SHIFT; -+ reserve_bytes = num_pages << PAGE_SHIFT; - - if (BTRFS_I(inode)->flags & (BTRFS_INODE_NODATACOW | - BTRFS_INODE_PREALLOC)) { -@@ -1541,8 +1541,8 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file, - * write_bytes, so scale down. - */ - num_pages = DIV_ROUND_UP(write_bytes + offset, -- PAGE_CACHE_SIZE); -- reserve_bytes = num_pages << PAGE_CACHE_SHIFT; -+ PAGE_SIZE); -+ reserve_bytes = num_pages << PAGE_SHIFT; - goto reserve_metadata; - } - } -@@ -1602,7 +1602,7 @@ again: - } else { - force_page_uptodate = false; - dirty_pages = DIV_ROUND_UP(copied + offset, -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - } - - /* -@@ -1614,7 +1614,7 @@ again: - */ - if (num_pages > dirty_pages) { - release_bytes = (num_pages - dirty_pages) << -- PAGE_CACHE_SHIFT; -+ PAGE_SHIFT; - if (copied > 0) { - spin_lock(&BTRFS_I(inode)->lock); - BTRFS_I(inode)->outstanding_extents++; -@@ -1627,13 +1627,13 @@ again: - u64 __pos; - - __pos = round_down(pos, root->sectorsize) + -- (dirty_pages << PAGE_CACHE_SHIFT); -+ (dirty_pages << PAGE_SHIFT); - btrfs_delalloc_release_space(inode, __pos, - release_bytes); - } - } - -- release_bytes = dirty_pages << PAGE_CACHE_SHIFT; -+ release_bytes = dirty_pages << PAGE_SHIFT; - - if (copied > 0) - ret = btrfs_dirty_pages(root, inode, pages, -@@ -1655,7 +1655,7 @@ again: - if (only_release_metadata && copied > 0) { - lockstart = round_down(pos, root->sectorsize); - lockend = lockstart + -- (dirty_pages << PAGE_CACHE_SHIFT) - 1; -+ (dirty_pages << PAGE_SHIFT) - 1; - - set_extent_bit(&BTRFS_I(inode)->io_tree, lockstart, - lockend, EXTENT_NORESERVE, NULL, -@@ -1668,7 +1668,7 @@ again: - cond_resched(); - - balance_dirty_pages_ratelimited(inode->i_mapping); -- if (dirty_pages < (root->nodesize >> PAGE_CACHE_SHIFT) + 1) -+ if (dirty_pages < (root->nodesize >> PAGE_SHIFT) + 1) - btrfs_btree_balance_dirty(root); - - pos += copied; -@@ -1724,8 +1724,8 @@ static ssize_t __btrfs_direct_write(struct kiocb *iocb, - goto out; - written += written_buffered; - iocb->ki_pos = pos + written_buffered; -- invalidate_mapping_pages(file->f_mapping, pos >> PAGE_CACHE_SHIFT, -- endbyte >> PAGE_CACHE_SHIFT); -+ invalidate_mapping_pages(file->f_mapping, pos >> PAGE_SHIFT, -+ endbyte >> PAGE_SHIFT); - out: - return written ? written : err; - } -@@ -2304,7 +2304,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) - return ret; - - inode_lock(inode); -- ino_size = round_up(inode->i_size, PAGE_CACHE_SIZE); -+ ino_size = round_up(inode->i_size, PAGE_SIZE); - ret = find_first_non_hole(inode, &offset, &len); - if (ret < 0) - goto out_only_mutex; -@@ -2317,8 +2317,8 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) - lockstart = round_up(offset, BTRFS_I(inode)->root->sectorsize); - lockend = round_down(offset + len, - BTRFS_I(inode)->root->sectorsize) - 1; -- same_page = ((offset >> PAGE_CACHE_SHIFT) == -- ((offset + len - 1) >> PAGE_CACHE_SHIFT)); -+ same_page = ((offset >> PAGE_SHIFT) == -+ ((offset + len - 1) >> PAGE_SHIFT)); - - /* - * We needn't truncate any page which is beyond the end of the file -@@ -2328,7 +2328,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) - * Only do this if we are in the same page and we aren't doing the - * entire page. - */ -- if (same_page && len < PAGE_CACHE_SIZE) { -+ if (same_page && len < PAGE_SIZE) { - if (offset < ino_size) { - truncated_page = true; - ret = btrfs_truncate_page(inode, offset, len, 0); -diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c -index 8f835bfa1bdd..5e6062c26129 100644 ---- a/fs/btrfs/free-space-cache.c -+++ b/fs/btrfs/free-space-cache.c -@@ -29,7 +29,7 @@ - #include "inode-map.h" - #include "volumes.h" - --#define BITS_PER_BITMAP (PAGE_CACHE_SIZE * 8) -+#define BITS_PER_BITMAP (PAGE_SIZE * 8) - #define MAX_CACHE_BYTES_PER_GIG SZ_32K - - struct btrfs_trim_range { -@@ -295,7 +295,7 @@ static int readahead_cache(struct inode *inode) - return -ENOMEM; - - file_ra_state_init(ra, inode->i_mapping); -- last_index = (i_size_read(inode) - 1) >> PAGE_CACHE_SHIFT; -+ last_index = (i_size_read(inode) - 1) >> PAGE_SHIFT; - - page_cache_sync_readahead(inode->i_mapping, ra, NULL, 0, last_index); - -@@ -310,14 +310,14 @@ static int io_ctl_init(struct btrfs_io_ctl *io_ctl, struct inode *inode, - int num_pages; - int check_crcs = 0; - -- num_pages = DIV_ROUND_UP(i_size_read(inode), PAGE_CACHE_SIZE); -+ num_pages = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE); - - if (btrfs_ino(inode) != BTRFS_FREE_INO_OBJECTID) - check_crcs = 1; - - /* Make sure we can fit our crcs into the first page */ - if (write && check_crcs && -- (num_pages * sizeof(u32)) >= PAGE_CACHE_SIZE) -+ (num_pages * sizeof(u32)) >= PAGE_SIZE) - return -ENOSPC; - - memset(io_ctl, 0, sizeof(struct btrfs_io_ctl)); -@@ -354,9 +354,9 @@ static void io_ctl_map_page(struct btrfs_io_ctl *io_ctl, int clear) - io_ctl->page = io_ctl->pages[io_ctl->index++]; - io_ctl->cur = page_address(io_ctl->page); - io_ctl->orig = io_ctl->cur; -- io_ctl->size = PAGE_CACHE_SIZE; -+ io_ctl->size = PAGE_SIZE; - if (clear) -- memset(io_ctl->cur, 0, PAGE_CACHE_SIZE); -+ memset(io_ctl->cur, 0, PAGE_SIZE); - } - - static void io_ctl_drop_pages(struct btrfs_io_ctl *io_ctl) -@@ -369,7 +369,7 @@ static void io_ctl_drop_pages(struct btrfs_io_ctl *io_ctl) - if (io_ctl->pages[i]) { - ClearPageChecked(io_ctl->pages[i]); - unlock_page(io_ctl->pages[i]); -- page_cache_release(io_ctl->pages[i]); -+ put_page(io_ctl->pages[i]); - } - } - } -@@ -475,7 +475,7 @@ static void io_ctl_set_crc(struct btrfs_io_ctl *io_ctl, int index) - offset = sizeof(u32) * io_ctl->num_pages; - - crc = btrfs_csum_data(io_ctl->orig + offset, crc, -- PAGE_CACHE_SIZE - offset); -+ PAGE_SIZE - offset); - btrfs_csum_final(crc, (char *)&crc); - io_ctl_unmap_page(io_ctl); - tmp = page_address(io_ctl->pages[0]); -@@ -503,7 +503,7 @@ static int io_ctl_check_crc(struct btrfs_io_ctl *io_ctl, int index) - - io_ctl_map_page(io_ctl, 0); - crc = btrfs_csum_data(io_ctl->orig + offset, crc, -- PAGE_CACHE_SIZE - offset); -+ PAGE_SIZE - offset); - btrfs_csum_final(crc, (char *)&crc); - if (val != crc) { - btrfs_err_rl(io_ctl->root->fs_info, -@@ -561,7 +561,7 @@ static int io_ctl_add_bitmap(struct btrfs_io_ctl *io_ctl, void *bitmap) - io_ctl_map_page(io_ctl, 0); - } - -- memcpy(io_ctl->cur, bitmap, PAGE_CACHE_SIZE); -+ memcpy(io_ctl->cur, bitmap, PAGE_SIZE); - io_ctl_set_crc(io_ctl, io_ctl->index - 1); - if (io_ctl->index < io_ctl->num_pages) - io_ctl_map_page(io_ctl, 0); -@@ -621,7 +621,7 @@ static int io_ctl_read_bitmap(struct btrfs_io_ctl *io_ctl, - if (ret) - return ret; - -- memcpy(entry->bitmap, io_ctl->cur, PAGE_CACHE_SIZE); -+ memcpy(entry->bitmap, io_ctl->cur, PAGE_SIZE); - io_ctl_unmap_page(io_ctl); - - return 0; -@@ -775,7 +775,7 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode, - } else { - ASSERT(num_bitmaps); - num_bitmaps--; -- e->bitmap = kzalloc(PAGE_CACHE_SIZE, GFP_NOFS); -+ e->bitmap = kzalloc(PAGE_SIZE, GFP_NOFS); - if (!e->bitmap) { - kmem_cache_free( - btrfs_free_space_cachep, e); -@@ -1660,7 +1660,7 @@ static void recalculate_thresholds(struct btrfs_free_space_ctl *ctl) - * sure we don't go over our overall goal of MAX_CACHE_BYTES_PER_GIG as - * we add more bitmaps. - */ -- bitmap_bytes = (ctl->total_bitmaps + 1) * PAGE_CACHE_SIZE; -+ bitmap_bytes = (ctl->total_bitmaps + 1) * PAGE_SIZE; - - if (bitmap_bytes >= max_bytes) { - ctl->extents_thresh = 0; -@@ -2111,7 +2111,7 @@ new_bitmap: - } - - /* allocate the bitmap */ -- info->bitmap = kzalloc(PAGE_CACHE_SIZE, GFP_NOFS); -+ info->bitmap = kzalloc(PAGE_SIZE, GFP_NOFS); - spin_lock(&ctl->tree_lock); - if (!info->bitmap) { - ret = -ENOMEM; -@@ -3580,7 +3580,7 @@ again: - } - - if (!map) { -- map = kzalloc(PAGE_CACHE_SIZE, GFP_NOFS); -+ map = kzalloc(PAGE_SIZE, GFP_NOFS); - if (!map) { - kmem_cache_free(btrfs_free_space_cachep, info); - return -ENOMEM; -diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c -index e50316c4af15..72e34e25dd8e 100644 ---- a/fs/btrfs/inode-map.c -+++ b/fs/btrfs/inode-map.c -@@ -283,7 +283,7 @@ void btrfs_unpin_free_ino(struct btrfs_root *root) - } - - #define INIT_THRESHOLD ((SZ_32K / 2) / sizeof(struct btrfs_free_space)) --#define INODES_PER_BITMAP (PAGE_CACHE_SIZE * 8) -+#define INODES_PER_BITMAP (PAGE_SIZE * 8) - - /* - * The goal is to keep the memory used by the free_ino tree won't -@@ -317,7 +317,7 @@ static void recalculate_thresholds(struct btrfs_free_space_ctl *ctl) - } - - ctl->extents_thresh = (max_bitmaps - ctl->total_bitmaps) * -- PAGE_CACHE_SIZE / sizeof(*info); -+ PAGE_SIZE / sizeof(*info); - } - - /* -@@ -481,12 +481,12 @@ again: - - spin_lock(&ctl->tree_lock); - prealloc = sizeof(struct btrfs_free_space) * ctl->free_extents; -- prealloc = ALIGN(prealloc, PAGE_CACHE_SIZE); -- prealloc += ctl->total_bitmaps * PAGE_CACHE_SIZE; -+ prealloc = ALIGN(prealloc, PAGE_SIZE); -+ prealloc += ctl->total_bitmaps * PAGE_SIZE; - spin_unlock(&ctl->tree_lock); - - /* Just to make sure we have enough space */ -- prealloc += 8 * PAGE_CACHE_SIZE; -+ prealloc += 8 * PAGE_SIZE; - - ret = btrfs_delalloc_reserve_space(inode, 0, prealloc); - if (ret) -diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c -index d96f5cf38a2d..ad15bbfc5003 100644 ---- a/fs/btrfs/inode.c -+++ b/fs/btrfs/inode.c -@@ -194,7 +194,7 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans, - while (compressed_size > 0) { - cpage = compressed_pages[i]; - cur_size = min_t(unsigned long, compressed_size, -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - - kaddr = kmap_atomic(cpage); - write_extent_buffer(leaf, kaddr, ptr, cur_size); -@@ -208,13 +208,13 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans, - compress_type); - } else { - page = find_get_page(inode->i_mapping, -- start >> PAGE_CACHE_SHIFT); -+ start >> PAGE_SHIFT); - btrfs_set_file_extent_compression(leaf, ei, 0); - kaddr = kmap_atomic(page); -- offset = start & (PAGE_CACHE_SIZE - 1); -+ offset = start & (PAGE_SIZE - 1); - write_extent_buffer(leaf, kaddr + offset, ptr, size); - kunmap_atomic(kaddr); -- page_cache_release(page); -+ put_page(page); - } - btrfs_mark_buffer_dirty(leaf); - btrfs_release_path(path); -@@ -263,7 +263,7 @@ static noinline int cow_file_range_inline(struct btrfs_root *root, - data_len = compressed_size; - - if (start > 0 || -- actual_end > PAGE_CACHE_SIZE || -+ actual_end > PAGE_SIZE || - data_len > BTRFS_MAX_INLINE_DATA_SIZE(root) || - (!compressed_size && - (actual_end & (root->sectorsize - 1)) == 0) || -@@ -322,7 +322,7 @@ out: - * And at reserve time, it's always aligned to page size, so - * just free one page here. - */ -- btrfs_qgroup_free_data(inode, 0, PAGE_CACHE_SIZE); -+ btrfs_qgroup_free_data(inode, 0, PAGE_SIZE); - btrfs_free_path(path); - btrfs_end_transaction(trans, root); - return ret; -@@ -435,8 +435,8 @@ static noinline void compress_file_range(struct inode *inode, - actual_end = min_t(u64, isize, end + 1); - again: - will_compress = 0; -- nr_pages = (end >> PAGE_CACHE_SHIFT) - (start >> PAGE_CACHE_SHIFT) + 1; -- nr_pages = min_t(unsigned long, nr_pages, SZ_128K / PAGE_CACHE_SIZE); -+ nr_pages = (end >> PAGE_SHIFT) - (start >> PAGE_SHIFT) + 1; -+ nr_pages = min_t(unsigned long, nr_pages, SZ_128K / PAGE_SIZE); - - /* - * we don't want to send crud past the end of i_size through -@@ -514,7 +514,7 @@ again: - - if (!ret) { - unsigned long offset = total_compressed & -- (PAGE_CACHE_SIZE - 1); -+ (PAGE_SIZE - 1); - struct page *page = pages[nr_pages_ret - 1]; - char *kaddr; - -@@ -524,7 +524,7 @@ again: - if (offset) { - kaddr = kmap_atomic(page); - memset(kaddr + offset, 0, -- PAGE_CACHE_SIZE - offset); -+ PAGE_SIZE - offset); - kunmap_atomic(kaddr); - } - will_compress = 1; -@@ -580,7 +580,7 @@ cont: - * one last check to make sure the compression is really a - * win, compare the page count read with the blocks on disk - */ -- total_in = ALIGN(total_in, PAGE_CACHE_SIZE); -+ total_in = ALIGN(total_in, PAGE_SIZE); - if (total_compressed >= total_in) { - will_compress = 0; - } else { -@@ -594,7 +594,7 @@ cont: - */ - for (i = 0; i < nr_pages_ret; i++) { - WARN_ON(pages[i]->mapping); -- page_cache_release(pages[i]); -+ put_page(pages[i]); - } - kfree(pages); - pages = NULL; -@@ -650,7 +650,7 @@ cleanup_and_bail_uncompressed: - free_pages_out: - for (i = 0; i < nr_pages_ret; i++) { - WARN_ON(pages[i]->mapping); -- page_cache_release(pages[i]); -+ put_page(pages[i]); - } - kfree(pages); - } -@@ -664,7 +664,7 @@ static void free_async_extent_pages(struct async_extent *async_extent) - - for (i = 0; i < async_extent->nr_pages; i++) { - WARN_ON(async_extent->pages[i]->mapping); -- page_cache_release(async_extent->pages[i]); -+ put_page(async_extent->pages[i]); - } - kfree(async_extent->pages); - async_extent->nr_pages = 0; -@@ -966,7 +966,7 @@ static noinline int cow_file_range(struct inode *inode, - PAGE_END_WRITEBACK); - - *nr_written = *nr_written + -- (end - start + PAGE_CACHE_SIZE) / PAGE_CACHE_SIZE; -+ (end - start + PAGE_SIZE) / PAGE_SIZE; - *page_started = 1; - goto out; - } else if (ret < 0) { -@@ -1106,8 +1106,8 @@ static noinline void async_cow_submit(struct btrfs_work *work) - async_cow = container_of(work, struct async_cow, work); - - root = async_cow->root; -- nr_pages = (async_cow->end - async_cow->start + PAGE_CACHE_SIZE) >> -- PAGE_CACHE_SHIFT; -+ nr_pages = (async_cow->end - async_cow->start + PAGE_SIZE) >> -+ PAGE_SHIFT; - - /* - * atomic_sub_return implies a barrier for waitqueue_active -@@ -1164,8 +1164,8 @@ static int cow_file_range_async(struct inode *inode, struct page *locked_page, - async_cow_start, async_cow_submit, - async_cow_free); - -- nr_pages = (cur_end - start + PAGE_CACHE_SIZE) >> -- PAGE_CACHE_SHIFT; -+ nr_pages = (cur_end - start + PAGE_SIZE) >> -+ PAGE_SHIFT; - atomic_add(nr_pages, &root->fs_info->async_delalloc_pages); - - btrfs_queue_work(root->fs_info->delalloc_workers, -@@ -1960,7 +1960,7 @@ static noinline int add_pending_csums(struct btrfs_trans_handle *trans, - int btrfs_set_extent_delalloc(struct inode *inode, u64 start, u64 end, - struct extent_state **cached_state) - { -- WARN_ON((end & (PAGE_CACHE_SIZE - 1)) == 0); -+ WARN_ON((end & (PAGE_SIZE - 1)) == 0); - return set_extent_delalloc(&BTRFS_I(inode)->io_tree, start, end, - cached_state, GFP_NOFS); - } -@@ -1993,7 +1993,7 @@ again: - - inode = page->mapping->host; - page_start = page_offset(page); -- page_end = page_offset(page) + PAGE_CACHE_SIZE - 1; -+ page_end = page_offset(page) + PAGE_SIZE - 1; - - lock_extent_bits(&BTRFS_I(inode)->io_tree, page_start, page_end, - &cached_state); -@@ -2013,7 +2013,7 @@ again: - } - - ret = btrfs_delalloc_reserve_space(inode, page_start, -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - if (ret) { - mapping_set_error(page->mapping, ret); - end_extent_writepage(page, ret, page_start, page_end); -@@ -2029,7 +2029,7 @@ out: - &cached_state, GFP_NOFS); - out_page: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - kfree(fixup); - } - -@@ -2062,7 +2062,7 @@ static int btrfs_writepage_start_hook(struct page *page, u64 start, u64 end) - return -EAGAIN; - - SetPageChecked(page); -- page_cache_get(page); -+ get_page(page); - btrfs_init_work(&fixup->work, btrfs_fixup_helper, - btrfs_writepage_fixup_worker, NULL, NULL); - fixup->page = page; -@@ -4236,7 +4236,7 @@ static int truncate_inline_extent(struct inode *inode, - - if (btrfs_file_extent_compression(leaf, fi) != BTRFS_COMPRESS_NONE) { - loff_t offset = new_size; -- loff_t page_end = ALIGN(offset, PAGE_CACHE_SIZE); -+ loff_t page_end = ALIGN(offset, PAGE_SIZE); - - /* - * Zero out the remaining of the last page of our inline extent, -@@ -4621,8 +4621,8 @@ int btrfs_truncate_page(struct inode *inode, loff_t from, loff_t len, - struct extent_state *cached_state = NULL; - char *kaddr; - u32 blocksize = root->sectorsize; -- pgoff_t index = from >> PAGE_CACHE_SHIFT; -- unsigned offset = from & (PAGE_CACHE_SIZE-1); -+ pgoff_t index = from >> PAGE_SHIFT; -+ unsigned offset = from & (PAGE_SIZE-1); - struct page *page; - gfp_t mask = btrfs_alloc_write_mask(mapping); - int ret = 0; -@@ -4633,7 +4633,7 @@ int btrfs_truncate_page(struct inode *inode, loff_t from, loff_t len, - (!len || ((len & (blocksize - 1)) == 0))) - goto out; - ret = btrfs_delalloc_reserve_space(inode, -- round_down(from, PAGE_CACHE_SIZE), PAGE_CACHE_SIZE); -+ round_down(from, PAGE_SIZE), PAGE_SIZE); - if (ret) - goto out; - -@@ -4641,21 +4641,21 @@ again: - page = find_or_create_page(mapping, index, mask); - if (!page) { - btrfs_delalloc_release_space(inode, -- round_down(from, PAGE_CACHE_SIZE), -- PAGE_CACHE_SIZE); -+ round_down(from, PAGE_SIZE), -+ PAGE_SIZE); - ret = -ENOMEM; - goto out; - } - - page_start = page_offset(page); -- page_end = page_start + PAGE_CACHE_SIZE - 1; -+ page_end = page_start + PAGE_SIZE - 1; - - if (!PageUptodate(page)) { - ret = btrfs_readpage(NULL, page); - lock_page(page); - if (page->mapping != mapping) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - goto again; - } - if (!PageUptodate(page)) { -@@ -4673,7 +4673,7 @@ again: - unlock_extent_cached(io_tree, page_start, page_end, - &cached_state, GFP_NOFS); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - btrfs_start_ordered_extent(inode, ordered, 1); - btrfs_put_ordered_extent(ordered); - goto again; -@@ -4692,9 +4692,9 @@ again: - goto out_unlock; - } - -- if (offset != PAGE_CACHE_SIZE) { -+ if (offset != PAGE_SIZE) { - if (!len) -- len = PAGE_CACHE_SIZE - offset; -+ len = PAGE_SIZE - offset; - kaddr = kmap(page); - if (front) - memset(kaddr, 0, offset); -@@ -4711,9 +4711,9 @@ again: - out_unlock: - if (ret) - btrfs_delalloc_release_space(inode, page_start, -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - out: - return ret; - } -@@ -6701,7 +6701,7 @@ static noinline int uncompress_inline(struct btrfs_path *path, - - read_extent_buffer(leaf, tmp, ptr, inline_size); - -- max_size = min_t(unsigned long, PAGE_CACHE_SIZE, max_size); -+ max_size = min_t(unsigned long, PAGE_SIZE, max_size); - ret = btrfs_decompress(compress_type, tmp, page, - extent_offset, inline_size, max_size); - kfree(tmp); -@@ -6863,8 +6863,8 @@ next: - - size = btrfs_file_extent_inline_len(leaf, path->slots[0], item); - extent_offset = page_offset(page) + pg_offset - extent_start; -- copy_size = min_t(u64, PAGE_CACHE_SIZE - pg_offset, -- size - extent_offset); -+ copy_size = min_t(u64, PAGE_SIZE - pg_offset, -+ size - extent_offset); - em->start = extent_start + extent_offset; - em->len = ALIGN(copy_size, root->sectorsize); - em->orig_block_len = em->len; -@@ -6883,9 +6883,9 @@ next: - map = kmap(page); - read_extent_buffer(leaf, map + pg_offset, ptr, - copy_size); -- if (pg_offset + copy_size < PAGE_CACHE_SIZE) { -+ if (pg_offset + copy_size < PAGE_SIZE) { - memset(map + pg_offset + copy_size, 0, -- PAGE_CACHE_SIZE - pg_offset - -+ PAGE_SIZE - pg_offset - - copy_size); - } - kunmap(page); -@@ -7320,12 +7320,12 @@ bool btrfs_page_exists_in_range(struct inode *inode, loff_t start, loff_t end) - int start_idx; - int end_idx; - -- start_idx = start >> PAGE_CACHE_SHIFT; -+ start_idx = start >> PAGE_SHIFT; - - /* - * end is the last byte in the last page. end == start is legal - */ -- end_idx = end >> PAGE_CACHE_SHIFT; -+ end_idx = end >> PAGE_SHIFT; - - rcu_read_lock(); - -@@ -7366,7 +7366,7 @@ bool btrfs_page_exists_in_range(struct inode *inode, loff_t start, loff_t end) - * include/linux/pagemap.h for details. - */ - if (unlikely(page != *pagep)) { -- page_cache_release(page); -+ put_page(page); - page = NULL; - } - } -@@ -7374,7 +7374,7 @@ bool btrfs_page_exists_in_range(struct inode *inode, loff_t start, loff_t end) - if (page) { - if (page->index <= end_idx) - found = true; -- page_cache_release(page); -+ put_page(page); - } - - rcu_read_unlock(); -@@ -8621,7 +8621,7 @@ static int __btrfs_releasepage(struct page *page, gfp_t gfp_flags) - if (ret == 1) { - ClearPagePrivate(page); - set_page_private(page, 0); -- page_cache_release(page); -+ put_page(page); - } - return ret; - } -@@ -8641,7 +8641,7 @@ static void btrfs_invalidatepage(struct page *page, unsigned int offset, - struct btrfs_ordered_extent *ordered; - struct extent_state *cached_state = NULL; - u64 page_start = page_offset(page); -- u64 page_end = page_start + PAGE_CACHE_SIZE - 1; -+ u64 page_end = page_start + PAGE_SIZE - 1; - int inode_evicting = inode->i_state & I_FREEING; - - /* -@@ -8692,7 +8692,7 @@ static void btrfs_invalidatepage(struct page *page, unsigned int offset, - - if (btrfs_dec_test_ordered_pending(inode, &ordered, - page_start, -- PAGE_CACHE_SIZE, 1)) -+ PAGE_SIZE, 1)) - btrfs_finish_ordered_io(ordered); - } - btrfs_put_ordered_extent(ordered); -@@ -8714,7 +8714,7 @@ static void btrfs_invalidatepage(struct page *page, unsigned int offset, - * 2) Not written to disk - * This means the reserved space should be freed here. - */ -- btrfs_qgroup_free_data(inode, page_start, PAGE_CACHE_SIZE); -+ btrfs_qgroup_free_data(inode, page_start, PAGE_SIZE); - if (!inode_evicting) { - clear_extent_bit(tree, page_start, page_end, - EXTENT_LOCKED | EXTENT_DIRTY | -@@ -8729,7 +8729,7 @@ static void btrfs_invalidatepage(struct page *page, unsigned int offset, - if (PagePrivate(page)) { - ClearPagePrivate(page); - set_page_private(page, 0); -- page_cache_release(page); -+ put_page(page); - } - } - -@@ -8766,10 +8766,10 @@ int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) - - sb_start_pagefault(inode->i_sb); - page_start = page_offset(page); -- page_end = page_start + PAGE_CACHE_SIZE - 1; -+ page_end = page_start + PAGE_SIZE - 1; - - ret = btrfs_delalloc_reserve_space(inode, page_start, -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - if (!ret) { - ret = file_update_time(vma->vm_file); - reserved = 1; -@@ -8836,14 +8836,14 @@ again: - ret = 0; - - /* page is wholly or partially inside EOF */ -- if (page_start + PAGE_CACHE_SIZE > size) -- zero_start = size & ~PAGE_CACHE_MASK; -+ if (page_start + PAGE_SIZE > size) -+ zero_start = size & ~PAGE_MASK; - else -- zero_start = PAGE_CACHE_SIZE; -+ zero_start = PAGE_SIZE; - -- if (zero_start != PAGE_CACHE_SIZE) { -+ if (zero_start != PAGE_SIZE) { - kaddr = kmap(page); -- memset(kaddr + zero_start, 0, PAGE_CACHE_SIZE - zero_start); -+ memset(kaddr + zero_start, 0, PAGE_SIZE - zero_start); - flush_dcache_page(page); - kunmap(page); - } -@@ -8864,7 +8864,7 @@ out_unlock: - } - unlock_page(page); - out: -- btrfs_delalloc_release_space(inode, page_start, PAGE_CACHE_SIZE); -+ btrfs_delalloc_release_space(inode, page_start, PAGE_SIZE); - out_noreserve: - sb_end_pagefault(inode->i_sb); - return ret; -@@ -9250,7 +9250,7 @@ static int btrfs_getattr(struct vfsmount *mnt, - - generic_fillattr(inode, stat); - stat->dev = BTRFS_I(inode)->root->anon_dev; -- stat->blksize = PAGE_CACHE_SIZE; -+ stat->blksize = PAGE_SIZE; - - spin_lock(&BTRFS_I(inode)->lock); - delalloc_bytes = BTRFS_I(inode)->delalloc_bytes; -diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c -index 48aee9846329..095a135ef6a2 100644 ---- a/fs/btrfs/ioctl.c -+++ b/fs/btrfs/ioctl.c -@@ -900,7 +900,7 @@ static int check_defrag_in_cache(struct inode *inode, u64 offset, u32 thresh) - u64 end; - - read_lock(&em_tree->lock); -- em = lookup_extent_mapping(em_tree, offset, PAGE_CACHE_SIZE); -+ em = lookup_extent_mapping(em_tree, offset, PAGE_SIZE); - read_unlock(&em_tree->lock); - - if (em) { -@@ -990,7 +990,7 @@ static struct extent_map *defrag_lookup_extent(struct inode *inode, u64 start) - struct extent_map_tree *em_tree = &BTRFS_I(inode)->extent_tree; - struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree; - struct extent_map *em; -- u64 len = PAGE_CACHE_SIZE; -+ u64 len = PAGE_SIZE; - - /* - * hopefully we have this extent in the tree already, try without -@@ -1126,15 +1126,15 @@ static int cluster_pages_for_defrag(struct inode *inode, - struct extent_io_tree *tree; - gfp_t mask = btrfs_alloc_write_mask(inode->i_mapping); - -- file_end = (isize - 1) >> PAGE_CACHE_SHIFT; -+ file_end = (isize - 1) >> PAGE_SHIFT; - if (!isize || start_index > file_end) - return 0; - - page_cnt = min_t(u64, (u64)num_pages, (u64)file_end - start_index + 1); - - ret = btrfs_delalloc_reserve_space(inode, -- start_index << PAGE_CACHE_SHIFT, -- page_cnt << PAGE_CACHE_SHIFT); -+ start_index << PAGE_SHIFT, -+ page_cnt << PAGE_SHIFT); - if (ret) - return ret; - i_done = 0; -@@ -1150,7 +1150,7 @@ again: - break; - - page_start = page_offset(page); -- page_end = page_start + PAGE_CACHE_SIZE - 1; -+ page_end = page_start + PAGE_SIZE - 1; - while (1) { - lock_extent_bits(tree, page_start, page_end, - &cached_state); -@@ -1171,7 +1171,7 @@ again: - */ - if (page->mapping != inode->i_mapping) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - goto again; - } - } -@@ -1181,7 +1181,7 @@ again: - lock_page(page); - if (!PageUptodate(page)) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - ret = -EIO; - break; - } -@@ -1189,7 +1189,7 @@ again: - - if (page->mapping != inode->i_mapping) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - goto again; - } - -@@ -1210,7 +1210,7 @@ again: - wait_on_page_writeback(pages[i]); - - page_start = page_offset(pages[0]); -- page_end = page_offset(pages[i_done - 1]) + PAGE_CACHE_SIZE; -+ page_end = page_offset(pages[i_done - 1]) + PAGE_SIZE; - - lock_extent_bits(&BTRFS_I(inode)->io_tree, - page_start, page_end - 1, &cached_state); -@@ -1224,8 +1224,8 @@ again: - BTRFS_I(inode)->outstanding_extents++; - spin_unlock(&BTRFS_I(inode)->lock); - btrfs_delalloc_release_space(inode, -- start_index << PAGE_CACHE_SHIFT, -- (page_cnt - i_done) << PAGE_CACHE_SHIFT); -+ start_index << PAGE_SHIFT, -+ (page_cnt - i_done) << PAGE_SHIFT); - } - - -@@ -1242,17 +1242,17 @@ again: - set_page_extent_mapped(pages[i]); - set_page_dirty(pages[i]); - unlock_page(pages[i]); -- page_cache_release(pages[i]); -+ put_page(pages[i]); - } - return i_done; - out: - for (i = 0; i < i_done; i++) { - unlock_page(pages[i]); -- page_cache_release(pages[i]); -+ put_page(pages[i]); - } - btrfs_delalloc_release_space(inode, -- start_index << PAGE_CACHE_SHIFT, -- page_cnt << PAGE_CACHE_SHIFT); -+ start_index << PAGE_SHIFT, -+ page_cnt << PAGE_SHIFT); - return ret; - - } -@@ -1275,7 +1275,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, - int defrag_count = 0; - int compress_type = BTRFS_COMPRESS_ZLIB; - u32 extent_thresh = range->extent_thresh; -- unsigned long max_cluster = SZ_256K >> PAGE_CACHE_SHIFT; -+ unsigned long max_cluster = SZ_256K >> PAGE_SHIFT; - unsigned long cluster = max_cluster; - u64 new_align = ~((u64)SZ_128K - 1); - struct page **pages = NULL; -@@ -1319,9 +1319,9 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, - /* find the last page to defrag */ - if (range->start + range->len > range->start) { - last_index = min_t(u64, isize - 1, -- range->start + range->len - 1) >> PAGE_CACHE_SHIFT; -+ range->start + range->len - 1) >> PAGE_SHIFT; - } else { -- last_index = (isize - 1) >> PAGE_CACHE_SHIFT; -+ last_index = (isize - 1) >> PAGE_SHIFT; - } - - if (newer_than) { -@@ -1333,11 +1333,11 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, - * we always align our defrag to help keep - * the extents in the file evenly spaced - */ -- i = (newer_off & new_align) >> PAGE_CACHE_SHIFT; -+ i = (newer_off & new_align) >> PAGE_SHIFT; - } else - goto out_ra; - } else { -- i = range->start >> PAGE_CACHE_SHIFT; -+ i = range->start >> PAGE_SHIFT; - } - if (!max_to_defrag) - max_to_defrag = last_index - i + 1; -@@ -1350,7 +1350,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, - inode->i_mapping->writeback_index = i; - - while (i <= last_index && defrag_count < max_to_defrag && -- (i < DIV_ROUND_UP(i_size_read(inode), PAGE_CACHE_SIZE))) { -+ (i < DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE))) { - /* - * make sure we stop running if someone unmounts - * the FS -@@ -1364,7 +1364,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, - break; - } - -- if (!should_defrag_range(inode, (u64)i << PAGE_CACHE_SHIFT, -+ if (!should_defrag_range(inode, (u64)i << PAGE_SHIFT, - extent_thresh, &last_len, &skip, - &defrag_end, range->flags & - BTRFS_DEFRAG_RANGE_COMPRESS)) { -@@ -1373,14 +1373,14 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, - * the should_defrag function tells us how much to skip - * bump our counter by the suggested amount - */ -- next = DIV_ROUND_UP(skip, PAGE_CACHE_SIZE); -+ next = DIV_ROUND_UP(skip, PAGE_SIZE); - i = max(i + 1, next); - continue; - } - - if (!newer_than) { -- cluster = (PAGE_CACHE_ALIGN(defrag_end) >> -- PAGE_CACHE_SHIFT) - i; -+ cluster = (PAGE_ALIGN(defrag_end) >> -+ PAGE_SHIFT) - i; - cluster = min(cluster, max_cluster); - } else { - cluster = max_cluster; -@@ -1414,20 +1414,20 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, - i += ret; - - newer_off = max(newer_off + 1, -- (u64)i << PAGE_CACHE_SHIFT); -+ (u64)i << PAGE_SHIFT); - - ret = find_new_extents(root, inode, newer_than, - &newer_off, SZ_64K); - if (!ret) { - range->start = newer_off; -- i = (newer_off & new_align) >> PAGE_CACHE_SHIFT; -+ i = (newer_off & new_align) >> PAGE_SHIFT; - } else { - break; - } - } else { - if (ret > 0) { - i += ret; -- last_len += ret << PAGE_CACHE_SHIFT; -+ last_len += ret << PAGE_SHIFT; - } else { - i++; - last_len = 0; -@@ -1724,7 +1724,7 @@ static noinline int btrfs_ioctl_snap_create_v2(struct file *file, - if (vol_args->flags & BTRFS_SUBVOL_RDONLY) - readonly = true; - if (vol_args->flags & BTRFS_SUBVOL_QGROUP_INHERIT) { -- if (vol_args->size > PAGE_CACHE_SIZE) { -+ if (vol_args->size > PAGE_SIZE) { - ret = -EINVAL; - goto free_args; - } -@@ -2808,12 +2808,12 @@ static struct page *extent_same_get_page(struct inode *inode, pgoff_t index) - lock_page(page); - if (!PageUptodate(page)) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return ERR_PTR(-EIO); - } - if (page->mapping != inode->i_mapping) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return ERR_PTR(-EAGAIN); - } - } -@@ -2825,7 +2825,7 @@ static int gather_extent_pages(struct inode *inode, struct page **pages, - int num_pages, u64 off) - { - int i; -- pgoff_t index = off >> PAGE_CACHE_SHIFT; -+ pgoff_t index = off >> PAGE_SHIFT; - - for (i = 0; i < num_pages; i++) { - again: -@@ -2934,12 +2934,12 @@ static void btrfs_cmp_data_free(struct cmp_pages *cmp) - pg = cmp->src_pages[i]; - if (pg) { - unlock_page(pg); -- page_cache_release(pg); -+ put_page(pg); - } - pg = cmp->dst_pages[i]; - if (pg) { - unlock_page(pg); -- page_cache_release(pg); -+ put_page(pg); - } - } - kfree(cmp->src_pages); -@@ -2951,7 +2951,7 @@ static int btrfs_cmp_data_prepare(struct inode *src, u64 loff, - u64 len, struct cmp_pages *cmp) - { - int ret; -- int num_pages = PAGE_CACHE_ALIGN(len) >> PAGE_CACHE_SHIFT; -+ int num_pages = PAGE_ALIGN(len) >> PAGE_SHIFT; - struct page **src_pgarr, **dst_pgarr; - - /* -@@ -2989,12 +2989,12 @@ static int btrfs_cmp_data(struct inode *src, u64 loff, struct inode *dst, - int ret = 0; - int i; - struct page *src_page, *dst_page; -- unsigned int cmp_len = PAGE_CACHE_SIZE; -+ unsigned int cmp_len = PAGE_SIZE; - void *addr, *dst_addr; - - i = 0; - while (len) { -- if (len < PAGE_CACHE_SIZE) -+ if (len < PAGE_SIZE) - cmp_len = len; - - BUG_ON(i >= cmp->num_pages); -@@ -3190,7 +3190,7 @@ ssize_t btrfs_dedupe_file_range(struct file *src_file, u64 loff, u64 olen, - if (olen > BTRFS_MAX_DEDUPE_LEN) - olen = BTRFS_MAX_DEDUPE_LEN; - -- if (WARN_ON_ONCE(bs < PAGE_CACHE_SIZE)) { -+ if (WARN_ON_ONCE(bs < PAGE_SIZE)) { - /* - * Btrfs does not support blocksize < page_size. As a - * result, btrfs_cmp_data() won't correctly handle -@@ -3890,7 +3890,7 @@ static noinline int btrfs_clone_files(struct file *file, struct file *file_src, - * data immediately and not the previous data. - */ - truncate_inode_pages_range(&inode->i_data, destoff, -- PAGE_CACHE_ALIGN(destoff + len) - 1); -+ PAGE_ALIGN(destoff + len) - 1); - out_unlock: - if (!same_inode) - btrfs_double_inode_unlock(src, inode); -@@ -4122,7 +4122,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg) - /* we generally have at most 6 or so space infos, one for each raid - * level. So, a whole page should be more than enough for everyone - */ -- if (alloc_size > PAGE_CACHE_SIZE) -+ if (alloc_size > PAGE_SIZE) - return -ENOMEM; - - space_args.total_spaces = 0; -diff --git a/fs/btrfs/lzo.c b/fs/btrfs/lzo.c -index a2f051347731..1adfbe7be6b8 100644 ---- a/fs/btrfs/lzo.c -+++ b/fs/btrfs/lzo.c -@@ -55,8 +55,8 @@ static struct list_head *lzo_alloc_workspace(void) - return ERR_PTR(-ENOMEM); - - workspace->mem = vmalloc(LZO1X_MEM_COMPRESS); -- workspace->buf = vmalloc(lzo1x_worst_compress(PAGE_CACHE_SIZE)); -- workspace->cbuf = vmalloc(lzo1x_worst_compress(PAGE_CACHE_SIZE)); -+ workspace->buf = vmalloc(lzo1x_worst_compress(PAGE_SIZE)); -+ workspace->cbuf = vmalloc(lzo1x_worst_compress(PAGE_SIZE)); - if (!workspace->mem || !workspace->buf || !workspace->cbuf) - goto fail; - -@@ -116,7 +116,7 @@ static int lzo_compress_pages(struct list_head *ws, - *total_out = 0; - *total_in = 0; - -- in_page = find_get_page(mapping, start >> PAGE_CACHE_SHIFT); -+ in_page = find_get_page(mapping, start >> PAGE_SHIFT); - data_in = kmap(in_page); - - /* -@@ -133,10 +133,10 @@ static int lzo_compress_pages(struct list_head *ws, - tot_out = LZO_LEN; - pages[0] = out_page; - nr_pages = 1; -- pg_bytes_left = PAGE_CACHE_SIZE - LZO_LEN; -+ pg_bytes_left = PAGE_SIZE - LZO_LEN; - - /* compress at most one page of data each time */ -- in_len = min(len, PAGE_CACHE_SIZE); -+ in_len = min(len, PAGE_SIZE); - while (tot_in < len) { - ret = lzo1x_1_compress(data_in, in_len, workspace->cbuf, - &out_len, workspace->mem); -@@ -201,7 +201,7 @@ static int lzo_compress_pages(struct list_head *ws, - cpage_out = kmap(out_page); - pages[nr_pages++] = out_page; - -- pg_bytes_left = PAGE_CACHE_SIZE; -+ pg_bytes_left = PAGE_SIZE; - out_offset = 0; - } - } -@@ -221,12 +221,12 @@ static int lzo_compress_pages(struct list_head *ws, - - bytes_left = len - tot_in; - kunmap(in_page); -- page_cache_release(in_page); -+ put_page(in_page); - -- start += PAGE_CACHE_SIZE; -- in_page = find_get_page(mapping, start >> PAGE_CACHE_SHIFT); -+ start += PAGE_SIZE; -+ in_page = find_get_page(mapping, start >> PAGE_SHIFT); - data_in = kmap(in_page); -- in_len = min(bytes_left, PAGE_CACHE_SIZE); -+ in_len = min(bytes_left, PAGE_SIZE); - } - - if (tot_out > tot_in) -@@ -248,7 +248,7 @@ out: - - if (in_page) { - kunmap(in_page); -- page_cache_release(in_page); -+ put_page(in_page); - } - - return ret; -@@ -266,7 +266,7 @@ static int lzo_decompress_biovec(struct list_head *ws, - char *data_in; - unsigned long page_in_index = 0; - unsigned long page_out_index = 0; -- unsigned long total_pages_in = DIV_ROUND_UP(srclen, PAGE_CACHE_SIZE); -+ unsigned long total_pages_in = DIV_ROUND_UP(srclen, PAGE_SIZE); - unsigned long buf_start; - unsigned long buf_offset = 0; - unsigned long bytes; -@@ -289,7 +289,7 @@ static int lzo_decompress_biovec(struct list_head *ws, - tot_in = LZO_LEN; - in_offset = LZO_LEN; - tot_len = min_t(size_t, srclen, tot_len); -- in_page_bytes_left = PAGE_CACHE_SIZE - LZO_LEN; -+ in_page_bytes_left = PAGE_SIZE - LZO_LEN; - - tot_out = 0; - pg_offset = 0; -@@ -345,12 +345,12 @@ cont: - - data_in = kmap(pages_in[++page_in_index]); - -- in_page_bytes_left = PAGE_CACHE_SIZE; -+ in_page_bytes_left = PAGE_SIZE; - in_offset = 0; - } - } - -- out_len = lzo1x_worst_compress(PAGE_CACHE_SIZE); -+ out_len = lzo1x_worst_compress(PAGE_SIZE); - ret = lzo1x_decompress_safe(buf, in_len, workspace->buf, - &out_len); - if (need_unmap) -@@ -399,7 +399,7 @@ static int lzo_decompress(struct list_head *ws, unsigned char *data_in, - in_len = read_compress_length(data_in); - data_in += LZO_LEN; - -- out_len = PAGE_CACHE_SIZE; -+ out_len = PAGE_SIZE; - ret = lzo1x_decompress_safe(data_in, in_len, workspace->buf, &out_len); - if (ret != LZO_E_OK) { - printk(KERN_WARNING "BTRFS: decompress failed!\n"); -diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c -index 55161369fab1..0b7792e02dd5 100644 ---- a/fs/btrfs/raid56.c -+++ b/fs/btrfs/raid56.c -@@ -270,7 +270,7 @@ static void cache_rbio_pages(struct btrfs_raid_bio *rbio) - s = kmap(rbio->bio_pages[i]); - d = kmap(rbio->stripe_pages[i]); - -- memcpy(d, s, PAGE_CACHE_SIZE); -+ memcpy(d, s, PAGE_SIZE); - - kunmap(rbio->bio_pages[i]); - kunmap(rbio->stripe_pages[i]); -@@ -962,7 +962,7 @@ static struct page *page_in_rbio(struct btrfs_raid_bio *rbio, - */ - static unsigned long rbio_nr_pages(unsigned long stripe_len, int nr_stripes) - { -- return DIV_ROUND_UP(stripe_len, PAGE_CACHE_SIZE) * nr_stripes; -+ return DIV_ROUND_UP(stripe_len, PAGE_SIZE) * nr_stripes; - } - - /* -@@ -1078,7 +1078,7 @@ static int rbio_add_io_page(struct btrfs_raid_bio *rbio, - u64 disk_start; - - stripe = &rbio->bbio->stripes[stripe_nr]; -- disk_start = stripe->physical + (page_index << PAGE_CACHE_SHIFT); -+ disk_start = stripe->physical + (page_index << PAGE_SHIFT); - - /* if the device is missing, just fail this stripe */ - if (!stripe->dev->bdev) -@@ -1096,8 +1096,8 @@ static int rbio_add_io_page(struct btrfs_raid_bio *rbio, - if (last_end == disk_start && stripe->dev->bdev && - !last->bi_error && - last->bi_bdev == stripe->dev->bdev) { -- ret = bio_add_page(last, page, PAGE_CACHE_SIZE, 0); -- if (ret == PAGE_CACHE_SIZE) -+ ret = bio_add_page(last, page, PAGE_SIZE, 0); -+ if (ret == PAGE_SIZE) - return 0; - } - } -@@ -1111,7 +1111,7 @@ static int rbio_add_io_page(struct btrfs_raid_bio *rbio, - bio->bi_bdev = stripe->dev->bdev; - bio->bi_iter.bi_sector = disk_start >> 9; - -- bio_add_page(bio, page, PAGE_CACHE_SIZE, 0); -+ bio_add_page(bio, page, PAGE_SIZE, 0); - bio_list_add(bio_list, bio); - return 0; - } -@@ -1154,7 +1154,7 @@ static void index_rbio_pages(struct btrfs_raid_bio *rbio) - bio_list_for_each(bio, &rbio->bio_list) { - start = (u64)bio->bi_iter.bi_sector << 9; - stripe_offset = start - rbio->bbio->raid_map[0]; -- page_index = stripe_offset >> PAGE_CACHE_SHIFT; -+ page_index = stripe_offset >> PAGE_SHIFT; - - for (i = 0; i < bio->bi_vcnt; i++) { - p = bio->bi_io_vec[i].bv_page; -@@ -1253,7 +1253,7 @@ static noinline void finish_rmw(struct btrfs_raid_bio *rbio) - } else { - /* raid5 */ - memcpy(pointers[nr_data], pointers[0], PAGE_SIZE); -- run_xor(pointers + 1, nr_data - 1, PAGE_CACHE_SIZE); -+ run_xor(pointers + 1, nr_data - 1, PAGE_SIZE); - } - - -@@ -1914,7 +1914,7 @@ pstripe: - /* Copy parity block into failed block to start with */ - memcpy(pointers[faila], - pointers[rbio->nr_data], -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - - /* rearrange the pointer array */ - p = pointers[faila]; -@@ -1923,7 +1923,7 @@ pstripe: - pointers[rbio->nr_data - 1] = p; - - /* xor in the rest */ -- run_xor(pointers, rbio->nr_data - 1, PAGE_CACHE_SIZE); -+ run_xor(pointers, rbio->nr_data - 1, PAGE_SIZE); - } - /* if we're doing this rebuild as part of an rmw, go through - * and set all of our private rbio pages in the -@@ -2250,7 +2250,7 @@ void raid56_add_scrub_pages(struct btrfs_raid_bio *rbio, struct page *page, - ASSERT(logical + PAGE_SIZE <= rbio->bbio->raid_map[0] + - rbio->stripe_len * rbio->nr_data); - stripe_offset = (int)(logical - rbio->bbio->raid_map[0]); -- index = stripe_offset >> PAGE_CACHE_SHIFT; -+ index = stripe_offset >> PAGE_SHIFT; - rbio->bio_pages[index] = page; - } - -@@ -2365,14 +2365,14 @@ static noinline void finish_parity_scrub(struct btrfs_raid_bio *rbio, - } else { - /* raid5 */ - memcpy(pointers[nr_data], pointers[0], PAGE_SIZE); -- run_xor(pointers + 1, nr_data - 1, PAGE_CACHE_SIZE); -+ run_xor(pointers + 1, nr_data - 1, PAGE_SIZE); - } - - /* Check scrubbing pairty and repair it */ - p = rbio_stripe_page(rbio, rbio->scrubp, pagenr); - parity = kmap(p); -- if (memcmp(parity, pointers[rbio->scrubp], PAGE_CACHE_SIZE)) -- memcpy(parity, pointers[rbio->scrubp], PAGE_CACHE_SIZE); -+ if (memcmp(parity, pointers[rbio->scrubp], PAGE_SIZE)) -+ memcpy(parity, pointers[rbio->scrubp], PAGE_SIZE); - else - /* Parity is right, needn't writeback */ - bitmap_clear(rbio->dbitmap, pagenr, 1); -diff --git a/fs/btrfs/reada.c b/fs/btrfs/reada.c -index 619f92963e27..bacc55e2655b 100644 ---- a/fs/btrfs/reada.c -+++ b/fs/btrfs/reada.c -@@ -116,7 +116,7 @@ static int __readahead_hook(struct btrfs_root *root, struct extent_buffer *eb, - struct reada_extent *re; - struct btrfs_fs_info *fs_info = root->fs_info; - struct list_head list; -- unsigned long index = start >> PAGE_CACHE_SHIFT; -+ unsigned long index = start >> PAGE_SHIFT; - struct btrfs_device *for_dev; - - if (eb) -@@ -259,7 +259,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) - kref_get(&zone->refcnt); - spin_unlock(&fs_info->reada_lock); -@@ -300,13 +300,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) - kref_get(&zone->refcnt); - } -@@ -331,7 +331,7 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root, - int real_stripes; - int nzones = 0; - int i; -- unsigned long index = logical >> PAGE_CACHE_SHIFT; -+ unsigned long index = logical >> PAGE_SHIFT; - int dev_replace_is_ongoing; - - spin_lock(&fs_info->reada_lock); -@@ -497,7 +497,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) { -@@ -542,7 +542,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); - } -@@ -591,7 +591,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; -@@ -626,7 +626,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; -@@ -678,7 +678,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) { -@@ -687,7 +687,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); -@@ -836,7 +836,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; -@@ -863,7 +863,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; - } -@@ -879,7 +879,7 @@ static void dump_devs(struct btrfs_fs_info *fs_info, int all) - if (ret == 0) - break; - if (!re->scheduled_for) { -- index = (re->logical >> PAGE_CACHE_SHIFT) + 1; -+ index = (re->logical >> PAGE_SHIFT) + 1; - continue; - } - printk(KERN_DEBUG -@@ -902,7 +902,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); - } -diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c -index 2bd0011450df..3c93968b539d 100644 ---- a/fs/btrfs/relocation.c -+++ b/fs/btrfs/relocation.c -@@ -3129,10 +3129,10 @@ static int relocate_file_extent_cluster(struct inode *inode, - if (ret) - goto out; - -- index = (cluster->start - offset) >> PAGE_CACHE_SHIFT; -- last_index = (cluster->end - offset) >> PAGE_CACHE_SHIFT; -+ index = (cluster->start - offset) >> PAGE_SHIFT; -+ last_index = (cluster->end - offset) >> PAGE_SHIFT; - while (index <= last_index) { -- ret = btrfs_delalloc_reserve_metadata(inode, PAGE_CACHE_SIZE); -+ ret = btrfs_delalloc_reserve_metadata(inode, PAGE_SIZE); - if (ret) - goto out; - -@@ -3145,7 +3145,7 @@ static int relocate_file_extent_cluster(struct inode *inode, - mask); - if (!page) { - btrfs_delalloc_release_metadata(inode, -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - ret = -ENOMEM; - goto out; - } -@@ -3162,16 +3162,16 @@ static int relocate_file_extent_cluster(struct inode *inode, - lock_page(page); - if (!PageUptodate(page)) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - btrfs_delalloc_release_metadata(inode, -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - ret = -EIO; - goto out; - } - } - - page_start = page_offset(page); -- page_end = page_start + PAGE_CACHE_SIZE - 1; -+ page_end = page_start + PAGE_SIZE - 1; - - lock_extent(&BTRFS_I(inode)->io_tree, page_start, page_end); - -@@ -3191,7 +3191,7 @@ static int relocate_file_extent_cluster(struct inode *inode, - unlock_extent(&BTRFS_I(inode)->io_tree, - page_start, page_end); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - index++; - balance_dirty_pages_ratelimited(inode->i_mapping); -diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c -index 92bf5ee732fb..1c6d3267029f 100644 ---- a/fs/btrfs/scrub.c -+++ b/fs/btrfs/scrub.c -@@ -703,7 +703,7 @@ static int scrub_fixup_readpage(u64 inum, u64 offset, u64 root, void *fixup_ctx) - if (IS_ERR(inode)) - return PTR_ERR(inode); - -- index = offset >> PAGE_CACHE_SHIFT; -+ index = offset >> PAGE_SHIFT; - - page = find_or_create_page(inode->i_mapping, index, GFP_NOFS); - if (!page) { -@@ -1636,7 +1636,7 @@ static int scrub_write_page_to_dev_replace(struct scrub_block *sblock, - if (spage->io_error) { - void *mapped_buffer = kmap_atomic(spage->page); - -- memset(mapped_buffer, 0, PAGE_CACHE_SIZE); -+ memset(mapped_buffer, 0, PAGE_SIZE); - flush_dcache_page(spage->page); - kunmap_atomic(mapped_buffer); - } -@@ -4292,8 +4292,8 @@ static int copy_nocow_pages_for_inode(u64 inum, u64 offset, u64 root, - goto out; - } - -- while (len >= PAGE_CACHE_SIZE) { -- index = offset >> PAGE_CACHE_SHIFT; -+ while (len >= PAGE_SIZE) { -+ index = offset >> PAGE_SHIFT; - again: - page = find_or_create_page(inode->i_mapping, index, GFP_NOFS); - if (!page) { -@@ -4324,7 +4324,7 @@ again: - */ - if (page->mapping != inode->i_mapping) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - goto again; - } - if (!PageUptodate(page)) { -@@ -4346,15 +4346,15 @@ again: - ret = err; - next_page: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - if (ret) - break; - -- offset += PAGE_CACHE_SIZE; -- physical_for_dev_replace += PAGE_CACHE_SIZE; -- nocow_ctx_logical += PAGE_CACHE_SIZE; -- len -= PAGE_CACHE_SIZE; -+ offset += PAGE_SIZE; -+ physical_for_dev_replace += PAGE_SIZE; -+ nocow_ctx_logical += PAGE_SIZE; -+ len -= PAGE_SIZE; - } - ret = COPY_COMPLETE; - out: -@@ -4388,8 +4388,8 @@ static int write_page_nocow(struct scrub_ctx *sctx, - bio->bi_iter.bi_size = 0; - bio->bi_iter.bi_sector = physical_for_dev_replace >> 9; - bio->bi_bdev = dev->bdev; -- ret = bio_add_page(bio, page, PAGE_CACHE_SIZE, 0); -- if (ret != PAGE_CACHE_SIZE) { -+ ret = bio_add_page(bio, page, PAGE_SIZE, 0); -+ if (ret != PAGE_SIZE) { - leave_with_eio: - bio_put(bio); - btrfs_dev_stat_inc_and_print(dev, BTRFS_DEV_STAT_WRITE_ERRS); -diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c -index 63a6152be04b..f5b875c8c2d8 100644 ---- a/fs/btrfs/send.c -+++ b/fs/btrfs/send.c -@@ -4448,9 +4448,9 @@ static ssize_t fill_read_buf(struct send_ctx *sctx, u64 offset, u32 len) - struct page *page; - char *addr; - struct btrfs_key key; -- pgoff_t index = offset >> PAGE_CACHE_SHIFT; -+ pgoff_t index = offset >> PAGE_SHIFT; - pgoff_t last_index; -- unsigned pg_offset = offset & ~PAGE_CACHE_MASK; -+ unsigned pg_offset = offset & ~PAGE_MASK; - ssize_t ret = 0; - - key.objectid = sctx->cur_ino; -@@ -4470,7 +4470,7 @@ static ssize_t fill_read_buf(struct send_ctx *sctx, u64 offset, u32 len) - if (len == 0) - goto out; - -- last_index = (offset + len - 1) >> PAGE_CACHE_SHIFT; -+ last_index = (offset + len - 1) >> PAGE_SHIFT; - - /* initial readahead */ - memset(&sctx->ra, 0, sizeof(struct file_ra_state)); -@@ -4480,7 +4480,7 @@ static ssize_t fill_read_buf(struct send_ctx *sctx, u64 offset, u32 len) - - while (index <= last_index) { - unsigned cur_len = min_t(unsigned, len, -- PAGE_CACHE_SIZE - pg_offset); -+ PAGE_SIZE - pg_offset); - page = find_or_create_page(inode->i_mapping, index, GFP_NOFS); - if (!page) { - ret = -ENOMEM; -@@ -4492,7 +4492,7 @@ static ssize_t fill_read_buf(struct send_ctx *sctx, u64 offset, u32 len) - lock_page(page); - if (!PageUptodate(page)) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - ret = -EIO; - break; - } -@@ -4502,7 +4502,7 @@ static ssize_t fill_read_buf(struct send_ctx *sctx, u64 offset, u32 len) - memcpy(sctx->read_buf + ret, addr + pg_offset, cur_len); - kunmap(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - index++; - pg_offset = 0; - len -= cur_len; -@@ -4803,7 +4803,7 @@ static int clone_range(struct send_ctx *sctx, - type = btrfs_file_extent_type(leaf, ei); - if (type == BTRFS_FILE_EXTENT_INLINE) { - ext_len = btrfs_file_extent_inline_len(leaf, slot, ei); -- ext_len = PAGE_CACHE_ALIGN(ext_len); -+ ext_len = PAGE_ALIGN(ext_len); - } else { - ext_len = btrfs_file_extent_num_bytes(leaf, ei); - } -@@ -4885,7 +4885,7 @@ static int send_write_or_clone(struct send_ctx *sctx, - * but there may be items after this page. Make - * sure to send the whole thing - */ -- len = PAGE_CACHE_ALIGN(len); -+ len = PAGE_ALIGN(len); - } else { - len = btrfs_file_extent_num_bytes(path->nodes[0], ei); - } -diff --git a/fs/btrfs/struct-funcs.c b/fs/btrfs/struct-funcs.c -index b976597b0721..42752e5ead15 100644 ---- a/fs/btrfs/struct-funcs.c -+++ b/fs/btrfs/struct-funcs.c -@@ -66,7 +66,7 @@ u##bits btrfs_get_token_##bits(struct extent_buffer *eb, void *ptr, \ - \ - if (token && token->kaddr && token->offset <= offset && \ - token->eb == eb && \ -- (token->offset + PAGE_CACHE_SIZE >= offset + size)) { \ -+ (token->offset + PAGE_SIZE >= offset + size)) { \ - kaddr = token->kaddr; \ - p = kaddr + part_offset - token->offset; \ - res = get_unaligned_le##bits(p + off); \ -@@ -104,7 +104,7 @@ void btrfs_set_token_##bits(struct extent_buffer *eb, \ - \ - if (token && token->kaddr && token->offset <= offset && \ - token->eb == eb && \ -- (token->offset + PAGE_CACHE_SIZE >= offset + size)) { \ -+ (token->offset + PAGE_SIZE >= offset + size)) { \ - kaddr = token->kaddr; \ - p = kaddr + part_offset - token->offset; \ - put_unaligned_le##bits(val, p + off); \ -diff --git a/fs/btrfs/tests/extent-io-tests.c b/fs/btrfs/tests/extent-io-tests.c -index 669b58201e36..70948b13bc81 100644 ---- a/fs/btrfs/tests/extent-io-tests.c -+++ b/fs/btrfs/tests/extent-io-tests.c -@@ -32,8 +32,8 @@ static noinline int process_page_range(struct inode *inode, u64 start, u64 end, - { - int ret; - struct page *pages[16]; -- unsigned long index = start >> PAGE_CACHE_SHIFT; -- unsigned long end_index = end >> PAGE_CACHE_SHIFT; -+ unsigned long index = start >> PAGE_SHIFT; -+ unsigned long end_index = end >> PAGE_SHIFT; - unsigned long nr_pages = end_index - index + 1; - int i; - int count = 0; -@@ -49,9 +49,9 @@ static noinline int process_page_range(struct inode *inode, u64 start, u64 end, - count++; - if (flags & PROCESS_UNLOCK && PageLocked(pages[i])) - unlock_page(pages[i]); -- page_cache_release(pages[i]); -+ put_page(pages[i]); - if (flags & PROCESS_RELEASE) -- page_cache_release(pages[i]); -+ put_page(pages[i]); - } - nr_pages -= ret; - index += ret; -@@ -93,7 +93,7 @@ static int test_find_delalloc(void) - * everything to make sure our pages don't get evicted and screw up our - * test. - */ -- for (index = 0; index < (total_dirty >> PAGE_CACHE_SHIFT); index++) { -+ for (index = 0; index < (total_dirty >> PAGE_SHIFT); index++) { - page = find_or_create_page(inode->i_mapping, index, GFP_KERNEL); - if (!page) { - test_msg("Failed to allocate test page\n"); -@@ -104,7 +104,7 @@ static int test_find_delalloc(void) - if (index) { - unlock_page(page); - } else { -- page_cache_get(page); -+ get_page(page); - locked_page = page; - } - } -@@ -129,7 +129,7 @@ static int test_find_delalloc(void) - } - unlock_extent(&tmp, start, end); - unlock_page(locked_page); -- page_cache_release(locked_page); -+ put_page(locked_page); - - /* - * Test this scenario -@@ -139,7 +139,7 @@ static int test_find_delalloc(void) - */ - test_start = SZ_64M; - locked_page = find_lock_page(inode->i_mapping, -- test_start >> PAGE_CACHE_SHIFT); -+ test_start >> PAGE_SHIFT); - if (!locked_page) { - test_msg("Couldn't find the locked page\n"); - goto out_bits; -@@ -165,7 +165,7 @@ static int test_find_delalloc(void) - } - unlock_extent(&tmp, start, end); - /* locked_page was unlocked above */ -- page_cache_release(locked_page); -+ put_page(locked_page); - - /* - * Test this scenario -@@ -174,7 +174,7 @@ static int test_find_delalloc(void) - */ - test_start = max_bytes + 4096; - locked_page = find_lock_page(inode->i_mapping, test_start >> -- PAGE_CACHE_SHIFT); -+ PAGE_SHIFT); - if (!locked_page) { - test_msg("Could'nt find the locked page\n"); - goto out_bits; -@@ -225,13 +225,13 @@ static int test_find_delalloc(void) - * range we want to find. - */ - page = find_get_page(inode->i_mapping, -- (max_bytes + SZ_1M) >> PAGE_CACHE_SHIFT); -+ (max_bytes + SZ_1M) >> PAGE_SHIFT); - if (!page) { - test_msg("Couldn't find our page\n"); - goto out_bits; - } - ClearPageDirty(page); -- page_cache_release(page); -+ put_page(page); - - /* We unlocked it in the previous test */ - lock_page(locked_page); -@@ -239,7 +239,7 @@ static int test_find_delalloc(void) - end = 0; - /* - * Currently if we fail to find dirty pages in the delalloc range we -- * will adjust max_bytes down to PAGE_CACHE_SIZE and then re-search. If -+ * will adjust max_bytes down to PAGE_SIZE and then re-search. If - * this changes at any point in the future we will need to fix this - * tests expected behavior. - */ -@@ -249,9 +249,9 @@ static int test_find_delalloc(void) - test_msg("Didn't find our range\n"); - goto out_bits; - } -- if (start != test_start && end != test_start + PAGE_CACHE_SIZE - 1) { -+ if (start != test_start && end != test_start + PAGE_SIZE - 1) { - test_msg("Expected start %Lu end %Lu, got start %Lu end %Lu\n", -- test_start, test_start + PAGE_CACHE_SIZE - 1, start, -+ test_start, test_start + PAGE_SIZE - 1, start, - end); - goto out_bits; - } -@@ -265,7 +265,7 @@ out_bits: - clear_extent_bits(&tmp, 0, total_dirty - 1, (unsigned)-1, GFP_KERNEL); - out: - if (locked_page) -- page_cache_release(locked_page); -+ put_page(locked_page); - process_page_range(inode, 0, total_dirty - 1, - PROCESS_UNLOCK | PROCESS_RELEASE); - iput(inode); -@@ -298,9 +298,9 @@ static int __test_eb_bitmaps(unsigned long *bitmap, struct extent_buffer *eb, - return -EINVAL; - } - -- bitmap_set(bitmap, (PAGE_CACHE_SIZE - sizeof(long) / 2) * BITS_PER_BYTE, -+ bitmap_set(bitmap, (PAGE_SIZE - sizeof(long) / 2) * BITS_PER_BYTE, - sizeof(long) * BITS_PER_BYTE); -- extent_buffer_bitmap_set(eb, PAGE_CACHE_SIZE - sizeof(long) / 2, 0, -+ extent_buffer_bitmap_set(eb, PAGE_SIZE - sizeof(long) / 2, 0, - sizeof(long) * BITS_PER_BYTE); - if (memcmp_extent_buffer(eb, bitmap, 0, len) != 0) { - test_msg("Setting straddling pages failed\n"); -@@ -309,10 +309,10 @@ static int __test_eb_bitmaps(unsigned long *bitmap, struct extent_buffer *eb, - - bitmap_set(bitmap, 0, len * BITS_PER_BYTE); - bitmap_clear(bitmap, -- (PAGE_CACHE_SIZE - sizeof(long) / 2) * BITS_PER_BYTE, -+ (PAGE_SIZE - sizeof(long) / 2) * BITS_PER_BYTE, - sizeof(long) * BITS_PER_BYTE); - extent_buffer_bitmap_set(eb, 0, 0, len * BITS_PER_BYTE); -- extent_buffer_bitmap_clear(eb, PAGE_CACHE_SIZE - sizeof(long) / 2, 0, -+ extent_buffer_bitmap_clear(eb, PAGE_SIZE - sizeof(long) / 2, 0, - sizeof(long) * BITS_PER_BYTE); - if (memcmp_extent_buffer(eb, bitmap, 0, len) != 0) { - test_msg("Clearing straddling pages failed\n"); -@@ -353,7 +353,7 @@ static int __test_eb_bitmaps(unsigned long *bitmap, struct extent_buffer *eb, - - static int test_eb_bitmaps(void) - { -- unsigned long len = PAGE_CACHE_SIZE * 4; -+ unsigned long len = PAGE_SIZE * 4; - unsigned long *bitmap; - struct extent_buffer *eb; - int ret; -@@ -379,7 +379,7 @@ static int test_eb_bitmaps(void) - - /* Do it over again with an extent buffer which isn't page-aligned. */ - free_extent_buffer(eb); -- eb = __alloc_dummy_extent_buffer(NULL, PAGE_CACHE_SIZE / 2, len); -+ eb = __alloc_dummy_extent_buffer(NULL, PAGE_SIZE / 2, len); - if (!eb) { - test_msg("Couldn't allocate test extent buffer\n"); - kfree(bitmap); -diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c -index c9ad97b1e690..514247515312 100644 ---- a/fs/btrfs/tests/free-space-tests.c -+++ b/fs/btrfs/tests/free-space-tests.c -@@ -22,7 +22,7 @@ - #include "../disk-io.h" - #include "../free-space-cache.h" - --#define BITS_PER_BITMAP (PAGE_CACHE_SIZE * 8) -+#define BITS_PER_BITMAP (PAGE_SIZE * 8) - - /* - * This test just does basic sanity checking, making sure we can add an exten -diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c -index 366b335946fa..eeb6da7976a5 100644 ---- a/fs/btrfs/volumes.c -+++ b/fs/btrfs/volumes.c -@@ -1024,16 +1024,16 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder, - } - - /* make sure our super fits in the device */ -- if (bytenr + PAGE_CACHE_SIZE >= i_size_read(bdev->bd_inode)) -+ if (bytenr + PAGE_SIZE >= i_size_read(bdev->bd_inode)) - goto error_bdev_put; - - /* make sure our super fits in the page */ -- if (sizeof(*disk_super) > PAGE_CACHE_SIZE) -+ if (sizeof(*disk_super) > PAGE_SIZE) - goto error_bdev_put; - - /* make sure our super doesn't straddle pages on disk */ -- index = bytenr >> PAGE_CACHE_SHIFT; -- if ((bytenr + sizeof(*disk_super) - 1) >> PAGE_CACHE_SHIFT != index) -+ index = bytenr >> PAGE_SHIFT; -+ if ((bytenr + sizeof(*disk_super) - 1) >> PAGE_SHIFT != index) - goto error_bdev_put; - - /* pull in the page with our super */ -@@ -1046,7 +1046,7 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder, - p = kmap(page); - - /* align our pointer to the offset of the super block */ -- disk_super = p + (bytenr & ~PAGE_CACHE_MASK); -+ disk_super = p + (bytenr & ~PAGE_MASK); - - if (btrfs_super_bytenr(disk_super) != bytenr || - btrfs_super_magic(disk_super) != BTRFS_MAGIC) -@@ -1074,7 +1074,7 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder, - - error_unmap: - kunmap(page); -- page_cache_release(page); -+ put_page(page); - - error_bdev_put: - blkdev_put(bdev, flags); -@@ -6522,7 +6522,7 @@ int btrfs_read_sys_array(struct btrfs_root *root) - * but sb spans only this function. Add an explicit SetPageUptodate call - * to silence the warning eg. on PowerPC 64. - */ -- if (PAGE_CACHE_SIZE > BTRFS_SUPER_INFO_SIZE) -+ if (PAGE_SIZE > BTRFS_SUPER_INFO_SIZE) - SetPageUptodate(sb->pages[0]); - - write_extent_buffer(sb, super_copy, 0, BTRFS_SUPER_INFO_SIZE); -diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c -index 82990b8f872b..88d274e8ecf2 100644 ---- a/fs/btrfs/zlib.c -+++ b/fs/btrfs/zlib.c -@@ -59,7 +59,7 @@ static struct list_head *zlib_alloc_workspace(void) - workspacesize = max(zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL), - zlib_inflate_workspacesize()); - workspace->strm.workspace = vmalloc(workspacesize); -- workspace->buf = kmalloc(PAGE_CACHE_SIZE, GFP_NOFS); -+ workspace->buf = kmalloc(PAGE_SIZE, GFP_NOFS); - if (!workspace->strm.workspace || !workspace->buf) - goto fail; - -@@ -103,7 +103,7 @@ static int zlib_compress_pages(struct list_head *ws, - workspace->strm.total_in = 0; - workspace->strm.total_out = 0; - -- in_page = find_get_page(mapping, start >> PAGE_CACHE_SHIFT); -+ in_page = find_get_page(mapping, start >> PAGE_SHIFT); - data_in = kmap(in_page); - - out_page = alloc_page(GFP_NOFS | __GFP_HIGHMEM); -@@ -117,8 +117,8 @@ static int zlib_compress_pages(struct list_head *ws, - - workspace->strm.next_in = data_in; - workspace->strm.next_out = cpage_out; -- workspace->strm.avail_out = PAGE_CACHE_SIZE; -- workspace->strm.avail_in = min(len, PAGE_CACHE_SIZE); -+ workspace->strm.avail_out = PAGE_SIZE; -+ workspace->strm.avail_in = min(len, PAGE_SIZE); - - while (workspace->strm.total_in < len) { - ret = zlib_deflate(&workspace->strm, Z_SYNC_FLUSH); -@@ -156,7 +156,7 @@ static int zlib_compress_pages(struct list_head *ws, - cpage_out = kmap(out_page); - pages[nr_pages] = out_page; - nr_pages++; -- workspace->strm.avail_out = PAGE_CACHE_SIZE; -+ workspace->strm.avail_out = PAGE_SIZE; - workspace->strm.next_out = cpage_out; - } - /* we're all done */ -@@ -170,14 +170,14 @@ static int zlib_compress_pages(struct list_head *ws, - - bytes_left = len - workspace->strm.total_in; - kunmap(in_page); -- page_cache_release(in_page); -+ put_page(in_page); - -- start += PAGE_CACHE_SIZE; -+ start += PAGE_SIZE; - in_page = find_get_page(mapping, -- start >> PAGE_CACHE_SHIFT); -+ start >> PAGE_SHIFT); - data_in = kmap(in_page); - workspace->strm.avail_in = min(bytes_left, -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - workspace->strm.next_in = data_in; - } - } -@@ -205,7 +205,7 @@ out: - - if (in_page) { - kunmap(in_page); -- page_cache_release(in_page); -+ put_page(in_page); - } - return ret; - } -@@ -223,18 +223,18 @@ static int zlib_decompress_biovec(struct list_head *ws, struct page **pages_in, - size_t total_out = 0; - unsigned long page_in_index = 0; - unsigned long page_out_index = 0; -- unsigned long total_pages_in = DIV_ROUND_UP(srclen, PAGE_CACHE_SIZE); -+ unsigned long total_pages_in = DIV_ROUND_UP(srclen, PAGE_SIZE); - unsigned long buf_start; - unsigned long pg_offset; - - data_in = kmap(pages_in[page_in_index]); - workspace->strm.next_in = data_in; -- workspace->strm.avail_in = min_t(size_t, srclen, PAGE_CACHE_SIZE); -+ workspace->strm.avail_in = min_t(size_t, srclen, PAGE_SIZE); - workspace->strm.total_in = 0; - - workspace->strm.total_out = 0; - workspace->strm.next_out = workspace->buf; -- workspace->strm.avail_out = PAGE_CACHE_SIZE; -+ workspace->strm.avail_out = PAGE_SIZE; - pg_offset = 0; - - /* If it's deflate, and it's got no preset dictionary, then -@@ -274,7 +274,7 @@ static int zlib_decompress_biovec(struct list_head *ws, struct page **pages_in, - } - - workspace->strm.next_out = workspace->buf; -- workspace->strm.avail_out = PAGE_CACHE_SIZE; -+ workspace->strm.avail_out = PAGE_SIZE; - - if (workspace->strm.avail_in == 0) { - unsigned long tmp; -@@ -288,7 +288,7 @@ static int zlib_decompress_biovec(struct list_head *ws, struct page **pages_in, - workspace->strm.next_in = data_in; - tmp = srclen - workspace->strm.total_in; - workspace->strm.avail_in = min(tmp, -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - } - } - if (ret != Z_STREAM_END) -@@ -325,7 +325,7 @@ static int zlib_decompress(struct list_head *ws, unsigned char *data_in, - workspace->strm.total_in = 0; - - workspace->strm.next_out = workspace->buf; -- workspace->strm.avail_out = PAGE_CACHE_SIZE; -+ workspace->strm.avail_out = PAGE_SIZE; - workspace->strm.total_out = 0; - /* If it's deflate, and it's got no preset dictionary, then - we can tell zlib to skip the adler32 check. */ -@@ -368,8 +368,8 @@ static int zlib_decompress(struct list_head *ws, unsigned char *data_in, - else - buf_offset = 0; - -- bytes = min(PAGE_CACHE_SIZE - pg_offset, -- PAGE_CACHE_SIZE - buf_offset); -+ bytes = min(PAGE_SIZE - pg_offset, -+ PAGE_SIZE - buf_offset); - bytes = min(bytes, bytes_left); - - kaddr = kmap_atomic(dest_page); -@@ -380,7 +380,7 @@ static int zlib_decompress(struct list_head *ws, unsigned char *data_in, - bytes_left -= bytes; - next: - workspace->strm.next_out = workspace->buf; -- workspace->strm.avail_out = PAGE_CACHE_SIZE; -+ workspace->strm.avail_out = PAGE_SIZE; - } - - if (ret != Z_STREAM_END && bytes_left != 0) -diff --git a/fs/buffer.c b/fs/buffer.c -index 33be29675358..af0d9a82a8ed 100644 ---- a/fs/buffer.c -+++ b/fs/buffer.c -@@ -129,7 +129,7 @@ __clear_page_buffers(struct page *page) - { - ClearPagePrivate(page); - set_page_private(page, 0); -- page_cache_release(page); -+ put_page(page); - } - - static void buffer_io_error(struct buffer_head *bh, char *msg) -@@ -207,7 +207,7 @@ __find_get_block_slow(struct block_device *bdev, sector_t block) - struct page *page; - int all_mapped = 1; - -- index = block >> (PAGE_CACHE_SHIFT - bd_inode->i_blkbits); -+ index = block >> (PAGE_SHIFT - bd_inode->i_blkbits); - page = find_get_page_flags(bd_mapping, index, FGP_ACCESSED); - if (!page) - goto out; -@@ -245,7 +245,7 @@ __find_get_block_slow(struct block_device *bdev, sector_t block) - } - out_unlock: - spin_unlock(&bd_mapping->private_lock); -- page_cache_release(page); -+ put_page(page); - out: - return ret; - } -@@ -1040,7 +1040,7 @@ done: - ret = (block < end_block) ? 1 : -ENXIO; - failed: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return ret; - } - -@@ -1533,7 +1533,7 @@ void block_invalidatepage(struct page *page, unsigned int offset, - /* - * Check for overflow - */ -- BUG_ON(stop > PAGE_CACHE_SIZE || stop < length); -+ BUG_ON(stop > PAGE_SIZE || stop < length); - - head = page_buffers(page); - bh = head; -@@ -1716,7 +1716,7 @@ static int __block_write_full_page(struct inode *inode, struct page *page, - blocksize = bh->b_size; - bbits = block_size_bits(blocksize); - -- block = (sector_t)page->index << (PAGE_CACHE_SHIFT - bbits); -+ block = (sector_t)page->index << (PAGE_SHIFT - bbits); - last_block = (i_size_read(inode) - 1) >> bbits; - - /* -@@ -1894,7 +1894,7 @@ EXPORT_SYMBOL(page_zero_new_buffers); - int __block_write_begin(struct page *page, loff_t pos, unsigned len, - get_block_t *get_block) - { -- unsigned from = pos & (PAGE_CACHE_SIZE - 1); -+ unsigned from = pos & (PAGE_SIZE - 1); - unsigned to = from + len; - struct inode *inode = page->mapping->host; - unsigned block_start, block_end; -@@ -1904,15 +1904,15 @@ int __block_write_begin(struct page *page, loff_t pos, unsigned len, - struct buffer_head *bh, *head, *wait[2], **wait_bh=wait; - - BUG_ON(!PageLocked(page)); -- BUG_ON(from > PAGE_CACHE_SIZE); -- BUG_ON(to > PAGE_CACHE_SIZE); -+ BUG_ON(from > PAGE_SIZE); -+ BUG_ON(to > PAGE_SIZE); - BUG_ON(from > to); - - head = create_page_buffers(page, inode, 0); - blocksize = head->b_size; - bbits = block_size_bits(blocksize); - -- block = (sector_t)page->index << (PAGE_CACHE_SHIFT - bbits); -+ block = (sector_t)page->index << (PAGE_SHIFT - bbits); - - for(bh = head, block_start = 0; bh != head || !block_start; - block++, block_start=block_end, bh = bh->b_this_page) { -@@ -2020,7 +2020,7 @@ static int __block_commit_write(struct inode *inode, struct page *page, - int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len, - unsigned flags, struct page **pagep, get_block_t *get_block) - { -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -+ pgoff_t index = pos >> PAGE_SHIFT; - struct page *page; - int status; - -@@ -2031,7 +2031,7 @@ int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len, - status = __block_write_begin(page, pos, len, get_block); - if (unlikely(status)) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - page = NULL; - } - -@@ -2047,7 +2047,7 @@ int block_write_end(struct file *file, struct address_space *mapping, - struct inode *inode = mapping->host; - unsigned start; - -- start = pos & (PAGE_CACHE_SIZE - 1); -+ start = pos & (PAGE_SIZE - 1); - - if (unlikely(copied < len)) { - /* -@@ -2099,7 +2099,7 @@ int generic_write_end(struct file *file, struct address_space *mapping, - } - - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - if (old_size < pos) - pagecache_isize_extended(inode, old_size, pos); -@@ -2136,9 +2136,9 @@ int block_is_partially_uptodate(struct page *page, unsigned long from, - - head = page_buffers(page); - blocksize = head->b_size; -- to = min_t(unsigned, PAGE_CACHE_SIZE - from, count); -+ to = min_t(unsigned, PAGE_SIZE - from, count); - to = from + to; -- if (from < blocksize && to > PAGE_CACHE_SIZE - blocksize) -+ if (from < blocksize && to > PAGE_SIZE - blocksize) - return 0; - - bh = head; -@@ -2181,7 +2181,7 @@ int block_read_full_page(struct page *page, get_block_t *get_block) - blocksize = head->b_size; - bbits = block_size_bits(blocksize); - -- iblock = (sector_t)page->index << (PAGE_CACHE_SHIFT - bbits); -+ iblock = (sector_t)page->index << (PAGE_SHIFT - bbits); - lblock = (i_size_read(inode)+blocksize-1) >> bbits; - bh = head; - nr = 0; -@@ -2295,16 +2295,16 @@ static int cont_expand_zero(struct file *file, struct address_space *mapping, - unsigned zerofrom, offset, len; - int err = 0; - -- index = pos >> PAGE_CACHE_SHIFT; -- offset = pos & ~PAGE_CACHE_MASK; -+ index = pos >> PAGE_SHIFT; -+ offset = pos & ~PAGE_MASK; - -- while (index > (curidx = (curpos = *bytes)>>PAGE_CACHE_SHIFT)) { -- zerofrom = curpos & ~PAGE_CACHE_MASK; -+ while (index > (curidx = (curpos = *bytes)>>PAGE_SHIFT)) { -+ zerofrom = curpos & ~PAGE_MASK; - if (zerofrom & (blocksize-1)) { - *bytes |= (blocksize-1); - (*bytes)++; - } -- len = PAGE_CACHE_SIZE - zerofrom; -+ len = PAGE_SIZE - zerofrom; - - err = pagecache_write_begin(file, mapping, curpos, len, - AOP_FLAG_UNINTERRUPTIBLE, -@@ -2329,7 +2329,7 @@ static int cont_expand_zero(struct file *file, struct address_space *mapping, - - /* page covers the boundary, find the boundary offset */ - if (index == curidx) { -- zerofrom = curpos & ~PAGE_CACHE_MASK; -+ zerofrom = curpos & ~PAGE_MASK; - /* if we will expand the thing last block will be filled */ - if (offset <= zerofrom) { - goto out; -@@ -2375,7 +2375,7 @@ int cont_write_begin(struct file *file, struct address_space *mapping, - if (err) - return err; - -- zerofrom = *bytes & ~PAGE_CACHE_MASK; -+ zerofrom = *bytes & ~PAGE_MASK; - if (pos+len > *bytes && zerofrom & (blocksize-1)) { - *bytes |= (blocksize-1); - (*bytes)++; -@@ -2430,10 +2430,10 @@ int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf, - } - - /* page is wholly or partially inside EOF */ -- if (((page->index + 1) << PAGE_CACHE_SHIFT) > size) -- end = size & ~PAGE_CACHE_MASK; -+ if (((page->index + 1) << PAGE_SHIFT) > size) -+ end = size & ~PAGE_MASK; - else -- end = PAGE_CACHE_SIZE; -+ end = PAGE_SIZE; - - ret = __block_write_begin(page, 0, end, get_block); - if (!ret) -@@ -2508,8 +2508,8 @@ int nobh_write_begin(struct address_space *mapping, - int ret = 0; - int is_mapped_to_disk = 1; - -- index = pos >> PAGE_CACHE_SHIFT; -- from = pos & (PAGE_CACHE_SIZE - 1); -+ index = pos >> PAGE_SHIFT; -+ from = pos & (PAGE_SIZE - 1); - to = from + len; - - page = grab_cache_page_write_begin(mapping, index, flags); -@@ -2543,7 +2543,7 @@ int nobh_write_begin(struct address_space *mapping, - goto out_release; - } - -- block_in_file = (sector_t)page->index << (PAGE_CACHE_SHIFT - blkbits); -+ block_in_file = (sector_t)page->index << (PAGE_SHIFT - blkbits); - - /* - * We loop across all blocks in the page, whether or not they are -@@ -2551,7 +2551,7 @@ int nobh_write_begin(struct address_space *mapping, - * page is fully mapped-to-disk. - */ - for (block_start = 0, block_in_page = 0, bh = head; -- block_start < PAGE_CACHE_SIZE; -+ block_start < PAGE_SIZE; - block_in_page++, block_start += blocksize, bh = bh->b_this_page) { - int create; - -@@ -2623,7 +2623,7 @@ failed: - - out_release: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - *pagep = NULL; - - return ret; -@@ -2653,7 +2653,7 @@ int nobh_write_end(struct file *file, struct address_space *mapping, - } - - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - while (head) { - bh = head; -@@ -2675,7 +2675,7 @@ int nobh_writepage(struct page *page, get_block_t *get_block, - { - struct inode * const inode = page->mapping->host; - loff_t i_size = i_size_read(inode); -- const pgoff_t end_index = i_size >> PAGE_CACHE_SHIFT; -+ const pgoff_t end_index = i_size >> PAGE_SHIFT; - unsigned offset; - int ret; - -@@ -2684,7 +2684,7 @@ int nobh_writepage(struct page *page, get_block_t *get_block, - goto out; - - /* Is the page fully outside i_size? (truncate in progress) */ -- offset = i_size & (PAGE_CACHE_SIZE-1); -+ offset = i_size & (PAGE_SIZE-1); - if (page->index >= end_index+1 || !offset) { - /* - * The page may have dirty, unmapped buffers. For example, -@@ -2707,7 +2707,7 @@ int nobh_writepage(struct page *page, get_block_t *get_block, - * the page size, the remaining memory is zeroed when mapped, and - * writes to that region are not written out to the file." - */ -- zero_user_segment(page, offset, PAGE_CACHE_SIZE); -+ zero_user_segment(page, offset, PAGE_SIZE); - out: - ret = mpage_writepage(page, get_block, wbc); - if (ret == -EAGAIN) -@@ -2720,8 +2720,8 @@ EXPORT_SYMBOL(nobh_writepage); - int nobh_truncate_page(struct address_space *mapping, - loff_t from, get_block_t *get_block) - { -- pgoff_t index = from >> PAGE_CACHE_SHIFT; -- unsigned offset = from & (PAGE_CACHE_SIZE-1); -+ pgoff_t index = from >> PAGE_SHIFT; -+ unsigned offset = from & (PAGE_SIZE-1); - unsigned blocksize; - sector_t iblock; - unsigned length, pos; -@@ -2738,7 +2738,7 @@ int nobh_truncate_page(struct address_space *mapping, - return 0; - - length = blocksize - length; -- iblock = (sector_t)index << (PAGE_CACHE_SHIFT - inode->i_blkbits); -+ iblock = (sector_t)index << (PAGE_SHIFT - inode->i_blkbits); - - page = grab_cache_page(mapping, index); - err = -ENOMEM; -@@ -2748,7 +2748,7 @@ int nobh_truncate_page(struct address_space *mapping, - if (page_has_buffers(page)) { - has_buffers: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return block_truncate_page(mapping, from, get_block); - } - -@@ -2772,7 +2772,7 @@ has_buffers: - if (!PageUptodate(page)) { - err = mapping->a_ops->readpage(NULL, page); - if (err) { -- page_cache_release(page); -+ put_page(page); - goto out; - } - lock_page(page); -@@ -2789,7 +2789,7 @@ has_buffers: - - unlock: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - out: - return err; - } -@@ -2798,8 +2798,8 @@ EXPORT_SYMBOL(nobh_truncate_page); - int block_truncate_page(struct address_space *mapping, - loff_t from, get_block_t *get_block) - { -- pgoff_t index = from >> PAGE_CACHE_SHIFT; -- unsigned offset = from & (PAGE_CACHE_SIZE-1); -+ pgoff_t index = from >> PAGE_SHIFT; -+ unsigned offset = from & (PAGE_SIZE-1); - unsigned blocksize; - sector_t iblock; - unsigned length, pos; -@@ -2816,7 +2816,7 @@ int block_truncate_page(struct address_space *mapping, - return 0; - - length = blocksize - length; -- iblock = (sector_t)index << (PAGE_CACHE_SHIFT - inode->i_blkbits); -+ iblock = (sector_t)index << (PAGE_SHIFT - inode->i_blkbits); - - page = grab_cache_page(mapping, index); - err = -ENOMEM; -@@ -2865,7 +2865,7 @@ int block_truncate_page(struct address_space *mapping, - - unlock: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - out: - return err; - } -@@ -2879,7 +2879,7 @@ int block_write_full_page(struct page *page, get_block_t *get_block, - { - struct inode * const inode = page->mapping->host; - loff_t i_size = i_size_read(inode); -- const pgoff_t end_index = i_size >> PAGE_CACHE_SHIFT; -+ const pgoff_t end_index = i_size >> PAGE_SHIFT; - unsigned offset; - - /* Is the page fully inside i_size? */ -@@ -2888,14 +2888,14 @@ int block_write_full_page(struct page *page, get_block_t *get_block, - end_buffer_async_write); - - /* Is the page fully outside i_size? (truncate in progress) */ -- offset = i_size & (PAGE_CACHE_SIZE-1); -+ offset = i_size & (PAGE_SIZE-1); - if (page->index >= end_index+1 || !offset) { - /* - * The page may have dirty, unmapped buffers. For example, - * they may have been added in ext3_writepage(). Make them - * freeable here, so the page does not leak. - */ -- do_invalidatepage(page, 0, PAGE_CACHE_SIZE); -+ do_invalidatepage(page, 0, PAGE_SIZE); - unlock_page(page); - return 0; /* don't care */ - } -@@ -2907,7 +2907,7 @@ int block_write_full_page(struct page *page, get_block_t *get_block, - * the page size, the remaining memory is zeroed when mapped, and - * writes to that region are not written out to the file." - */ -- zero_user_segment(page, offset, PAGE_CACHE_SIZE); -+ zero_user_segment(page, offset, PAGE_SIZE); - return __block_write_full_page(inode, page, get_block, wbc, - end_buffer_async_write); - } -diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c -index c0f3da3926a0..afbdc418966d 100644 ---- a/fs/cachefiles/rdwr.c -+++ b/fs/cachefiles/rdwr.c -@@ -194,10 +194,10 @@ static void cachefiles_read_copier(struct fscache_operation *_op) - error = -EIO; - } - -- page_cache_release(monitor->back_page); -+ put_page(monitor->back_page); - - fscache_end_io(op, monitor->netfs_page, error); -- page_cache_release(monitor->netfs_page); -+ put_page(monitor->netfs_page); - fscache_retrieval_complete(op, 1); - fscache_put_retrieval(op); - kfree(monitor); -@@ -288,8 +288,8 @@ monitor_backing_page: - _debug("- monitor add"); - - /* install the monitor */ -- page_cache_get(monitor->netfs_page); -- page_cache_get(backpage); -+ get_page(monitor->netfs_page); -+ get_page(backpage); - monitor->back_page = backpage; - monitor->monitor.private = backpage; - add_page_wait_queue(backpage, &monitor->monitor); -@@ -310,7 +310,7 @@ backing_page_already_present: - _debug("- present"); - - if (newpage) { -- page_cache_release(newpage); -+ put_page(newpage); - newpage = NULL; - } - -@@ -342,7 +342,7 @@ success: - - out: - if (backpage) -- page_cache_release(backpage); -+ put_page(backpage); - if (monitor) { - fscache_put_retrieval(monitor->op); - kfree(monitor); -@@ -363,7 +363,7 @@ io_error: - goto out; - - nomem_page: -- page_cache_release(newpage); -+ put_page(newpage); - nomem_monitor: - fscache_put_retrieval(monitor->op); - kfree(monitor); -@@ -530,7 +530,7 @@ static int cachefiles_read_backing_file(struct cachefiles_object *object, - netpage->index, cachefiles_gfp); - if (ret < 0) { - if (ret == -EEXIST) { -- page_cache_release(netpage); -+ put_page(netpage); - fscache_retrieval_complete(op, 1); - continue; - } -@@ -538,10 +538,10 @@ static int cachefiles_read_backing_file(struct cachefiles_object *object, - } - - /* install a monitor */ -- page_cache_get(netpage); -+ get_page(netpage); - monitor->netfs_page = netpage; - -- page_cache_get(backpage); -+ get_page(backpage); - monitor->back_page = backpage; - monitor->monitor.private = backpage; - add_page_wait_queue(backpage, &monitor->monitor); -@@ -555,10 +555,10 @@ static int cachefiles_read_backing_file(struct cachefiles_object *object, - unlock_page(backpage); - } - -- page_cache_release(backpage); -+ put_page(backpage); - backpage = NULL; - -- page_cache_release(netpage); -+ put_page(netpage); - netpage = NULL; - continue; - -@@ -603,7 +603,7 @@ static int cachefiles_read_backing_file(struct cachefiles_object *object, - netpage->index, cachefiles_gfp); - if (ret < 0) { - if (ret == -EEXIST) { -- page_cache_release(netpage); -+ put_page(netpage); - fscache_retrieval_complete(op, 1); - continue; - } -@@ -612,14 +612,14 @@ static int cachefiles_read_backing_file(struct cachefiles_object *object, - - copy_highpage(netpage, backpage); - -- page_cache_release(backpage); -+ put_page(backpage); - backpage = NULL; - - fscache_mark_page_cached(op, netpage); - - /* the netpage is unlocked and marked up to date here */ - fscache_end_io(op, netpage, 0); -- page_cache_release(netpage); -+ put_page(netpage); - netpage = NULL; - fscache_retrieval_complete(op, 1); - continue; -@@ -632,11 +632,11 @@ static int cachefiles_read_backing_file(struct cachefiles_object *object, - out: - /* tidy up */ - if (newpage) -- page_cache_release(newpage); -+ put_page(newpage); - if (netpage) -- page_cache_release(netpage); -+ put_page(netpage); - if (backpage) -- page_cache_release(backpage); -+ put_page(backpage); - if (monitor) { - fscache_put_retrieval(op); - kfree(monitor); -@@ -644,7 +644,7 @@ out: - - list_for_each_entry_safe(netpage, _n, list, lru) { - list_del(&netpage->lru); -- page_cache_release(netpage); -+ put_page(netpage); - fscache_retrieval_complete(op, 1); - } - -diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c -index 19adeb0ef82a..355e2bc794cd 100644 ---- a/fs/ceph/addr.c -+++ b/fs/ceph/addr.c -@@ -143,7 +143,7 @@ static void ceph_invalidatepage(struct page *page, unsigned int offset, - inode = page->mapping->host; - ci = ceph_inode(inode); - -- if (offset != 0 || length != PAGE_CACHE_SIZE) { -+ if (offset != 0 || length != PAGE_SIZE) { - dout("%p invalidatepage %p idx %lu partial dirty page %u~%u\n", - inode, page, page->index, offset, length); - return; -@@ -197,10 +197,10 @@ static int readpage_nounlock(struct file *filp, struct page *page) - &ceph_inode_to_client(inode)->client->osdc; - int err = 0; - u64 off = page_offset(page); -- u64 len = PAGE_CACHE_SIZE; -+ u64 len = PAGE_SIZE; - - if (off >= i_size_read(inode)) { -- zero_user_segment(page, 0, PAGE_CACHE_SIZE); -+ zero_user_segment(page, 0, PAGE_SIZE); - SetPageUptodate(page); - return 0; - } -@@ -212,7 +212,7 @@ static int readpage_nounlock(struct file *filp, struct page *page) - */ - if (off == 0) - return -EINVAL; -- zero_user_segment(page, 0, PAGE_CACHE_SIZE); -+ zero_user_segment(page, 0, PAGE_SIZE); - SetPageUptodate(page); - return 0; - } -@@ -234,9 +234,9 @@ static int readpage_nounlock(struct file *filp, struct page *page) - ceph_fscache_readpage_cancel(inode, page); - goto out; - } -- if (err < PAGE_CACHE_SIZE) -+ if (err < PAGE_SIZE) - /* zero fill remainder of page */ -- zero_user_segment(page, err, PAGE_CACHE_SIZE); -+ zero_user_segment(page, err, PAGE_SIZE); - else - flush_dcache_page(page); - -@@ -278,10 +278,10 @@ static void finish_read(struct ceph_osd_request *req, struct ceph_msg *msg) - - if (rc < 0 && rc != ENOENT) - goto unlock; -- if (bytes < (int)PAGE_CACHE_SIZE) { -+ if (bytes < (int)PAGE_SIZE) { - /* zero (remainder of) page */ - int s = bytes < 0 ? 0 : bytes; -- zero_user_segment(page, s, PAGE_CACHE_SIZE); -+ zero_user_segment(page, s, PAGE_SIZE); - } - dout("finish_read %p uptodate %p idx %lu\n", inode, page, - page->index); -@@ -290,8 +290,8 @@ static void finish_read(struct ceph_osd_request *req, struct ceph_msg *msg) - ceph_readpage_to_fscache(inode, page); - unlock: - unlock_page(page); -- page_cache_release(page); -- bytes -= PAGE_CACHE_SIZE; -+ put_page(page); -+ bytes -= PAGE_SIZE; - } - kfree(osd_data->pages); - } -@@ -336,7 +336,7 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max) - if (max && nr_pages == max) - break; - } -- len = nr_pages << PAGE_CACHE_SHIFT; -+ len = nr_pages << PAGE_SHIFT; - dout("start_read %p nr_pages %d is %lld~%lld\n", inode, nr_pages, - off, len); - vino = ceph_vino(inode); -@@ -364,7 +364,7 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max) - if (add_to_page_cache_lru(page, &inode->i_data, page->index, - GFP_KERNEL)) { - ceph_fscache_uncache_page(inode, page); -- page_cache_release(page); -+ put_page(page); - dout("start_read %p add_to_page_cache failed %p\n", - inode, page); - nr_pages = i; -@@ -415,8 +415,8 @@ static int ceph_readpages(struct file *file, struct address_space *mapping, - if (rc == 0) - goto out; - -- if (fsc->mount_options->rsize >= PAGE_CACHE_SIZE) -- max = (fsc->mount_options->rsize + PAGE_CACHE_SIZE - 1) -+ if (fsc->mount_options->rsize >= PAGE_SIZE) -+ max = (fsc->mount_options->rsize + PAGE_SIZE - 1) - >> PAGE_SHIFT; - - dout("readpages %p file %p nr_pages %d max %d\n", inode, -@@ -484,7 +484,7 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc) - long writeback_stat; - u64 truncate_size; - u32 truncate_seq; -- int err = 0, len = PAGE_CACHE_SIZE; -+ int err = 0, len = PAGE_SIZE; - - dout("writepage %p idx %lu\n", page, page->index); - -@@ -725,9 +725,9 @@ static int ceph_writepages_start(struct address_space *mapping, - } - if (fsc->mount_options->wsize && fsc->mount_options->wsize < wsize) - wsize = fsc->mount_options->wsize; -- if (wsize < PAGE_CACHE_SIZE) -- wsize = PAGE_CACHE_SIZE; -- max_pages_ever = wsize >> PAGE_CACHE_SHIFT; -+ if (wsize < PAGE_SIZE) -+ wsize = PAGE_SIZE; -+ max_pages_ever = wsize >> PAGE_SHIFT; - - pagevec_init(&pvec, 0); - -@@ -737,8 +737,8 @@ static int ceph_writepages_start(struct address_space *mapping, - end = -1; - dout(" cyclic, start at %lu\n", start); - } else { -- start = wbc->range_start >> PAGE_CACHE_SHIFT; -- end = wbc->range_end >> PAGE_CACHE_SHIFT; -+ start = wbc->range_start >> PAGE_SHIFT; -+ end = wbc->range_end >> PAGE_SHIFT; - if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) - range_whole = 1; - should_loop = 0; -@@ -953,14 +953,14 @@ get_more_pages: - - /* Format the osd request message and submit the write */ - offset = page_offset(pages[0]); -- len = (u64)locked_pages << PAGE_CACHE_SHIFT; -+ len = (u64)locked_pages << PAGE_SHIFT; - if (snap_size == -1) { - len = min(len, (u64)i_size_read(inode) - offset); - /* writepages_finish() clears writeback pages - * according to the data length, so make sure - * data length covers all locked pages */ - len = max(len, 1 + -- ((u64)(locked_pages - 1) << PAGE_CACHE_SHIFT)); -+ ((u64)(locked_pages - 1) << PAGE_SHIFT)); - } else { - len = min(len, snap_size - offset); - } -@@ -1048,8 +1048,8 @@ static int ceph_update_writeable_page(struct file *file, - { - struct inode *inode = file_inode(file); - struct ceph_inode_info *ci = ceph_inode(inode); -- loff_t page_off = pos & PAGE_CACHE_MASK; -- int pos_in_page = pos & ~PAGE_CACHE_MASK; -+ loff_t page_off = pos & PAGE_MASK; -+ int pos_in_page = pos & ~PAGE_MASK; - int end_in_page = pos_in_page + len; - loff_t i_size; - int r; -@@ -1104,7 +1104,7 @@ retry_locked: - } - - /* full page? */ -- if (pos_in_page == 0 && len == PAGE_CACHE_SIZE) -+ if (pos_in_page == 0 && len == PAGE_SIZE) - return 0; - - /* past end of file? */ -@@ -1112,12 +1112,12 @@ retry_locked: - - if (page_off >= i_size || - (pos_in_page == 0 && (pos+len) >= i_size && -- end_in_page - pos_in_page != PAGE_CACHE_SIZE)) { -+ end_in_page - pos_in_page != PAGE_SIZE)) { - dout(" zeroing %p 0 - %d and %d - %d\n", -- page, pos_in_page, end_in_page, (int)PAGE_CACHE_SIZE); -+ page, pos_in_page, end_in_page, (int)PAGE_SIZE); - zero_user_segments(page, - 0, pos_in_page, -- end_in_page, PAGE_CACHE_SIZE); -+ end_in_page, PAGE_SIZE); - return 0; - } - -@@ -1141,7 +1141,7 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping, - { - struct inode *inode = file_inode(file); - struct page *page; -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -+ pgoff_t index = pos >> PAGE_SHIFT; - int r; - - do { -@@ -1155,7 +1155,7 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping, - - r = ceph_update_writeable_page(file, pos, len, page); - if (r < 0) -- page_cache_release(page); -+ put_page(page); - else - *pagep = page; - } while (r == -EAGAIN); -@@ -1172,7 +1172,7 @@ static int ceph_write_end(struct file *file, struct address_space *mapping, - struct page *page, void *fsdata) - { - struct inode *inode = file_inode(file); -- unsigned from = pos & (PAGE_CACHE_SIZE - 1); -+ unsigned from = pos & (PAGE_SIZE - 1); - int check_cap = 0; - - dout("write_end file %p inode %p page %p %d~%d (%d)\n", file, -@@ -1192,7 +1192,7 @@ static int ceph_write_end(struct file *file, struct address_space *mapping, - set_page_dirty(page); - - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - if (check_cap) - ceph_check_caps(ceph_inode(inode), CHECK_CAPS_AUTHONLY, NULL); -@@ -1235,11 +1235,11 @@ static int ceph_filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) - struct ceph_inode_info *ci = ceph_inode(inode); - struct ceph_file_info *fi = vma->vm_file->private_data; - struct page *pinned_page = NULL; -- loff_t off = vmf->pgoff << PAGE_CACHE_SHIFT; -+ loff_t off = vmf->pgoff << PAGE_SHIFT; - int want, got, ret; - - dout("filemap_fault %p %llx.%llx %llu~%zd trying to get caps\n", -- inode, ceph_vinop(inode), off, (size_t)PAGE_CACHE_SIZE); -+ inode, ceph_vinop(inode), off, (size_t)PAGE_SIZE); - if (fi->fmode & CEPH_FILE_MODE_LAZY) - want = CEPH_CAP_FILE_CACHE | CEPH_CAP_FILE_LAZYIO; - else -@@ -1256,7 +1256,7 @@ static int ceph_filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) - } - } - dout("filemap_fault %p %llu~%zd got cap refs on %s\n", -- inode, off, (size_t)PAGE_CACHE_SIZE, ceph_cap_string(got)); -+ inode, off, (size_t)PAGE_SIZE, ceph_cap_string(got)); - - if ((got & (CEPH_CAP_FILE_CACHE | CEPH_CAP_FILE_LAZYIO)) || - ci->i_inline_version == CEPH_INLINE_NONE) -@@ -1265,16 +1265,16 @@ static int ceph_filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) - ret = -EAGAIN; - - dout("filemap_fault %p %llu~%zd dropping cap refs on %s ret %d\n", -- inode, off, (size_t)PAGE_CACHE_SIZE, ceph_cap_string(got), ret); -+ inode, off, (size_t)PAGE_SIZE, ceph_cap_string(got), ret); - if (pinned_page) -- page_cache_release(pinned_page); -+ put_page(pinned_page); - ceph_put_cap_refs(ci, got); - - if (ret != -EAGAIN) - return ret; - - /* read inline data */ -- if (off >= PAGE_CACHE_SIZE) { -+ if (off >= PAGE_SIZE) { - /* does not support inline data > PAGE_SIZE */ - ret = VM_FAULT_SIGBUS; - } else { -@@ -1291,12 +1291,12 @@ static int ceph_filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) - CEPH_STAT_CAP_INLINE_DATA, true); - if (ret1 < 0 || off >= i_size_read(inode)) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - ret = VM_FAULT_SIGBUS; - goto out; - } -- if (ret1 < PAGE_CACHE_SIZE) -- zero_user_segment(page, ret1, PAGE_CACHE_SIZE); -+ if (ret1 < PAGE_SIZE) -+ zero_user_segment(page, ret1, PAGE_SIZE); - else - flush_dcache_page(page); - SetPageUptodate(page); -@@ -1305,7 +1305,7 @@ static int ceph_filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) - } - out: - dout("filemap_fault %p %llu~%zd read inline data ret %d\n", -- inode, off, (size_t)PAGE_CACHE_SIZE, ret); -+ inode, off, (size_t)PAGE_SIZE, ret); - return ret; - } - -@@ -1343,10 +1343,10 @@ static int ceph_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) - } - } - -- if (off + PAGE_CACHE_SIZE <= size) -- len = PAGE_CACHE_SIZE; -+ if (off + PAGE_SIZE <= size) -+ len = PAGE_SIZE; - else -- len = size & ~PAGE_CACHE_MASK; -+ len = size & ~PAGE_MASK; - - dout("page_mkwrite %p %llx.%llx %llu~%zd getting caps i_size %llu\n", - inode, ceph_vinop(inode), off, len, size); -@@ -1432,7 +1432,7 @@ void ceph_fill_inline_data(struct inode *inode, struct page *locked_page, - return; - if (PageUptodate(page)) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return; - } - } -@@ -1447,14 +1447,14 @@ void ceph_fill_inline_data(struct inode *inode, struct page *locked_page, - } - - if (page != locked_page) { -- if (len < PAGE_CACHE_SIZE) -- zero_user_segment(page, len, PAGE_CACHE_SIZE); -+ if (len < PAGE_SIZE) -+ zero_user_segment(page, len, PAGE_SIZE); - else - flush_dcache_page(page); - - SetPageUptodate(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - } - -@@ -1491,7 +1491,7 @@ int ceph_uninline_data(struct file *filp, struct page *locked_page) - from_pagecache = true; - lock_page(page); - } else { -- page_cache_release(page); -+ put_page(page); - page = NULL; - } - } -@@ -1499,8 +1499,8 @@ int ceph_uninline_data(struct file *filp, struct page *locked_page) - - if (page) { - len = i_size_read(inode); -- if (len > PAGE_CACHE_SIZE) -- len = PAGE_CACHE_SIZE; -+ if (len > PAGE_SIZE) -+ len = PAGE_SIZE; - } else { - page = __page_cache_alloc(GFP_NOFS); - if (!page) { -@@ -1584,7 +1584,7 @@ out: - if (page && page != locked_page) { - if (from_pagecache) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } else - __free_pages(page, 0); - } -diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c -index 6fe0ad26a7df..835b1d9a8873 100644 ---- a/fs/ceph/caps.c -+++ b/fs/ceph/caps.c -@@ -2507,7 +2507,7 @@ int ceph_get_caps(struct ceph_inode_info *ci, int need, int want, - *pinned_page = page; - break; - } -- page_cache_release(page); -+ put_page(page); - } - /* - * drop cap refs first because getattr while -diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c -index fd11fb231a2e..b91369988eaa 100644 ---- a/fs/ceph/dir.c -+++ b/fs/ceph/dir.c -@@ -146,7 +146,7 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx, - struct inode *dir = d_inode(parent); - struct dentry *dentry, *last = NULL; - struct ceph_dentry_info *di; -- unsigned nsize = PAGE_CACHE_SIZE / sizeof(struct dentry *); -+ unsigned nsize = PAGE_SIZE / sizeof(struct dentry *); - int err = 0; - loff_t ptr_pos = 0; - struct ceph_readdir_cache_control cache_ctl = {}; -@@ -171,7 +171,7 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx, - } - - err = -EAGAIN; -- pgoff = ptr_pos >> PAGE_CACHE_SHIFT; -+ pgoff = ptr_pos >> PAGE_SHIFT; - if (!cache_ctl.page || pgoff != page_index(cache_ctl.page)) { - ceph_readdir_cache_release(&cache_ctl); - cache_ctl.page = find_lock_page(&dir->i_data, pgoff); -diff --git a/fs/ceph/file.c b/fs/ceph/file.c -index eb9028e8cfc5..04040daaf5f1 100644 ---- a/fs/ceph/file.c -+++ b/fs/ceph/file.c -@@ -459,7 +459,7 @@ more: - ret += zlen; - } - -- didpages = (page_align + ret) >> PAGE_CACHE_SHIFT; -+ didpages = (page_align + ret) >> PAGE_SHIFT; - pos += ret; - read = pos - off; - left -= ret; -@@ -800,8 +800,8 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter, - - if (write) { - ret = invalidate_inode_pages2_range(inode->i_mapping, -- pos >> PAGE_CACHE_SHIFT, -- (pos + count) >> PAGE_CACHE_SHIFT); -+ pos >> PAGE_SHIFT, -+ (pos + count) >> PAGE_SHIFT); - if (ret < 0) - dout("invalidate_inode_pages2_range returned %d\n", ret); - -@@ -866,7 +866,7 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter, - * may block. - */ - truncate_inode_pages_range(inode->i_mapping, pos, -- (pos+len) | (PAGE_CACHE_SIZE - 1)); -+ (pos+len) | (PAGE_SIZE - 1)); - - osd_req_op_init(req, 1, CEPH_OSD_OP_STARTSYNC, 0); - } -@@ -1001,8 +1001,8 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos, - return ret; - - ret = invalidate_inode_pages2_range(inode->i_mapping, -- pos >> PAGE_CACHE_SHIFT, -- (pos + count) >> PAGE_CACHE_SHIFT); -+ pos >> PAGE_SHIFT, -+ (pos + count) >> PAGE_SHIFT); - if (ret < 0) - dout("invalidate_inode_pages2_range returned %d\n", ret); - -@@ -1031,7 +1031,7 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos, - * write from beginning of first page, - * regardless of io alignment - */ -- num_pages = (len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -+ num_pages = (len + PAGE_SIZE - 1) >> PAGE_SHIFT; - - pages = ceph_alloc_page_vector(num_pages, GFP_KERNEL); - if (IS_ERR(pages)) { -@@ -1154,7 +1154,7 @@ again: - dout("aio_read %p %llx.%llx dropping cap refs on %s = %d\n", - inode, ceph_vinop(inode), ceph_cap_string(got), (int)ret); - if (pinned_page) { -- page_cache_release(pinned_page); -+ put_page(pinned_page); - pinned_page = NULL; - } - ceph_put_cap_refs(ci, got); -@@ -1183,10 +1183,10 @@ again: - if (retry_op == READ_INLINE) { - BUG_ON(ret > 0 || read > 0); - if (iocb->ki_pos < i_size && -- iocb->ki_pos < PAGE_CACHE_SIZE) { -+ iocb->ki_pos < PAGE_SIZE) { - loff_t end = min_t(loff_t, i_size, - iocb->ki_pos + len); -- end = min_t(loff_t, end, PAGE_CACHE_SIZE); -+ end = min_t(loff_t, end, PAGE_SIZE); - if (statret < end) - zero_user_segment(page, statret, end); - ret = copy_page_to_iter(page, -@@ -1458,21 +1458,21 @@ static inline void ceph_zero_partial_page( - struct inode *inode, loff_t offset, unsigned size) - { - struct page *page; -- pgoff_t index = offset >> PAGE_CACHE_SHIFT; -+ pgoff_t index = offset >> PAGE_SHIFT; - - page = find_lock_page(inode->i_mapping, index); - if (page) { - wait_on_page_writeback(page); -- zero_user(page, offset & (PAGE_CACHE_SIZE - 1), size); -+ zero_user(page, offset & (PAGE_SIZE - 1), size); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - } - - static void ceph_zero_pagecache_range(struct inode *inode, loff_t offset, - loff_t length) - { -- loff_t nearly = round_up(offset, PAGE_CACHE_SIZE); -+ loff_t nearly = round_up(offset, PAGE_SIZE); - if (offset < nearly) { - loff_t size = nearly - offset; - if (length < size) -@@ -1481,8 +1481,8 @@ static void ceph_zero_pagecache_range(struct inode *inode, loff_t offset, - offset += size; - length -= size; - } -- if (length >= PAGE_CACHE_SIZE) { -- loff_t size = round_down(length, PAGE_CACHE_SIZE); -+ if (length >= PAGE_SIZE) { -+ loff_t size = round_down(length, PAGE_SIZE); - truncate_pagecache_range(inode, offset, offset + size - 1); - offset += size; - length -= size; -diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c -index e48fd8b23257..d5572db245e5 100644 ---- a/fs/ceph/inode.c -+++ b/fs/ceph/inode.c -@@ -1333,7 +1333,7 @@ void ceph_readdir_cache_release(struct ceph_readdir_cache_control *ctl) - { - if (ctl->page) { - kunmap(ctl->page); -- page_cache_release(ctl->page); -+ put_page(ctl->page); - ctl->page = NULL; - } - } -@@ -1343,7 +1343,7 @@ static int fill_readdir_cache(struct inode *dir, struct dentry *dn, - struct ceph_mds_request *req) - { - struct ceph_inode_info *ci = ceph_inode(dir); -- unsigned nsize = PAGE_CACHE_SIZE / sizeof(struct dentry*); -+ unsigned nsize = PAGE_SIZE / sizeof(struct dentry*); - unsigned idx = ctl->index % nsize; - pgoff_t pgoff = ctl->index / nsize; - -diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c -index 911d64d865f1..859c0444d3b9 100644 ---- a/fs/ceph/mds_client.c -+++ b/fs/ceph/mds_client.c -@@ -1610,7 +1610,7 @@ again: - while (!list_empty(&tmp_list)) { - if (!msg) { - msg = ceph_msg_new(CEPH_MSG_CLIENT_CAPRELEASE, -- PAGE_CACHE_SIZE, GFP_NOFS, false); -+ PAGE_SIZE, GFP_NOFS, false); - if (!msg) - goto out_err; - head = msg->front.iov_base; -diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h -index 37712ccffcc6..3a8408ccf337 100644 ---- a/fs/ceph/mds_client.h -+++ b/fs/ceph/mds_client.h -@@ -97,7 +97,7 @@ struct ceph_mds_reply_info_parsed { - /* - * cap releases are batched and sent to the MDS en masse. - */ --#define CEPH_CAPS_PER_RELEASE ((PAGE_CACHE_SIZE - \ -+#define CEPH_CAPS_PER_RELEASE ((PAGE_SIZE - \ - sizeof(struct ceph_mds_cap_release)) / \ - sizeof(struct ceph_mds_cap_item)) - -diff --git a/fs/ceph/super.c b/fs/ceph/super.c -index ca4d5e8457f1..98acbf7b3efc 100644 ---- a/fs/ceph/super.c -+++ b/fs/ceph/super.c -@@ -560,7 +560,7 @@ static struct ceph_fs_client *create_fs_client(struct ceph_mount_options *fsopt, - - /* set up mempools */ - err = -ENOMEM; -- page_count = fsc->mount_options->wsize >> PAGE_CACHE_SHIFT; -+ page_count = fsc->mount_options->wsize >> PAGE_SHIFT; - size = sizeof (struct page *) * (page_count ? page_count : 1); - fsc->wb_pagevec_pool = mempool_create_kmalloc_pool(10, size); - if (!fsc->wb_pagevec_pool) -@@ -915,13 +915,13 @@ static int ceph_register_bdi(struct super_block *sb, - int err; - - /* set ra_pages based on rasize mount option? */ -- if (fsc->mount_options->rasize >= PAGE_CACHE_SIZE) -+ if (fsc->mount_options->rasize >= PAGE_SIZE) - fsc->backing_dev_info.ra_pages = -- (fsc->mount_options->rasize + PAGE_CACHE_SIZE - 1) -+ (fsc->mount_options->rasize + PAGE_SIZE - 1) - >> PAGE_SHIFT; - else - fsc->backing_dev_info.ra_pages = -- VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE; -+ VM_MAX_READAHEAD * 1024 / PAGE_SIZE; - - err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld", - atomic_long_inc_return(&bdi_seq)); -diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c -index 1d86fc620e5c..89201564c346 100644 ---- a/fs/cifs/cifsfs.c -+++ b/fs/cifs/cifsfs.c -@@ -962,7 +962,7 @@ static int cifs_clone_file_range(struct file *src_file, loff_t off, - cifs_dbg(FYI, "about to flush pages\n"); - /* should we flush first and last page first */ - truncate_inode_pages_range(&target_inode->i_data, destoff, -- PAGE_CACHE_ALIGN(destoff + len)-1); -+ PAGE_ALIGN(destoff + len)-1); - - if (target_tcon->ses->server->ops->duplicate_extents) - rc = target_tcon->ses->server->ops->duplicate_extents(xid, -diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h -index d21da9f05bae..f2cc0b3d1af7 100644 ---- a/fs/cifs/cifsglob.h -+++ b/fs/cifs/cifsglob.h -@@ -714,7 +714,7 @@ compare_mid(__u16 mid, const struct smb_hdr *smb) - * - * Note that this might make for "interesting" allocation problems during - * writeback however as we have to allocate an array of pointers for the -- * pages. A 16M write means ~32kb page array with PAGE_CACHE_SIZE == 4096. -+ * pages. A 16M write means ~32kb page array with PAGE_SIZE == 4096. - * - * For reads, there is a similar problem as we need to allocate an array - * of kvecs to handle the receive, though that should only need to be done -@@ -733,7 +733,7 @@ compare_mid(__u16 mid, const struct smb_hdr *smb) - - /* - * The default wsize is 1M. find_get_pages seems to return a maximum of 256 -- * pages in a single call. With PAGE_CACHE_SIZE == 4k, this means we can fill -+ * pages in a single call. With PAGE_SIZE == 4k, this means we can fill - * a single wsize request with a single call. - */ - #define CIFS_DEFAULT_IOSIZE (1024 * 1024) -diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c -index 76fcb50295a3..a894bf809ff7 100644 ---- a/fs/cifs/cifssmb.c -+++ b/fs/cifs/cifssmb.c -@@ -1929,17 +1929,17 @@ cifs_writev_requeue(struct cifs_writedata *wdata) - - wsize = server->ops->wp_retry_size(inode); - if (wsize < rest_len) { -- nr_pages = wsize / PAGE_CACHE_SIZE; -+ nr_pages = wsize / PAGE_SIZE; - if (!nr_pages) { - rc = -ENOTSUPP; - break; - } -- cur_len = nr_pages * PAGE_CACHE_SIZE; -- tailsz = PAGE_CACHE_SIZE; -+ cur_len = nr_pages * PAGE_SIZE; -+ tailsz = PAGE_SIZE; - } else { -- nr_pages = DIV_ROUND_UP(rest_len, PAGE_CACHE_SIZE); -+ nr_pages = DIV_ROUND_UP(rest_len, PAGE_SIZE); - cur_len = rest_len; -- tailsz = rest_len - (nr_pages - 1) * PAGE_CACHE_SIZE; -+ tailsz = rest_len - (nr_pages - 1) * PAGE_SIZE; - } - - wdata2 = cifs_writedata_alloc(nr_pages, cifs_writev_complete); -@@ -1957,7 +1957,7 @@ cifs_writev_requeue(struct cifs_writedata *wdata) - wdata2->sync_mode = wdata->sync_mode; - wdata2->nr_pages = nr_pages; - wdata2->offset = page_offset(wdata2->pages[0]); -- wdata2->pagesz = PAGE_CACHE_SIZE; -+ wdata2->pagesz = PAGE_SIZE; - wdata2->tailsz = tailsz; - wdata2->bytes = cur_len; - -@@ -1975,7 +1975,7 @@ cifs_writev_requeue(struct cifs_writedata *wdata) - if (rc != 0 && rc != -EAGAIN) { - SetPageError(wdata2->pages[j]); - end_page_writeback(wdata2->pages[j]); -- page_cache_release(wdata2->pages[j]); -+ put_page(wdata2->pages[j]); - } - } - -@@ -2018,7 +2018,7 @@ cifs_writev_complete(struct work_struct *work) - else if (wdata->result < 0) - SetPageError(page); - end_page_writeback(page); -- page_cache_release(page); -+ put_page(page); - } - if (wdata->result != -EAGAIN) - mapping_set_error(inode->i_mapping, wdata->result); -diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c -index a763cd3d9e7c..6f62ac821a84 100644 ---- a/fs/cifs/connect.c -+++ b/fs/cifs/connect.c -@@ -3630,7 +3630,7 @@ try_mount_again: - cifs_sb->rsize = server->ops->negotiate_rsize(tcon, volume_info); - - /* tune readahead according to rsize */ -- cifs_sb->bdi.ra_pages = cifs_sb->rsize / PAGE_CACHE_SIZE; -+ cifs_sb->bdi.ra_pages = cifs_sb->rsize / PAGE_SIZE; - - remote_path_check: - #ifdef CONFIG_CIFS_DFS_UPCALL -diff --git a/fs/cifs/file.c b/fs/cifs/file.c -index ff882aeaccc6..c03d0744648b 100644 ---- a/fs/cifs/file.c -+++ b/fs/cifs/file.c -@@ -1833,7 +1833,7 @@ refind_writable: - static int cifs_partialpagewrite(struct page *page, unsigned from, unsigned to) - { - struct address_space *mapping = page->mapping; -- loff_t offset = (loff_t)page->index << PAGE_CACHE_SHIFT; -+ loff_t offset = (loff_t)page->index << PAGE_SHIFT; - char *write_data; - int rc = -EFAULT; - int bytes_written = 0; -@@ -1849,7 +1849,7 @@ static int cifs_partialpagewrite(struct page *page, unsigned from, unsigned to) - write_data = kmap(page); - write_data += from; - -- if ((to > PAGE_CACHE_SIZE) || (from > to)) { -+ if ((to > PAGE_SIZE) || (from > to)) { - kunmap(page); - return -EIO; - } -@@ -1902,7 +1902,7 @@ wdata_alloc_and_fillpages(pgoff_t tofind, struct address_space *mapping, - * find_get_pages_tag seems to return a max of 256 on each - * iteration, so we must call it several times in order to - * fill the array or the wsize is effectively limited to -- * 256 * PAGE_CACHE_SIZE. -+ * 256 * PAGE_SIZE. - */ - *found_pages = 0; - pages = wdata->pages; -@@ -1991,7 +1991,7 @@ wdata_prepare_pages(struct cifs_writedata *wdata, unsigned int found_pages, - - /* put any pages we aren't going to use */ - for (i = nr_pages; i < found_pages; i++) { -- page_cache_release(wdata->pages[i]); -+ put_page(wdata->pages[i]); - wdata->pages[i] = NULL; - } - -@@ -2009,11 +2009,11 @@ wdata_send_pages(struct cifs_writedata *wdata, unsigned int nr_pages, - wdata->sync_mode = wbc->sync_mode; - wdata->nr_pages = nr_pages; - wdata->offset = page_offset(wdata->pages[0]); -- wdata->pagesz = PAGE_CACHE_SIZE; -+ wdata->pagesz = PAGE_SIZE; - wdata->tailsz = min(i_size_read(mapping->host) - - page_offset(wdata->pages[nr_pages - 1]), -- (loff_t)PAGE_CACHE_SIZE); -- wdata->bytes = ((nr_pages - 1) * PAGE_CACHE_SIZE) + wdata->tailsz; -+ (loff_t)PAGE_SIZE); -+ wdata->bytes = ((nr_pages - 1) * PAGE_SIZE) + wdata->tailsz; - - if (wdata->cfile != NULL) - cifsFileInfo_put(wdata->cfile); -@@ -2047,15 +2047,15 @@ static int cifs_writepages(struct address_space *mapping, - * If wsize is smaller than the page cache size, default to writing - * one page at a time via cifs_writepage - */ -- if (cifs_sb->wsize < PAGE_CACHE_SIZE) -+ if (cifs_sb->wsize < PAGE_SIZE) - return generic_writepages(mapping, wbc); - - if (wbc->range_cyclic) { - index = mapping->writeback_index; /* Start from prev offset */ - end = -1; - } else { -- index = wbc->range_start >> PAGE_CACHE_SHIFT; -- end = wbc->range_end >> PAGE_CACHE_SHIFT; -+ index = wbc->range_start >> PAGE_SHIFT; -+ end = wbc->range_end >> PAGE_SHIFT; - if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) - range_whole = true; - scanned = true; -@@ -2071,7 +2071,7 @@ retry: - if (rc) - break; - -- tofind = min((wsize / PAGE_CACHE_SIZE) - 1, end - index) + 1; -+ tofind = min((wsize / PAGE_SIZE) - 1, end - index) + 1; - - wdata = wdata_alloc_and_fillpages(tofind, mapping, end, &index, - &found_pages); -@@ -2111,7 +2111,7 @@ retry: - else - SetPageError(wdata->pages[i]); - end_page_writeback(wdata->pages[i]); -- page_cache_release(wdata->pages[i]); -+ put_page(wdata->pages[i]); - } - if (rc != -EAGAIN) - mapping_set_error(mapping, rc); -@@ -2154,7 +2154,7 @@ cifs_writepage_locked(struct page *page, struct writeback_control *wbc) - - xid = get_xid(); - /* BB add check for wbc flags */ -- page_cache_get(page); -+ get_page(page); - if (!PageUptodate(page)) - cifs_dbg(FYI, "ppw - page not up to date\n"); - -@@ -2170,7 +2170,7 @@ cifs_writepage_locked(struct page *page, struct writeback_control *wbc) - */ - set_page_writeback(page); - retry_write: -- rc = cifs_partialpagewrite(page, 0, PAGE_CACHE_SIZE); -+ rc = cifs_partialpagewrite(page, 0, PAGE_SIZE); - if (rc == -EAGAIN && wbc->sync_mode == WB_SYNC_ALL) - goto retry_write; - else if (rc == -EAGAIN) -@@ -2180,7 +2180,7 @@ retry_write: - else - SetPageUptodate(page); - end_page_writeback(page); -- page_cache_release(page); -+ put_page(page); - free_xid(xid); - return rc; - } -@@ -2214,12 +2214,12 @@ static int cifs_write_end(struct file *file, struct address_space *mapping, - if (copied == len) - SetPageUptodate(page); - ClearPageChecked(page); -- } else if (!PageUptodate(page) && copied == PAGE_CACHE_SIZE) -+ } else if (!PageUptodate(page) && copied == PAGE_SIZE) - SetPageUptodate(page); - - if (!PageUptodate(page)) { - char *page_data; -- unsigned offset = pos & (PAGE_CACHE_SIZE - 1); -+ unsigned offset = pos & (PAGE_SIZE - 1); - unsigned int xid; - - xid = get_xid(); -@@ -2248,7 +2248,7 @@ static int cifs_write_end(struct file *file, struct address_space *mapping, - } - - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - return rc; - } -@@ -3286,9 +3286,9 @@ cifs_readv_complete(struct work_struct *work) - (rdata->result == -EAGAIN && got_bytes)) - cifs_readpage_to_fscache(rdata->mapping->host, page); - -- got_bytes -= min_t(unsigned int, PAGE_CACHE_SIZE, got_bytes); -+ got_bytes -= min_t(unsigned int, PAGE_SIZE, got_bytes); - -- page_cache_release(page); -+ put_page(page); - rdata->pages[i] = NULL; - } - kref_put(&rdata->refcount, cifs_readdata_release); -@@ -3307,21 +3307,21 @@ cifs_readpages_read_into_pages(struct TCP_Server_Info *server, - - /* determine the eof that the server (probably) has */ - eof = CIFS_I(rdata->mapping->host)->server_eof; -- eof_index = eof ? (eof - 1) >> PAGE_CACHE_SHIFT : 0; -+ eof_index = eof ? (eof - 1) >> PAGE_SHIFT : 0; - cifs_dbg(FYI, "eof=%llu eof_index=%lu\n", eof, eof_index); - - rdata->got_bytes = 0; -- rdata->tailsz = PAGE_CACHE_SIZE; -+ rdata->tailsz = PAGE_SIZE; - for (i = 0; i < nr_pages; i++) { - struct page *page = rdata->pages[i]; - -- if (len >= PAGE_CACHE_SIZE) { -+ if (len >= PAGE_SIZE) { - /* enough data to fill the page */ - iov.iov_base = kmap(page); -- iov.iov_len = PAGE_CACHE_SIZE; -+ iov.iov_len = PAGE_SIZE; - cifs_dbg(FYI, "%u: idx=%lu iov_base=%p iov_len=%zu\n", - i, page->index, iov.iov_base, iov.iov_len); -- len -= PAGE_CACHE_SIZE; -+ len -= PAGE_SIZE; - } else if (len > 0) { - /* enough for partial page, fill and zero the rest */ - iov.iov_base = kmap(page); -@@ -3329,7 +3329,7 @@ cifs_readpages_read_into_pages(struct TCP_Server_Info *server, - cifs_dbg(FYI, "%u: idx=%lu iov_base=%p iov_len=%zu\n", - i, page->index, iov.iov_base, iov.iov_len); - memset(iov.iov_base + len, -- '\0', PAGE_CACHE_SIZE - len); -+ '\0', PAGE_SIZE - len); - rdata->tailsz = len; - len = 0; - } else if (page->index > eof_index) { -@@ -3341,12 +3341,12 @@ cifs_readpages_read_into_pages(struct TCP_Server_Info *server, - * to prevent the VFS from repeatedly attempting to - * fill them until the writes are flushed. - */ -- zero_user(page, 0, PAGE_CACHE_SIZE); -+ zero_user(page, 0, PAGE_SIZE); - lru_cache_add_file(page); - flush_dcache_page(page); - SetPageUptodate(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - rdata->pages[i] = NULL; - rdata->nr_pages--; - continue; -@@ -3354,7 +3354,7 @@ cifs_readpages_read_into_pages(struct TCP_Server_Info *server, - /* no need to hold page hostage */ - lru_cache_add_file(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - rdata->pages[i] = NULL; - rdata->nr_pages--; - continue; -@@ -3402,8 +3402,8 @@ readpages_get_pages(struct address_space *mapping, struct list_head *page_list, - } - - /* move first page to the tmplist */ -- *offset = (loff_t)page->index << PAGE_CACHE_SHIFT; -- *bytes = PAGE_CACHE_SIZE; -+ *offset = (loff_t)page->index << PAGE_SHIFT; -+ *bytes = PAGE_SIZE; - *nr_pages = 1; - list_move_tail(&page->lru, tmplist); - -@@ -3415,7 +3415,7 @@ readpages_get_pages(struct address_space *mapping, struct list_head *page_list, - break; - - /* would this page push the read over the rsize? */ -- if (*bytes + PAGE_CACHE_SIZE > rsize) -+ if (*bytes + PAGE_SIZE > rsize) - break; - - __SetPageLocked(page); -@@ -3424,7 +3424,7 @@ readpages_get_pages(struct address_space *mapping, struct list_head *page_list, - break; - } - list_move_tail(&page->lru, tmplist); -- (*bytes) += PAGE_CACHE_SIZE; -+ (*bytes) += PAGE_SIZE; - expected_index++; - (*nr_pages)++; - } -@@ -3493,7 +3493,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, - * reach this point however since we set ra_pages to 0 when the - * rsize is smaller than a cache page. - */ -- if (unlikely(rsize < PAGE_CACHE_SIZE)) { -+ if (unlikely(rsize < PAGE_SIZE)) { - add_credits_and_wake_if(server, credits, 0); - return 0; - } -@@ -3512,7 +3512,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, - list_del(&page->lru); - lru_cache_add_file(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - rc = -ENOMEM; - add_credits_and_wake_if(server, credits, 0); -@@ -3524,7 +3524,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, - rdata->offset = offset; - rdata->bytes = bytes; - rdata->pid = pid; -- rdata->pagesz = PAGE_CACHE_SIZE; -+ rdata->pagesz = PAGE_SIZE; - rdata->read_into_pages = cifs_readpages_read_into_pages; - rdata->credits = credits; - -@@ -3542,7 +3542,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, - page = rdata->pages[i]; - lru_cache_add_file(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - /* Fallback to the readpage in error/reconnect cases */ - kref_put(&rdata->refcount, cifs_readdata_release); -@@ -3577,7 +3577,7 @@ static int cifs_readpage_worker(struct file *file, struct page *page, - read_data = kmap(page); - /* for reads over a certain size could initiate async read ahead */ - -- rc = cifs_read(file, read_data, PAGE_CACHE_SIZE, poffset); -+ rc = cifs_read(file, read_data, PAGE_SIZE, poffset); - - if (rc < 0) - goto io_error; -@@ -3587,8 +3587,8 @@ static int cifs_readpage_worker(struct file *file, struct page *page, - file_inode(file)->i_atime = - current_fs_time(file_inode(file)->i_sb); - -- if (PAGE_CACHE_SIZE > rc) -- memset(read_data + rc, 0, PAGE_CACHE_SIZE - rc); -+ if (PAGE_SIZE > rc) -+ memset(read_data + rc, 0, PAGE_SIZE - rc); - - flush_dcache_page(page); - SetPageUptodate(page); -@@ -3608,7 +3608,7 @@ read_complete: - - static int cifs_readpage(struct file *file, struct page *page) - { -- loff_t offset = (loff_t)page->index << PAGE_CACHE_SHIFT; -+ loff_t offset = (loff_t)page->index << PAGE_SHIFT; - int rc = -EACCES; - unsigned int xid; - -@@ -3679,8 +3679,8 @@ static int cifs_write_begin(struct file *file, struct address_space *mapping, - struct page **pagep, void **fsdata) - { - int oncethru = 0; -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -- loff_t offset = pos & (PAGE_CACHE_SIZE - 1); -+ pgoff_t index = pos >> PAGE_SHIFT; -+ loff_t offset = pos & (PAGE_SIZE - 1); - loff_t page_start = pos & PAGE_MASK; - loff_t i_size; - struct page *page; -@@ -3703,7 +3703,7 @@ start: - * the server. If the write is short, we'll end up doing a sync write - * instead. - */ -- if (len == PAGE_CACHE_SIZE) -+ if (len == PAGE_SIZE) - goto out; - - /* -@@ -3718,7 +3718,7 @@ start: - (offset == 0 && (pos + len) >= i_size)) { - zero_user_segments(page, 0, offset, - offset + len, -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - /* - * PageChecked means that the parts of the page - * to which we're not writing are considered up -@@ -3737,7 +3737,7 @@ start: - * do a sync write instead since PG_uptodate isn't set. - */ - cifs_readpage_worker(file, page, &page_start); -- page_cache_release(page); -+ put_page(page); - oncethru = 1; - goto start; - } else { -@@ -3764,7 +3764,7 @@ static void cifs_invalidate_page(struct page *page, unsigned int offset, - { - struct cifsInodeInfo *cifsi = CIFS_I(page->mapping->host); - -- if (offset == 0 && length == PAGE_CACHE_SIZE) -+ if (offset == 0 && length == PAGE_SIZE) - cifs_fscache_invalidate_page(page, &cifsi->vfs_inode); - } - -@@ -3772,7 +3772,7 @@ static int cifs_launder_page(struct page *page) - { - int rc = 0; - loff_t range_start = page_offset(page); -- loff_t range_end = range_start + (loff_t)(PAGE_CACHE_SIZE - 1); -+ loff_t range_end = range_start + (loff_t)(PAGE_SIZE - 1); - struct writeback_control wbc = { - .sync_mode = WB_SYNC_ALL, - .nr_to_write = 0, -diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c -index aeb26dbfa1bf..5f9ad5c42180 100644 ---- a/fs/cifs/inode.c -+++ b/fs/cifs/inode.c -@@ -59,7 +59,7 @@ static void cifs_set_ops(struct inode *inode) - - /* check if server can support readpages */ - if (cifs_sb_master_tcon(cifs_sb)->ses->server->maxBuf < -- PAGE_CACHE_SIZE + MAX_CIFS_HDR_SIZE) -+ PAGE_SIZE + MAX_CIFS_HDR_SIZE) - inode->i_data.a_ops = &cifs_addr_ops_smallbuf; - else - inode->i_data.a_ops = &cifs_addr_ops; -@@ -2019,8 +2019,8 @@ int cifs_getattr(struct vfsmount *mnt, struct dentry *dentry, - - static int cifs_truncate_page(struct address_space *mapping, loff_t from) - { -- pgoff_t index = from >> PAGE_CACHE_SHIFT; -- unsigned offset = from & (PAGE_CACHE_SIZE - 1); -+ pgoff_t index = from >> PAGE_SHIFT; -+ unsigned offset = from & (PAGE_SIZE - 1); - struct page *page; - int rc = 0; - -@@ -2028,9 +2028,9 @@ static int cifs_truncate_page(struct address_space *mapping, loff_t from) - if (!page) - return -ENOMEM; - -- zero_user_segment(page, offset, PAGE_CACHE_SIZE); -+ zero_user_segment(page, offset, PAGE_SIZE); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return rc; - } - -diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c -index a8f3b589a2df..cfd91320e869 100644 ---- a/fs/configfs/mount.c -+++ b/fs/configfs/mount.c -@@ -71,8 +71,8 @@ static int configfs_fill_super(struct super_block *sb, void *data, int silent) - struct inode *inode; - struct dentry *root; - -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ sb->s_blocksize = PAGE_SIZE; -+ sb->s_blocksize_bits = PAGE_SHIFT; - sb->s_magic = CONFIGFS_MAGIC; - sb->s_op = &configfs_ops; - sb->s_time_gran = 1; -diff --git a/fs/cramfs/README b/fs/cramfs/README -index 445d1c2d7646..9d4e7ea311f4 100644 ---- a/fs/cramfs/README -+++ b/fs/cramfs/README -@@ -86,26 +86,26 @@ Block Size - - (Block size in cramfs refers to the size of input data that is - compressed at a time. It's intended to be somewhere around --PAGE_CACHE_SIZE for cramfs_readpage's convenience.) -+PAGE_SIZE for cramfs_readpage's convenience.) - - The superblock ought to indicate the block size that the fs was - written for, since comments in <linux/pagemap.h> indicate that --PAGE_CACHE_SIZE may grow in future (if I interpret the comment -+PAGE_SIZE may grow in future (if I interpret the comment - correctly). - --Currently, mkcramfs #define's PAGE_CACHE_SIZE as 4096 and uses that --for blksize, whereas Linux-2.3.39 uses its PAGE_CACHE_SIZE, which in -+Currently, mkcramfs #define's PAGE_SIZE as 4096 and uses that -+for blksize, whereas Linux-2.3.39 uses its PAGE_SIZE, which in - turn is defined as PAGE_SIZE (which can be as large as 32KB on arm). - This discrepancy is a bug, though it's not clear which should be - changed. - --One option is to change mkcramfs to take its PAGE_CACHE_SIZE from -+One option is to change mkcramfs to take its PAGE_SIZE from - <asm/page.h>. Personally I don't like this option, but it does - require the least amount of change: just change `#define --PAGE_CACHE_SIZE (4096)' to `#include <asm/page.h>'. The disadvantage -+PAGE_SIZE (4096)' to `#include <asm/page.h>'. The disadvantage - is that the generated cramfs cannot always be shared between different - kernels, not even necessarily kernels of the same architecture if --PAGE_CACHE_SIZE is subject to change between kernel versions -+PAGE_SIZE is subject to change between kernel versions - (currently possible with arm and ia64). - - The remaining options try to make cramfs more sharable. -@@ -126,22 +126,22 @@ size. The options are: - 1. Always 4096 bytes. - - 2. Writer chooses blocksize; kernel adapts but rejects blocksize > -- PAGE_CACHE_SIZE. -+ PAGE_SIZE. - - 3. Writer chooses blocksize; kernel adapts even to blocksize > -- PAGE_CACHE_SIZE. -+ PAGE_SIZE. - - It's easy enough to change the kernel to use a smaller value than --PAGE_CACHE_SIZE: just make cramfs_readpage read multiple blocks. -+PAGE_SIZE: just make cramfs_readpage read multiple blocks. - --The cost of option 1 is that kernels with a larger PAGE_CACHE_SIZE -+The cost of option 1 is that kernels with a larger PAGE_SIZE - value don't get as good compression as they can. - - The cost of option 2 relative to option 1 is that the code uses - variables instead of #define'd constants. The gain is that people --with kernels having larger PAGE_CACHE_SIZE can make use of that if -+with kernels having larger PAGE_SIZE can make use of that if - they don't mind their cramfs being inaccessible to kernels with --smaller PAGE_CACHE_SIZE values. -+smaller PAGE_SIZE values. - - Option 3 is easy to implement if we don't mind being CPU-inefficient: - e.g. get readpage to decompress to a buffer of size MAX_BLKSIZE (which -diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c -index b862bc219cd7..3a32ddf98095 100644 ---- a/fs/cramfs/inode.c -+++ b/fs/cramfs/inode.c -@@ -137,7 +137,7 @@ static struct inode *get_cramfs_inode(struct super_block *sb, - * page cache and dentry tree anyway.. - * - * This also acts as a way to guarantee contiguous areas of up to -- * BLKS_PER_BUF*PAGE_CACHE_SIZE, so that the caller doesn't need to -+ * BLKS_PER_BUF*PAGE_SIZE, so that the caller doesn't need to - * worry about end-of-buffer issues even when decompressing a full - * page cache. - */ -@@ -152,7 +152,7 @@ static struct inode *get_cramfs_inode(struct super_block *sb, - */ - #define BLKS_PER_BUF_SHIFT (2) - #define BLKS_PER_BUF (1 << BLKS_PER_BUF_SHIFT) --#define BUFFER_SIZE (BLKS_PER_BUF*PAGE_CACHE_SIZE) -+#define BUFFER_SIZE (BLKS_PER_BUF*PAGE_SIZE) - - static unsigned char read_buffers[READ_BUFFERS][BUFFER_SIZE]; - static unsigned buffer_blocknr[READ_BUFFERS]; -@@ -173,8 +173,8 @@ static void *cramfs_read(struct super_block *sb, unsigned int offset, unsigned i - - if (!len) - return NULL; -- blocknr = offset >> PAGE_CACHE_SHIFT; -- offset &= PAGE_CACHE_SIZE - 1; -+ blocknr = offset >> PAGE_SHIFT; -+ offset &= PAGE_SIZE - 1; - - /* Check if an existing buffer already has the data.. */ - for (i = 0; i < READ_BUFFERS; i++) { -@@ -184,14 +184,14 @@ static void *cramfs_read(struct super_block *sb, unsigned int offset, unsigned i - continue; - if (blocknr < buffer_blocknr[i]) - continue; -- blk_offset = (blocknr - buffer_blocknr[i]) << PAGE_CACHE_SHIFT; -+ blk_offset = (blocknr - buffer_blocknr[i]) << PAGE_SHIFT; - blk_offset += offset; - if (blk_offset + len > BUFFER_SIZE) - continue; - return read_buffers[i] + blk_offset; - } - -- devsize = mapping->host->i_size >> PAGE_CACHE_SHIFT; -+ devsize = mapping->host->i_size >> PAGE_SHIFT; - - /* Ok, read in BLKS_PER_BUF pages completely first. */ - for (i = 0; i < BLKS_PER_BUF; i++) { -@@ -213,7 +213,7 @@ static void *cramfs_read(struct super_block *sb, unsigned int offset, unsigned i - wait_on_page_locked(page); - if (!PageUptodate(page)) { - /* asynchronous error */ -- page_cache_release(page); -+ put_page(page); - pages[i] = NULL; - } - } -@@ -229,12 +229,12 @@ static void *cramfs_read(struct super_block *sb, unsigned int offset, unsigned i - struct page *page = pages[i]; - - if (page) { -- memcpy(data, kmap(page), PAGE_CACHE_SIZE); -+ memcpy(data, kmap(page), PAGE_SIZE); - kunmap(page); -- page_cache_release(page); -+ put_page(page); - } else -- memset(data, 0, PAGE_CACHE_SIZE); -- data += PAGE_CACHE_SIZE; -+ memset(data, 0, PAGE_SIZE); -+ data += PAGE_SIZE; - } - return read_buffers[buffer] + offset; - } -@@ -353,7 +353,7 @@ static int cramfs_statfs(struct dentry *dentry, struct kstatfs *buf) - u64 id = huge_encode_dev(sb->s_bdev->bd_dev); - - buf->f_type = CRAMFS_MAGIC; -- buf->f_bsize = PAGE_CACHE_SIZE; -+ buf->f_bsize = PAGE_SIZE; - buf->f_blocks = CRAMFS_SB(sb)->blocks; - buf->f_bfree = 0; - buf->f_bavail = 0; -@@ -496,7 +496,7 @@ static int cramfs_readpage(struct file *file, struct page *page) - int bytes_filled; - void *pgdata; - -- maxblock = (inode->i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -+ maxblock = (inode->i_size + PAGE_SIZE - 1) >> PAGE_SHIFT; - bytes_filled = 0; - pgdata = kmap(page); - -@@ -516,14 +516,14 @@ static int cramfs_readpage(struct file *file, struct page *page) - - if (compr_len == 0) - ; /* hole */ -- else if (unlikely(compr_len > (PAGE_CACHE_SIZE << 1))) { -+ else if (unlikely(compr_len > (PAGE_SIZE << 1))) { - pr_err("bad compressed blocksize %u\n", - compr_len); - goto err; - } else { - mutex_lock(&read_mutex); - bytes_filled = cramfs_uncompress_block(pgdata, -- PAGE_CACHE_SIZE, -+ PAGE_SIZE, - cramfs_read(sb, start_offset, compr_len), - compr_len); - mutex_unlock(&read_mutex); -@@ -532,7 +532,7 @@ static int cramfs_readpage(struct file *file, struct page *page) - } - } - -- memset(pgdata + bytes_filled, 0, PAGE_CACHE_SIZE - bytes_filled); -+ memset(pgdata + bytes_filled, 0, PAGE_SIZE - bytes_filled); - flush_dcache_page(page); - kunmap(page); - SetPageUptodate(page); -diff --git a/fs/dax.c b/fs/dax.c -index bbb2ad783770..1144c55561f5 100644 ---- a/fs/dax.c -+++ b/fs/dax.c -@@ -318,7 +318,7 @@ static int dax_load_hole(struct address_space *mapping, struct page *page, - size = (i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT; - if (vmf->pgoff >= size) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return VM_FAULT_SIGBUS; - } - -@@ -346,7 +346,7 @@ static int copy_user_bh(struct page *to, struct inode *inode, - } - - #define NO_SECTOR -1 --#define DAX_PMD_INDEX(page_index) (page_index & (PMD_MASK >> PAGE_CACHE_SHIFT)) -+#define DAX_PMD_INDEX(page_index) (page_index & (PMD_MASK >> PAGE_SHIFT)) - - static int dax_radix_entry(struct address_space *mapping, pgoff_t index, - sector_t sector, bool pmd_entry, bool dirty) -@@ -501,8 +501,8 @@ int dax_writeback_mapping_range(struct address_space *mapping, - if (!mapping->nrexceptional || wbc->sync_mode != WB_SYNC_ALL) - return 0; - -- start_index = wbc->range_start >> PAGE_CACHE_SHIFT; -- end_index = wbc->range_end >> PAGE_CACHE_SHIFT; -+ start_index = wbc->range_start >> PAGE_SHIFT; -+ end_index = wbc->range_end >> PAGE_SHIFT; - pmd_index = DAX_PMD_INDEX(start_index); - - rcu_read_lock(); -@@ -637,12 +637,12 @@ int __dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf, - page = find_get_page(mapping, vmf->pgoff); - if (page) { - if (!lock_page_or_retry(page, vma->vm_mm, vmf->flags)) { -- page_cache_release(page); -+ put_page(page); - return VM_FAULT_RETRY; - } - if (unlikely(page->mapping != mapping)) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - goto repeat; - } - size = (i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT; -@@ -706,10 +706,10 @@ int __dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf, - - if (page) { - unmap_mapping_range(mapping, vmf->pgoff << PAGE_SHIFT, -- PAGE_CACHE_SIZE, 0); -+ PAGE_SIZE, 0); - delete_from_page_cache(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - page = NULL; - } - -@@ -742,7 +742,7 @@ int __dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf, - unlock_page: - if (page) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - goto out; - } -@@ -1089,7 +1089,7 @@ EXPORT_SYMBOL_GPL(dax_pfn_mkwrite); - * you are truncating a file, the helper function dax_truncate_page() may be - * more convenient. - * -- * We work in terms of PAGE_CACHE_SIZE here for commonality with -+ * We work in terms of PAGE_SIZE here for commonality with - * block_truncate_page(), but we could go down to PAGE_SIZE if the filesystem - * took care of disposing of the unnecessary blocks. Even if the filesystem - * block size is smaller than PAGE_SIZE, we have to zero the rest of the page -@@ -1099,18 +1099,18 @@ int dax_zero_page_range(struct inode *inode, loff_t from, unsigned length, - get_block_t get_block) - { - struct buffer_head bh; -- pgoff_t index = from >> PAGE_CACHE_SHIFT; -- unsigned offset = from & (PAGE_CACHE_SIZE-1); -+ pgoff_t index = from >> PAGE_SHIFT; -+ unsigned offset = from & (PAGE_SIZE-1); - int err; - - /* Block boundary? Nothing to do */ - if (!length) - return 0; -- BUG_ON((offset + length) > PAGE_CACHE_SIZE); -+ BUG_ON((offset + length) > PAGE_SIZE); - - memset(&bh, 0, sizeof(bh)); - bh.b_bdev = inode->i_sb->s_bdev; -- bh.b_size = PAGE_CACHE_SIZE; -+ bh.b_size = PAGE_SIZE; - err = get_block(inode, index, &bh, 0); - if (err < 0) - return err; -@@ -1118,7 +1118,7 @@ int dax_zero_page_range(struct inode *inode, loff_t from, unsigned length, - struct block_device *bdev = bh.b_bdev; - struct blk_dax_ctl dax = { - .sector = to_sector(&bh, inode), -- .size = PAGE_CACHE_SIZE, -+ .size = PAGE_SIZE, - }; - - if (dax_map_atomic(bdev, &dax) < 0) -@@ -1141,7 +1141,7 @@ EXPORT_SYMBOL_GPL(dax_zero_page_range); - * Similar to block_truncate_page(), this function can be called by a - * filesystem when it is truncating a DAX file to handle the partial page. - * -- * We work in terms of PAGE_CACHE_SIZE here for commonality with -+ * We work in terms of PAGE_SIZE here for commonality with - * block_truncate_page(), but we could go down to PAGE_SIZE if the filesystem - * took care of disposing of the unnecessary blocks. Even if the filesystem - * block size is smaller than PAGE_SIZE, we have to zero the rest of the page -@@ -1149,7 +1149,7 @@ EXPORT_SYMBOL_GPL(dax_zero_page_range); - */ - int dax_truncate_page(struct inode *inode, loff_t from, get_block_t get_block) - { -- unsigned length = PAGE_CACHE_ALIGN(from) - from; -+ unsigned length = PAGE_ALIGN(from) - from; - return dax_zero_page_range(inode, from, length, get_block); - } - EXPORT_SYMBOL_GPL(dax_truncate_page); -diff --git a/fs/direct-io.c b/fs/direct-io.c -index 0a8d937c6775..9a65345a57ad 100644 ---- a/fs/direct-io.c -+++ b/fs/direct-io.c -@@ -172,7 +172,7 @@ static inline int dio_refill_pages(struct dio *dio, struct dio_submit *sdio) - */ - if (dio->page_errors == 0) - dio->page_errors = ret; -- page_cache_get(page); -+ get_page(page); - dio->pages[0] = page; - sdio->head = 0; - sdio->tail = 1; -@@ -419,7 +419,7 @@ static inline void dio_bio_submit(struct dio *dio, struct dio_submit *sdio) - static inline void dio_cleanup(struct dio *dio, struct dio_submit *sdio) - { - while (sdio->head < sdio->tail) -- page_cache_release(dio->pages[sdio->head++]); -+ put_page(dio->pages[sdio->head++]); - } - - /* -@@ -482,7 +482,7 @@ static int dio_bio_complete(struct dio *dio, struct bio *bio) - if (dio->rw == READ && !PageCompound(page) && - dio->should_dirty) - set_page_dirty_lock(page); -- page_cache_release(page); -+ put_page(page); - } - err = bio->bi_error; - bio_put(bio); -@@ -691,7 +691,7 @@ static inline int dio_bio_add_page(struct dio_submit *sdio) - */ - if ((sdio->cur_page_len + sdio->cur_page_offset) == PAGE_SIZE) - sdio->pages_in_io--; -- page_cache_get(sdio->cur_page); -+ get_page(sdio->cur_page); - sdio->final_block_in_bio = sdio->cur_page_block + - (sdio->cur_page_len >> sdio->blkbits); - ret = 0; -@@ -805,13 +805,13 @@ submit_page_section(struct dio *dio, struct dio_submit *sdio, struct page *page, - */ - if (sdio->cur_page) { - ret = dio_send_cur_page(dio, sdio, map_bh); -- page_cache_release(sdio->cur_page); -+ put_page(sdio->cur_page); - sdio->cur_page = NULL; - if (ret) - return ret; - } - -- page_cache_get(page); /* It is in dio */ -+ get_page(page); /* It is in dio */ - sdio->cur_page = page; - sdio->cur_page_offset = offset; - sdio->cur_page_len = len; -@@ -825,7 +825,7 @@ out: - if (sdio->boundary) { - ret = dio_send_cur_page(dio, sdio, map_bh); - dio_bio_submit(dio, sdio); -- page_cache_release(sdio->cur_page); -+ put_page(sdio->cur_page); - sdio->cur_page = NULL; - } - return ret; -@@ -942,7 +942,7 @@ static int do_direct_IO(struct dio *dio, struct dio_submit *sdio, - - ret = get_more_blocks(dio, sdio, map_bh); - if (ret) { -- page_cache_release(page); -+ put_page(page); - goto out; - } - if (!buffer_mapped(map_bh)) -@@ -983,7 +983,7 @@ do_holes: - - /* AKPM: eargh, -ENOTBLK is a hack */ - if (dio->rw & WRITE) { -- page_cache_release(page); -+ put_page(page); - return -ENOTBLK; - } - -@@ -996,7 +996,7 @@ do_holes: - if (sdio->block_in_file >= - i_size_aligned >> blkbits) { - /* We hit eof */ -- page_cache_release(page); -+ put_page(page); - goto out; - } - zero_user(page, from, 1 << blkbits); -@@ -1036,7 +1036,7 @@ do_holes: - sdio->next_block_for_io, - map_bh); - if (ret) { -- page_cache_release(page); -+ put_page(page); - goto out; - } - sdio->next_block_for_io += this_chunk_blocks; -@@ -1052,7 +1052,7 @@ next_block: - } - - /* Drop the ref which was taken in get_user_pages() */ -- page_cache_release(page); -+ put_page(page); - } - out: - return ret; -@@ -1276,7 +1276,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, - ret2 = dio_send_cur_page(dio, &sdio, &map_bh); - if (retval == 0) - retval = ret2; -- page_cache_release(sdio.cur_page); -+ put_page(sdio.cur_page); - sdio.cur_page = NULL; - } - if (sdio.bio) -diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c -index 00640e70ed7a..1ab012a27d9f 100644 ---- a/fs/dlm/lowcomms.c -+++ b/fs/dlm/lowcomms.c -@@ -640,7 +640,7 @@ static int receive_from_sock(struct connection *con) - con->rx_page = alloc_page(GFP_ATOMIC); - if (con->rx_page == NULL) - goto out_resched; -- cbuf_init(&con->cb, PAGE_CACHE_SIZE); -+ cbuf_init(&con->cb, PAGE_SIZE); - } - - /* -@@ -657,7 +657,7 @@ static int receive_from_sock(struct connection *con) - * buffer and the start of the currently used section (cb.base) - */ - if (cbuf_data(&con->cb) >= con->cb.base) { -- iov[0].iov_len = PAGE_CACHE_SIZE - cbuf_data(&con->cb); -+ iov[0].iov_len = PAGE_SIZE - cbuf_data(&con->cb); - iov[1].iov_len = con->cb.base; - iov[1].iov_base = page_address(con->rx_page); - nvec = 2; -@@ -675,7 +675,7 @@ static int receive_from_sock(struct connection *con) - ret = dlm_process_incoming_buffer(con->nodeid, - page_address(con->rx_page), - con->cb.base, con->cb.len, -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - if (ret == -EBADMSG) { - log_print("lowcomms: addr=%p, base=%u, len=%u, read=%d", - page_address(con->rx_page), con->cb.base, -@@ -1416,7 +1416,7 @@ void *dlm_lowcomms_get_buffer(int nodeid, int len, gfp_t allocation, char **ppc) - spin_lock(&con->writequeue_lock); - e = list_entry(con->writequeue.prev, struct writequeue_entry, list); - if ((&e->list == &con->writequeue) || -- (PAGE_CACHE_SIZE - e->end < len)) { -+ (PAGE_SIZE - e->end < len)) { - e = NULL; - } else { - offset = e->end; -diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c -index 64026e53722a..d09cb4cdd09f 100644 ---- a/fs/ecryptfs/crypto.c -+++ b/fs/ecryptfs/crypto.c -@@ -286,7 +286,7 @@ int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg, - pg = virt_to_page(addr); - offset = offset_in_page(addr); - sg_set_page(&sg[i], pg, 0, offset); -- remainder_of_page = PAGE_CACHE_SIZE - offset; -+ remainder_of_page = PAGE_SIZE - offset; - if (size >= remainder_of_page) { - sg[i].length = remainder_of_page; - addr += remainder_of_page; -@@ -400,7 +400,7 @@ static loff_t lower_offset_for_page(struct ecryptfs_crypt_stat *crypt_stat, - struct page *page) - { - return ecryptfs_lower_header_size(crypt_stat) + -- ((loff_t)page->index << PAGE_CACHE_SHIFT); -+ ((loff_t)page->index << PAGE_SHIFT); - } - - /** -@@ -428,7 +428,7 @@ static int crypt_extent(struct ecryptfs_crypt_stat *crypt_stat, - size_t extent_size = crypt_stat->extent_size; - int rc; - -- extent_base = (((loff_t)page_index) * (PAGE_CACHE_SIZE / extent_size)); -+ extent_base = (((loff_t)page_index) * (PAGE_SIZE / extent_size)); - rc = ecryptfs_derive_iv(extent_iv, crypt_stat, - (extent_base + extent_offset)); - if (rc) { -@@ -498,7 +498,7 @@ int ecryptfs_encrypt_page(struct page *page) - } - - for (extent_offset = 0; -- extent_offset < (PAGE_CACHE_SIZE / crypt_stat->extent_size); -+ extent_offset < (PAGE_SIZE / crypt_stat->extent_size); - extent_offset++) { - rc = crypt_extent(crypt_stat, enc_extent_page, page, - extent_offset, ENCRYPT); -@@ -512,7 +512,7 @@ int ecryptfs_encrypt_page(struct page *page) - lower_offset = lower_offset_for_page(crypt_stat, page); - enc_extent_virt = kmap(enc_extent_page); - rc = ecryptfs_write_lower(ecryptfs_inode, enc_extent_virt, lower_offset, -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - kunmap(enc_extent_page); - if (rc < 0) { - ecryptfs_printk(KERN_ERR, -@@ -560,7 +560,7 @@ int ecryptfs_decrypt_page(struct page *page) - - lower_offset = lower_offset_for_page(crypt_stat, page); - page_virt = kmap(page); -- rc = ecryptfs_read_lower(page_virt, lower_offset, PAGE_CACHE_SIZE, -+ rc = ecryptfs_read_lower(page_virt, lower_offset, PAGE_SIZE, - ecryptfs_inode); - kunmap(page); - if (rc < 0) { -@@ -571,7 +571,7 @@ int ecryptfs_decrypt_page(struct page *page) - } - - for (extent_offset = 0; -- extent_offset < (PAGE_CACHE_SIZE / crypt_stat->extent_size); -+ extent_offset < (PAGE_SIZE / crypt_stat->extent_size); - extent_offset++) { - rc = crypt_extent(crypt_stat, page, page, - extent_offset, DECRYPT); -@@ -659,11 +659,11 @@ void ecryptfs_set_default_sizes(struct ecryptfs_crypt_stat *crypt_stat) - if (crypt_stat->flags & ECRYPTFS_METADATA_IN_XATTR) - crypt_stat->metadata_size = ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE; - else { -- if (PAGE_CACHE_SIZE <= ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE) -+ if (PAGE_SIZE <= ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE) - crypt_stat->metadata_size = - ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE; - else -- crypt_stat->metadata_size = PAGE_CACHE_SIZE; -+ crypt_stat->metadata_size = PAGE_SIZE; - } - } - -@@ -1442,7 +1442,7 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry) - ECRYPTFS_VALIDATE_HEADER_SIZE); - if (rc) { - /* metadata is not in the file header, so try xattrs */ -- memset(page_virt, 0, PAGE_CACHE_SIZE); -+ memset(page_virt, 0, PAGE_SIZE); - rc = ecryptfs_read_xattr_region(page_virt, ecryptfs_inode); - if (rc) { - printk(KERN_DEBUG "Valid eCryptfs headers not found in " -@@ -1475,7 +1475,7 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry) - } - out: - if (page_virt) { -- memset(page_virt, 0, PAGE_CACHE_SIZE); -+ memset(page_virt, 0, PAGE_SIZE); - kmem_cache_free(ecryptfs_header_cache, page_virt); - } - return rc; -diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c -index 121114e9a464..224b49e71aa4 100644 ---- a/fs/ecryptfs/inode.c -+++ b/fs/ecryptfs/inode.c -@@ -763,10 +763,10 @@ static int truncate_upper(struct dentry *dentry, struct iattr *ia, - } else { /* ia->ia_size < i_size_read(inode) */ - /* We're chopping off all the pages down to the page - * in which ia->ia_size is located. Fill in the end of -- * that page from (ia->ia_size & ~PAGE_CACHE_MASK) to -- * PAGE_CACHE_SIZE with zeros. */ -- size_t num_zeros = (PAGE_CACHE_SIZE -- - (ia->ia_size & ~PAGE_CACHE_MASK)); -+ * that page from (ia->ia_size & ~PAGE_MASK) to -+ * PAGE_SIZE with zeros. */ -+ size_t num_zeros = (PAGE_SIZE -+ - (ia->ia_size & ~PAGE_MASK)); - - if (!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)) { - truncate_setsize(inode, ia->ia_size); -diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c -index c5c84dfb5b3e..3274c469b42f 100644 ---- a/fs/ecryptfs/keystore.c -+++ b/fs/ecryptfs/keystore.c -@@ -1800,7 +1800,7 @@ int ecryptfs_parse_packet_set(struct ecryptfs_crypt_stat *crypt_stat, - * added the our &auth_tok_list */ - next_packet_is_auth_tok_packet = 1; - while (next_packet_is_auth_tok_packet) { -- size_t max_packet_size = ((PAGE_CACHE_SIZE - 8) - i); -+ size_t max_packet_size = ((PAGE_SIZE - 8) - i); - - switch (src[i]) { - case ECRYPTFS_TAG_3_PACKET_TYPE: -diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c -index 8b0b4a73116d..1698132d0e57 100644 ---- a/fs/ecryptfs/main.c -+++ b/fs/ecryptfs/main.c -@@ -695,12 +695,12 @@ static struct ecryptfs_cache_info { - { - .cache = &ecryptfs_header_cache, - .name = "ecryptfs_headers", -- .size = PAGE_CACHE_SIZE, -+ .size = PAGE_SIZE, - }, - { - .cache = &ecryptfs_xattr_cache, - .name = "ecryptfs_xattr_cache", -- .size = PAGE_CACHE_SIZE, -+ .size = PAGE_SIZE, - }, - { - .cache = &ecryptfs_key_record_cache, -@@ -818,7 +818,7 @@ static int __init ecryptfs_init(void) - { - int rc; - -- if (ECRYPTFS_DEFAULT_EXTENT_SIZE > PAGE_CACHE_SIZE) { -+ if (ECRYPTFS_DEFAULT_EXTENT_SIZE > PAGE_SIZE) { - rc = -EINVAL; - ecryptfs_printk(KERN_ERR, "The eCryptfs extent size is " - "larger than the host's page size, and so " -@@ -826,7 +826,7 @@ static int __init ecryptfs_init(void) - "default eCryptfs extent size is [%u] bytes; " - "the page size is [%lu] bytes.\n", - ECRYPTFS_DEFAULT_EXTENT_SIZE, -- (unsigned long)PAGE_CACHE_SIZE); -+ (unsigned long)PAGE_SIZE); - goto out; - } - rc = ecryptfs_init_kmem_caches(); -diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c -index 1f5865263b3e..e6b1d80952b9 100644 ---- a/fs/ecryptfs/mmap.c -+++ b/fs/ecryptfs/mmap.c -@@ -122,7 +122,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page, - struct ecryptfs_crypt_stat *crypt_stat) - { - loff_t extent_num_in_page = 0; -- loff_t num_extents_per_page = (PAGE_CACHE_SIZE -+ loff_t num_extents_per_page = (PAGE_SIZE - / crypt_stat->extent_size); - int rc = 0; - -@@ -138,7 +138,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page, - char *page_virt; - - page_virt = kmap_atomic(page); -- memset(page_virt, 0, PAGE_CACHE_SIZE); -+ memset(page_virt, 0, PAGE_SIZE); - /* TODO: Support more than one header extent */ - if (view_extent_num == 0) { - size_t written; -@@ -164,8 +164,8 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page, - - crypt_stat->metadata_size); - - rc = ecryptfs_read_lower_page_segment( -- page, (lower_offset >> PAGE_CACHE_SHIFT), -- (lower_offset & ~PAGE_CACHE_MASK), -+ page, (lower_offset >> PAGE_SHIFT), -+ (lower_offset & ~PAGE_MASK), - crypt_stat->extent_size, page->mapping->host); - if (rc) { - printk(KERN_ERR "%s: Error attempting to read " -@@ -198,7 +198,7 @@ static int ecryptfs_readpage(struct file *file, struct page *page) - - if (!crypt_stat || !(crypt_stat->flags & ECRYPTFS_ENCRYPTED)) { - rc = ecryptfs_read_lower_page_segment(page, page->index, 0, -- PAGE_CACHE_SIZE, -+ PAGE_SIZE, - page->mapping->host); - } else if (crypt_stat->flags & ECRYPTFS_VIEW_AS_ENCRYPTED) { - if (crypt_stat->flags & ECRYPTFS_METADATA_IN_XATTR) { -@@ -215,7 +215,7 @@ static int ecryptfs_readpage(struct file *file, struct page *page) - - } else { - rc = ecryptfs_read_lower_page_segment( -- page, page->index, 0, PAGE_CACHE_SIZE, -+ page, page->index, 0, PAGE_SIZE, - page->mapping->host); - if (rc) { - printk(KERN_ERR "Error reading page; rc = " -@@ -250,12 +250,12 @@ static int fill_zeros_to_end_of_page(struct page *page, unsigned int to) - struct inode *inode = page->mapping->host; - int end_byte_in_page; - -- if ((i_size_read(inode) / PAGE_CACHE_SIZE) != page->index) -+ if ((i_size_read(inode) / PAGE_SIZE) != page->index) - goto out; -- end_byte_in_page = i_size_read(inode) % PAGE_CACHE_SIZE; -+ end_byte_in_page = i_size_read(inode) % PAGE_SIZE; - if (to > end_byte_in_page) - end_byte_in_page = to; -- zero_user_segment(page, end_byte_in_page, PAGE_CACHE_SIZE); -+ zero_user_segment(page, end_byte_in_page, PAGE_SIZE); - out: - return 0; - } -@@ -279,7 +279,7 @@ static int ecryptfs_write_begin(struct file *file, - loff_t pos, unsigned len, unsigned flags, - struct page **pagep, void **fsdata) - { -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -+ pgoff_t index = pos >> PAGE_SHIFT; - struct page *page; - loff_t prev_page_end_size; - int rc = 0; -@@ -289,14 +289,14 @@ static int ecryptfs_write_begin(struct file *file, - return -ENOMEM; - *pagep = page; - -- prev_page_end_size = ((loff_t)index << PAGE_CACHE_SHIFT); -+ prev_page_end_size = ((loff_t)index << PAGE_SHIFT); - if (!PageUptodate(page)) { - struct ecryptfs_crypt_stat *crypt_stat = - &ecryptfs_inode_to_private(mapping->host)->crypt_stat; - - if (!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)) { - rc = ecryptfs_read_lower_page_segment( -- page, index, 0, PAGE_CACHE_SIZE, mapping->host); -+ page, index, 0, PAGE_SIZE, mapping->host); - if (rc) { - printk(KERN_ERR "%s: Error attempting to read " - "lower page segment; rc = [%d]\n", -@@ -322,7 +322,7 @@ static int ecryptfs_write_begin(struct file *file, - SetPageUptodate(page); - } else { - rc = ecryptfs_read_lower_page_segment( -- page, index, 0, PAGE_CACHE_SIZE, -+ page, index, 0, PAGE_SIZE, - mapping->host); - if (rc) { - printk(KERN_ERR "%s: Error reading " -@@ -336,9 +336,9 @@ static int ecryptfs_write_begin(struct file *file, - } else { - if (prev_page_end_size - >= i_size_read(page->mapping->host)) { -- zero_user(page, 0, PAGE_CACHE_SIZE); -+ zero_user(page, 0, PAGE_SIZE); - SetPageUptodate(page); -- } else if (len < PAGE_CACHE_SIZE) { -+ } else if (len < PAGE_SIZE) { - rc = ecryptfs_decrypt_page(page); - if (rc) { - printk(KERN_ERR "%s: Error decrypting " -@@ -371,11 +371,11 @@ static int ecryptfs_write_begin(struct file *file, - * of page? Zero it out. */ - if ((i_size_read(mapping->host) == prev_page_end_size) - && (pos != 0)) -- zero_user(page, 0, PAGE_CACHE_SIZE); -+ zero_user(page, 0, PAGE_SIZE); - out: - if (unlikely(rc)) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - *pagep = NULL; - } - return rc; -@@ -437,7 +437,7 @@ static int ecryptfs_write_inode_size_to_xattr(struct inode *ecryptfs_inode) - } - inode_lock(lower_inode); - size = lower_inode->i_op->getxattr(lower_dentry, ECRYPTFS_XATTR_NAME, -- xattr_virt, PAGE_CACHE_SIZE); -+ xattr_virt, PAGE_SIZE); - if (size < 0) - size = 8; - put_unaligned_be64(i_size_read(ecryptfs_inode), xattr_virt); -@@ -479,8 +479,8 @@ static int ecryptfs_write_end(struct file *file, - loff_t pos, unsigned len, unsigned copied, - struct page *page, void *fsdata) - { -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -- unsigned from = pos & (PAGE_CACHE_SIZE - 1); -+ pgoff_t index = pos >> PAGE_SHIFT; -+ unsigned from = pos & (PAGE_SIZE - 1); - unsigned to = from + copied; - struct inode *ecryptfs_inode = mapping->host; - struct ecryptfs_crypt_stat *crypt_stat = -@@ -500,7 +500,7 @@ static int ecryptfs_write_end(struct file *file, - goto out; - } - if (!PageUptodate(page)) { -- if (copied < PAGE_CACHE_SIZE) { -+ if (copied < PAGE_SIZE) { - rc = 0; - goto out; - } -@@ -533,7 +533,7 @@ static int ecryptfs_write_end(struct file *file, - rc = copied; - out: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return rc; - } - -diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c -index 09fe622274e4..158a3a39f82d 100644 ---- a/fs/ecryptfs/read_write.c -+++ b/fs/ecryptfs/read_write.c -@@ -74,7 +74,7 @@ int ecryptfs_write_lower_page_segment(struct inode *ecryptfs_inode, - loff_t offset; - int rc; - -- offset = ((((loff_t)page_for_lower->index) << PAGE_CACHE_SHIFT) -+ offset = ((((loff_t)page_for_lower->index) << PAGE_SHIFT) - + offset_in_page); - virt = kmap(page_for_lower); - rc = ecryptfs_write_lower(ecryptfs_inode, virt, offset, size); -@@ -123,9 +123,9 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset, - else - pos = offset; - while (pos < (offset + size)) { -- pgoff_t ecryptfs_page_idx = (pos >> PAGE_CACHE_SHIFT); -- size_t start_offset_in_page = (pos & ~PAGE_CACHE_MASK); -- size_t num_bytes = (PAGE_CACHE_SIZE - start_offset_in_page); -+ pgoff_t ecryptfs_page_idx = (pos >> PAGE_SHIFT); -+ size_t start_offset_in_page = (pos & ~PAGE_MASK); -+ size_t num_bytes = (PAGE_SIZE - start_offset_in_page); - loff_t total_remaining_bytes = ((offset + size) - pos); - - if (fatal_signal_pending(current)) { -@@ -165,7 +165,7 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset, - * Fill in zero values to the end of the page */ - memset(((char *)ecryptfs_page_virt - + start_offset_in_page), 0, -- PAGE_CACHE_SIZE - start_offset_in_page); -+ PAGE_SIZE - start_offset_in_page); - } - - /* pos >= offset, we are now writing the data request */ -@@ -186,7 +186,7 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset, - ecryptfs_page, - start_offset_in_page, - data_offset); -- page_cache_release(ecryptfs_page); -+ put_page(ecryptfs_page); - if (rc) { - printk(KERN_ERR "%s: Error encrypting " - "page; rc = [%d]\n", __func__, rc); -@@ -262,7 +262,7 @@ int ecryptfs_read_lower_page_segment(struct page *page_for_ecryptfs, - loff_t offset; - int rc; - -- offset = ((((loff_t)page_index) << PAGE_CACHE_SHIFT) + offset_in_page); -+ offset = ((((loff_t)page_index) << PAGE_SHIFT) + offset_in_page); - virt = kmap(page_for_ecryptfs); - rc = ecryptfs_read_lower(virt, offset, size, ecryptfs_inode); - if (rc > 0) -diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c -index dd029d13ea61..553c5d2db4a4 100644 ---- a/fs/efivarfs/super.c -+++ b/fs/efivarfs/super.c -@@ -197,8 +197,8 @@ static int efivarfs_fill_super(struct super_block *sb, void *data, int silent) - efivarfs_sb = sb; - - sb->s_maxbytes = MAX_LFS_FILESIZE; -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ sb->s_blocksize = PAGE_SIZE; -+ sb->s_blocksize_bits = PAGE_SHIFT; - sb->s_magic = EFIVARFS_MAGIC; - sb->s_op = &efivarfs_ops; - sb->s_d_op = &efivarfs_d_ops; -diff --git a/fs/exofs/dir.c b/fs/exofs/dir.c -index e5bb2abf77f9..547b93cbea63 100644 ---- a/fs/exofs/dir.c -+++ b/fs/exofs/dir.c -@@ -41,16 +41,16 @@ static inline unsigned exofs_chunk_size(struct inode *inode) - static inline void exofs_put_page(struct page *page) - { - kunmap(page); -- page_cache_release(page); -+ put_page(page); - } - - static unsigned exofs_last_byte(struct inode *inode, unsigned long page_nr) - { - loff_t last_byte = inode->i_size; - -- last_byte -= page_nr << PAGE_CACHE_SHIFT; -- if (last_byte > PAGE_CACHE_SIZE) -- last_byte = PAGE_CACHE_SIZE; -+ last_byte -= page_nr << PAGE_SHIFT; -+ if (last_byte > PAGE_SIZE) -+ last_byte = PAGE_SIZE; - return last_byte; - } - -@@ -85,13 +85,13 @@ static void exofs_check_page(struct page *page) - unsigned chunk_size = exofs_chunk_size(dir); - char *kaddr = page_address(page); - unsigned offs, rec_len; -- unsigned limit = PAGE_CACHE_SIZE; -+ unsigned limit = PAGE_SIZE; - struct exofs_dir_entry *p; - char *error; - - /* if the page is the last one in the directory */ -- if ((dir->i_size >> PAGE_CACHE_SHIFT) == page->index) { -- limit = dir->i_size & ~PAGE_CACHE_MASK; -+ if ((dir->i_size >> PAGE_SHIFT) == page->index) { -+ limit = dir->i_size & ~PAGE_MASK; - if (limit & (chunk_size - 1)) - goto Ebadsize; - if (!limit) -@@ -138,7 +138,7 @@ bad_entry: - EXOFS_ERR( - "ERROR [exofs_check_page]: bad entry in directory(0x%lx): %s - " - "offset=%lu, inode=0x%llu, rec_len=%d, name_len=%d\n", -- dir->i_ino, error, (page->index<<PAGE_CACHE_SHIFT)+offs, -+ dir->i_ino, error, (page->index<<PAGE_SHIFT)+offs, - _LLU(le64_to_cpu(p->inode_no)), - rec_len, p->name_len); - goto fail; -@@ -147,7 +147,7 @@ Eend: - EXOFS_ERR("ERROR [exofs_check_page]: " - "entry in directory(0x%lx) spans the page boundary" - "offset=%lu, inode=0x%llx\n", -- dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs, -+ dir->i_ino, (page->index<<PAGE_SHIFT)+offs, - _LLU(le64_to_cpu(p->inode_no))); - fail: - SetPageChecked(page); -@@ -237,8 +237,8 @@ exofs_readdir(struct file *file, struct dir_context *ctx) - { - loff_t pos = ctx->pos; - struct inode *inode = file_inode(file); -- unsigned int offset = pos & ~PAGE_CACHE_MASK; -- unsigned long n = pos >> PAGE_CACHE_SHIFT; -+ unsigned int offset = pos & ~PAGE_MASK; -+ unsigned long n = pos >> PAGE_SHIFT; - unsigned long npages = dir_pages(inode); - unsigned chunk_mask = ~(exofs_chunk_size(inode)-1); - int need_revalidate = (file->f_version != inode->i_version); -@@ -254,7 +254,7 @@ exofs_readdir(struct file *file, struct dir_context *ctx) - if (IS_ERR(page)) { - EXOFS_ERR("ERROR: bad page in directory(0x%lx)\n", - inode->i_ino); -- ctx->pos += PAGE_CACHE_SIZE - offset; -+ ctx->pos += PAGE_SIZE - offset; - return PTR_ERR(page); - } - kaddr = page_address(page); -@@ -262,7 +262,7 @@ exofs_readdir(struct file *file, struct dir_context *ctx) - if (offset) { - offset = exofs_validate_entry(kaddr, offset, - chunk_mask); -- ctx->pos = (n<<PAGE_CACHE_SHIFT) + offset; -+ ctx->pos = (n<<PAGE_SHIFT) + offset; - } - file->f_version = inode->i_version; - need_revalidate = 0; -@@ -449,7 +449,7 @@ int exofs_add_link(struct dentry *dentry, struct inode *inode) - kaddr = page_address(page); - dir_end = kaddr + exofs_last_byte(dir, n); - de = (struct exofs_dir_entry *)kaddr; -- kaddr += PAGE_CACHE_SIZE - reclen; -+ kaddr += PAGE_SIZE - reclen; - while ((char *)de <= kaddr) { - if ((char *)de == dir_end) { - name_len = 0; -@@ -602,7 +602,7 @@ int exofs_make_empty(struct inode *inode, struct inode *parent) - kunmap_atomic(kaddr); - err = exofs_commit_chunk(page, 0, chunk_size); - fail: -- page_cache_release(page); -+ put_page(page); - return err; - } - -diff --git a/fs/exofs/inode.c b/fs/exofs/inode.c -index 9eaf595aeaf8..49e1bd00b4ec 100644 ---- a/fs/exofs/inode.c -+++ b/fs/exofs/inode.c -@@ -317,7 +317,7 @@ static int read_exec(struct page_collect *pcol) - - if (!pcol->ios) { - int ret = ore_get_rw_state(&pcol->sbi->layout, &oi->oc, true, -- pcol->pg_first << PAGE_CACHE_SHIFT, -+ pcol->pg_first << PAGE_SHIFT, - pcol->length, &pcol->ios); - - if (ret) -@@ -383,7 +383,7 @@ static int readpage_strip(void *data, struct page *page) - struct inode *inode = pcol->inode; - struct exofs_i_info *oi = exofs_i(inode); - loff_t i_size = i_size_read(inode); -- pgoff_t end_index = i_size >> PAGE_CACHE_SHIFT; -+ pgoff_t end_index = i_size >> PAGE_SHIFT; - size_t len; - int ret; - -@@ -397,9 +397,9 @@ static int readpage_strip(void *data, struct page *page) - pcol->that_locked_page = page; - - if (page->index < end_index) -- len = PAGE_CACHE_SIZE; -+ len = PAGE_SIZE; - else if (page->index == end_index) -- len = i_size & ~PAGE_CACHE_MASK; -+ len = i_size & ~PAGE_MASK; - else - len = 0; - -@@ -442,8 +442,8 @@ try_again: - goto fail; - } - -- if (len != PAGE_CACHE_SIZE) -- zero_user(page, len, PAGE_CACHE_SIZE - len); -+ if (len != PAGE_SIZE) -+ zero_user(page, len, PAGE_SIZE - len); - - EXOFS_DBGMSG2(" readpage_strip(0x%lx, 0x%lx) len=0x%zx\n", - inode->i_ino, page->index, len); -@@ -609,7 +609,7 @@ static void __r4w_put_page(void *priv, struct page *page) - - if ((pcol->that_locked_page != page) && (ZERO_PAGE(0) != page)) { - EXOFS_DBGMSG2("index=0x%lx\n", page->index); -- page_cache_release(page); -+ put_page(page); - return; - } - EXOFS_DBGMSG2("that_locked_page index=0x%lx\n", -@@ -633,7 +633,7 @@ static int write_exec(struct page_collect *pcol) - - BUG_ON(pcol->ios); - ret = ore_get_rw_state(&pcol->sbi->layout, &oi->oc, false, -- pcol->pg_first << PAGE_CACHE_SHIFT, -+ pcol->pg_first << PAGE_SHIFT, - pcol->length, &pcol->ios); - if (unlikely(ret)) - goto err; -@@ -696,7 +696,7 @@ static int writepage_strip(struct page *page, - struct inode *inode = pcol->inode; - struct exofs_i_info *oi = exofs_i(inode); - loff_t i_size = i_size_read(inode); -- pgoff_t end_index = i_size >> PAGE_CACHE_SHIFT; -+ pgoff_t end_index = i_size >> PAGE_SHIFT; - size_t len; - int ret; - -@@ -708,9 +708,9 @@ static int writepage_strip(struct page *page, - - if (page->index < end_index) - /* in this case, the page is within the limits of the file */ -- len = PAGE_CACHE_SIZE; -+ len = PAGE_SIZE; - else { -- len = i_size & ~PAGE_CACHE_MASK; -+ len = i_size & ~PAGE_MASK; - - if (page->index > end_index || !len) { - /* in this case, the page is outside the limits -@@ -790,10 +790,10 @@ static int exofs_writepages(struct address_space *mapping, - long start, end, expected_pages; - int ret; - -- start = wbc->range_start >> PAGE_CACHE_SHIFT; -+ start = wbc->range_start >> PAGE_SHIFT; - end = (wbc->range_end == LLONG_MAX) ? - start + mapping->nrpages : -- wbc->range_end >> PAGE_CACHE_SHIFT; -+ wbc->range_end >> PAGE_SHIFT; - - if (start || end) - expected_pages = end - start + 1; -@@ -881,15 +881,15 @@ int exofs_write_begin(struct file *file, struct address_space *mapping, - } - - /* read modify write */ -- if (!PageUptodate(page) && (len != PAGE_CACHE_SIZE)) { -+ if (!PageUptodate(page) && (len != PAGE_SIZE)) { - loff_t i_size = i_size_read(mapping->host); -- pgoff_t end_index = i_size >> PAGE_CACHE_SHIFT; -+ pgoff_t end_index = i_size >> PAGE_SHIFT; - size_t rlen; - - if (page->index < end_index) -- rlen = PAGE_CACHE_SIZE; -+ rlen = PAGE_SIZE; - else if (page->index == end_index) -- rlen = i_size & ~PAGE_CACHE_MASK; -+ rlen = i_size & ~PAGE_MASK; - else - rlen = 0; - -diff --git a/fs/exofs/namei.c b/fs/exofs/namei.c -index c20d77df2679..622a686bb08b 100644 ---- a/fs/exofs/namei.c -+++ b/fs/exofs/namei.c -@@ -292,11 +292,11 @@ static int exofs_rename(struct inode *old_dir, struct dentry *old_dentry, - out_dir: - if (dir_de) { - kunmap(dir_page); -- page_cache_release(dir_page); -+ put_page(dir_page); - } - out_old: - kunmap(old_page); -- page_cache_release(old_page); -+ put_page(old_page); - out: - return err; - } -diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c -index 0c6638b40f21..7ff6fcfa685d 100644 ---- a/fs/ext2/dir.c -+++ b/fs/ext2/dir.c -@@ -37,7 +37,7 @@ static inline unsigned ext2_rec_len_from_disk(__le16 dlen) - { - unsigned len = le16_to_cpu(dlen); - --#if (PAGE_CACHE_SIZE >= 65536) -+#if (PAGE_SIZE >= 65536) - if (len == EXT2_MAX_REC_LEN) - return 1 << 16; - #endif -@@ -46,7 +46,7 @@ static inline unsigned ext2_rec_len_from_disk(__le16 dlen) - - static inline __le16 ext2_rec_len_to_disk(unsigned len) - { --#if (PAGE_CACHE_SIZE >= 65536) -+#if (PAGE_SIZE >= 65536) - if (len == (1 << 16)) - return cpu_to_le16(EXT2_MAX_REC_LEN); - else -@@ -67,7 +67,7 @@ static inline unsigned ext2_chunk_size(struct inode *inode) - static inline void ext2_put_page(struct page *page) - { - kunmap(page); -- page_cache_release(page); -+ put_page(page); - } - - /* -@@ -79,9 +79,9 @@ ext2_last_byte(struct inode *inode, unsigned long page_nr) - { - unsigned last_byte = inode->i_size; - -- last_byte -= page_nr << PAGE_CACHE_SHIFT; -- if (last_byte > PAGE_CACHE_SIZE) -- last_byte = PAGE_CACHE_SIZE; -+ last_byte -= page_nr << PAGE_SHIFT; -+ if (last_byte > PAGE_SIZE) -+ last_byte = PAGE_SIZE; - return last_byte; - } - -@@ -118,12 +118,12 @@ static void ext2_check_page(struct page *page, int quiet) - char *kaddr = page_address(page); - u32 max_inumber = le32_to_cpu(EXT2_SB(sb)->s_es->s_inodes_count); - unsigned offs, rec_len; -- unsigned limit = PAGE_CACHE_SIZE; -+ unsigned limit = PAGE_SIZE; - ext2_dirent *p; - char *error; - -- if ((dir->i_size >> PAGE_CACHE_SHIFT) == page->index) { -- limit = dir->i_size & ~PAGE_CACHE_MASK; -+ if ((dir->i_size >> PAGE_SHIFT) == page->index) { -+ limit = dir->i_size & ~PAGE_MASK; - if (limit & (chunk_size - 1)) - goto Ebadsize; - if (!limit) -@@ -176,7 +176,7 @@ bad_entry: - if (!quiet) - ext2_error(sb, __func__, "bad entry in directory #%lu: : %s - " - "offset=%lu, inode=%lu, rec_len=%d, name_len=%d", -- dir->i_ino, error, (page->index<<PAGE_CACHE_SHIFT)+offs, -+ dir->i_ino, error, (page->index<<PAGE_SHIFT)+offs, - (unsigned long) le32_to_cpu(p->inode), - rec_len, p->name_len); - goto fail; -@@ -186,7 +186,7 @@ Eend: - ext2_error(sb, "ext2_check_page", - "entry in directory #%lu spans the page boundary" - "offset=%lu, inode=%lu", -- dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs, -+ dir->i_ino, (page->index<<PAGE_SHIFT)+offs, - (unsigned long) le32_to_cpu(p->inode)); - } - fail: -@@ -287,8 +287,8 @@ ext2_readdir(struct file *file, struct dir_context *ctx) - loff_t pos = ctx->pos; - struct inode *inode = file_inode(file); - struct super_block *sb = inode->i_sb; -- unsigned int offset = pos & ~PAGE_CACHE_MASK; -- unsigned long n = pos >> PAGE_CACHE_SHIFT; -+ unsigned int offset = pos & ~PAGE_MASK; -+ unsigned long n = pos >> PAGE_SHIFT; - unsigned long npages = dir_pages(inode); - unsigned chunk_mask = ~(ext2_chunk_size(inode)-1); - unsigned char *types = NULL; -@@ -309,14 +309,14 @@ ext2_readdir(struct file *file, struct dir_context *ctx) - ext2_error(sb, __func__, - "bad page in #%lu", - inode->i_ino); -- ctx->pos += PAGE_CACHE_SIZE - offset; -+ ctx->pos += PAGE_SIZE - offset; - return PTR_ERR(page); - } - kaddr = page_address(page); - if (unlikely(need_revalidate)) { - if (offset) { - offset = ext2_validate_entry(kaddr, offset, chunk_mask); -- ctx->pos = (n<<PAGE_CACHE_SHIFT) + offset; -+ ctx->pos = (n<<PAGE_SHIFT) + offset; - } - file->f_version = inode->i_version; - need_revalidate = 0; -@@ -406,7 +406,7 @@ struct ext2_dir_entry_2 *ext2_find_entry (struct inode * dir, - if (++n >= npages) - n = 0; - /* next page is past the blocks we've got */ -- if (unlikely(n > (dir->i_blocks >> (PAGE_CACHE_SHIFT - 9)))) { -+ if (unlikely(n > (dir->i_blocks >> (PAGE_SHIFT - 9)))) { - ext2_error(dir->i_sb, __func__, - "dir %lu size %lld exceeds block count %llu", - dir->i_ino, dir->i_size, -@@ -511,7 +511,7 @@ int ext2_add_link (struct dentry *dentry, struct inode *inode) - kaddr = page_address(page); - dir_end = kaddr + ext2_last_byte(dir, n); - de = (ext2_dirent *)kaddr; -- kaddr += PAGE_CACHE_SIZE - reclen; -+ kaddr += PAGE_SIZE - reclen; - while ((char *)de <= kaddr) { - if ((char *)de == dir_end) { - /* We hit i_size */ -@@ -655,7 +655,7 @@ int ext2_make_empty(struct inode *inode, struct inode *parent) - kunmap_atomic(kaddr); - err = ext2_commit_chunk(page, 0, chunk_size); - fail: -- page_cache_release(page); -+ put_page(page); - return err; - } - -diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c -index 7a2be8f7f3c3..d34843925b23 100644 ---- a/fs/ext2/namei.c -+++ b/fs/ext2/namei.c -@@ -398,7 +398,7 @@ static int ext2_rename (struct inode * old_dir, struct dentry * old_dentry, - ext2_set_link(old_inode, dir_de, dir_page, new_dir, 0); - else { - kunmap(dir_page); -- page_cache_release(dir_page); -+ put_page(dir_page); - } - inode_dec_link_count(old_dir); - } -@@ -408,11 +408,11 @@ static int ext2_rename (struct inode * old_dir, struct dentry * old_dentry, - out_dir: - if (dir_de) { - kunmap(dir_page); -- page_cache_release(dir_page); -+ put_page(dir_page); - } - out_old: - kunmap(old_page); -- page_cache_release(old_page); -+ put_page(old_page); - out: - return err; - } -diff --git a/fs/ext4/crypto.c b/fs/ext4/crypto.c -index edc053a81914..2580ef3346ca 100644 ---- a/fs/ext4/crypto.c -+++ b/fs/ext4/crypto.c -@@ -283,10 +283,10 @@ static int ext4_page_crypto(struct inode *inode, - EXT4_XTS_TWEAK_SIZE - sizeof(index)); - - sg_init_table(&dst, 1); -- sg_set_page(&dst, dest_page, PAGE_CACHE_SIZE, 0); -+ sg_set_page(&dst, dest_page, PAGE_SIZE, 0); - sg_init_table(&src, 1); -- sg_set_page(&src, src_page, PAGE_CACHE_SIZE, 0); -- skcipher_request_set_crypt(req, &src, &dst, PAGE_CACHE_SIZE, -+ sg_set_page(&src, src_page, PAGE_SIZE, 0); -+ skcipher_request_set_crypt(req, &src, &dst, PAGE_SIZE, - xts_tweak); - if (rw == EXT4_DECRYPT) - res = crypto_skcipher_decrypt(req); -@@ -396,7 +396,7 @@ int ext4_encrypted_zeroout(struct inode *inode, ext4_lblk_t lblk, - (unsigned long) inode->i_ino, lblk, len); - #endif - -- BUG_ON(inode->i_sb->s_blocksize != PAGE_CACHE_SIZE); -+ BUG_ON(inode->i_sb->s_blocksize != PAGE_SIZE); - - ctx = ext4_get_crypto_ctx(inode); - if (IS_ERR(ctx)) -diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c -index 33f5e2a50cf8..a887efeb7027 100644 ---- a/fs/ext4/dir.c -+++ b/fs/ext4/dir.c -@@ -155,13 +155,13 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx) - err = ext4_map_blocks(NULL, inode, &map, 0); - if (err > 0) { - pgoff_t index = map.m_pblk >> -- (PAGE_CACHE_SHIFT - inode->i_blkbits); -+ (PAGE_SHIFT - inode->i_blkbits); - if (!ra_has_index(&file->f_ra, index)) - page_cache_sync_readahead( - sb->s_bdev->bd_inode->i_mapping, - &file->f_ra, file, - index, 1); -- file->f_ra.prev_pos = (loff_t)index << PAGE_CACHE_SHIFT; -+ file->f_ra.prev_pos = (loff_t)index << PAGE_SHIFT; - bh = ext4_bread(NULL, inode, map.m_lblk, 0); - if (IS_ERR(bh)) { - err = PTR_ERR(bh); -diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h -index 393689dfa1af..d96ec1dd22a9 100644 ---- a/fs/ext4/ext4.h -+++ b/fs/ext4/ext4.h -@@ -1970,7 +1970,7 @@ ext4_rec_len_from_disk(__le16 dlen, unsigned blocksize) - { - unsigned len = le16_to_cpu(dlen); - --#if (PAGE_CACHE_SIZE >= 65536) -+#if (PAGE_SIZE >= 65536) - if (len == EXT4_MAX_REC_LEN || len == 0) - return blocksize; - return (len & 65532) | ((len & 3) << 16); -@@ -1983,7 +1983,7 @@ static inline __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize) - { - if ((len > blocksize) || (blocksize > (1 << 18)) || (len & 3)) - BUG(); --#if (PAGE_CACHE_SIZE >= 65536) -+#if (PAGE_SIZE >= 65536) - if (len < 65536) - return cpu_to_le16(len); - if (len == blocksize) { -diff --git a/fs/ext4/file.c b/fs/ext4/file.c -index 6659e216385e..0caece398eb8 100644 ---- a/fs/ext4/file.c -+++ b/fs/ext4/file.c -@@ -428,8 +428,8 @@ static int ext4_find_unwritten_pgoff(struct inode *inode, - lastoff = startoff; - endoff = (loff_t)end_blk << blkbits; - -- index = startoff >> PAGE_CACHE_SHIFT; -- end = endoff >> PAGE_CACHE_SHIFT; -+ index = startoff >> PAGE_SHIFT; -+ end = endoff >> PAGE_SHIFT; - - pagevec_init(&pvec, 0); - do { -diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c -index 7cbdd3752ba5..7bc6c855cc18 100644 ---- a/fs/ext4/inline.c -+++ b/fs/ext4/inline.c -@@ -482,7 +482,7 @@ static int ext4_read_inline_page(struct inode *inode, struct page *page) - ret = ext4_read_inline_data(inode, kaddr, len, &iloc); - flush_dcache_page(page); - kunmap_atomic(kaddr); -- zero_user_segment(page, len, PAGE_CACHE_SIZE); -+ zero_user_segment(page, len, PAGE_SIZE); - SetPageUptodate(page); - brelse(iloc.bh); - -@@ -507,7 +507,7 @@ int ext4_readpage_inline(struct inode *inode, struct page *page) - if (!page->index) - ret = ext4_read_inline_page(inode, page); - else if (!PageUptodate(page)) { -- zero_user_segment(page, 0, PAGE_CACHE_SIZE); -+ zero_user_segment(page, 0, PAGE_SIZE); - SetPageUptodate(page); - } - -@@ -595,7 +595,7 @@ retry: - - if (ret) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - page = NULL; - ext4_orphan_add(handle, inode); - up_write(&EXT4_I(inode)->xattr_sem); -@@ -621,7 +621,7 @@ retry: - out: - if (page) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - if (sem_held) - up_write(&EXT4_I(inode)->xattr_sem); -@@ -690,7 +690,7 @@ int ext4_try_to_write_inline_data(struct address_space *mapping, - if (!ext4_has_inline_data(inode)) { - ret = 0; - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - goto out_up_read; - } - -@@ -815,7 +815,7 @@ static int ext4_da_convert_inline_data_to_extent(struct address_space *mapping, - if (ret) { - up_read(&EXT4_I(inode)->xattr_sem); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - ext4_truncate_failed_write(inode); - return ret; - } -@@ -829,7 +829,7 @@ out: - up_read(&EXT4_I(inode)->xattr_sem); - if (page) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - return ret; - } -@@ -919,7 +919,7 @@ retry_journal: - out_release_page: - up_read(&EXT4_I(inode)->xattr_sem); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - out_journal: - ext4_journal_stop(handle); - out: -@@ -947,7 +947,7 @@ int ext4_da_write_inline_data_end(struct inode *inode, loff_t pos, - i_size_changed = 1; - } - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - /* - * Don't mark the inode dirty under page lock. First, it unnecessarily -diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c -index b2e9576450eb..58ec44be2f42 100644 ---- a/fs/ext4/inode.c -+++ b/fs/ext4/inode.c -@@ -1057,7 +1057,7 @@ int do_journal_get_write_access(handle_t *handle, - static int ext4_block_write_begin(struct page *page, loff_t pos, unsigned len, - get_block_t *get_block) - { -- unsigned from = pos & (PAGE_CACHE_SIZE - 1); -+ unsigned from = pos & (PAGE_SIZE - 1); - unsigned to = from + len; - struct inode *inode = page->mapping->host; - unsigned block_start, block_end; -@@ -1069,15 +1069,15 @@ static int ext4_block_write_begin(struct page *page, loff_t pos, unsigned len, - bool decrypt = false; - - BUG_ON(!PageLocked(page)); -- BUG_ON(from > PAGE_CACHE_SIZE); -- BUG_ON(to > PAGE_CACHE_SIZE); -+ BUG_ON(from > PAGE_SIZE); -+ BUG_ON(to > PAGE_SIZE); - BUG_ON(from > to); - - if (!page_has_buffers(page)) - create_empty_buffers(page, blocksize, 0); - head = page_buffers(page); - bbits = ilog2(blocksize); -- block = (sector_t)page->index << (PAGE_CACHE_SHIFT - bbits); -+ block = (sector_t)page->index << (PAGE_SHIFT - bbits); - - for (bh = head, block_start = 0; bh != head || !block_start; - block++, block_start = block_end, bh = bh->b_this_page) { -@@ -1159,8 +1159,8 @@ static int ext4_write_begin(struct file *file, struct address_space *mapping, - * we allocate blocks but write fails for some reason - */ - needed_blocks = ext4_writepage_trans_blocks(inode) + 1; -- index = pos >> PAGE_CACHE_SHIFT; -- from = pos & (PAGE_CACHE_SIZE - 1); -+ index = pos >> PAGE_SHIFT; -+ from = pos & (PAGE_SIZE - 1); - to = from + len; - - if (ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) { -@@ -1188,7 +1188,7 @@ retry_grab: - retry_journal: - handle = ext4_journal_start(inode, EXT4_HT_WRITE_PAGE, needed_blocks); - if (IS_ERR(handle)) { -- page_cache_release(page); -+ put_page(page); - return PTR_ERR(handle); - } - -@@ -1196,7 +1196,7 @@ retry_journal: - if (page->mapping != mapping) { - /* The page got truncated from under us */ - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - ext4_journal_stop(handle); - goto retry_grab; - } -@@ -1252,7 +1252,7 @@ retry_journal: - if (ret == -ENOSPC && - ext4_should_retry_alloc(inode->i_sb, &retries)) - goto retry_journal; -- page_cache_release(page); -+ put_page(page); - return ret; - } - *pagep = page; -@@ -1295,7 +1295,7 @@ static int ext4_write_end(struct file *file, - ret = ext4_jbd2_file_inode(handle, inode); - if (ret) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - goto errout; - } - } -@@ -1315,7 +1315,7 @@ static int ext4_write_end(struct file *file, - */ - i_size_changed = ext4_update_inode_size(inode, pos + copied); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - if (old_size < pos) - pagecache_isize_extended(inode, old_size, pos); -@@ -1399,7 +1399,7 @@ static int ext4_journalled_write_end(struct file *file, - int size_changed = 0; - - trace_ext4_journalled_write_end(inode, pos, len, copied); -- from = pos & (PAGE_CACHE_SIZE - 1); -+ from = pos & (PAGE_SIZE - 1); - to = from + len; - - BUG_ON(!ext4_handle_valid(handle)); -@@ -1423,7 +1423,7 @@ static int ext4_journalled_write_end(struct file *file, - ext4_set_inode_state(inode, EXT4_STATE_JDATA); - EXT4_I(inode)->i_datasync_tid = handle->h_transaction->t_tid; - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - if (old_size < pos) - pagecache_isize_extended(inode, old_size, pos); -@@ -1537,7 +1537,7 @@ static void ext4_da_page_release_reservation(struct page *page, - int num_clusters; - ext4_fsblk_t lblk; - -- BUG_ON(stop > PAGE_CACHE_SIZE || stop < length); -+ BUG_ON(stop > PAGE_SIZE || stop < length); - - head = page_buffers(page); - bh = head; -@@ -1553,7 +1553,7 @@ static void ext4_da_page_release_reservation(struct page *page, - clear_buffer_delay(bh); - } else if (contiguous_blks) { - lblk = page->index << -- (PAGE_CACHE_SHIFT - inode->i_blkbits); -+ (PAGE_SHIFT - inode->i_blkbits); - lblk += (curr_off >> inode->i_blkbits) - - contiguous_blks; - ext4_es_remove_extent(inode, lblk, contiguous_blks); -@@ -1563,7 +1563,7 @@ static void ext4_da_page_release_reservation(struct page *page, - } while ((bh = bh->b_this_page) != head); - - if (contiguous_blks) { -- lblk = page->index << (PAGE_CACHE_SHIFT - inode->i_blkbits); -+ lblk = page->index << (PAGE_SHIFT - inode->i_blkbits); - lblk += (curr_off >> inode->i_blkbits) - contiguous_blks; - ext4_es_remove_extent(inode, lblk, contiguous_blks); - } -@@ -1572,7 +1572,7 @@ static void ext4_da_page_release_reservation(struct page *page, - * need to release the reserved space for that cluster. */ - num_clusters = EXT4_NUM_B2C(sbi, to_release); - while (num_clusters > 0) { -- lblk = (page->index << (PAGE_CACHE_SHIFT - inode->i_blkbits)) + -+ lblk = (page->index << (PAGE_SHIFT - inode->i_blkbits)) + - ((num_clusters - 1) << sbi->s_cluster_bits); - if (sbi->s_cluster_ratio == 1 || - !ext4_find_delalloc_cluster(inode, lblk)) -@@ -1619,8 +1619,8 @@ static void mpage_release_unused_pages(struct mpage_da_data *mpd, - end = mpd->next_page - 1; - if (invalidate) { - ext4_lblk_t start, last; -- start = index << (PAGE_CACHE_SHIFT - inode->i_blkbits); -- last = end << (PAGE_CACHE_SHIFT - inode->i_blkbits); -+ start = index << (PAGE_SHIFT - inode->i_blkbits); -+ last = end << (PAGE_SHIFT - inode->i_blkbits); - ext4_es_remove_extent(inode, start, last - start + 1); - } - -@@ -1636,7 +1636,7 @@ static void mpage_release_unused_pages(struct mpage_da_data *mpd, - BUG_ON(!PageLocked(page)); - BUG_ON(PageWriteback(page)); - if (invalidate) { -- block_invalidatepage(page, 0, PAGE_CACHE_SIZE); -+ block_invalidatepage(page, 0, PAGE_SIZE); - ClearPageUptodate(page); - } - unlock_page(page); -@@ -2007,10 +2007,10 @@ static int ext4_writepage(struct page *page, - - trace_ext4_writepage(page); - size = i_size_read(inode); -- if (page->index == size >> PAGE_CACHE_SHIFT) -- len = size & ~PAGE_CACHE_MASK; -+ if (page->index == size >> PAGE_SHIFT) -+ len = size & ~PAGE_MASK; - else -- len = PAGE_CACHE_SIZE; -+ len = PAGE_SIZE; - - page_bufs = page_buffers(page); - /* -@@ -2034,7 +2034,7 @@ static int ext4_writepage(struct page *page, - ext4_bh_delay_or_unwritten)) { - redirty_page_for_writepage(wbc, page); - if ((current->flags & PF_MEMALLOC) || -- (inode->i_sb->s_blocksize == PAGE_CACHE_SIZE)) { -+ (inode->i_sb->s_blocksize == PAGE_SIZE)) { - /* - * For memory cleaning there's no point in writing only - * some buffers. So just bail out. Warn if we came here -@@ -2076,10 +2076,10 @@ static int mpage_submit_page(struct mpage_da_data *mpd, struct page *page) - int err; - - BUG_ON(page->index != mpd->first_page); -- if (page->index == size >> PAGE_CACHE_SHIFT) -- len = size & ~PAGE_CACHE_MASK; -+ if (page->index == size >> PAGE_SHIFT) -+ len = size & ~PAGE_MASK; - else -- len = PAGE_CACHE_SIZE; -+ len = PAGE_SIZE; - clear_page_dirty_for_io(page); - err = ext4_bio_write_page(&mpd->io_submit, page, len, mpd->wbc, false); - if (!err) -@@ -2213,7 +2213,7 @@ static int mpage_map_and_submit_buffers(struct mpage_da_data *mpd) - int nr_pages, i; - struct inode *inode = mpd->inode; - struct buffer_head *head, *bh; -- int bpp_bits = PAGE_CACHE_SHIFT - inode->i_blkbits; -+ int bpp_bits = PAGE_SHIFT - inode->i_blkbits; - pgoff_t start, end; - ext4_lblk_t lblk; - sector_t pblock; -@@ -2274,7 +2274,7 @@ static int mpage_map_and_submit_buffers(struct mpage_da_data *mpd) - * supports blocksize < pagesize as we will try to - * convert potentially unmapped parts of inode. - */ -- mpd->io_submit.io_end->size += PAGE_CACHE_SIZE; -+ mpd->io_submit.io_end->size += PAGE_SIZE; - /* Page fully mapped - let IO run! */ - err = mpage_submit_page(mpd, page); - if (err < 0) { -@@ -2426,7 +2426,7 @@ update_disksize: - * Update on-disk size after IO is submitted. Races with - * truncate are avoided by checking i_size under i_data_sem. - */ -- disksize = ((loff_t)mpd->first_page) << PAGE_CACHE_SHIFT; -+ disksize = ((loff_t)mpd->first_page) << PAGE_SHIFT; - if (disksize > EXT4_I(inode)->i_disksize) { - int err2; - loff_t i_size; -@@ -2562,7 +2562,7 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd) - mpd->next_page = page->index + 1; - /* Add all dirty buffers to mpd */ - lblk = ((ext4_lblk_t)page->index) << -- (PAGE_CACHE_SHIFT - blkbits); -+ (PAGE_SHIFT - blkbits); - head = page_buffers(page); - err = mpage_process_page_bufs(mpd, head, head, lblk); - if (err <= 0) -@@ -2647,7 +2647,7 @@ static int ext4_writepages(struct address_space *mapping, - * We may need to convert up to one extent per block in - * the page and we may dirty the inode. - */ -- rsv_blocks = 1 + (PAGE_CACHE_SIZE >> inode->i_blkbits); -+ rsv_blocks = 1 + (PAGE_SIZE >> inode->i_blkbits); - } - - /* -@@ -2678,8 +2678,8 @@ static int ext4_writepages(struct address_space *mapping, - mpd.first_page = writeback_index; - mpd.last_page = -1; - } else { -- mpd.first_page = wbc->range_start >> PAGE_CACHE_SHIFT; -- mpd.last_page = wbc->range_end >> PAGE_CACHE_SHIFT; -+ mpd.first_page = wbc->range_start >> PAGE_SHIFT; -+ mpd.last_page = wbc->range_end >> PAGE_SHIFT; - } - - mpd.inode = inode; -@@ -2838,7 +2838,7 @@ static int ext4_da_write_begin(struct file *file, struct address_space *mapping, - struct inode *inode = mapping->host; - handle_t *handle; - -- index = pos >> PAGE_CACHE_SHIFT; -+ index = pos >> PAGE_SHIFT; - - if (ext4_nonda_switch(inode->i_sb)) { - *fsdata = (void *)FALL_BACK_TO_NONDELALLOC; -@@ -2881,7 +2881,7 @@ retry_journal: - handle = ext4_journal_start(inode, EXT4_HT_WRITE_PAGE, - ext4_da_write_credits(inode, pos, len)); - if (IS_ERR(handle)) { -- page_cache_release(page); -+ put_page(page); - return PTR_ERR(handle); - } - -@@ -2889,7 +2889,7 @@ retry_journal: - if (page->mapping != mapping) { - /* The page got truncated from under us */ - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - ext4_journal_stop(handle); - goto retry_grab; - } -@@ -2917,7 +2917,7 @@ retry_journal: - ext4_should_retry_alloc(inode->i_sb, &retries)) - goto retry_journal; - -- page_cache_release(page); -+ put_page(page); - return ret; - } - -@@ -2965,7 +2965,7 @@ static int ext4_da_write_end(struct file *file, - len, copied, page, fsdata); - - trace_ext4_da_write_end(inode, pos, len, copied); -- start = pos & (PAGE_CACHE_SIZE - 1); -+ start = pos & (PAGE_SIZE - 1); - end = start + copied - 1; - - /* -@@ -3187,7 +3187,7 @@ static int __ext4_journalled_invalidatepage(struct page *page, - /* - * If it's a full truncate we just forget about the pending dirtying - */ -- if (offset == 0 && length == PAGE_CACHE_SIZE) -+ if (offset == 0 && length == PAGE_SIZE) - ClearPageChecked(page); - - return jbd2_journal_invalidatepage(journal, page, offset, length); -@@ -3546,8 +3546,8 @@ void ext4_set_aops(struct inode *inode) - static int __ext4_block_zero_page_range(handle_t *handle, - struct address_space *mapping, loff_t from, loff_t length) - { -- ext4_fsblk_t index = from >> PAGE_CACHE_SHIFT; -- unsigned offset = from & (PAGE_CACHE_SIZE-1); -+ ext4_fsblk_t index = from >> PAGE_SHIFT; -+ unsigned offset = from & (PAGE_SIZE-1); - unsigned blocksize, pos; - ext4_lblk_t iblock; - struct inode *inode = mapping->host; -@@ -3555,14 +3555,14 @@ static int __ext4_block_zero_page_range(handle_t *handle, - struct page *page; - int err = 0; - -- page = find_or_create_page(mapping, from >> PAGE_CACHE_SHIFT, -+ page = find_or_create_page(mapping, from >> PAGE_SHIFT, - mapping_gfp_constraint(mapping, ~__GFP_FS)); - if (!page) - return -ENOMEM; - - blocksize = inode->i_sb->s_blocksize; - -- iblock = index << (PAGE_CACHE_SHIFT - inode->i_sb->s_blocksize_bits); -+ iblock = index << (PAGE_SHIFT - inode->i_sb->s_blocksize_bits); - - if (!page_has_buffers(page)) - create_empty_buffers(page, blocksize, 0); -@@ -3604,7 +3604,7 @@ static int __ext4_block_zero_page_range(handle_t *handle, - ext4_encrypted_inode(inode)) { - /* We expect the key to be set. */ - BUG_ON(!ext4_has_encryption_key(inode)); -- BUG_ON(blocksize != PAGE_CACHE_SIZE); -+ BUG_ON(blocksize != PAGE_SIZE); - WARN_ON_ONCE(ext4_decrypt(page)); - } - } -@@ -3628,7 +3628,7 @@ static int __ext4_block_zero_page_range(handle_t *handle, - - unlock: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return err; - } - -@@ -3643,7 +3643,7 @@ static int ext4_block_zero_page_range(handle_t *handle, - struct address_space *mapping, loff_t from, loff_t length) - { - struct inode *inode = mapping->host; -- unsigned offset = from & (PAGE_CACHE_SIZE-1); -+ unsigned offset = from & (PAGE_SIZE-1); - unsigned blocksize = inode->i_sb->s_blocksize; - unsigned max = blocksize - (offset & (blocksize - 1)); - -@@ -3668,7 +3668,7 @@ static int ext4_block_zero_page_range(handle_t *handle, - static int ext4_block_truncate_page(handle_t *handle, - struct address_space *mapping, loff_t from) - { -- unsigned offset = from & (PAGE_CACHE_SIZE-1); -+ unsigned offset = from & (PAGE_SIZE-1); - unsigned length; - unsigned blocksize; - struct inode *inode = mapping->host; -@@ -3806,7 +3806,7 @@ int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length) - */ - if (offset + length > inode->i_size) { - length = inode->i_size + -- PAGE_CACHE_SIZE - (inode->i_size & (PAGE_CACHE_SIZE - 1)) - -+ PAGE_SIZE - (inode->i_size & (PAGE_SIZE - 1)) - - offset; - } - -@@ -4881,23 +4881,23 @@ static void ext4_wait_for_tail_page_commit(struct inode *inode) - tid_t commit_tid = 0; - int ret; - -- offset = inode->i_size & (PAGE_CACHE_SIZE - 1); -+ offset = inode->i_size & (PAGE_SIZE - 1); - /* - * All buffers in the last page remain valid? Then there's nothing to -- * do. We do the check mainly to optimize the common PAGE_CACHE_SIZE == -+ * do. We do the check mainly to optimize the common PAGE_SIZE == - * blocksize case - */ -- if (offset > PAGE_CACHE_SIZE - (1 << inode->i_blkbits)) -+ if (offset > PAGE_SIZE - (1 << inode->i_blkbits)) - return; - while (1) { - page = find_lock_page(inode->i_mapping, -- inode->i_size >> PAGE_CACHE_SHIFT); -+ inode->i_size >> PAGE_SHIFT); - if (!page) - return; - ret = __ext4_journalled_invalidatepage(page, offset, -- PAGE_CACHE_SIZE - offset); -+ PAGE_SIZE - offset); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - if (ret != -EBUSY) - return; - commit_tid = 0; -@@ -5536,10 +5536,10 @@ int ext4_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) - goto out; - } - -- if (page->index == size >> PAGE_CACHE_SHIFT) -- len = size & ~PAGE_CACHE_MASK; -+ if (page->index == size >> PAGE_SHIFT) -+ len = size & ~PAGE_MASK; - else -- len = PAGE_CACHE_SIZE; -+ len = PAGE_SIZE; - /* - * Return if we have all the buffers mapped. This avoids the need to do - * journal_start/journal_stop which can block and take a long time -@@ -5570,7 +5570,7 @@ retry_alloc: - ret = block_page_mkwrite(vma, vmf, get_block); - if (!ret && ext4_should_journal_data(inode)) { - if (ext4_walk_page_buffers(handle, page_buffers(page), 0, -- PAGE_CACHE_SIZE, NULL, do_journal_get_write_access)) { -+ PAGE_SIZE, NULL, do_journal_get_write_access)) { - unlock_page(page); - ret = VM_FAULT_SIGBUS; - ext4_journal_stop(handle); -diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c -index 50e05df28f66..eeeade76012e 100644 ---- a/fs/ext4/mballoc.c -+++ b/fs/ext4/mballoc.c -@@ -119,7 +119,7 @@ MODULE_PARM_DESC(mballoc_debug, "Debugging level for ext4's mballoc"); - * - * - * one block each for bitmap and buddy information. So for each group we -- * take up 2 blocks. A page can contain blocks_per_page (PAGE_CACHE_SIZE / -+ * take up 2 blocks. A page can contain blocks_per_page (PAGE_SIZE / - * blocksize) blocks. So it can have information regarding groups_per_page - * which is blocks_per_page/2 - * -@@ -807,7 +807,7 @@ static void mb_regenerate_buddy(struct ext4_buddy *e4b) - * - * one block each for bitmap and buddy information. - * So for each group we take up 2 blocks. A page can -- * contain blocks_per_page (PAGE_CACHE_SIZE / blocksize) blocks. -+ * contain blocks_per_page (PAGE_SIZE / blocksize) blocks. - * So it can have information regarding groups_per_page which - * is blocks_per_page/2 - * -@@ -839,7 +839,7 @@ static int ext4_mb_init_cache(struct page *page, char *incore, gfp_t gfp) - sb = inode->i_sb; - ngroups = ext4_get_groups_count(sb); - blocksize = 1 << inode->i_blkbits; -- blocks_per_page = PAGE_CACHE_SIZE / blocksize; -+ blocks_per_page = PAGE_SIZE / blocksize; - - groups_per_page = blocks_per_page >> 1; - if (groups_per_page == 0) -@@ -993,7 +993,7 @@ static int ext4_mb_get_buddy_page_lock(struct super_block *sb, - e4b->bd_buddy_page = NULL; - e4b->bd_bitmap_page = NULL; - -- blocks_per_page = PAGE_CACHE_SIZE / sb->s_blocksize; -+ blocks_per_page = PAGE_SIZE / sb->s_blocksize; - /* - * the buddy cache inode stores the block bitmap - * and buddy information in consecutive blocks. -@@ -1028,11 +1028,11 @@ static void ext4_mb_put_buddy_page_lock(struct ext4_buddy *e4b) - { - if (e4b->bd_bitmap_page) { - unlock_page(e4b->bd_bitmap_page); -- page_cache_release(e4b->bd_bitmap_page); -+ put_page(e4b->bd_bitmap_page); - } - if (e4b->bd_buddy_page) { - unlock_page(e4b->bd_buddy_page); -- page_cache_release(e4b->bd_buddy_page); -+ put_page(e4b->bd_buddy_page); - } - } - -@@ -1125,7 +1125,7 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group, - might_sleep(); - mb_debug(1, "load group %u\n", group); - -- blocks_per_page = PAGE_CACHE_SIZE / sb->s_blocksize; -+ blocks_per_page = PAGE_SIZE / sb->s_blocksize; - grp = ext4_get_group_info(sb, group); - - e4b->bd_blkbits = sb->s_blocksize_bits; -@@ -1167,7 +1167,7 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group, - * is yet to initialize the same. So - * wait for it to initialize. - */ -- page_cache_release(page); -+ put_page(page); - page = find_or_create_page(inode->i_mapping, pnum, gfp); - if (page) { - BUG_ON(page->mapping != inode->i_mapping); -@@ -1203,7 +1203,7 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group, - page = find_get_page_flags(inode->i_mapping, pnum, FGP_ACCESSED); - if (page == NULL || !PageUptodate(page)) { - if (page) -- page_cache_release(page); -+ put_page(page); - page = find_or_create_page(inode->i_mapping, pnum, gfp); - if (page) { - BUG_ON(page->mapping != inode->i_mapping); -@@ -1238,11 +1238,11 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group, - - err: - if (page) -- page_cache_release(page); -+ put_page(page); - if (e4b->bd_bitmap_page) -- page_cache_release(e4b->bd_bitmap_page); -+ put_page(e4b->bd_bitmap_page); - if (e4b->bd_buddy_page) -- page_cache_release(e4b->bd_buddy_page); -+ put_page(e4b->bd_buddy_page); - e4b->bd_buddy = NULL; - e4b->bd_bitmap = NULL; - return ret; -@@ -1257,9 +1257,9 @@ static int ext4_mb_load_buddy(struct super_block *sb, ext4_group_t group, - static void ext4_mb_unload_buddy(struct ext4_buddy *e4b) - { - if (e4b->bd_bitmap_page) -- page_cache_release(e4b->bd_bitmap_page); -+ put_page(e4b->bd_bitmap_page); - if (e4b->bd_buddy_page) -- page_cache_release(e4b->bd_buddy_page); -+ put_page(e4b->bd_buddy_page); - } - - -@@ -2833,8 +2833,8 @@ static void ext4_free_data_callback(struct super_block *sb, - /* No more items in the per group rb tree - * balance refcounts from ext4_mb_free_metadata() - */ -- page_cache_release(e4b.bd_buddy_page); -- page_cache_release(e4b.bd_bitmap_page); -+ put_page(e4b.bd_buddy_page); -+ put_page(e4b.bd_bitmap_page); - } - ext4_unlock_group(sb, entry->efd_group); - kmem_cache_free(ext4_free_data_cachep, entry); -@@ -4385,9 +4385,9 @@ static int ext4_mb_release_context(struct ext4_allocation_context *ac) - ext4_mb_put_pa(ac, ac->ac_sb, pa); - } - if (ac->ac_bitmap_page) -- page_cache_release(ac->ac_bitmap_page); -+ put_page(ac->ac_bitmap_page); - if (ac->ac_buddy_page) -- page_cache_release(ac->ac_buddy_page); -+ put_page(ac->ac_buddy_page); - if (ac->ac_flags & EXT4_MB_HINT_GROUP_ALLOC) - mutex_unlock(&ac->ac_lg->lg_mutex); - ext4_mb_collect_stats(ac); -@@ -4599,8 +4599,8 @@ ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b, - * otherwise we'll refresh it from - * on-disk bitmap and lose not-yet-available - * blocks */ -- page_cache_get(e4b->bd_buddy_page); -- page_cache_get(e4b->bd_bitmap_page); -+ get_page(e4b->bd_buddy_page); -+ get_page(e4b->bd_bitmap_page); - } - while (*n) { - parent = *n; -diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c -index 4098acc701c3..675b67e5d5c2 100644 ---- a/fs/ext4/move_extent.c -+++ b/fs/ext4/move_extent.c -@@ -156,7 +156,7 @@ mext_page_double_lock(struct inode *inode1, struct inode *inode2, - page[1] = grab_cache_page_write_begin(mapping[1], index2, fl); - if (!page[1]) { - unlock_page(page[0]); -- page_cache_release(page[0]); -+ put_page(page[0]); - return -ENOMEM; - } - /* -@@ -192,7 +192,7 @@ mext_page_mkuptodate(struct page *page, unsigned from, unsigned to) - create_empty_buffers(page, blocksize, 0); - - head = page_buffers(page); -- block = (sector_t)page->index << (PAGE_CACHE_SHIFT - inode->i_blkbits); -+ block = (sector_t)page->index << (PAGE_SHIFT - inode->i_blkbits); - for (bh = head, block_start = 0; bh != head || !block_start; - block++, block_start = block_end, bh = bh->b_this_page) { - block_end = block_start + blocksize; -@@ -268,7 +268,7 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode, - int i, err2, jblocks, retries = 0; - int replaced_count = 0; - int from = data_offset_in_page << orig_inode->i_blkbits; -- int blocks_per_page = PAGE_CACHE_SIZE >> orig_inode->i_blkbits; -+ int blocks_per_page = PAGE_SIZE >> orig_inode->i_blkbits; - struct super_block *sb = orig_inode->i_sb; - struct buffer_head *bh = NULL; - -@@ -404,9 +404,9 @@ data_copy: - - unlock_pages: - unlock_page(pagep[0]); -- page_cache_release(pagep[0]); -+ put_page(pagep[0]); - unlock_page(pagep[1]); -- page_cache_release(pagep[1]); -+ put_page(pagep[1]); - stop_journal: - ext4_journal_stop(handle); - if (*err == -ENOSPC && -@@ -554,7 +554,7 @@ ext4_move_extents(struct file *o_filp, struct file *d_filp, __u64 orig_blk, - struct inode *orig_inode = file_inode(o_filp); - struct inode *donor_inode = file_inode(d_filp); - struct ext4_ext_path *path = NULL; -- int blocks_per_page = PAGE_CACHE_SIZE >> orig_inode->i_blkbits; -+ int blocks_per_page = PAGE_SIZE >> orig_inode->i_blkbits; - ext4_lblk_t o_end, o_start = orig_blk; - ext4_lblk_t d_start = donor_blk; - int ret; -@@ -648,9 +648,9 @@ ext4_move_extents(struct file *o_filp, struct file *d_filp, __u64 orig_blk, - if (o_end - o_start < cur_len) - cur_len = o_end - o_start; - -- orig_page_index = o_start >> (PAGE_CACHE_SHIFT - -+ orig_page_index = o_start >> (PAGE_SHIFT - - orig_inode->i_blkbits); -- donor_page_index = d_start >> (PAGE_CACHE_SHIFT - -+ donor_page_index = d_start >> (PAGE_SHIFT - - donor_inode->i_blkbits); - offset_in_page = o_start % blocks_per_page; - if (cur_len > blocks_per_page- offset_in_page) -diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c -index 349d7aa04fe7..741599a011c1 100644 ---- a/fs/ext4/page-io.c -+++ b/fs/ext4/page-io.c -@@ -442,8 +442,8 @@ int ext4_bio_write_page(struct ext4_io_submit *io, - * the page size, the remaining memory is zeroed when mapped, and - * writes to that region are not written out to the file." - */ -- if (len < PAGE_CACHE_SIZE) -- zero_user_segment(page, len, PAGE_CACHE_SIZE); -+ if (len < PAGE_SIZE) -+ zero_user_segment(page, len, PAGE_SIZE); - /* - * In the first loop we prepare and mark buffers to submit. We have to - * mark all buffers in the page before submitting so that -diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c -index 5dc5e95063de..f24e7299e1c8 100644 ---- a/fs/ext4/readpage.c -+++ b/fs/ext4/readpage.c -@@ -23,7 +23,7 @@ - * - * then this code just gives up and calls the buffer_head-based read function. - * It does handle a page which has holes at the end - that is a common case: -- * the end-of-file on blocksize < PAGE_CACHE_SIZE setups. -+ * the end-of-file on blocksize < PAGE_SIZE setups. - * - */ - -@@ -140,7 +140,7 @@ int ext4_mpage_readpages(struct address_space *mapping, - - struct inode *inode = mapping->host; - const unsigned blkbits = inode->i_blkbits; -- const unsigned blocks_per_page = PAGE_CACHE_SIZE >> blkbits; -+ const unsigned blocks_per_page = PAGE_SIZE >> blkbits; - const unsigned blocksize = 1 << blkbits; - sector_t block_in_file; - sector_t last_block; -@@ -173,7 +173,7 @@ int ext4_mpage_readpages(struct address_space *mapping, - if (page_has_buffers(page)) - goto confused; - -- block_in_file = (sector_t)page->index << (PAGE_CACHE_SHIFT - blkbits); -+ block_in_file = (sector_t)page->index << (PAGE_SHIFT - blkbits); - last_block = block_in_file + nr_pages * blocks_per_page; - last_block_in_file = (i_size_read(inode) + blocksize - 1) >> blkbits; - if (last_block > last_block_in_file) -@@ -217,7 +217,7 @@ int ext4_mpage_readpages(struct address_space *mapping, - set_error_page: - SetPageError(page); - zero_user_segment(page, 0, -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - unlock_page(page); - goto next_page; - } -@@ -250,7 +250,7 @@ int ext4_mpage_readpages(struct address_space *mapping, - } - if (first_hole != blocks_per_page) { - zero_user_segment(page, first_hole << blkbits, -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - if (first_hole == 0) { - SetPageUptodate(page); - unlock_page(page); -@@ -319,7 +319,7 @@ int ext4_mpage_readpages(struct address_space *mapping, - unlock_page(page); - next_page: - if (pages) -- page_cache_release(page); -+ put_page(page); - } - BUG_ON(pages && !list_empty(pages)); - if (bio) -diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index 99996e9a8f57..75b229414ee8 100644 ---- a/fs/ext4/super.c -+++ b/fs/ext4/super.c -@@ -1782,7 +1782,7 @@ static int parse_options(char *options, struct super_block *sb, - int blocksize = - BLOCK_SIZE << le32_to_cpu(sbi->s_es->s_log_block_size); - -- if (blocksize < PAGE_CACHE_SIZE) { -+ if (blocksize < PAGE_SIZE) { - ext4_msg(sb, KERN_ERR, "can't mount with " - "dioread_nolock if block size != PAGE_SIZE"); - return 0; -@@ -3806,7 +3806,7 @@ no_journal: - } - - if ((DUMMY_ENCRYPTION_ENABLED(sbi) || ext4_has_feature_encrypt(sb)) && -- (blocksize != PAGE_CACHE_SIZE)) { -+ (blocksize != PAGE_SIZE)) { - ext4_msg(sb, KERN_ERR, - "Unsupported blocksize for fs encryption"); - goto failed_mount_wq; -diff --git a/fs/ext4/symlink.c b/fs/ext4/symlink.c -index 6f7ee30a89ce..75ed5c2f0c16 100644 ---- a/fs/ext4/symlink.c -+++ b/fs/ext4/symlink.c -@@ -80,12 +80,12 @@ static const char *ext4_encrypted_get_link(struct dentry *dentry, - if (res <= plen) - paddr[res] = '\0'; - if (cpage) -- page_cache_release(cpage); -+ put_page(cpage); - set_delayed_call(done, kfree_link, paddr); - return paddr; - errout: - if (cpage) -- page_cache_release(cpage); -+ put_page(cpage); - kfree(paddr); - return ERR_PTR(res); - } -diff --git a/fs/f2fs/crypto.c b/fs/f2fs/crypto.c -index 95c5cf039711..da186961a5f0 100644 ---- a/fs/f2fs/crypto.c -+++ b/fs/f2fs/crypto.c -@@ -350,10 +350,10 @@ static int f2fs_page_crypto(struct f2fs_crypto_ctx *ctx, - F2FS_XTS_TWEAK_SIZE - sizeof(index)); - - sg_init_table(&dst, 1); -- sg_set_page(&dst, dest_page, PAGE_CACHE_SIZE, 0); -+ sg_set_page(&dst, dest_page, PAGE_SIZE, 0); - sg_init_table(&src, 1); -- sg_set_page(&src, src_page, PAGE_CACHE_SIZE, 0); -- skcipher_request_set_crypt(req, &src, &dst, PAGE_CACHE_SIZE, -+ sg_set_page(&src, src_page, PAGE_SIZE, 0); -+ skcipher_request_set_crypt(req, &src, &dst, PAGE_SIZE, - xts_tweak); - if (rw == F2FS_DECRYPT) - res = crypto_skcipher_decrypt(req); -diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c -index 5c06db17e41f..8654e83bcea1 100644 ---- a/fs/f2fs/data.c -+++ b/fs/f2fs/data.c -@@ -153,7 +153,7 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio) - /* Allocate a new bio */ - bio = __bio_alloc(fio->sbi, fio->blk_addr, 1, is_read_io(fio->rw)); - -- if (bio_add_page(bio, page, PAGE_CACHE_SIZE, 0) < PAGE_CACHE_SIZE) { -+ if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) { - bio_put(bio); - return -EFAULT; - } -@@ -192,8 +192,8 @@ alloc_new: - - bio_page = fio->encrypted_page ? fio->encrypted_page : fio->page; - -- if (bio_add_page(io->bio, bio_page, PAGE_CACHE_SIZE, 0) < -- PAGE_CACHE_SIZE) { -+ if (bio_add_page(io->bio, bio_page, PAGE_SIZE, 0) < -+ PAGE_SIZE) { - __submit_merged_bio(io); - goto alloc_new; - } -@@ -326,7 +326,7 @@ got_it: - * see, f2fs_add_link -> get_new_data_page -> init_inode_metadata. - */ - if (dn.data_blkaddr == NEW_ADDR) { -- zero_user_segment(page, 0, PAGE_CACHE_SIZE); -+ zero_user_segment(page, 0, PAGE_SIZE); - SetPageUptodate(page); - unlock_page(page); - return page; -@@ -437,7 +437,7 @@ struct page *get_new_data_page(struct inode *inode, - goto got_it; - - if (dn.data_blkaddr == NEW_ADDR) { -- zero_user_segment(page, 0, PAGE_CACHE_SIZE); -+ zero_user_segment(page, 0, PAGE_SIZE); - SetPageUptodate(page); - } else { - f2fs_put_page(page, 1); -@@ -450,8 +450,8 @@ struct page *get_new_data_page(struct inode *inode, - } - got_it: - if (new_i_size && i_size_read(inode) < -- ((loff_t)(index + 1) << PAGE_CACHE_SHIFT)) { -- i_size_write(inode, ((loff_t)(index + 1) << PAGE_CACHE_SHIFT)); -+ ((loff_t)(index + 1) << PAGE_SHIFT)) { -+ i_size_write(inode, ((loff_t)(index + 1) << PAGE_SHIFT)); - /* Only the directory inode sets new_i_size */ - set_inode_flag(F2FS_I(inode), FI_UPDATE_DIR); - } -@@ -491,9 +491,9 @@ alloc: - /* update i_size */ - fofs = start_bidx_of_node(ofs_of_node(dn->node_page), fi) + - dn->ofs_in_node; -- if (i_size_read(dn->inode) < ((loff_t)(fofs + 1) << PAGE_CACHE_SHIFT)) -+ if (i_size_read(dn->inode) < ((loff_t)(fofs + 1) << PAGE_SHIFT)) - i_size_write(dn->inode, -- ((loff_t)(fofs + 1) << PAGE_CACHE_SHIFT)); -+ ((loff_t)(fofs + 1) << PAGE_SHIFT)); - return 0; - } - -@@ -940,7 +940,7 @@ got_it: - goto confused; - } - } else { -- zero_user_segment(page, 0, PAGE_CACHE_SIZE); -+ zero_user_segment(page, 0, PAGE_SIZE); - SetPageUptodate(page); - unlock_page(page); - goto next_page; -@@ -990,7 +990,7 @@ submit_and_realloc: - goto next_page; - set_error_page: - SetPageError(page); -- zero_user_segment(page, 0, PAGE_CACHE_SIZE); -+ zero_user_segment(page, 0, PAGE_SIZE); - unlock_page(page); - goto next_page; - confused: -@@ -1001,7 +1001,7 @@ confused: - unlock_page(page); - next_page: - if (pages) -- page_cache_release(page); -+ put_page(page); - } - BUG_ON(pages && !list_empty(pages)); - if (bio) -@@ -1107,7 +1107,7 @@ static int f2fs_write_data_page(struct page *page, - struct f2fs_sb_info *sbi = F2FS_I_SB(inode); - loff_t i_size = i_size_read(inode); - const pgoff_t end_index = ((unsigned long long) i_size) -- >> PAGE_CACHE_SHIFT; -+ >> PAGE_SHIFT; - unsigned offset = 0; - bool need_balance_fs = false; - int err = 0; -@@ -1128,11 +1128,11 @@ static int f2fs_write_data_page(struct page *page, - * If the offset is out-of-range of file size, - * this page does not have to be written to disk. - */ -- offset = i_size & (PAGE_CACHE_SIZE - 1); -+ offset = i_size & (PAGE_SIZE - 1); - if ((page->index >= end_index + 1) || !offset) - goto out; - -- zero_user_segment(page, offset, PAGE_CACHE_SIZE); -+ zero_user_segment(page, offset, PAGE_SIZE); - write: - if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING))) - goto redirty_out; -@@ -1232,8 +1232,8 @@ next: - cycled = 0; - end = -1; - } else { -- index = wbc->range_start >> PAGE_CACHE_SHIFT; -- end = wbc->range_end >> PAGE_CACHE_SHIFT; -+ index = wbc->range_start >> PAGE_SHIFT; -+ end = wbc->range_end >> PAGE_SHIFT; - if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) - range_whole = 1; - cycled = 1; /* ignore range_cyclic tests */ -@@ -1407,7 +1407,7 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi, - int err = 0; - - if (f2fs_has_inline_data(inode) || -- (pos & PAGE_CACHE_MASK) >= i_size_read(inode)) { -+ (pos & PAGE_MASK) >= i_size_read(inode)) { - f2fs_lock_op(sbi); - locked = true; - } -@@ -1472,7 +1472,7 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, - struct inode *inode = mapping->host; - struct f2fs_sb_info *sbi = F2FS_I_SB(inode); - struct page *page = NULL; -- pgoff_t index = ((unsigned long long) pos) >> PAGE_CACHE_SHIFT; -+ pgoff_t index = ((unsigned long long) pos) >> PAGE_SHIFT; - bool need_balance = false; - block_t blkaddr = NULL_ADDR; - int err = 0; -@@ -1520,22 +1520,22 @@ repeat: - if (f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode)) - f2fs_wait_on_encrypted_page_writeback(sbi, blkaddr); - -- if (len == PAGE_CACHE_SIZE) -+ if (len == PAGE_SIZE) - goto out_update; - if (PageUptodate(page)) - goto out_clear; - -- if ((pos & PAGE_CACHE_MASK) >= i_size_read(inode)) { -- unsigned start = pos & (PAGE_CACHE_SIZE - 1); -+ if ((pos & PAGE_MASK) >= i_size_read(inode)) { -+ unsigned start = pos & (PAGE_SIZE - 1); - unsigned end = start + len; - - /* Reading beyond i_size is simple: memset to zero */ -- zero_user_segments(page, 0, start, end, PAGE_CACHE_SIZE); -+ zero_user_segments(page, 0, start, end, PAGE_SIZE); - goto out_update; - } - - if (blkaddr == NEW_ADDR) { -- zero_user_segment(page, 0, PAGE_CACHE_SIZE); -+ zero_user_segment(page, 0, PAGE_SIZE); - } else { - struct f2fs_io_info fio = { - .sbi = sbi, -@@ -1660,7 +1660,7 @@ void f2fs_invalidate_page(struct page *page, unsigned int offset, - struct f2fs_sb_info *sbi = F2FS_I_SB(inode); - - if (inode->i_ino >= F2FS_ROOT_INO(sbi) && -- (offset % PAGE_CACHE_SIZE || length != PAGE_CACHE_SIZE)) -+ (offset % PAGE_SIZE || length != PAGE_SIZE)) - return; - - if (PageDirty(page)) { -diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c -index 4fb6ef88a34f..f4a61a5ff79f 100644 ---- a/fs/f2fs/debug.c -+++ b/fs/f2fs/debug.c -@@ -164,7 +164,7 @@ static void update_mem_info(struct f2fs_sb_info *sbi) - - /* build curseg */ - si->base_mem += sizeof(struct curseg_info) * NR_CURSEG_TYPE; -- si->base_mem += PAGE_CACHE_SIZE * NR_CURSEG_TYPE; -+ si->base_mem += PAGE_SIZE * NR_CURSEG_TYPE; - - /* build dirty segmap */ - si->base_mem += sizeof(struct dirty_seglist_info); -@@ -201,9 +201,9 @@ get_cache: - - si->page_mem = 0; - npages = NODE_MAPPING(sbi)->nrpages; -- si->page_mem += (unsigned long long)npages << PAGE_CACHE_SHIFT; -+ si->page_mem += (unsigned long long)npages << PAGE_SHIFT; - npages = META_MAPPING(sbi)->nrpages; -- si->page_mem += (unsigned long long)npages << PAGE_CACHE_SHIFT; -+ si->page_mem += (unsigned long long)npages << PAGE_SHIFT; - } - - static int stat_show(struct seq_file *s, void *v) -diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c -index faa7495e2d7e..8e07acbaeae6 100644 ---- a/fs/f2fs/dir.c -+++ b/fs/f2fs/dir.c -@@ -17,8 +17,8 @@ - - static unsigned long dir_blocks(struct inode *inode) - { -- return ((unsigned long long) (i_size_read(inode) + PAGE_CACHE_SIZE - 1)) -- >> PAGE_CACHE_SHIFT; -+ return ((unsigned long long) (i_size_read(inode) + PAGE_SIZE - 1)) -+ >> PAGE_SHIFT; - } - - static unsigned int dir_buckets(unsigned int level, int dir_level) -diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h -index ff79054c6cf6..0de2ee482828 100644 ---- a/fs/f2fs/f2fs.h -+++ b/fs/f2fs/f2fs.h -@@ -1306,7 +1306,7 @@ static inline void f2fs_put_page(struct page *page, int unlock) - f2fs_bug_on(F2FS_P_SB(page), !PageLocked(page)); - unlock_page(page); - } -- page_cache_release(page); -+ put_page(page); - } - - static inline void f2fs_put_dnode(struct dnode_of_data *dn) -diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c -index ea272be62677..eafaa6dceefc 100644 ---- a/fs/f2fs/file.c -+++ b/fs/f2fs/file.c -@@ -74,11 +74,11 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma, - goto mapped; - - /* page is wholly or partially inside EOF */ -- if (((loff_t)(page->index + 1) << PAGE_CACHE_SHIFT) > -+ if (((loff_t)(page->index + 1) << PAGE_SHIFT) > - i_size_read(inode)) { - unsigned offset; -- offset = i_size_read(inode) & ~PAGE_CACHE_MASK; -- zero_user_segment(page, offset, PAGE_CACHE_SIZE); -+ offset = i_size_read(inode) & ~PAGE_MASK; -+ zero_user_segment(page, offset, PAGE_SIZE); - } - set_page_dirty(page); - SetPageUptodate(page); -@@ -346,11 +346,11 @@ static loff_t f2fs_seek_block(struct file *file, loff_t offset, int whence) - goto found; - } - -- pgofs = (pgoff_t)(offset >> PAGE_CACHE_SHIFT); -+ pgofs = (pgoff_t)(offset >> PAGE_SHIFT); - - dirty = __get_first_dirty_index(inode->i_mapping, pgofs, whence); - -- for (; data_ofs < isize; data_ofs = (loff_t)pgofs << PAGE_CACHE_SHIFT) { -+ for (; data_ofs < isize; data_ofs = (loff_t)pgofs << PAGE_SHIFT) { - set_new_dnode(&dn, inode, NULL, NULL, 0); - err = get_dnode_of_data(&dn, pgofs, LOOKUP_NODE_RA); - if (err && err != -ENOENT) { -@@ -371,7 +371,7 @@ static loff_t f2fs_seek_block(struct file *file, loff_t offset, int whence) - /* find data/hole in dnode block */ - for (; dn.ofs_in_node < end_offset; - dn.ofs_in_node++, pgofs++, -- data_ofs = (loff_t)pgofs << PAGE_CACHE_SHIFT) { -+ data_ofs = (loff_t)pgofs << PAGE_SHIFT) { - block_t blkaddr; - blkaddr = datablock_addr(dn.node_page, dn.ofs_in_node); - -@@ -501,8 +501,8 @@ void truncate_data_blocks(struct dnode_of_data *dn) - static int truncate_partial_data_page(struct inode *inode, u64 from, - bool cache_only) - { -- unsigned offset = from & (PAGE_CACHE_SIZE - 1); -- pgoff_t index = from >> PAGE_CACHE_SHIFT; -+ unsigned offset = from & (PAGE_SIZE - 1); -+ pgoff_t index = from >> PAGE_SHIFT; - struct address_space *mapping = inode->i_mapping; - struct page *page; - -@@ -522,7 +522,7 @@ static int truncate_partial_data_page(struct inode *inode, u64 from, - return 0; - truncate_out: - f2fs_wait_on_page_writeback(page, DATA); -- zero_user(page, offset, PAGE_CACHE_SIZE - offset); -+ zero_user(page, offset, PAGE_SIZE - offset); - if (!cache_only || !f2fs_encrypted_inode(inode) || !S_ISREG(inode->i_mode)) - set_page_dirty(page); - f2fs_put_page(page, 1); -@@ -791,11 +791,11 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len) - if (ret) - return ret; - -- pg_start = ((unsigned long long) offset) >> PAGE_CACHE_SHIFT; -- pg_end = ((unsigned long long) offset + len) >> PAGE_CACHE_SHIFT; -+ pg_start = ((unsigned long long) offset) >> PAGE_SHIFT; -+ pg_end = ((unsigned long long) offset + len) >> PAGE_SHIFT; - -- off_start = offset & (PAGE_CACHE_SIZE - 1); -- off_end = (offset + len) & (PAGE_CACHE_SIZE - 1); -+ off_start = offset & (PAGE_SIZE - 1); -+ off_end = (offset + len) & (PAGE_SIZE - 1); - - if (pg_start == pg_end) { - ret = fill_zero(inode, pg_start, off_start, -@@ -805,7 +805,7 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len) - } else { - if (off_start) { - ret = fill_zero(inode, pg_start++, off_start, -- PAGE_CACHE_SIZE - off_start); -+ PAGE_SIZE - off_start); - if (ret) - return ret; - } -@@ -822,8 +822,8 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len) - - f2fs_balance_fs(sbi, true); - -- blk_start = (loff_t)pg_start << PAGE_CACHE_SHIFT; -- blk_end = (loff_t)pg_end << PAGE_CACHE_SHIFT; -+ blk_start = (loff_t)pg_start << PAGE_SHIFT; -+ blk_end = (loff_t)pg_end << PAGE_SHIFT; - truncate_inode_pages_range(mapping, blk_start, - blk_end - 1); - -@@ -950,8 +950,8 @@ static int f2fs_collapse_range(struct inode *inode, loff_t offset, loff_t len) - if (ret) - return ret; - -- pg_start = offset >> PAGE_CACHE_SHIFT; -- pg_end = (offset + len) >> PAGE_CACHE_SHIFT; -+ pg_start = offset >> PAGE_SHIFT; -+ pg_end = (offset + len) >> PAGE_SHIFT; - - /* write out all dirty pages from offset */ - ret = filemap_write_and_wait_range(inode->i_mapping, offset, LLONG_MAX); -@@ -1002,11 +1002,11 @@ static int f2fs_zero_range(struct inode *inode, loff_t offset, loff_t len, - - truncate_pagecache_range(inode, offset, offset + len - 1); - -- pg_start = ((unsigned long long) offset) >> PAGE_CACHE_SHIFT; -- pg_end = ((unsigned long long) offset + len) >> PAGE_CACHE_SHIFT; -+ pg_start = ((unsigned long long) offset) >> PAGE_SHIFT; -+ pg_end = ((unsigned long long) offset + len) >> PAGE_SHIFT; - -- off_start = offset & (PAGE_CACHE_SIZE - 1); -- off_end = (offset + len) & (PAGE_CACHE_SIZE - 1); -+ off_start = offset & (PAGE_SIZE - 1); -+ off_end = (offset + len) & (PAGE_SIZE - 1); - - if (pg_start == pg_end) { - ret = fill_zero(inode, pg_start, off_start, -@@ -1020,12 +1020,12 @@ static int f2fs_zero_range(struct inode *inode, loff_t offset, loff_t len, - } else { - if (off_start) { - ret = fill_zero(inode, pg_start++, off_start, -- PAGE_CACHE_SIZE - off_start); -+ PAGE_SIZE - off_start); - if (ret) - return ret; - - new_size = max_t(loff_t, new_size, -- (loff_t)pg_start << PAGE_CACHE_SHIFT); -+ (loff_t)pg_start << PAGE_SHIFT); - } - - for (index = pg_start; index < pg_end; index++) { -@@ -1061,7 +1061,7 @@ static int f2fs_zero_range(struct inode *inode, loff_t offset, loff_t len, - f2fs_unlock_op(sbi); - - new_size = max_t(loff_t, new_size, -- (loff_t)(index + 1) << PAGE_CACHE_SHIFT); -+ (loff_t)(index + 1) << PAGE_SHIFT); - } - - if (off_end) { -@@ -1118,8 +1118,8 @@ static int f2fs_insert_range(struct inode *inode, loff_t offset, loff_t len) - - truncate_pagecache(inode, offset); - -- pg_start = offset >> PAGE_CACHE_SHIFT; -- pg_end = (offset + len) >> PAGE_CACHE_SHIFT; -+ pg_start = offset >> PAGE_SHIFT; -+ pg_end = (offset + len) >> PAGE_SHIFT; - delta = pg_end - pg_start; - nrpages = (i_size_read(inode) + PAGE_SIZE - 1) / PAGE_SIZE; - -@@ -1159,11 +1159,11 @@ static int expand_inode_data(struct inode *inode, loff_t offset, - - f2fs_balance_fs(sbi, true); - -- pg_start = ((unsigned long long) offset) >> PAGE_CACHE_SHIFT; -- pg_end = ((unsigned long long) offset + len) >> PAGE_CACHE_SHIFT; -+ pg_start = ((unsigned long long) offset) >> PAGE_SHIFT; -+ pg_end = ((unsigned long long) offset + len) >> PAGE_SHIFT; - -- off_start = offset & (PAGE_CACHE_SIZE - 1); -- off_end = (offset + len) & (PAGE_CACHE_SIZE - 1); -+ off_start = offset & (PAGE_SIZE - 1); -+ off_end = (offset + len) & (PAGE_SIZE - 1); - - f2fs_lock_op(sbi); - -@@ -1181,12 +1181,12 @@ noalloc: - if (pg_start == pg_end) - new_size = offset + len; - else if (index == pg_start && off_start) -- new_size = (loff_t)(index + 1) << PAGE_CACHE_SHIFT; -+ new_size = (loff_t)(index + 1) << PAGE_SHIFT; - else if (index == pg_end) -- new_size = ((loff_t)index << PAGE_CACHE_SHIFT) + -+ new_size = ((loff_t)index << PAGE_SHIFT) + - off_end; - else -- new_size += PAGE_CACHE_SIZE; -+ new_size += PAGE_SIZE; - } - - if (!(mode & FALLOC_FL_KEEP_SIZE) && -@@ -1662,8 +1662,8 @@ static int f2fs_defragment_range(struct f2fs_sb_info *sbi, - if (need_inplace_update(inode)) - return -EINVAL; - -- pg_start = range->start >> PAGE_CACHE_SHIFT; -- pg_end = (range->start + range->len) >> PAGE_CACHE_SHIFT; -+ pg_start = range->start >> PAGE_SHIFT; -+ pg_end = (range->start + range->len) >> PAGE_SHIFT; - - f2fs_balance_fs(sbi, true); - -@@ -1780,7 +1780,7 @@ clear_out: - out: - inode_unlock(inode); - if (!err) -- range->len = (u64)total << PAGE_CACHE_SHIFT; -+ range->len = (u64)total << PAGE_SHIFT; - return err; - } - -diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c -index c3f0b7d4cfca..b42042e79558 100644 ---- a/fs/f2fs/inline.c -+++ b/fs/f2fs/inline.c -@@ -51,7 +51,7 @@ void read_inline_data(struct page *page, struct page *ipage) - - f2fs_bug_on(F2FS_P_SB(page), page->index); - -- zero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE); -+ zero_user_segment(page, MAX_INLINE_DATA, PAGE_SIZE); - - /* Copy the whole inline data block */ - src_addr = inline_data_addr(ipage); -@@ -93,7 +93,7 @@ int f2fs_read_inline_data(struct inode *inode, struct page *page) - } - - if (page->index) -- zero_user_segment(page, 0, PAGE_CACHE_SIZE); -+ zero_user_segment(page, 0, PAGE_SIZE); - else - read_inline_data(page, ipage); - -@@ -129,7 +129,7 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page) - if (PageUptodate(page)) - goto no_update; - -- zero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE); -+ zero_user_segment(page, MAX_INLINE_DATA, PAGE_SIZE); - - /* Copy the whole inline data block */ - src_addr = inline_data_addr(dn->inode_page); -@@ -390,7 +390,7 @@ static int f2fs_convert_inline_dir(struct inode *dir, struct page *ipage, - goto out; - - f2fs_wait_on_page_writeback(page, DATA); -- zero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE); -+ zero_user_segment(page, MAX_INLINE_DATA, PAGE_SIZE); - - dentry_blk = kmap_atomic(page); - -@@ -420,8 +420,8 @@ static int f2fs_convert_inline_dir(struct inode *dir, struct page *ipage, - stat_dec_inline_dir(dir); - clear_inode_flag(F2FS_I(dir), FI_INLINE_DENTRY); - -- if (i_size_read(dir) < PAGE_CACHE_SIZE) { -- i_size_write(dir, PAGE_CACHE_SIZE); -+ if (i_size_read(dir) < PAGE_SIZE) { -+ i_size_write(dir, PAGE_SIZE); - set_inode_flag(F2FS_I(dir), FI_UPDATE_DIR); - } - -diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c -index 6f944e5eb76e..5a5538f2b53b 100644 ---- a/fs/f2fs/namei.c -+++ b/fs/f2fs/namei.c -@@ -1007,13 +1007,13 @@ static const char *f2fs_encrypted_get_link(struct dentry *dentry, - /* Null-terminate the name */ - paddr[res] = '\0'; - -- page_cache_release(cpage); -+ put_page(cpage); - set_delayed_call(done, kfree_link, paddr); - return paddr; - errout: - kfree(cstr.name); - f2fs_fname_crypto_free_buffer(&pstr); -- page_cache_release(cpage); -+ put_page(cpage); - return ERR_PTR(res); - } - -diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c -index 342597a5897f..7b9ff127093a 100644 ---- a/fs/f2fs/node.c -+++ b/fs/f2fs/node.c -@@ -46,11 +46,11 @@ bool available_free_memory(struct f2fs_sb_info *sbi, int type) - */ - if (type == FREE_NIDS) { - mem_size = (nm_i->fcnt * sizeof(struct free_nid)) >> -- PAGE_CACHE_SHIFT; -+ PAGE_SHIFT; - res = mem_size < ((avail_ram * nm_i->ram_thresh / 100) >> 2); - } else if (type == NAT_ENTRIES) { - mem_size = (nm_i->nat_cnt * sizeof(struct nat_entry)) >> -- PAGE_CACHE_SHIFT; -+ PAGE_SHIFT; - res = mem_size < ((avail_ram * nm_i->ram_thresh / 100) >> 2); - } else if (type == DIRTY_DENTS) { - if (sbi->sb->s_bdi->wb.dirty_exceeded) -@@ -62,13 +62,13 @@ bool available_free_memory(struct f2fs_sb_info *sbi, int type) - - for (i = 0; i <= UPDATE_INO; i++) - mem_size += (sbi->im[i].ino_num * -- sizeof(struct ino_entry)) >> PAGE_CACHE_SHIFT; -+ sizeof(struct ino_entry)) >> PAGE_SHIFT; - res = mem_size < ((avail_ram * nm_i->ram_thresh / 100) >> 1); - } else if (type == EXTENT_CACHE) { - mem_size = (atomic_read(&sbi->total_ext_tree) * - sizeof(struct extent_tree) + - atomic_read(&sbi->total_ext_node) * -- sizeof(struct extent_node)) >> PAGE_CACHE_SHIFT; -+ sizeof(struct extent_node)) >> PAGE_SHIFT; - res = mem_size < ((avail_ram * nm_i->ram_thresh / 100) >> 1); - } else { - if (!sbi->sb->s_bdi->wb.dirty_exceeded) -@@ -121,7 +121,7 @@ static struct page *get_next_nat_page(struct f2fs_sb_info *sbi, nid_t nid) - - src_addr = page_address(src_page); - dst_addr = page_address(dst_page); -- memcpy(dst_addr, src_addr, PAGE_CACHE_SIZE); -+ memcpy(dst_addr, src_addr, PAGE_SIZE); - set_page_dirty(dst_page); - f2fs_put_page(src_page, 1); - -diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c -index 589b20b8677b..45f53f27a5f6 100644 ---- a/fs/f2fs/recovery.c -+++ b/fs/f2fs/recovery.c -@@ -593,7 +593,7 @@ out: - - /* truncate meta pages to be used by the recovery */ - truncate_inode_pages_range(META_MAPPING(sbi), -- (loff_t)MAIN_BLKADDR(sbi) << PAGE_CACHE_SHIFT, -1); -+ (loff_t)MAIN_BLKADDR(sbi) << PAGE_SHIFT, -1); - - if (err) { - truncate_inode_pages_final(NODE_MAPPING(sbi)); -diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c -index 5904a411c86f..89ba77786772 100644 ---- a/fs/f2fs/segment.c -+++ b/fs/f2fs/segment.c -@@ -804,12 +804,12 @@ int npages_for_summary_flush(struct f2fs_sb_info *sbi, bool for_ra) - } - } - -- sum_in_page = (PAGE_CACHE_SIZE - 2 * SUM_JOURNAL_SIZE - -+ sum_in_page = (PAGE_SIZE - 2 * SUM_JOURNAL_SIZE - - SUM_FOOTER_SIZE) / SUMMARY_SIZE; - if (valid_sum_count <= sum_in_page) - return 1; - else if ((valid_sum_count - sum_in_page) <= -- (PAGE_CACHE_SIZE - SUM_FOOTER_SIZE) / SUMMARY_SIZE) -+ (PAGE_SIZE - SUM_FOOTER_SIZE) / SUMMARY_SIZE) - return 2; - return 3; - } -@@ -828,9 +828,9 @@ void update_meta_page(struct f2fs_sb_info *sbi, void *src, block_t blk_addr) - void *dst = page_address(page); - - if (src) -- memcpy(dst, src, PAGE_CACHE_SIZE); -+ memcpy(dst, src, PAGE_SIZE); - else -- memset(dst, 0, PAGE_CACHE_SIZE); -+ memset(dst, 0, PAGE_SIZE); - set_page_dirty(page); - f2fs_put_page(page, 1); - } -@@ -1527,7 +1527,7 @@ static int read_compacted_summaries(struct f2fs_sb_info *sbi) - s = (struct f2fs_summary *)(kaddr + offset); - seg_i->sum_blk->entries[j] = *s; - offset += SUMMARY_SIZE; -- if (offset + SUMMARY_SIZE <= PAGE_CACHE_SIZE - -+ if (offset + SUMMARY_SIZE <= PAGE_SIZE - - SUM_FOOTER_SIZE) - continue; - -@@ -1599,7 +1599,7 @@ static int read_normal_summaries(struct f2fs_sb_info *sbi, int type) - /* set uncompleted segment to curseg */ - curseg = CURSEG_I(sbi, type); - mutex_lock(&curseg->curseg_mutex); -- memcpy(curseg->sum_blk, sum, PAGE_CACHE_SIZE); -+ memcpy(curseg->sum_blk, sum, PAGE_SIZE); - curseg->next_segno = segno; - reset_curseg(sbi, type, 0); - curseg->alloc_type = ckpt->alloc_type[type]; -@@ -1682,7 +1682,7 @@ static void write_compacted_summaries(struct f2fs_sb_info *sbi, block_t blkaddr) - *summary = seg_i->sum_blk->entries[j]; - written_size += SUMMARY_SIZE; - -- if (written_size + SUMMARY_SIZE <= PAGE_CACHE_SIZE - -+ if (written_size + SUMMARY_SIZE <= PAGE_SIZE - - SUM_FOOTER_SIZE) - continue; - -@@ -1773,7 +1773,7 @@ static struct page *get_next_sit_page(struct f2fs_sb_info *sbi, - - src_addr = page_address(src_page); - dst_addr = page_address(dst_page); -- memcpy(dst_addr, src_addr, PAGE_CACHE_SIZE); -+ memcpy(dst_addr, src_addr, PAGE_SIZE); - - set_page_dirty(dst_page); - f2fs_put_page(src_page, 1); -@@ -2096,7 +2096,7 @@ static int build_curseg(struct f2fs_sb_info *sbi) - - for (i = 0; i < NR_CURSEG_TYPE; i++) { - mutex_init(&array[i].curseg_mutex); -- array[i].sum_blk = kzalloc(PAGE_CACHE_SIZE, GFP_KERNEL); -+ array[i].sum_blk = kzalloc(PAGE_SIZE, GFP_KERNEL); - if (!array[i].sum_blk) - return -ENOMEM; - array[i].segno = NULL_SEGNO; -diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c -index 6134832baaaf..6d35862ce113 100644 ---- a/fs/f2fs/super.c -+++ b/fs/f2fs/super.c -@@ -1012,10 +1012,10 @@ static int sanity_check_raw_super(struct super_block *sb, - } - - /* Currently, support only 4KB page cache size */ -- if (F2FS_BLKSIZE != PAGE_CACHE_SIZE) { -+ if (F2FS_BLKSIZE != PAGE_SIZE) { - f2fs_msg(sb, KERN_INFO, - "Invalid page_cache_size (%lu), supports only 4KB\n", -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - return 1; - } - -diff --git a/fs/freevxfs/vxfs_immed.c b/fs/freevxfs/vxfs_immed.c -index cb84f0fcc72a..bfc780c682fb 100644 ---- a/fs/freevxfs/vxfs_immed.c -+++ b/fs/freevxfs/vxfs_immed.c -@@ -66,11 +66,11 @@ static int - vxfs_immed_readpage(struct file *fp, struct page *pp) - { - struct vxfs_inode_info *vip = VXFS_INO(pp->mapping->host); -- u_int64_t offset = (u_int64_t)pp->index << PAGE_CACHE_SHIFT; -+ u_int64_t offset = (u_int64_t)pp->index << PAGE_SHIFT; - caddr_t kaddr; - - kaddr = kmap(pp); -- memcpy(kaddr, vip->vii_immed.vi_immed + offset, PAGE_CACHE_SIZE); -+ memcpy(kaddr, vip->vii_immed.vi_immed + offset, PAGE_SIZE); - kunmap(pp); - - flush_dcache_page(pp); -diff --git a/fs/freevxfs/vxfs_lookup.c b/fs/freevxfs/vxfs_lookup.c -index 1cff72df0389..a49e0cfbb686 100644 ---- a/fs/freevxfs/vxfs_lookup.c -+++ b/fs/freevxfs/vxfs_lookup.c -@@ -45,7 +45,7 @@ - /* - * Number of VxFS blocks per page. - */ --#define VXFS_BLOCK_PER_PAGE(sbp) ((PAGE_CACHE_SIZE / (sbp)->s_blocksize)) -+#define VXFS_BLOCK_PER_PAGE(sbp) ((PAGE_SIZE / (sbp)->s_blocksize)) - - - static struct dentry * vxfs_lookup(struct inode *, struct dentry *, unsigned int); -@@ -175,7 +175,7 @@ vxfs_inode_by_name(struct inode *dip, struct dentry *dp) - if (de) { - ino = de->d_ino; - kunmap(pp); -- page_cache_release(pp); -+ put_page(pp); - } - - return (ino); -@@ -255,8 +255,8 @@ vxfs_readdir(struct file *fp, struct dir_context *ctx) - nblocks = dir_blocks(ip); - pblocks = VXFS_BLOCK_PER_PAGE(sbp); - -- page = pos >> PAGE_CACHE_SHIFT; -- offset = pos & ~PAGE_CACHE_MASK; -+ page = pos >> PAGE_SHIFT; -+ offset = pos & ~PAGE_MASK; - block = (u_long)(pos >> sbp->s_blocksize_bits) % pblocks; - - for (; page < npages; page++, block = 0) { -@@ -289,7 +289,7 @@ vxfs_readdir(struct file *fp, struct dir_context *ctx) - continue; - - offset = (char *)de - kaddr; -- ctx->pos = ((page << PAGE_CACHE_SHIFT) | offset) + 2; -+ ctx->pos = ((page << PAGE_SHIFT) | offset) + 2; - if (!dir_emit(ctx, de->d_name, de->d_namelen, - de->d_ino, DT_UNKNOWN)) { - vxfs_put_page(pp); -@@ -301,6 +301,6 @@ vxfs_readdir(struct file *fp, struct dir_context *ctx) - vxfs_put_page(pp); - offset = 0; - } -- ctx->pos = ((page << PAGE_CACHE_SHIFT) | offset) + 2; -+ ctx->pos = ((page << PAGE_SHIFT) | offset) + 2; - return 0; - } -diff --git a/fs/freevxfs/vxfs_subr.c b/fs/freevxfs/vxfs_subr.c -index 5d318c44f855..e806694d4145 100644 ---- a/fs/freevxfs/vxfs_subr.c -+++ b/fs/freevxfs/vxfs_subr.c -@@ -50,7 +50,7 @@ inline void - vxfs_put_page(struct page *pp) - { - kunmap(pp); -- page_cache_release(pp); -+ put_page(pp); - } - - /** -diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c -index 5c46ed9f3e14..671e1780afc3 100644 ---- a/fs/fs-writeback.c -+++ b/fs/fs-writeback.c -@@ -33,7 +33,7 @@ - /* - * 4MB minimal write chunk size - */ --#define MIN_WRITEBACK_PAGES (4096UL >> (PAGE_CACHE_SHIFT - 10)) -+#define MIN_WRITEBACK_PAGES (4096UL >> (PAGE_SHIFT - 10)) - - struct wb_completion { - atomic_t cnt; -diff --git a/fs/fscache/page.c b/fs/fscache/page.c -index 6b35fc4860a0..3078b679fcd1 100644 ---- a/fs/fscache/page.c -+++ b/fs/fscache/page.c -@@ -113,7 +113,7 @@ try_again: - - wake_up_bit(&cookie->flags, 0); - if (xpage) -- page_cache_release(xpage); -+ put_page(xpage); - __fscache_uncache_page(cookie, page); - return true; - -@@ -164,7 +164,7 @@ static void fscache_end_page_write(struct fscache_object *object, - } - spin_unlock(&object->lock); - if (xpage) -- page_cache_release(xpage); -+ put_page(xpage); - } - - /* -@@ -884,7 +884,7 @@ void fscache_invalidate_writes(struct fscache_cookie *cookie) - spin_unlock(&cookie->stores_lock); - - for (i = n - 1; i >= 0; i--) -- page_cache_release(results[i]); -+ put_page(results[i]); - } - - _leave(""); -@@ -982,7 +982,7 @@ int __fscache_write_page(struct fscache_cookie *cookie, - - radix_tree_tag_set(&cookie->stores, page->index, - FSCACHE_COOKIE_PENDING_TAG); -- page_cache_get(page); -+ get_page(page); - - /* we only want one writer at a time, but we do need to queue new - * writers after exclusive ops */ -@@ -1026,7 +1026,7 @@ submit_failed: - radix_tree_delete(&cookie->stores, page->index); - spin_unlock(&cookie->stores_lock); - wake_cookie = __fscache_unuse_cookie(cookie); -- page_cache_release(page); -+ put_page(page); - ret = -ENOBUFS; - goto nobufs; - -diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c -index ebb5e37455a0..cbece1221417 100644 ---- a/fs/fuse/dev.c -+++ b/fs/fuse/dev.c -@@ -897,7 +897,7 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep) - return err; - } - -- page_cache_get(newpage); -+ get_page(newpage); - - if (!(buf->flags & PIPE_BUF_FLAG_LRU)) - lru_cache_add_file(newpage); -@@ -912,12 +912,12 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep) - - if (err) { - unlock_page(newpage); -- page_cache_release(newpage); -+ put_page(newpage); - return err; - } - - unlock_page(oldpage); -- page_cache_release(oldpage); -+ put_page(oldpage); - cs->len = 0; - - return 0; -@@ -951,7 +951,7 @@ static int fuse_ref_page(struct fuse_copy_state *cs, struct page *page, - fuse_copy_finish(cs); - - buf = cs->pipebufs; -- page_cache_get(page); -+ get_page(page); - buf->page = page; - buf->offset = offset; - buf->len = count; -@@ -1435,7 +1435,7 @@ out_unlock: - - out: - for (; page_nr < cs.nr_segs; page_nr++) -- page_cache_release(bufs[page_nr].page); -+ put_page(bufs[page_nr].page); - - kfree(bufs); - return ret; -@@ -1632,8 +1632,8 @@ static int fuse_notify_store(struct fuse_conn *fc, unsigned int size, - goto out_up_killsb; - - mapping = inode->i_mapping; -- index = outarg.offset >> PAGE_CACHE_SHIFT; -- offset = outarg.offset & ~PAGE_CACHE_MASK; -+ index = outarg.offset >> PAGE_SHIFT; -+ offset = outarg.offset & ~PAGE_MASK; - file_size = i_size_read(inode); - end = outarg.offset + outarg.size; - if (end > file_size) { -@@ -1652,13 +1652,13 @@ static int fuse_notify_store(struct fuse_conn *fc, unsigned int size, - if (!page) - goto out_iput; - -- this_num = min_t(unsigned, num, PAGE_CACHE_SIZE - offset); -+ this_num = min_t(unsigned, num, PAGE_SIZE - offset); - err = fuse_copy_page(cs, &page, offset, this_num, 0); - if (!err && offset == 0 && -- (this_num == PAGE_CACHE_SIZE || file_size == end)) -+ (this_num == PAGE_SIZE || file_size == end)) - SetPageUptodate(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - if (err) - goto out_iput; -@@ -1697,7 +1697,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode, - size_t total_len = 0; - int num_pages; - -- offset = outarg->offset & ~PAGE_CACHE_MASK; -+ offset = outarg->offset & ~PAGE_MASK; - file_size = i_size_read(inode); - - num = outarg->size; -@@ -1720,7 +1720,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode, - req->page_descs[0].offset = offset; - req->end = fuse_retrieve_end; - -- index = outarg->offset >> PAGE_CACHE_SHIFT; -+ index = outarg->offset >> PAGE_SHIFT; - - while (num && req->num_pages < num_pages) { - struct page *page; -@@ -1730,7 +1730,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode, - if (!page) - break; - -- this_num = min_t(unsigned, num, PAGE_CACHE_SIZE - offset); -+ this_num = min_t(unsigned, num, PAGE_SIZE - offset); - req->pages[req->num_pages] = page; - req->page_descs[req->num_pages].length = this_num; - req->num_pages++; -diff --git a/fs/fuse/file.c b/fs/fuse/file.c -index b03d253ece15..6fc09c6fc80c 100644 ---- a/fs/fuse/file.c -+++ b/fs/fuse/file.c -@@ -348,7 +348,7 @@ static bool fuse_range_is_writeback(struct inode *inode, pgoff_t idx_from, - pgoff_t curr_index; - - BUG_ON(req->inode != inode); -- curr_index = req->misc.write.in.offset >> PAGE_CACHE_SHIFT; -+ curr_index = req->misc.write.in.offset >> PAGE_SHIFT; - if (idx_from < curr_index + req->num_pages && - curr_index <= idx_to) { - found = true; -@@ -676,11 +676,11 @@ static void fuse_short_read(struct fuse_req *req, struct inode *inode, - * present there. - */ - int i; -- int start_idx = num_read >> PAGE_CACHE_SHIFT; -- size_t off = num_read & (PAGE_CACHE_SIZE - 1); -+ int start_idx = num_read >> PAGE_SHIFT; -+ size_t off = num_read & (PAGE_SIZE - 1); - - for (i = start_idx; i < req->num_pages; i++) { -- zero_user_segment(req->pages[i], off, PAGE_CACHE_SIZE); -+ zero_user_segment(req->pages[i], off, PAGE_SIZE); - off = 0; - } - } else { -@@ -697,7 +697,7 @@ static int fuse_do_readpage(struct file *file, struct page *page) - struct fuse_req *req; - size_t num_read; - loff_t pos = page_offset(page); -- size_t count = PAGE_CACHE_SIZE; -+ size_t count = PAGE_SIZE; - u64 attr_ver; - int err; - -@@ -782,7 +782,7 @@ static void fuse_readpages_end(struct fuse_conn *fc, struct fuse_req *req) - else - SetPageError(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - if (req->ff) - fuse_file_put(req->ff, false); -@@ -793,7 +793,7 @@ static void fuse_send_readpages(struct fuse_req *req, struct file *file) - struct fuse_file *ff = file->private_data; - struct fuse_conn *fc = ff->fc; - loff_t pos = page_offset(req->pages[0]); -- size_t count = req->num_pages << PAGE_CACHE_SHIFT; -+ size_t count = req->num_pages << PAGE_SHIFT; - - req->out.argpages = 1; - req->out.page_zeroing = 1; -@@ -829,7 +829,7 @@ static int fuse_readpages_fill(void *_data, struct page *page) - - if (req->num_pages && - (req->num_pages == FUSE_MAX_PAGES_PER_REQ || -- (req->num_pages + 1) * PAGE_CACHE_SIZE > fc->max_read || -+ (req->num_pages + 1) * PAGE_SIZE > fc->max_read || - req->pages[req->num_pages - 1]->index + 1 != page->index)) { - int nr_alloc = min_t(unsigned, data->nr_pages, - FUSE_MAX_PAGES_PER_REQ); -@@ -851,7 +851,7 @@ static int fuse_readpages_fill(void *_data, struct page *page) - return -EIO; - } - -- page_cache_get(page); -+ get_page(page); - req->pages[req->num_pages] = page; - req->page_descs[req->num_pages].length = PAGE_SIZE; - req->num_pages++; -@@ -996,17 +996,17 @@ static size_t fuse_send_write_pages(struct fuse_req *req, struct file *file, - for (i = 0; i < req->num_pages; i++) { - struct page *page = req->pages[i]; - -- if (!req->out.h.error && !offset && count >= PAGE_CACHE_SIZE) -+ if (!req->out.h.error && !offset && count >= PAGE_SIZE) - SetPageUptodate(page); - -- if (count > PAGE_CACHE_SIZE - offset) -- count -= PAGE_CACHE_SIZE - offset; -+ if (count > PAGE_SIZE - offset) -+ count -= PAGE_SIZE - offset; - else - count = 0; - offset = 0; - - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - - return res; -@@ -1017,7 +1017,7 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req, - struct iov_iter *ii, loff_t pos) - { - struct fuse_conn *fc = get_fuse_conn(mapping->host); -- unsigned offset = pos & (PAGE_CACHE_SIZE - 1); -+ unsigned offset = pos & (PAGE_SIZE - 1); - size_t count = 0; - int err; - -@@ -1027,8 +1027,8 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req, - do { - size_t tmp; - struct page *page; -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -- size_t bytes = min_t(size_t, PAGE_CACHE_SIZE - offset, -+ pgoff_t index = pos >> PAGE_SHIFT; -+ size_t bytes = min_t(size_t, PAGE_SIZE - offset, - iov_iter_count(ii)); - - bytes = min_t(size_t, bytes, fc->max_write - count); -@@ -1052,7 +1052,7 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req, - iov_iter_advance(ii, tmp); - if (!tmp) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - bytes = min(bytes, iov_iter_single_seg_count(ii)); - goto again; - } -@@ -1065,7 +1065,7 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req, - count += tmp; - pos += tmp; - offset += tmp; -- if (offset == PAGE_CACHE_SIZE) -+ if (offset == PAGE_SIZE) - offset = 0; - - if (!fc->big_writes) -@@ -1079,8 +1079,8 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req, - static inline unsigned fuse_wr_pages(loff_t pos, size_t len) - { - return min_t(unsigned, -- ((pos + len - 1) >> PAGE_CACHE_SHIFT) - -- (pos >> PAGE_CACHE_SHIFT) + 1, -+ ((pos + len - 1) >> PAGE_SHIFT) - -+ (pos >> PAGE_SHIFT) + 1, - FUSE_MAX_PAGES_PER_REQ); - } - -@@ -1198,8 +1198,8 @@ static ssize_t fuse_file_write_iter(struct kiocb *iocb, struct iov_iter *from) - goto out; - - invalidate_mapping_pages(file->f_mapping, -- pos >> PAGE_CACHE_SHIFT, -- endbyte >> PAGE_CACHE_SHIFT); -+ pos >> PAGE_SHIFT, -+ endbyte >> PAGE_SHIFT); - - written += written_buffered; - iocb->ki_pos = pos + written_buffered; -@@ -1308,8 +1308,8 @@ ssize_t fuse_direct_io(struct fuse_io_priv *io, struct iov_iter *iter, - size_t nmax = write ? fc->max_write : fc->max_read; - loff_t pos = *ppos; - size_t count = iov_iter_count(iter); -- pgoff_t idx_from = pos >> PAGE_CACHE_SHIFT; -- pgoff_t idx_to = (pos + count - 1) >> PAGE_CACHE_SHIFT; -+ pgoff_t idx_from = pos >> PAGE_SHIFT; -+ pgoff_t idx_to = (pos + count - 1) >> PAGE_SHIFT; - ssize_t res = 0; - struct fuse_req *req; - -@@ -1460,7 +1460,7 @@ __acquires(fc->lock) - { - struct fuse_inode *fi = get_fuse_inode(req->inode); - struct fuse_write_in *inarg = &req->misc.write.in; -- __u64 data_size = req->num_pages * PAGE_CACHE_SIZE; -+ __u64 data_size = req->num_pages * PAGE_SIZE; - - if (!fc->connected) - goto out_free; -@@ -1721,7 +1721,7 @@ static bool fuse_writepage_in_flight(struct fuse_req *new_req, - list_del(&new_req->writepages_entry); - list_for_each_entry(old_req, &fi->writepages, writepages_entry) { - BUG_ON(old_req->inode != new_req->inode); -- curr_index = old_req->misc.write.in.offset >> PAGE_CACHE_SHIFT; -+ curr_index = old_req->misc.write.in.offset >> PAGE_SHIFT; - if (curr_index <= page->index && - page->index < curr_index + old_req->num_pages) { - found = true; -@@ -1736,7 +1736,7 @@ static bool fuse_writepage_in_flight(struct fuse_req *new_req, - new_req->num_pages = 1; - for (tmp = old_req; tmp != NULL; tmp = tmp->misc.write.next) { - BUG_ON(tmp->inode != new_req->inode); -- curr_index = tmp->misc.write.in.offset >> PAGE_CACHE_SHIFT; -+ curr_index = tmp->misc.write.in.offset >> PAGE_SHIFT; - if (tmp->num_pages == 1 && - curr_index == page->index) { - old_req = tmp; -@@ -1793,7 +1793,7 @@ static int fuse_writepages_fill(struct page *page, - - if (req && req->num_pages && - (is_writeback || req->num_pages == FUSE_MAX_PAGES_PER_REQ || -- (req->num_pages + 1) * PAGE_CACHE_SIZE > fc->max_write || -+ (req->num_pages + 1) * PAGE_SIZE > fc->max_write || - data->orig_pages[req->num_pages - 1]->index + 1 != page->index)) { - fuse_writepages_send(data); - data->req = NULL; -@@ -1918,7 +1918,7 @@ static int fuse_write_begin(struct file *file, struct address_space *mapping, - loff_t pos, unsigned len, unsigned flags, - struct page **pagep, void **fsdata) - { -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -+ pgoff_t index = pos >> PAGE_SHIFT; - struct fuse_conn *fc = get_fuse_conn(file_inode(file)); - struct page *page; - loff_t fsize; -@@ -1932,15 +1932,15 @@ static int fuse_write_begin(struct file *file, struct address_space *mapping, - - fuse_wait_on_page_writeback(mapping->host, page->index); - -- if (PageUptodate(page) || len == PAGE_CACHE_SIZE) -+ if (PageUptodate(page) || len == PAGE_SIZE) - goto success; - /* - * Check if the start this page comes after the end of file, in which - * case the readpage can be optimized away. - */ - fsize = i_size_read(mapping->host); -- if (fsize <= (pos & PAGE_CACHE_MASK)) { -- size_t off = pos & ~PAGE_CACHE_MASK; -+ if (fsize <= (pos & PAGE_MASK)) { -+ size_t off = pos & ~PAGE_MASK; - if (off) - zero_user_segment(page, 0, off); - goto success; -@@ -1954,7 +1954,7 @@ success: - - cleanup: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - error: - return err; - } -@@ -1967,16 +1967,16 @@ static int fuse_write_end(struct file *file, struct address_space *mapping, - - if (!PageUptodate(page)) { - /* Zero any unwritten bytes at the end of the page */ -- size_t endoff = (pos + copied) & ~PAGE_CACHE_MASK; -+ size_t endoff = (pos + copied) & ~PAGE_MASK; - if (endoff) -- zero_user_segment(page, endoff, PAGE_CACHE_SIZE); -+ zero_user_segment(page, endoff, PAGE_SIZE); - SetPageUptodate(page); - } - - fuse_write_update_size(inode, pos + copied); - set_page_dirty(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - return copied; - } -diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c -index 4d69d5c0bedc..1ce67668a8e1 100644 ---- a/fs/fuse/inode.c -+++ b/fs/fuse/inode.c -@@ -339,11 +339,11 @@ int fuse_reverse_inval_inode(struct super_block *sb, u64 nodeid, - - fuse_invalidate_attr(inode); - if (offset >= 0) { -- pg_start = offset >> PAGE_CACHE_SHIFT; -+ pg_start = offset >> PAGE_SHIFT; - if (len <= 0) - pg_end = -1; - else -- pg_end = (offset + len - 1) >> PAGE_CACHE_SHIFT; -+ pg_end = (offset + len - 1) >> PAGE_SHIFT; - invalidate_inode_pages2_range(inode->i_mapping, - pg_start, pg_end); - } -@@ -864,7 +864,7 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req) - process_init_limits(fc, arg); - - if (arg->minor >= 6) { -- ra_pages = arg->max_readahead / PAGE_CACHE_SIZE; -+ ra_pages = arg->max_readahead / PAGE_SIZE; - if (arg->flags & FUSE_ASYNC_READ) - fc->async_read = 1; - if (!(arg->flags & FUSE_POSIX_LOCKS)) -@@ -901,7 +901,7 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req) - if (arg->time_gran && arg->time_gran <= 1000000000) - fc->sb->s_time_gran = arg->time_gran; - } else { -- ra_pages = fc->max_read / PAGE_CACHE_SIZE; -+ ra_pages = fc->max_read / PAGE_SIZE; - fc->no_lock = 1; - fc->no_flock = 1; - } -@@ -922,7 +922,7 @@ static void fuse_send_init(struct fuse_conn *fc, struct fuse_req *req) - - arg->major = FUSE_KERNEL_VERSION; - arg->minor = FUSE_KERNEL_MINOR_VERSION; -- arg->max_readahead = fc->bdi.ra_pages * PAGE_CACHE_SIZE; -+ arg->max_readahead = fc->bdi.ra_pages * PAGE_SIZE; - arg->flags |= FUSE_ASYNC_READ | FUSE_POSIX_LOCKS | FUSE_ATOMIC_O_TRUNC | - FUSE_EXPORT_SUPPORT | FUSE_BIG_WRITES | FUSE_DONT_MASK | - FUSE_SPLICE_WRITE | FUSE_SPLICE_MOVE | FUSE_SPLICE_READ | -@@ -955,7 +955,7 @@ static int fuse_bdi_init(struct fuse_conn *fc, struct super_block *sb) - int err; - - fc->bdi.name = "fuse"; -- fc->bdi.ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE; -+ fc->bdi.ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_SIZE; - /* fuse does it's own writeback accounting */ - fc->bdi.capabilities = BDI_CAP_NO_ACCT_WB | BDI_CAP_STRICTLIMIT; - -@@ -1053,8 +1053,8 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) - goto err; - #endif - } else { -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ sb->s_blocksize = PAGE_SIZE; -+ sb->s_blocksize_bits = PAGE_SHIFT; - } - sb->s_magic = FUSE_SUPER_MAGIC; - sb->s_op = &fuse_super_operations; -diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c -index aa016e4b8bec..1bbbee945f46 100644 ---- a/fs/gfs2/aops.c -+++ b/fs/gfs2/aops.c -@@ -101,7 +101,7 @@ static int gfs2_writepage_common(struct page *page, - struct gfs2_inode *ip = GFS2_I(inode); - struct gfs2_sbd *sdp = GFS2_SB(inode); - loff_t i_size = i_size_read(inode); -- pgoff_t end_index = i_size >> PAGE_CACHE_SHIFT; -+ pgoff_t end_index = i_size >> PAGE_SHIFT; - unsigned offset; - - if (gfs2_assert_withdraw(sdp, gfs2_glock_is_held_excl(ip->i_gl))) -@@ -109,9 +109,9 @@ static int gfs2_writepage_common(struct page *page, - if (current->journal_info) - goto redirty; - /* Is the page fully outside i_size? (truncate in progress) */ -- offset = i_size & (PAGE_CACHE_SIZE-1); -+ offset = i_size & (PAGE_SIZE-1); - if (page->index > end_index || (page->index == end_index && !offset)) { -- page->mapping->a_ops->invalidatepage(page, 0, PAGE_CACHE_SIZE); -+ page->mapping->a_ops->invalidatepage(page, 0, PAGE_SIZE); - goto out; - } - return 1; -@@ -238,7 +238,7 @@ static int gfs2_write_jdata_pagevec(struct address_space *mapping, - { - struct inode *inode = mapping->host; - struct gfs2_sbd *sdp = GFS2_SB(inode); -- unsigned nrblocks = nr_pages * (PAGE_CACHE_SIZE/inode->i_sb->s_blocksize); -+ unsigned nrblocks = nr_pages * (PAGE_SIZE/inode->i_sb->s_blocksize); - int i; - int ret; - -@@ -366,8 +366,8 @@ static int gfs2_write_cache_jdata(struct address_space *mapping, - cycled = 0; - end = -1; - } else { -- index = wbc->range_start >> PAGE_CACHE_SHIFT; -- end = wbc->range_end >> PAGE_CACHE_SHIFT; -+ index = wbc->range_start >> PAGE_SHIFT; -+ end = wbc->range_end >> PAGE_SHIFT; - if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) - range_whole = 1; - cycled = 1; /* ignore range_cyclic tests */ -@@ -458,7 +458,7 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page) - * so we need to supply one here. It doesn't happen often. - */ - if (unlikely(page->index)) { -- zero_user(page, 0, PAGE_CACHE_SIZE); -+ zero_user(page, 0, PAGE_SIZE); - SetPageUptodate(page); - return 0; - } -@@ -471,7 +471,7 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page) - if (dsize > (dibh->b_size - sizeof(struct gfs2_dinode))) - dsize = (dibh->b_size - sizeof(struct gfs2_dinode)); - memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), dsize); -- memset(kaddr + dsize, 0, PAGE_CACHE_SIZE - dsize); -+ memset(kaddr + dsize, 0, PAGE_SIZE - dsize); - kunmap_atomic(kaddr); - flush_dcache_page(page); - brelse(dibh); -@@ -560,8 +560,8 @@ int gfs2_internal_read(struct gfs2_inode *ip, char *buf, loff_t *pos, - unsigned size) - { - struct address_space *mapping = ip->i_inode.i_mapping; -- unsigned long index = *pos / PAGE_CACHE_SIZE; -- unsigned offset = *pos & (PAGE_CACHE_SIZE - 1); -+ unsigned long index = *pos / PAGE_SIZE; -+ unsigned offset = *pos & (PAGE_SIZE - 1); - unsigned copied = 0; - unsigned amt; - struct page *page; -@@ -569,15 +569,15 @@ int gfs2_internal_read(struct gfs2_inode *ip, char *buf, loff_t *pos, - - do { - amt = size - copied; -- if (offset + size > PAGE_CACHE_SIZE) -- amt = PAGE_CACHE_SIZE - offset; -+ if (offset + size > PAGE_SIZE) -+ amt = PAGE_SIZE - offset; - page = read_cache_page(mapping, index, __gfs2_readpage, NULL); - if (IS_ERR(page)) - return PTR_ERR(page); - p = kmap_atomic(page); - memcpy(buf + copied, p + offset, amt); - kunmap_atomic(p); -- page_cache_release(page); -+ put_page(page); - copied += amt; - index++; - offset = 0; -@@ -651,8 +651,8 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping, - unsigned requested = 0; - int alloc_required; - int error = 0; -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -- unsigned from = pos & (PAGE_CACHE_SIZE - 1); -+ pgoff_t index = pos >> PAGE_SHIFT; -+ unsigned from = pos & (PAGE_SIZE - 1); - struct page *page; - - gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &ip->i_gh); -@@ -697,7 +697,7 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping, - rblocks += gfs2_rg_blocks(ip, requested); - - error = gfs2_trans_begin(sdp, rblocks, -- PAGE_CACHE_SIZE/sdp->sd_sb.sb_bsize); -+ PAGE_SIZE/sdp->sd_sb.sb_bsize); - if (error) - goto out_trans_fail; - -@@ -727,7 +727,7 @@ out: - return 0; - - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - gfs2_trans_end(sdp); - if (pos + len > ip->i_inode.i_size) -@@ -827,7 +827,7 @@ static int gfs2_stuffed_write_end(struct inode *inode, struct buffer_head *dibh, - if (!PageUptodate(page)) - SetPageUptodate(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - if (copied) { - if (inode->i_size < to) -@@ -877,7 +877,7 @@ static int gfs2_write_end(struct file *file, struct address_space *mapping, - struct gfs2_sbd *sdp = GFS2_SB(inode); - struct gfs2_inode *m_ip = GFS2_I(sdp->sd_statfs_inode); - struct buffer_head *dibh; -- unsigned int from = pos & (PAGE_CACHE_SIZE - 1); -+ unsigned int from = pos & (PAGE_SIZE - 1); - unsigned int to = from + len; - int ret; - struct gfs2_trans *tr = current->journal_info; -@@ -888,7 +888,7 @@ static int gfs2_write_end(struct file *file, struct address_space *mapping, - ret = gfs2_meta_inode_buffer(ip, &dibh); - if (unlikely(ret)) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - goto failed; - } - -@@ -992,7 +992,7 @@ static void gfs2_invalidatepage(struct page *page, unsigned int offset, - { - struct gfs2_sbd *sdp = GFS2_SB(page->mapping->host); - unsigned int stop = offset + length; -- int partial_page = (offset || length < PAGE_CACHE_SIZE); -+ int partial_page = (offset || length < PAGE_SIZE); - struct buffer_head *bh, *head; - unsigned long pos = 0; - -@@ -1082,7 +1082,7 @@ static ssize_t gfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter, - * the first place, mapping->nr_pages will always be zero. - */ - if (mapping->nrpages) { -- loff_t lstart = offset & ~(PAGE_CACHE_SIZE - 1); -+ loff_t lstart = offset & ~(PAGE_SIZE - 1); - loff_t len = iov_iter_count(iter); - loff_t end = PAGE_ALIGN(offset + len) - 1; - -diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c -index 0860f0b5b3f1..24ce1cdd434a 100644 ---- a/fs/gfs2/bmap.c -+++ b/fs/gfs2/bmap.c -@@ -75,7 +75,7 @@ static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh, - dsize = dibh->b_size - sizeof(struct gfs2_dinode); - - memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), dsize); -- memset(kaddr + dsize, 0, PAGE_CACHE_SIZE - dsize); -+ memset(kaddr + dsize, 0, PAGE_SIZE - dsize); - kunmap(page); - - SetPageUptodate(page); -@@ -98,7 +98,7 @@ static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh, - - if (release) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - - return 0; -@@ -932,8 +932,8 @@ static int gfs2_block_truncate_page(struct address_space *mapping, loff_t from) - { - struct inode *inode = mapping->host; - struct gfs2_inode *ip = GFS2_I(inode); -- unsigned long index = from >> PAGE_CACHE_SHIFT; -- unsigned offset = from & (PAGE_CACHE_SIZE-1); -+ unsigned long index = from >> PAGE_SHIFT; -+ unsigned offset = from & (PAGE_SIZE-1); - unsigned blocksize, iblock, length, pos; - struct buffer_head *bh; - struct page *page; -@@ -945,7 +945,7 @@ static int gfs2_block_truncate_page(struct address_space *mapping, loff_t from) - - blocksize = inode->i_sb->s_blocksize; - length = blocksize - (offset & (blocksize - 1)); -- iblock = index << (PAGE_CACHE_SHIFT - inode->i_sb->s_blocksize_bits); -+ iblock = index << (PAGE_SHIFT - inode->i_sb->s_blocksize_bits); - - if (!page_has_buffers(page)) - create_empty_buffers(page, blocksize, 0); -@@ -989,7 +989,7 @@ static int gfs2_block_truncate_page(struct address_space *mapping, loff_t from) - mark_buffer_dirty(bh); - unlock: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return err; - } - -diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c -index c9384f932975..208efc70ad49 100644 ---- a/fs/gfs2/file.c -+++ b/fs/gfs2/file.c -@@ -354,8 +354,8 @@ static int gfs2_allocate_page_backing(struct page *page) - { - struct inode *inode = page->mapping->host; - struct buffer_head bh; -- unsigned long size = PAGE_CACHE_SIZE; -- u64 lblock = page->index << (PAGE_CACHE_SHIFT - inode->i_blkbits); -+ unsigned long size = PAGE_SIZE; -+ u64 lblock = page->index << (PAGE_SHIFT - inode->i_blkbits); - - do { - bh.b_state = 0; -@@ -386,7 +386,7 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) - struct gfs2_sbd *sdp = GFS2_SB(inode); - struct gfs2_alloc_parms ap = { .aflags = 0, }; - unsigned long last_index; -- u64 pos = page->index << PAGE_CACHE_SHIFT; -+ u64 pos = page->index << PAGE_SHIFT; - unsigned int data_blocks, ind_blocks, rblocks; - struct gfs2_holder gh; - loff_t size; -@@ -401,7 +401,7 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) - if (ret) - goto out; - -- gfs2_size_hint(vma->vm_file, pos, PAGE_CACHE_SIZE); -+ gfs2_size_hint(vma->vm_file, pos, PAGE_SIZE); - - gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh); - ret = gfs2_glock_nq(&gh); -@@ -411,7 +411,7 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) - set_bit(GLF_DIRTY, &ip->i_gl->gl_flags); - set_bit(GIF_SW_PAGED, &ip->i_flags); - -- if (!gfs2_write_alloc_required(ip, pos, PAGE_CACHE_SIZE)) { -+ if (!gfs2_write_alloc_required(ip, pos, PAGE_SIZE)) { - lock_page(page); - if (!PageUptodate(page) || page->mapping != inode->i_mapping) { - ret = -EAGAIN; -@@ -424,7 +424,7 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) - if (ret) - goto out_unlock; - -- gfs2_write_calc_reserv(ip, PAGE_CACHE_SIZE, &data_blocks, &ind_blocks); -+ gfs2_write_calc_reserv(ip, PAGE_SIZE, &data_blocks, &ind_blocks); - ap.target = data_blocks + ind_blocks; - ret = gfs2_quota_lock_check(ip, &ap); - if (ret) -@@ -447,7 +447,7 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) - lock_page(page); - ret = -EINVAL; - size = i_size_read(inode); -- last_index = (size - 1) >> PAGE_CACHE_SHIFT; -+ last_index = (size - 1) >> PAGE_SHIFT; - /* Check page index against inode size */ - if (size == 0 || (page->index > last_index)) - goto out_trans_end; -@@ -873,7 +873,7 @@ static long __gfs2_fallocate(struct file *file, int mode, loff_t offset, loff_t - rblocks += data_blocks ? data_blocks : 1; - - error = gfs2_trans_begin(sdp, rblocks, -- PAGE_CACHE_SIZE/sdp->sd_sb.sb_bsize); -+ PAGE_SIZE/sdp->sd_sb.sb_bsize); - if (error) - goto out_trans_fail; - -diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c -index e137d96f1b17..0448524c11bc 100644 ---- a/fs/gfs2/meta_io.c -+++ b/fs/gfs2/meta_io.c -@@ -124,7 +124,7 @@ struct buffer_head *gfs2_getbuf(struct gfs2_glock *gl, u64 blkno, int create) - if (mapping == NULL) - mapping = &sdp->sd_aspace; - -- shift = PAGE_CACHE_SHIFT - sdp->sd_sb.sb_bsize_shift; -+ shift = PAGE_SHIFT - sdp->sd_sb.sb_bsize_shift; - index = blkno >> shift; /* convert block to page */ - bufnum = blkno - (index << shift); /* block buf index within page */ - -@@ -154,7 +154,7 @@ struct buffer_head *gfs2_getbuf(struct gfs2_glock *gl, u64 blkno, int create) - map_bh(bh, sdp->sd_vfs, blkno); - - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - return bh; - } -diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c -index a39891344259..ce7d69a2fdc0 100644 ---- a/fs/gfs2/quota.c -+++ b/fs/gfs2/quota.c -@@ -701,7 +701,7 @@ static int gfs2_write_buf_to_page(struct gfs2_inode *ip, unsigned long index, - unsigned to_write = bytes, pg_off = off; - int done = 0; - -- blk = index << (PAGE_CACHE_SHIFT - sdp->sd_sb.sb_bsize_shift); -+ blk = index << (PAGE_SHIFT - sdp->sd_sb.sb_bsize_shift); - boff = off % bsize; - - page = find_or_create_page(mapping, index, GFP_NOFS); -@@ -753,13 +753,13 @@ static int gfs2_write_buf_to_page(struct gfs2_inode *ip, unsigned long index, - flush_dcache_page(page); - kunmap_atomic(kaddr); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - return 0; - - unlock_out: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return -EIO; - } - -@@ -773,13 +773,13 @@ static int gfs2_write_disk_quota(struct gfs2_inode *ip, struct gfs2_quota *qp, - - nbytes = sizeof(struct gfs2_quota); - -- pg_beg = loc >> PAGE_CACHE_SHIFT; -- pg_off = loc % PAGE_CACHE_SIZE; -+ pg_beg = loc >> PAGE_SHIFT; -+ pg_off = loc % PAGE_SIZE; - - /* If the quota straddles a page boundary, split the write in two */ -- if ((pg_off + nbytes) > PAGE_CACHE_SIZE) { -+ if ((pg_off + nbytes) > PAGE_SIZE) { - pg_oflow = 1; -- overflow = (pg_off + nbytes) - PAGE_CACHE_SIZE; -+ overflow = (pg_off + nbytes) - PAGE_SIZE; - } - - ptr = qp; -diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c -index 07c0265aa195..99a0bdac8796 100644 ---- a/fs/gfs2/rgrp.c -+++ b/fs/gfs2/rgrp.c -@@ -918,9 +918,8 @@ static int read_rindex_entry(struct gfs2_inode *ip) - goto fail; - - rgd->rd_gl->gl_object = rgd; -- rgd->rd_gl->gl_vm.start = (rgd->rd_addr * bsize) & PAGE_CACHE_MASK; -- rgd->rd_gl->gl_vm.end = PAGE_CACHE_ALIGN((rgd->rd_addr + -- rgd->rd_length) * bsize) - 1; -+ rgd->rd_gl->gl_vm.start = (rgd->rd_addr * bsize) & PAGE_MASK; -+ rgd->rd_gl->gl_vm.end = PAGE_ALIGN((rgd->rd_addr + rgd->rd_length) * bsize) - 1; - rgd->rd_rgl = (struct gfs2_rgrp_lvb *)rgd->rd_gl->gl_lksb.sb_lvbptr; - rgd->rd_flags &= ~(GFS2_RDF_UPTODATE | GFS2_RDF_PREFERRED); - if (rgd->rd_data > sdp->sd_max_rg_data) -diff --git a/fs/hfs/bnode.c b/fs/hfs/bnode.c -index 221719eac5de..d77d844b668b 100644 ---- a/fs/hfs/bnode.c -+++ b/fs/hfs/bnode.c -@@ -278,14 +278,14 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid) - - mapping = tree->inode->i_mapping; - off = (loff_t)cnid * tree->node_size; -- block = off >> PAGE_CACHE_SHIFT; -- node->page_offset = off & ~PAGE_CACHE_MASK; -+ block = off >> PAGE_SHIFT; -+ node->page_offset = off & ~PAGE_MASK; - for (i = 0; i < tree->pages_per_bnode; i++) { - page = read_mapping_page(mapping, block++, NULL); - if (IS_ERR(page)) - goto fail; - if (PageError(page)) { -- page_cache_release(page); -+ put_page(page); - goto fail; - } - node->page[i] = page; -@@ -401,7 +401,7 @@ void hfs_bnode_free(struct hfs_bnode *node) - - for (i = 0; i < node->tree->pages_per_bnode; i++) - if (node->page[i]) -- page_cache_release(node->page[i]); -+ put_page(node->page[i]); - kfree(node); - } - -@@ -429,11 +429,11 @@ struct hfs_bnode *hfs_bnode_create(struct hfs_btree *tree, u32 num) - - pagep = node->page; - memset(kmap(*pagep) + node->page_offset, 0, -- min((int)PAGE_CACHE_SIZE, (int)tree->node_size)); -+ min((int)PAGE_SIZE, (int)tree->node_size)); - set_page_dirty(*pagep); - kunmap(*pagep); - for (i = 1; i < tree->pages_per_bnode; i++) { -- memset(kmap(*++pagep), 0, PAGE_CACHE_SIZE); -+ memset(kmap(*++pagep), 0, PAGE_SIZE); - set_page_dirty(*pagep); - kunmap(*pagep); - } -diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c -index 1ab19e660e69..37cdd955eceb 100644 ---- a/fs/hfs/btree.c -+++ b/fs/hfs/btree.c -@@ -116,14 +116,14 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke - } - - tree->node_size_shift = ffs(size) - 1; -- tree->pages_per_bnode = (tree->node_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -+ tree->pages_per_bnode = (tree->node_size + PAGE_SIZE - 1) >> PAGE_SHIFT; - - kunmap(page); -- page_cache_release(page); -+ put_page(page); - return tree; - - fail_page: -- page_cache_release(page); -+ put_page(page); - free_inode: - tree->inode->i_mapping->a_ops = &hfs_aops; - iput(tree->inode); -@@ -257,9 +257,9 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree) - off = off16; - - off += node->page_offset; -- pagep = node->page + (off >> PAGE_CACHE_SHIFT); -+ pagep = node->page + (off >> PAGE_SHIFT); - data = kmap(*pagep); -- off &= ~PAGE_CACHE_MASK; -+ off &= ~PAGE_MASK; - idx = 0; - - for (;;) { -@@ -279,7 +279,7 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree) - } - } - } -- if (++off >= PAGE_CACHE_SIZE) { -+ if (++off >= PAGE_SIZE) { - kunmap(*pagep); - data = kmap(*++pagep); - off = 0; -@@ -302,9 +302,9 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree) - len = hfs_brec_lenoff(node, 0, &off16); - off = off16; - off += node->page_offset; -- pagep = node->page + (off >> PAGE_CACHE_SHIFT); -+ pagep = node->page + (off >> PAGE_SHIFT); - data = kmap(*pagep); -- off &= ~PAGE_CACHE_MASK; -+ off &= ~PAGE_MASK; - } - } - -@@ -348,9 +348,9 @@ void hfs_bmap_free(struct hfs_bnode *node) - len = hfs_brec_lenoff(node, 0, &off); - } - off += node->page_offset + nidx / 8; -- page = node->page[off >> PAGE_CACHE_SHIFT]; -+ page = node->page[off >> PAGE_SHIFT]; - data = kmap(page); -- off &= ~PAGE_CACHE_MASK; -+ off &= ~PAGE_MASK; - m = 1 << (~nidx & 7); - byte = data[off]; - if (!(byte & m)) { -diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c -index 6686bf39a5b5..cb1e5faa2fb7 100644 ---- a/fs/hfs/inode.c -+++ b/fs/hfs/inode.c -@@ -91,8 +91,8 @@ static int hfs_releasepage(struct page *page, gfp_t mask) - if (!tree) - return 0; - -- if (tree->node_size >= PAGE_CACHE_SIZE) { -- nidx = page->index >> (tree->node_size_shift - PAGE_CACHE_SHIFT); -+ if (tree->node_size >= PAGE_SIZE) { -+ nidx = page->index >> (tree->node_size_shift - PAGE_SHIFT); - spin_lock(&tree->hash_lock); - node = hfs_bnode_findhash(tree, nidx); - if (!node) -@@ -105,8 +105,8 @@ static int hfs_releasepage(struct page *page, gfp_t mask) - } - spin_unlock(&tree->hash_lock); - } else { -- nidx = page->index << (PAGE_CACHE_SHIFT - tree->node_size_shift); -- i = 1 << (PAGE_CACHE_SHIFT - tree->node_size_shift); -+ nidx = page->index << (PAGE_SHIFT - tree->node_size_shift); -+ i = 1 << (PAGE_SHIFT - tree->node_size_shift); - spin_lock(&tree->hash_lock); - do { - node = hfs_bnode_findhash(tree, nidx++); -diff --git a/fs/hfsplus/bitmap.c b/fs/hfsplus/bitmap.c -index d2954451519e..c0ae274c0a22 100644 ---- a/fs/hfsplus/bitmap.c -+++ b/fs/hfsplus/bitmap.c -@@ -13,7 +13,7 @@ - #include "hfsplus_fs.h" - #include "hfsplus_raw.h" - --#define PAGE_CACHE_BITS (PAGE_CACHE_SIZE * 8) -+#define PAGE_CACHE_BITS (PAGE_SIZE * 8) - - int hfsplus_block_allocate(struct super_block *sb, u32 size, - u32 offset, u32 *max) -diff --git a/fs/hfsplus/bnode.c b/fs/hfsplus/bnode.c -index 63924662aaf3..ce014ceb89ef 100644 ---- a/fs/hfsplus/bnode.c -+++ b/fs/hfsplus/bnode.c -@@ -24,16 +24,16 @@ void hfs_bnode_read(struct hfs_bnode *node, void *buf, int off, int len) - int l; - - off += node->page_offset; -- pagep = node->page + (off >> PAGE_CACHE_SHIFT); -- off &= ~PAGE_CACHE_MASK; -+ pagep = node->page + (off >> PAGE_SHIFT); -+ off &= ~PAGE_MASK; - -- l = min_t(int, len, PAGE_CACHE_SIZE - off); -+ l = min_t(int, len, PAGE_SIZE - off); - memcpy(buf, kmap(*pagep) + off, l); - kunmap(*pagep); - - while ((len -= l) != 0) { - buf += l; -- l = min_t(int, len, PAGE_CACHE_SIZE); -+ l = min_t(int, len, PAGE_SIZE); - memcpy(buf, kmap(*++pagep), l); - kunmap(*pagep); - } -@@ -77,17 +77,17 @@ void hfs_bnode_write(struct hfs_bnode *node, void *buf, int off, int len) - int l; - - off += node->page_offset; -- pagep = node->page + (off >> PAGE_CACHE_SHIFT); -- off &= ~PAGE_CACHE_MASK; -+ pagep = node->page + (off >> PAGE_SHIFT); -+ off &= ~PAGE_MASK; - -- l = min_t(int, len, PAGE_CACHE_SIZE - off); -+ l = min_t(int, len, PAGE_SIZE - off); - memcpy(kmap(*pagep) + off, buf, l); - set_page_dirty(*pagep); - kunmap(*pagep); - - while ((len -= l) != 0) { - buf += l; -- l = min_t(int, len, PAGE_CACHE_SIZE); -+ l = min_t(int, len, PAGE_SIZE); - memcpy(kmap(*++pagep), buf, l); - set_page_dirty(*pagep); - kunmap(*pagep); -@@ -107,16 +107,16 @@ void hfs_bnode_clear(struct hfs_bnode *node, int off, int len) - int l; - - off += node->page_offset; -- pagep = node->page + (off >> PAGE_CACHE_SHIFT); -- off &= ~PAGE_CACHE_MASK; -+ pagep = node->page + (off >> PAGE_SHIFT); -+ off &= ~PAGE_MASK; - -- l = min_t(int, len, PAGE_CACHE_SIZE - off); -+ l = min_t(int, len, PAGE_SIZE - off); - memset(kmap(*pagep) + off, 0, l); - set_page_dirty(*pagep); - kunmap(*pagep); - - while ((len -= l) != 0) { -- l = min_t(int, len, PAGE_CACHE_SIZE); -+ l = min_t(int, len, PAGE_SIZE); - memset(kmap(*++pagep), 0, l); - set_page_dirty(*pagep); - kunmap(*pagep); -@@ -136,20 +136,20 @@ void hfs_bnode_copy(struct hfs_bnode *dst_node, int dst, - tree = src_node->tree; - src += src_node->page_offset; - dst += dst_node->page_offset; -- src_page = src_node->page + (src >> PAGE_CACHE_SHIFT); -- src &= ~PAGE_CACHE_MASK; -- dst_page = dst_node->page + (dst >> PAGE_CACHE_SHIFT); -- dst &= ~PAGE_CACHE_MASK; -+ src_page = src_node->page + (src >> PAGE_SHIFT); -+ src &= ~PAGE_MASK; -+ dst_page = dst_node->page + (dst >> PAGE_SHIFT); -+ dst &= ~PAGE_MASK; - - if (src == dst) { -- l = min_t(int, len, PAGE_CACHE_SIZE - src); -+ l = min_t(int, len, PAGE_SIZE - src); - memcpy(kmap(*dst_page) + src, kmap(*src_page) + src, l); - kunmap(*src_page); - set_page_dirty(*dst_page); - kunmap(*dst_page); - - while ((len -= l) != 0) { -- l = min_t(int, len, PAGE_CACHE_SIZE); -+ l = min_t(int, len, PAGE_SIZE); - memcpy(kmap(*++dst_page), kmap(*++src_page), l); - kunmap(*src_page); - set_page_dirty(*dst_page); -@@ -161,12 +161,12 @@ void hfs_bnode_copy(struct hfs_bnode *dst_node, int dst, - do { - src_ptr = kmap(*src_page) + src; - dst_ptr = kmap(*dst_page) + dst; -- if (PAGE_CACHE_SIZE - src < PAGE_CACHE_SIZE - dst) { -- l = PAGE_CACHE_SIZE - src; -+ if (PAGE_SIZE - src < PAGE_SIZE - dst) { -+ l = PAGE_SIZE - src; - src = 0; - dst += l; - } else { -- l = PAGE_CACHE_SIZE - dst; -+ l = PAGE_SIZE - dst; - src += l; - dst = 0; - } -@@ -195,11 +195,11 @@ void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len) - dst += node->page_offset; - if (dst > src) { - src += len - 1; -- src_page = node->page + (src >> PAGE_CACHE_SHIFT); -- src = (src & ~PAGE_CACHE_MASK) + 1; -+ src_page = node->page + (src >> PAGE_SHIFT); -+ src = (src & ~PAGE_MASK) + 1; - dst += len - 1; -- dst_page = node->page + (dst >> PAGE_CACHE_SHIFT); -- dst = (dst & ~PAGE_CACHE_MASK) + 1; -+ dst_page = node->page + (dst >> PAGE_SHIFT); -+ dst = (dst & ~PAGE_MASK) + 1; - - if (src == dst) { - while (src < len) { -@@ -208,7 +208,7 @@ void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len) - set_page_dirty(*dst_page); - kunmap(*dst_page); - len -= src; -- src = PAGE_CACHE_SIZE; -+ src = PAGE_SIZE; - src_page--; - dst_page--; - } -@@ -226,32 +226,32 @@ void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len) - dst_ptr = kmap(*dst_page) + dst; - if (src < dst) { - l = src; -- src = PAGE_CACHE_SIZE; -+ src = PAGE_SIZE; - dst -= l; - } else { - l = dst; - src -= l; -- dst = PAGE_CACHE_SIZE; -+ dst = PAGE_SIZE; - } - l = min(len, l); - memmove(dst_ptr - l, src_ptr - l, l); - kunmap(*src_page); - set_page_dirty(*dst_page); - kunmap(*dst_page); -- if (dst == PAGE_CACHE_SIZE) -+ if (dst == PAGE_SIZE) - dst_page--; - else - src_page--; - } while ((len -= l)); - } - } else { -- src_page = node->page + (src >> PAGE_CACHE_SHIFT); -- src &= ~PAGE_CACHE_MASK; -- dst_page = node->page + (dst >> PAGE_CACHE_SHIFT); -- dst &= ~PAGE_CACHE_MASK; -+ src_page = node->page + (src >> PAGE_SHIFT); -+ src &= ~PAGE_MASK; -+ dst_page = node->page + (dst >> PAGE_SHIFT); -+ dst &= ~PAGE_MASK; - - if (src == dst) { -- l = min_t(int, len, PAGE_CACHE_SIZE - src); -+ l = min_t(int, len, PAGE_SIZE - src); - memmove(kmap(*dst_page) + src, - kmap(*src_page) + src, l); - kunmap(*src_page); -@@ -259,7 +259,7 @@ void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len) - kunmap(*dst_page); - - while ((len -= l) != 0) { -- l = min_t(int, len, PAGE_CACHE_SIZE); -+ l = min_t(int, len, PAGE_SIZE); - memmove(kmap(*++dst_page), - kmap(*++src_page), l); - kunmap(*src_page); -@@ -272,13 +272,13 @@ void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len) - do { - src_ptr = kmap(*src_page) + src; - dst_ptr = kmap(*dst_page) + dst; -- if (PAGE_CACHE_SIZE - src < -- PAGE_CACHE_SIZE - dst) { -- l = PAGE_CACHE_SIZE - src; -+ if (PAGE_SIZE - src < -+ PAGE_SIZE - dst) { -+ l = PAGE_SIZE - src; - src = 0; - dst += l; - } else { -- l = PAGE_CACHE_SIZE - dst; -+ l = PAGE_SIZE - dst; - src += l; - dst = 0; - } -@@ -444,14 +444,14 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid) - - mapping = tree->inode->i_mapping; - off = (loff_t)cnid << tree->node_size_shift; -- block = off >> PAGE_CACHE_SHIFT; -- node->page_offset = off & ~PAGE_CACHE_MASK; -+ block = off >> PAGE_SHIFT; -+ node->page_offset = off & ~PAGE_MASK; - for (i = 0; i < tree->pages_per_bnode; block++, i++) { - page = read_mapping_page(mapping, block, NULL); - if (IS_ERR(page)) - goto fail; - if (PageError(page)) { -- page_cache_release(page); -+ put_page(page); - goto fail; - } - node->page[i] = page; -@@ -569,7 +569,7 @@ void hfs_bnode_free(struct hfs_bnode *node) - - for (i = 0; i < node->tree->pages_per_bnode; i++) - if (node->page[i]) -- page_cache_release(node->page[i]); -+ put_page(node->page[i]); - kfree(node); - } - -@@ -597,11 +597,11 @@ struct hfs_bnode *hfs_bnode_create(struct hfs_btree *tree, u32 num) - - pagep = node->page; - memset(kmap(*pagep) + node->page_offset, 0, -- min_t(int, PAGE_CACHE_SIZE, tree->node_size)); -+ min_t(int, PAGE_SIZE, tree->node_size)); - set_page_dirty(*pagep); - kunmap(*pagep); - for (i = 1; i < tree->pages_per_bnode; i++) { -- memset(kmap(*++pagep), 0, PAGE_CACHE_SIZE); -+ memset(kmap(*++pagep), 0, PAGE_SIZE); - set_page_dirty(*pagep); - kunmap(*pagep); - } -diff --git a/fs/hfsplus/btree.c b/fs/hfsplus/btree.c -index 3345c7553edc..d9d1a36ba826 100644 ---- a/fs/hfsplus/btree.c -+++ b/fs/hfsplus/btree.c -@@ -236,15 +236,15 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id) - tree->node_size_shift = ffs(size) - 1; - - tree->pages_per_bnode = -- (tree->node_size + PAGE_CACHE_SIZE - 1) >> -- PAGE_CACHE_SHIFT; -+ (tree->node_size + PAGE_SIZE - 1) >> -+ PAGE_SHIFT; - - kunmap(page); -- page_cache_release(page); -+ put_page(page); - return tree; - - fail_page: -- page_cache_release(page); -+ put_page(page); - free_inode: - tree->inode->i_mapping->a_ops = &hfsplus_aops; - iput(tree->inode); -@@ -380,9 +380,9 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree) - off = off16; - - off += node->page_offset; -- pagep = node->page + (off >> PAGE_CACHE_SHIFT); -+ pagep = node->page + (off >> PAGE_SHIFT); - data = kmap(*pagep); -- off &= ~PAGE_CACHE_MASK; -+ off &= ~PAGE_MASK; - idx = 0; - - for (;;) { -@@ -403,7 +403,7 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree) - } - } - } -- if (++off >= PAGE_CACHE_SIZE) { -+ if (++off >= PAGE_SIZE) { - kunmap(*pagep); - data = kmap(*++pagep); - off = 0; -@@ -426,9 +426,9 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree) - len = hfs_brec_lenoff(node, 0, &off16); - off = off16; - off += node->page_offset; -- pagep = node->page + (off >> PAGE_CACHE_SHIFT); -+ pagep = node->page + (off >> PAGE_SHIFT); - data = kmap(*pagep); -- off &= ~PAGE_CACHE_MASK; -+ off &= ~PAGE_MASK; - } - } - -@@ -475,9 +475,9 @@ void hfs_bmap_free(struct hfs_bnode *node) - len = hfs_brec_lenoff(node, 0, &off); - } - off += node->page_offset + nidx / 8; -- page = node->page[off >> PAGE_CACHE_SHIFT]; -+ page = node->page[off >> PAGE_SHIFT]; - data = kmap(page); -- off &= ~PAGE_CACHE_MASK; -+ off &= ~PAGE_MASK; - m = 1 << (~nidx & 7); - byte = data[off]; - if (!(byte & m)) { -diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c -index 1a6394cdb54e..b28f39865c3a 100644 ---- a/fs/hfsplus/inode.c -+++ b/fs/hfsplus/inode.c -@@ -87,9 +87,9 @@ static int hfsplus_releasepage(struct page *page, gfp_t mask) - } - if (!tree) - return 0; -- if (tree->node_size >= PAGE_CACHE_SIZE) { -+ if (tree->node_size >= PAGE_SIZE) { - nidx = page->index >> -- (tree->node_size_shift - PAGE_CACHE_SHIFT); -+ (tree->node_size_shift - PAGE_SHIFT); - spin_lock(&tree->hash_lock); - node = hfs_bnode_findhash(tree, nidx); - if (!node) -@@ -103,8 +103,8 @@ static int hfsplus_releasepage(struct page *page, gfp_t mask) - spin_unlock(&tree->hash_lock); - } else { - nidx = page->index << -- (PAGE_CACHE_SHIFT - tree->node_size_shift); -- i = 1 << (PAGE_CACHE_SHIFT - tree->node_size_shift); -+ (PAGE_SHIFT - tree->node_size_shift); -+ i = 1 << (PAGE_SHIFT - tree->node_size_shift); - spin_lock(&tree->hash_lock); - do { - node = hfs_bnode_findhash(tree, nidx++); -diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c -index 5d54490a136d..c35911362ff9 100644 ---- a/fs/hfsplus/super.c -+++ b/fs/hfsplus/super.c -@@ -438,7 +438,7 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent) - err = -EFBIG; - last_fs_block = sbi->total_blocks - 1; - last_fs_page = (last_fs_block << sbi->alloc_blksz_shift) >> -- PAGE_CACHE_SHIFT; -+ PAGE_SHIFT; - - if ((last_fs_block > (sector_t)(~0ULL) >> (sbi->alloc_blksz_shift - 9)) || - (last_fs_page > (pgoff_t)(~0ULL))) { -diff --git a/fs/hfsplus/xattr.c b/fs/hfsplus/xattr.c -index ab01530b4930..70e445ff0cff 100644 ---- a/fs/hfsplus/xattr.c -+++ b/fs/hfsplus/xattr.c -@@ -220,7 +220,7 @@ check_attr_tree_state_again: - - index = 0; - written = 0; -- for (; written < node_size; index++, written += PAGE_CACHE_SIZE) { -+ for (; written < node_size; index++, written += PAGE_SIZE) { - void *kaddr; - - page = read_mapping_page(mapping, index, NULL); -@@ -231,11 +231,11 @@ check_attr_tree_state_again: - - kaddr = kmap_atomic(page); - memcpy(kaddr, buf + written, -- min_t(size_t, PAGE_CACHE_SIZE, node_size - written)); -+ min_t(size_t, PAGE_SIZE, node_size - written)); - kunmap_atomic(kaddr); - - set_page_dirty(page); -- page_cache_release(page); -+ put_page(page); - } - - hfsplus_mark_inode_dirty(attr_file, HFSPLUS_I_ATTR_DIRTY); -diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c -index d1abbee281d1..7016653f3e41 100644 ---- a/fs/hostfs/hostfs_kern.c -+++ b/fs/hostfs/hostfs_kern.c -@@ -410,12 +410,12 @@ static int hostfs_writepage(struct page *page, struct writeback_control *wbc) - struct inode *inode = mapping->host; - char *buffer; - loff_t base = page_offset(page); -- int count = PAGE_CACHE_SIZE; -- int end_index = inode->i_size >> PAGE_CACHE_SHIFT; -+ int count = PAGE_SIZE; -+ int end_index = inode->i_size >> PAGE_SHIFT; - int err; - - if (page->index >= end_index) -- count = inode->i_size & (PAGE_CACHE_SIZE-1); -+ count = inode->i_size & (PAGE_SIZE-1); - - buffer = kmap(page); - -@@ -447,7 +447,7 @@ static int hostfs_readpage(struct file *file, struct page *page) - - buffer = kmap(page); - bytes_read = read_file(FILE_HOSTFS_I(file)->fd, &start, buffer, -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - if (bytes_read < 0) { - ClearPageUptodate(page); - SetPageError(page); -@@ -455,7 +455,7 @@ static int hostfs_readpage(struct file *file, struct page *page) - goto out; - } - -- memset(buffer + bytes_read, 0, PAGE_CACHE_SIZE - bytes_read); -+ memset(buffer + bytes_read, 0, PAGE_SIZE - bytes_read); - - ClearPageError(page); - SetPageUptodate(page); -@@ -471,7 +471,7 @@ static int hostfs_write_begin(struct file *file, struct address_space *mapping, - loff_t pos, unsigned len, unsigned flags, - struct page **pagep, void **fsdata) - { -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -+ pgoff_t index = pos >> PAGE_SHIFT; - - *pagep = grab_cache_page_write_begin(mapping, index, flags); - if (!*pagep) -@@ -485,14 +485,14 @@ static int hostfs_write_end(struct file *file, struct address_space *mapping, - { - struct inode *inode = mapping->host; - void *buffer; -- unsigned from = pos & (PAGE_CACHE_SIZE - 1); -+ unsigned from = pos & (PAGE_SIZE - 1); - int err; - - buffer = kmap(page); - err = write_file(FILE_HOSTFS_I(file)->fd, &pos, buffer + from, copied); - kunmap(page); - -- if (!PageUptodate(page) && err == PAGE_CACHE_SIZE) -+ if (!PageUptodate(page) && err == PAGE_SIZE) - SetPageUptodate(page); - - /* -@@ -502,7 +502,7 @@ static int hostfs_write_end(struct file *file, struct address_space *mapping, - if (err > 0 && (pos > inode->i_size)) - inode->i_size = pos; - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - return err; - } -diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c -index e1f465a389d5..4ea71eba40a5 100644 ---- a/fs/hugetlbfs/inode.c -+++ b/fs/hugetlbfs/inode.c -@@ -213,12 +213,12 @@ hugetlbfs_read_actor(struct page *page, unsigned long offset, - int i, chunksize; - - /* Find which 4k chunk and offset with in that chunk */ -- i = offset >> PAGE_CACHE_SHIFT; -- offset = offset & ~PAGE_CACHE_MASK; -+ i = offset >> PAGE_SHIFT; -+ offset = offset & ~PAGE_MASK; - - while (size) { - size_t n; -- chunksize = PAGE_CACHE_SIZE; -+ chunksize = PAGE_SIZE; - if (offset) - chunksize -= offset; - if (chunksize > size) -@@ -237,7 +237,7 @@ hugetlbfs_read_actor(struct page *page, unsigned long offset, - /* - * Support for read() - Find the page attached to f_mapping and copy out the - * data. Its *very* similar to do_generic_mapping_read(), we can't use that -- * since it has PAGE_CACHE_SIZE assumptions. -+ * since it has PAGE_SIZE assumptions. - */ - static ssize_t hugetlbfs_read_iter(struct kiocb *iocb, struct iov_iter *to) - { -@@ -285,7 +285,7 @@ static ssize_t hugetlbfs_read_iter(struct kiocb *iocb, struct iov_iter *to) - * We have the page, copy it to user space buffer. - */ - copied = hugetlbfs_read_actor(page, offset, to, nr); -- page_cache_release(page); -+ put_page(page); - } - offset += copied; - retval += copied; -diff --git a/fs/isofs/compress.c b/fs/isofs/compress.c -index f311bf084015..2e4e834d1a98 100644 ---- a/fs/isofs/compress.c -+++ b/fs/isofs/compress.c -@@ -26,7 +26,7 @@ - #include "zisofs.h" - - /* This should probably be global. */ --static char zisofs_sink_page[PAGE_CACHE_SIZE]; -+static char zisofs_sink_page[PAGE_SIZE]; - - /* - * This contains the zlib memory allocation and the mutex for the -@@ -70,11 +70,11 @@ static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start, - for ( i = 0 ; i < pcount ; i++ ) { - if (!pages[i]) - continue; -- memset(page_address(pages[i]), 0, PAGE_CACHE_SIZE); -+ memset(page_address(pages[i]), 0, PAGE_SIZE); - flush_dcache_page(pages[i]); - SetPageUptodate(pages[i]); - } -- return ((loff_t)pcount) << PAGE_CACHE_SHIFT; -+ return ((loff_t)pcount) << PAGE_SHIFT; - } - - /* Because zlib is not thread-safe, do all the I/O at the top. */ -@@ -121,11 +121,11 @@ static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start, - if (pages[curpage]) { - stream.next_out = page_address(pages[curpage]) - + poffset; -- stream.avail_out = PAGE_CACHE_SIZE - poffset; -+ stream.avail_out = PAGE_SIZE - poffset; - poffset = 0; - } else { - stream.next_out = (void *)&zisofs_sink_page; -- stream.avail_out = PAGE_CACHE_SIZE; -+ stream.avail_out = PAGE_SIZE; - } - } - if (!stream.avail_in) { -@@ -220,14 +220,14 @@ static int zisofs_fill_pages(struct inode *inode, int full_page, int pcount, - * pages with the data we have anyway... - */ - start_off = page_offset(pages[full_page]); -- end_off = min_t(loff_t, start_off + PAGE_CACHE_SIZE, inode->i_size); -+ end_off = min_t(loff_t, start_off + PAGE_SIZE, inode->i_size); - - cstart_block = start_off >> zisofs_block_shift; - cend_block = (end_off + (1 << zisofs_block_shift) - 1) - >> zisofs_block_shift; - -- WARN_ON(start_off - (full_page << PAGE_CACHE_SHIFT) != -- ((cstart_block << zisofs_block_shift) & PAGE_CACHE_MASK)); -+ WARN_ON(start_off - (full_page << PAGE_SHIFT) != -+ ((cstart_block << zisofs_block_shift) & PAGE_MASK)); - - /* Find the pointer to this specific chunk */ - /* Note: we're not using isonum_731() here because the data is known aligned */ -@@ -260,10 +260,10 @@ static int zisofs_fill_pages(struct inode *inode, int full_page, int pcount, - ret = zisofs_uncompress_block(inode, block_start, block_end, - pcount, pages, poffset, &err); - poffset += ret; -- pages += poffset >> PAGE_CACHE_SHIFT; -- pcount -= poffset >> PAGE_CACHE_SHIFT; -- full_page -= poffset >> PAGE_CACHE_SHIFT; -- poffset &= ~PAGE_CACHE_MASK; -+ pages += poffset >> PAGE_SHIFT; -+ pcount -= poffset >> PAGE_SHIFT; -+ full_page -= poffset >> PAGE_SHIFT; -+ poffset &= ~PAGE_MASK; - - if (err) { - brelse(bh); -@@ -282,7 +282,7 @@ static int zisofs_fill_pages(struct inode *inode, int full_page, int pcount, - - if (poffset && *pages) { - memset(page_address(*pages) + poffset, 0, -- PAGE_CACHE_SIZE - poffset); -+ PAGE_SIZE - poffset); - flush_dcache_page(*pages); - SetPageUptodate(*pages); - } -@@ -302,12 +302,12 @@ static int zisofs_readpage(struct file *file, struct page *page) - int i, pcount, full_page; - unsigned int zisofs_block_shift = ISOFS_I(inode)->i_format_parm[1]; - unsigned int zisofs_pages_per_cblock = -- PAGE_CACHE_SHIFT <= zisofs_block_shift ? -- (1 << (zisofs_block_shift - PAGE_CACHE_SHIFT)) : 0; -+ PAGE_SHIFT <= zisofs_block_shift ? -+ (1 << (zisofs_block_shift - PAGE_SHIFT)) : 0; - struct page *pages[max_t(unsigned, zisofs_pages_per_cblock, 1)]; - pgoff_t index = page->index, end_index; - -- end_index = (inode->i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -+ end_index = (inode->i_size + PAGE_SIZE - 1) >> PAGE_SHIFT; - /* - * If this page is wholly outside i_size we just return zero; - * do_generic_file_read() will handle this for us -@@ -318,7 +318,7 @@ static int zisofs_readpage(struct file *file, struct page *page) - return 0; - } - -- if (PAGE_CACHE_SHIFT <= zisofs_block_shift) { -+ if (PAGE_SHIFT <= zisofs_block_shift) { - /* We have already been given one page, this is the one - we must do. */ - full_page = index & (zisofs_pages_per_cblock - 1); -@@ -351,7 +351,7 @@ static int zisofs_readpage(struct file *file, struct page *page) - kunmap(pages[i]); - unlock_page(pages[i]); - if (i != full_page) -- page_cache_release(pages[i]); -+ put_page(pages[i]); - } - } - -diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c -index bcd2d41b318a..131dedc920d8 100644 ---- a/fs/isofs/inode.c -+++ b/fs/isofs/inode.c -@@ -1021,7 +1021,7 @@ int isofs_get_blocks(struct inode *inode, sector_t iblock, - * the page with useless information without generating any - * I/O errors. - */ -- if (b_off > ((inode->i_size + PAGE_CACHE_SIZE - 1) >> ISOFS_BUFFER_BITS(inode))) { -+ if (b_off > ((inode->i_size + PAGE_SIZE - 1) >> ISOFS_BUFFER_BITS(inode))) { - printk(KERN_DEBUG "%s: block >= EOF (%lu, %llu)\n", - __func__, b_off, - (unsigned long long)inode->i_size); -diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c -index 517f2de784cf..2ad98d6e19f4 100644 ---- a/fs/jbd2/commit.c -+++ b/fs/jbd2/commit.c -@@ -81,11 +81,11 @@ static void release_buffer_page(struct buffer_head *bh) - if (!trylock_page(page)) - goto nope; - -- page_cache_get(page); -+ get_page(page); - __brelse(bh); - try_to_free_buffers(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return; - - nope: -diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c -index de73a9516a54..435f0b26ac20 100644 ---- a/fs/jbd2/journal.c -+++ b/fs/jbd2/journal.c -@@ -2221,7 +2221,7 @@ void jbd2_journal_ack_err(journal_t *journal) - - int jbd2_journal_blocks_per_page(struct inode *inode) - { -- return 1 << (PAGE_CACHE_SHIFT - inode->i_sb->s_blocksize_bits); -+ return 1 << (PAGE_SHIFT - inode->i_sb->s_blocksize_bits); - } - - /* -diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c -index 01e4652d88f6..67c103867bf8 100644 ---- a/fs/jbd2/transaction.c -+++ b/fs/jbd2/transaction.c -@@ -2263,7 +2263,7 @@ int jbd2_journal_invalidatepage(journal_t *journal, - struct buffer_head *head, *bh, *next; - unsigned int stop = offset + length; - unsigned int curr_off = 0; -- int partial_page = (offset || length < PAGE_CACHE_SIZE); -+ int partial_page = (offset || length < PAGE_SIZE); - int may_free = 1; - int ret = 0; - -@@ -2272,7 +2272,7 @@ int jbd2_journal_invalidatepage(journal_t *journal, - if (!page_has_buffers(page)) - return 0; - -- BUG_ON(stop > PAGE_CACHE_SIZE || stop < length); -+ BUG_ON(stop > PAGE_SIZE || stop < length); - - /* We will potentially be playing with lists other than just the - * data lists (especially for journaled data mode), so be -diff --git a/fs/jffs2/debug.c b/fs/jffs2/debug.c -index 1090eb64b90d..9d26b1b9fc01 100644 ---- a/fs/jffs2/debug.c -+++ b/fs/jffs2/debug.c -@@ -95,15 +95,15 @@ __jffs2_dbg_fragtree_paranoia_check_nolock(struct jffs2_inode_info *f) - rather than mucking around with actually reading the node - and checking the compression type, which is the real way - to tell a hole node. */ -- if (frag->ofs & (PAGE_CACHE_SIZE-1) && frag_prev(frag) -- && frag_prev(frag)->size < PAGE_CACHE_SIZE && frag_prev(frag)->node) { -+ if (frag->ofs & (PAGE_SIZE-1) && frag_prev(frag) -+ && frag_prev(frag)->size < PAGE_SIZE && frag_prev(frag)->node) { - JFFS2_ERROR("REF_PRISTINE node at 0x%08x had a previous non-hole frag in the same page. Tell dwmw2.\n", - ref_offset(fn->raw)); - bitched = 1; - } - -- if ((frag->ofs+frag->size) & (PAGE_CACHE_SIZE-1) && frag_next(frag) -- && frag_next(frag)->size < PAGE_CACHE_SIZE && frag_next(frag)->node) { -+ if ((frag->ofs+frag->size) & (PAGE_SIZE-1) && frag_next(frag) -+ && frag_next(frag)->size < PAGE_SIZE && frag_next(frag)->node) { - JFFS2_ERROR("REF_PRISTINE node at 0x%08x (%08x-%08x) had a following non-hole frag in the same page. Tell dwmw2.\n", - ref_offset(fn->raw), frag->ofs, frag->ofs+frag->size); - bitched = 1; -diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c -index cad86bac3453..0e62dec3effc 100644 ---- a/fs/jffs2/file.c -+++ b/fs/jffs2/file.c -@@ -87,14 +87,15 @@ static int jffs2_do_readpage_nolock (struct inode *inode, struct page *pg) - int ret; - - jffs2_dbg(2, "%s(): ino #%lu, page at offset 0x%lx\n", -- __func__, inode->i_ino, pg->index << PAGE_CACHE_SHIFT); -+ __func__, inode->i_ino, pg->index << PAGE_SHIFT); - - BUG_ON(!PageLocked(pg)); - - pg_buf = kmap(pg); - /* FIXME: Can kmap fail? */ - -- ret = jffs2_read_inode_range(c, f, pg_buf, pg->index << PAGE_CACHE_SHIFT, PAGE_CACHE_SIZE); -+ ret = jffs2_read_inode_range(c, f, pg_buf, pg->index << PAGE_SHIFT, -+ PAGE_SIZE); - - if (ret) { - ClearPageUptodate(pg); -@@ -137,8 +138,8 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping, - struct page *pg; - struct inode *inode = mapping->host; - struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode); -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -- uint32_t pageofs = index << PAGE_CACHE_SHIFT; -+ pgoff_t index = pos >> PAGE_SHIFT; -+ uint32_t pageofs = index << PAGE_SHIFT; - int ret = 0; - - pg = grab_cache_page_write_begin(mapping, index, flags); -@@ -230,7 +231,7 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping, - - out_page: - unlock_page(pg); -- page_cache_release(pg); -+ put_page(pg); - return ret; - } - -@@ -245,14 +246,14 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping, - struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode); - struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb); - struct jffs2_raw_inode *ri; -- unsigned start = pos & (PAGE_CACHE_SIZE - 1); -+ unsigned start = pos & (PAGE_SIZE - 1); - unsigned end = start + copied; - unsigned aligned_start = start & ~3; - int ret = 0; - uint32_t writtenlen = 0; - - jffs2_dbg(1, "%s(): ino #%lu, page at 0x%lx, range %d-%d, flags %lx\n", -- __func__, inode->i_ino, pg->index << PAGE_CACHE_SHIFT, -+ __func__, inode->i_ino, pg->index << PAGE_SHIFT, - start, end, pg->flags); - - /* We need to avoid deadlock with page_cache_read() in -@@ -261,7 +262,7 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping, - to re-lock it. */ - BUG_ON(!PageUptodate(pg)); - -- if (end == PAGE_CACHE_SIZE) { -+ if (end == PAGE_SIZE) { - /* When writing out the end of a page, write out the - _whole_ page. This helps to reduce the number of - nodes in files which have many short writes, like -@@ -275,7 +276,7 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping, - jffs2_dbg(1, "%s(): Allocation of raw inode failed\n", - __func__); - unlock_page(pg); -- page_cache_release(pg); -+ put_page(pg); - return -ENOMEM; - } - -@@ -292,7 +293,7 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping, - kmap(pg); - - ret = jffs2_write_inode_range(c, f, ri, page_address(pg) + aligned_start, -- (pg->index << PAGE_CACHE_SHIFT) + aligned_start, -+ (pg->index << PAGE_SHIFT) + aligned_start, - end - aligned_start, &writtenlen); - - kunmap(pg); -@@ -329,6 +330,6 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping, - jffs2_dbg(1, "%s() returning %d\n", - __func__, writtenlen > 0 ? writtenlen : ret); - unlock_page(pg); -- page_cache_release(pg); -+ put_page(pg); - return writtenlen > 0 ? writtenlen : ret; - } -diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c -index bead25ae8fe4..ae2ebb26b446 100644 ---- a/fs/jffs2/fs.c -+++ b/fs/jffs2/fs.c -@@ -586,8 +586,8 @@ int jffs2_do_fill_super(struct super_block *sb, void *data, int silent) - goto out_root; - - sb->s_maxbytes = 0xFFFFFFFF; -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ sb->s_blocksize = PAGE_SIZE; -+ sb->s_blocksize_bits = PAGE_SHIFT; - sb->s_magic = JFFS2_SUPER_MAGIC; - if (!(sb->s_flags & MS_RDONLY)) - jffs2_start_garbage_collect_thread(c); -@@ -685,7 +685,7 @@ unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c, - struct inode *inode = OFNI_EDONI_2SFFJ(f); - struct page *pg; - -- pg = read_cache_page(inode->i_mapping, offset >> PAGE_CACHE_SHIFT, -+ pg = read_cache_page(inode->i_mapping, offset >> PAGE_SHIFT, - (void *)jffs2_do_readpage_unlock, inode); - if (IS_ERR(pg)) - return (void *)pg; -@@ -701,7 +701,7 @@ void jffs2_gc_release_page(struct jffs2_sb_info *c, - struct page *pg = (void *)*priv; - - kunmap(pg); -- page_cache_release(pg); -+ put_page(pg); - } - - static int jffs2_flash_setup(struct jffs2_sb_info *c) { -diff --git a/fs/jffs2/gc.c b/fs/jffs2/gc.c -index 95d5880a63ee..7c82e6159826 100644 ---- a/fs/jffs2/gc.c -+++ b/fs/jffs2/gc.c -@@ -532,7 +532,7 @@ static int jffs2_garbage_collect_live(struct jffs2_sb_info *c, struct jffs2_era - goto upnout; - } - /* We found a datanode. Do the GC */ -- if((start >> PAGE_CACHE_SHIFT) < ((end-1) >> PAGE_CACHE_SHIFT)) { -+ if((start >> PAGE_SHIFT) < ((end-1) >> PAGE_SHIFT)) { - /* It crosses a page boundary. Therefore, it must be a hole. */ - ret = jffs2_garbage_collect_hole(c, jeb, f, fn, start, end); - } else { -@@ -1172,8 +1172,8 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era - struct jffs2_node_frag *frag; - uint32_t min, max; - -- min = start & ~(PAGE_CACHE_SIZE-1); -- max = min + PAGE_CACHE_SIZE; -+ min = start & ~(PAGE_SIZE-1); -+ max = min + PAGE_SIZE; - - frag = jffs2_lookup_node_frag(&f->fragtree, start); - -@@ -1331,7 +1331,7 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era - cdatalen = min_t(uint32_t, alloclen - sizeof(ri), end - offset); - datalen = end - offset; - -- writebuf = pg_ptr + (offset & (PAGE_CACHE_SIZE -1)); -+ writebuf = pg_ptr + (offset & (PAGE_SIZE -1)); - - comprtype = jffs2_compress(c, f, writebuf, &comprbuf, &datalen, &cdatalen); - -diff --git a/fs/jffs2/nodelist.c b/fs/jffs2/nodelist.c -index 9a5449bc3afb..b86c78d178c6 100644 ---- a/fs/jffs2/nodelist.c -+++ b/fs/jffs2/nodelist.c -@@ -90,7 +90,7 @@ uint32_t jffs2_truncate_fragtree(struct jffs2_sb_info *c, struct rb_root *list, - - /* If the last fragment starts at the RAM page boundary, it is - * REF_PRISTINE irrespective of its size. */ -- if (frag->node && (frag->ofs & (PAGE_CACHE_SIZE - 1)) == 0) { -+ if (frag->node && (frag->ofs & (PAGE_SIZE - 1)) == 0) { - dbg_fragtree2("marking the last fragment 0x%08x-0x%08x REF_PRISTINE.\n", - frag->ofs, frag->ofs + frag->size); - frag->node->raw->flash_offset = ref_offset(frag->node->raw) | REF_PRISTINE; -@@ -237,7 +237,7 @@ static int jffs2_add_frag_to_fragtree(struct jffs2_sb_info *c, struct rb_root *r - If so, both 'this' and the new node get marked REF_NORMAL so - the GC can take a look. - */ -- if (lastend && (lastend-1) >> PAGE_CACHE_SHIFT == newfrag->ofs >> PAGE_CACHE_SHIFT) { -+ if (lastend && (lastend-1) >> PAGE_SHIFT == newfrag->ofs >> PAGE_SHIFT) { - if (this->node) - mark_ref_normal(this->node->raw); - mark_ref_normal(newfrag->node->raw); -@@ -382,7 +382,7 @@ int jffs2_add_full_dnode_to_inode(struct jffs2_sb_info *c, struct jffs2_inode_in - - /* If we now share a page with other nodes, mark either previous - or next node REF_NORMAL, as appropriate. */ -- if (newfrag->ofs & (PAGE_CACHE_SIZE-1)) { -+ if (newfrag->ofs & (PAGE_SIZE-1)) { - struct jffs2_node_frag *prev = frag_prev(newfrag); - - mark_ref_normal(fn->raw); -@@ -391,7 +391,7 @@ int jffs2_add_full_dnode_to_inode(struct jffs2_sb_info *c, struct jffs2_inode_in - mark_ref_normal(prev->node->raw); - } - -- if ((newfrag->ofs+newfrag->size) & (PAGE_CACHE_SIZE-1)) { -+ if ((newfrag->ofs+newfrag->size) & (PAGE_SIZE-1)) { - struct jffs2_node_frag *next = frag_next(newfrag); - - if (next) { -diff --git a/fs/jffs2/write.c b/fs/jffs2/write.c -index b634de4c8101..7fb187ab2682 100644 ---- a/fs/jffs2/write.c -+++ b/fs/jffs2/write.c -@@ -172,8 +172,8 @@ struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2 - beginning of a page and runs to the end of the file, or if - it's a hole node, mark it REF_PRISTINE, else REF_NORMAL. - */ -- if ((je32_to_cpu(ri->dsize) >= PAGE_CACHE_SIZE) || -- ( ((je32_to_cpu(ri->offset)&(PAGE_CACHE_SIZE-1))==0) && -+ if ((je32_to_cpu(ri->dsize) >= PAGE_SIZE) || -+ ( ((je32_to_cpu(ri->offset)&(PAGE_SIZE-1))==0) && - (je32_to_cpu(ri->dsize)+je32_to_cpu(ri->offset) == je32_to_cpu(ri->isize)))) { - flash_ofs |= REF_PRISTINE; - } else { -@@ -366,7 +366,8 @@ int jffs2_write_inode_range(struct jffs2_sb_info *c, struct jffs2_inode_info *f, - break; - } - mutex_lock(&f->sem); -- datalen = min_t(uint32_t, writelen, PAGE_CACHE_SIZE - (offset & (PAGE_CACHE_SIZE-1))); -+ datalen = min_t(uint32_t, writelen, -+ PAGE_SIZE - (offset & (PAGE_SIZE-1))); - cdatalen = min_t(uint32_t, alloclen - sizeof(*ri), datalen); - - comprtype = jffs2_compress(c, f, buf, &comprbuf, &datalen, &cdatalen); -diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c -index a3eb316b1ac3..b60e015cc757 100644 ---- a/fs/jfs/jfs_metapage.c -+++ b/fs/jfs/jfs_metapage.c -@@ -80,7 +80,7 @@ static inline void lock_metapage(struct metapage *mp) - static struct kmem_cache *metapage_cache; - static mempool_t *metapage_mempool; - --#define MPS_PER_PAGE (PAGE_CACHE_SIZE >> L2PSIZE) -+#define MPS_PER_PAGE (PAGE_SIZE >> L2PSIZE) - - #if MPS_PER_PAGE > 1 - -@@ -316,7 +316,7 @@ static void last_write_complete(struct page *page) - struct metapage *mp; - unsigned int offset; - -- for (offset = 0; offset < PAGE_CACHE_SIZE; offset += PSIZE) { -+ for (offset = 0; offset < PAGE_SIZE; offset += PSIZE) { - mp = page_to_mp(page, offset); - if (mp && test_bit(META_io, &mp->flag)) { - if (mp->lsn) -@@ -366,12 +366,12 @@ static int metapage_writepage(struct page *page, struct writeback_control *wbc) - int bad_blocks = 0; - - page_start = (sector_t)page->index << -- (PAGE_CACHE_SHIFT - inode->i_blkbits); -+ (PAGE_SHIFT - inode->i_blkbits); - BUG_ON(!PageLocked(page)); - BUG_ON(PageWriteback(page)); - set_page_writeback(page); - -- for (offset = 0; offset < PAGE_CACHE_SIZE; offset += PSIZE) { -+ for (offset = 0; offset < PAGE_SIZE; offset += PSIZE) { - mp = page_to_mp(page, offset); - - if (!mp || !test_bit(META_dirty, &mp->flag)) -@@ -416,7 +416,7 @@ static int metapage_writepage(struct page *page, struct writeback_control *wbc) - bio = NULL; - } else - inc_io(page); -- xlen = (PAGE_CACHE_SIZE - offset) >> inode->i_blkbits; -+ xlen = (PAGE_SIZE - offset) >> inode->i_blkbits; - pblock = metapage_get_blocks(inode, lblock, &xlen); - if (!pblock) { - printk(KERN_ERR "JFS: metapage_get_blocks failed\n"); -@@ -485,7 +485,7 @@ static int metapage_readpage(struct file *fp, struct page *page) - struct inode *inode = page->mapping->host; - struct bio *bio = NULL; - int block_offset; -- int blocks_per_page = PAGE_CACHE_SIZE >> inode->i_blkbits; -+ int blocks_per_page = PAGE_SIZE >> inode->i_blkbits; - sector_t page_start; /* address of page in fs blocks */ - sector_t pblock; - int xlen; -@@ -494,7 +494,7 @@ static int metapage_readpage(struct file *fp, struct page *page) - - BUG_ON(!PageLocked(page)); - page_start = (sector_t)page->index << -- (PAGE_CACHE_SHIFT - inode->i_blkbits); -+ (PAGE_SHIFT - inode->i_blkbits); - - block_offset = 0; - while (block_offset < blocks_per_page) { -@@ -542,7 +542,7 @@ static int metapage_releasepage(struct page *page, gfp_t gfp_mask) - int ret = 1; - int offset; - -- for (offset = 0; offset < PAGE_CACHE_SIZE; offset += PSIZE) { -+ for (offset = 0; offset < PAGE_SIZE; offset += PSIZE) { - mp = page_to_mp(page, offset); - - if (!mp) -@@ -568,7 +568,7 @@ static int metapage_releasepage(struct page *page, gfp_t gfp_mask) - static void metapage_invalidatepage(struct page *page, unsigned int offset, - unsigned int length) - { -- BUG_ON(offset || length < PAGE_CACHE_SIZE); -+ BUG_ON(offset || length < PAGE_SIZE); - - BUG_ON(PageWriteback(page)); - -@@ -599,10 +599,10 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock, - inode->i_ino, lblock, absolute); - - l2bsize = inode->i_blkbits; -- l2BlocksPerPage = PAGE_CACHE_SHIFT - l2bsize; -+ l2BlocksPerPage = PAGE_SHIFT - l2bsize; - page_index = lblock >> l2BlocksPerPage; - page_offset = (lblock - (page_index << l2BlocksPerPage)) << l2bsize; -- if ((page_offset + size) > PAGE_CACHE_SIZE) { -+ if ((page_offset + size) > PAGE_SIZE) { - jfs_err("MetaData crosses page boundary!!"); - jfs_err("lblock = %lx, size = %d", lblock, size); - dump_stack(); -@@ -621,7 +621,7 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock, - mapping = inode->i_mapping; - } - -- if (new && (PSIZE == PAGE_CACHE_SIZE)) { -+ if (new && (PSIZE == PAGE_SIZE)) { - page = grab_cache_page(mapping, page_index); - if (!page) { - jfs_err("grab_cache_page failed!"); -@@ -693,7 +693,7 @@ unlock: - void grab_metapage(struct metapage * mp) - { - jfs_info("grab_metapage: mp = 0x%p", mp); -- page_cache_get(mp->page); -+ get_page(mp->page); - lock_page(mp->page); - mp->count++; - lock_metapage(mp); -@@ -706,12 +706,12 @@ void force_metapage(struct metapage *mp) - jfs_info("force_metapage: mp = 0x%p", mp); - set_bit(META_forcewrite, &mp->flag); - clear_bit(META_sync, &mp->flag); -- page_cache_get(page); -+ get_page(page); - lock_page(page); - set_page_dirty(page); - write_one_page(page, 1); - clear_bit(META_forcewrite, &mp->flag); -- page_cache_release(page); -+ put_page(page); - } - - void hold_metapage(struct metapage *mp) -@@ -726,7 +726,7 @@ void put_metapage(struct metapage *mp) - unlock_page(mp->page); - return; - } -- page_cache_get(mp->page); -+ get_page(mp->page); - mp->count++; - lock_metapage(mp); - unlock_page(mp->page); -@@ -746,7 +746,7 @@ void release_metapage(struct metapage * mp) - assert(mp->count); - if (--mp->count || mp->nohomeok) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return; - } - -@@ -764,13 +764,13 @@ void release_metapage(struct metapage * mp) - drop_metapage(page, mp); - - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - - void __invalidate_metapages(struct inode *ip, s64 addr, int len) - { - sector_t lblock; -- int l2BlocksPerPage = PAGE_CACHE_SHIFT - ip->i_blkbits; -+ int l2BlocksPerPage = PAGE_SHIFT - ip->i_blkbits; - int BlocksPerPage = 1 << l2BlocksPerPage; - /* All callers are interested in block device's mapping */ - struct address_space *mapping = -@@ -788,7 +788,7 @@ void __invalidate_metapages(struct inode *ip, s64 addr, int len) - page = find_lock_page(mapping, lblock >> l2BlocksPerPage); - if (!page) - continue; -- for (offset = 0; offset < PAGE_CACHE_SIZE; offset += PSIZE) { -+ for (offset = 0; offset < PAGE_SIZE; offset += PSIZE) { - mp = page_to_mp(page, offset); - if (!mp) - continue; -@@ -803,7 +803,7 @@ void __invalidate_metapages(struct inode *ip, s64 addr, int len) - remove_from_logsync(mp); - } - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - } - -diff --git a/fs/jfs/jfs_metapage.h b/fs/jfs/jfs_metapage.h -index 337e9e51ac06..a869fb4a20d6 100644 ---- a/fs/jfs/jfs_metapage.h -+++ b/fs/jfs/jfs_metapage.h -@@ -106,7 +106,7 @@ static inline void metapage_nohomeok(struct metapage *mp) - lock_page(page); - if (!mp->nohomeok++) { - mark_metapage_dirty(mp); -- page_cache_get(page); -+ get_page(page); - wait_on_page_writeback(page); - } - unlock_page(page); -@@ -128,7 +128,7 @@ static inline void metapage_wait_for_io(struct metapage *mp) - static inline void _metapage_homeok(struct metapage *mp) - { - if (!--mp->nohomeok) -- page_cache_release(mp->page); -+ put_page(mp->page); - } - - static inline void metapage_homeok(struct metapage *mp) -diff --git a/fs/jfs/super.c b/fs/jfs/super.c -index 4f5d85ba8e23..78d599198bf5 100644 ---- a/fs/jfs/super.c -+++ b/fs/jfs/super.c -@@ -596,7 +596,7 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent) - * Page cache is indexed by long. - * I would use MAX_LFS_FILESIZE, but it's only half as big - */ -- sb->s_maxbytes = min(((u64) PAGE_CACHE_SIZE << 32) - 1, -+ sb->s_maxbytes = min(((u64) PAGE_SIZE << 32) - 1, - (u64)sb->s_maxbytes); - #endif - sb->s_time_gran = 1; -diff --git a/fs/kernfs/mount.c b/fs/kernfs/mount.c -index 8eaf417187f1..43393e1008d1 100644 ---- a/fs/kernfs/mount.c -+++ b/fs/kernfs/mount.c -@@ -69,8 +69,8 @@ static int kernfs_fill_super(struct super_block *sb, unsigned long magic) - struct dentry *root; - - info->sb = sb; -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ sb->s_blocksize = PAGE_SIZE; -+ sb->s_blocksize_bits = PAGE_SHIFT; - sb->s_magic = magic; - sb->s_op = &kernfs_sops; - sb->s_time_gran = 1; -diff --git a/fs/libfs.c b/fs/libfs.c -index 0ca80b2af420..f3fa82ce9b70 100644 ---- a/fs/libfs.c -+++ b/fs/libfs.c -@@ -25,7 +25,7 @@ int simple_getattr(struct vfsmount *mnt, struct dentry *dentry, - { - struct inode *inode = d_inode(dentry); - generic_fillattr(inode, stat); -- stat->blocks = inode->i_mapping->nrpages << (PAGE_CACHE_SHIFT - 9); -+ stat->blocks = inode->i_mapping->nrpages << (PAGE_SHIFT - 9); - return 0; - } - EXPORT_SYMBOL(simple_getattr); -@@ -33,7 +33,7 @@ EXPORT_SYMBOL(simple_getattr); - int simple_statfs(struct dentry *dentry, struct kstatfs *buf) - { - buf->f_type = dentry->d_sb->s_magic; -- buf->f_bsize = PAGE_CACHE_SIZE; -+ buf->f_bsize = PAGE_SIZE; - buf->f_namelen = NAME_MAX; - return 0; - } -@@ -395,7 +395,7 @@ int simple_write_begin(struct file *file, struct address_space *mapping, - struct page *page; - pgoff_t index; - -- index = pos >> PAGE_CACHE_SHIFT; -+ index = pos >> PAGE_SHIFT; - - page = grab_cache_page_write_begin(mapping, index, flags); - if (!page) -@@ -403,10 +403,10 @@ int simple_write_begin(struct file *file, struct address_space *mapping, - - *pagep = page; - -- if (!PageUptodate(page) && (len != PAGE_CACHE_SIZE)) { -- unsigned from = pos & (PAGE_CACHE_SIZE - 1); -+ if (!PageUptodate(page) && (len != PAGE_SIZE)) { -+ unsigned from = pos & (PAGE_SIZE - 1); - -- zero_user_segments(page, 0, from, from + len, PAGE_CACHE_SIZE); -+ zero_user_segments(page, 0, from, from + len, PAGE_SIZE); - } - return 0; - } -@@ -442,7 +442,7 @@ int simple_write_end(struct file *file, struct address_space *mapping, - - /* zero the stale part of the page if we did a short copy */ - if (copied < len) { -- unsigned from = pos & (PAGE_CACHE_SIZE - 1); -+ unsigned from = pos & (PAGE_SIZE - 1); - - zero_user(page, from + copied, len - copied); - } -@@ -458,7 +458,7 @@ int simple_write_end(struct file *file, struct address_space *mapping, - - set_page_dirty(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - return copied; - } -@@ -477,8 +477,8 @@ int simple_fill_super(struct super_block *s, unsigned long magic, - struct dentry *dentry; - int i; - -- s->s_blocksize = PAGE_CACHE_SIZE; -- s->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ s->s_blocksize = PAGE_SIZE; -+ s->s_blocksize_bits = PAGE_SHIFT; - s->s_magic = magic; - s->s_op = &simple_super_operations; - s->s_time_gran = 1; -@@ -994,12 +994,12 @@ int generic_check_addressable(unsigned blocksize_bits, u64 num_blocks) - { - u64 last_fs_block = num_blocks - 1; - u64 last_fs_page = -- last_fs_block >> (PAGE_CACHE_SHIFT - blocksize_bits); -+ last_fs_block >> (PAGE_SHIFT - blocksize_bits); - - if (unlikely(num_blocks == 0)) - return 0; - -- if ((blocksize_bits < 9) || (blocksize_bits > PAGE_CACHE_SHIFT)) -+ if ((blocksize_bits < 9) || (blocksize_bits > PAGE_SHIFT)) - return -EINVAL; - - if ((last_fs_block > (sector_t)(~0ULL) >> (blocksize_bits - 9)) || -diff --git a/fs/logfs/dev_bdev.c b/fs/logfs/dev_bdev.c -index a709d80c8ebc..cc26f8f215f5 100644 ---- a/fs/logfs/dev_bdev.c -+++ b/fs/logfs/dev_bdev.c -@@ -64,7 +64,7 @@ static void writeseg_end_io(struct bio *bio) - - bio_for_each_segment_all(bvec, bio, i) { - end_page_writeback(bvec->bv_page); -- page_cache_release(bvec->bv_page); -+ put_page(bvec->bv_page); - } - bio_put(bio); - if (atomic_dec_and_test(&super->s_pending_writes)) -diff --git a/fs/logfs/dev_mtd.c b/fs/logfs/dev_mtd.c -index 9c501449450d..b76a62b1978f 100644 ---- a/fs/logfs/dev_mtd.c -+++ b/fs/logfs/dev_mtd.c -@@ -46,9 +46,9 @@ static int loffs_mtd_write(struct super_block *sb, loff_t ofs, size_t len, - - BUG_ON((ofs >= mtd->size) || (len > mtd->size - ofs)); - BUG_ON(ofs != (ofs >> super->s_writeshift) << super->s_writeshift); -- BUG_ON(len > PAGE_CACHE_SIZE); -- page_start = ofs & PAGE_CACHE_MASK; -- page_end = PAGE_CACHE_ALIGN(ofs + len) - 1; -+ BUG_ON(len > PAGE_SIZE); -+ page_start = ofs & PAGE_MASK; -+ page_end = PAGE_ALIGN(ofs + len) - 1; - ret = mtd_write(mtd, ofs, len, &retlen, buf); - if (ret || (retlen != len)) - return -EIO; -@@ -82,7 +82,7 @@ static int logfs_mtd_erase_mapping(struct super_block *sb, loff_t ofs, - if (!page) - continue; - memset(page_address(page), 0xFF, PAGE_SIZE); -- page_cache_release(page); -+ put_page(page); - } - return 0; - } -@@ -195,7 +195,7 @@ static int __logfs_mtd_writeseg(struct super_block *sb, u64 ofs, pgoff_t index, - err = loffs_mtd_write(sb, page->index << PAGE_SHIFT, PAGE_SIZE, - page_address(page)); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - if (err) - return err; - } -diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c -index 542468e9bfb4..ddbed2be5366 100644 ---- a/fs/logfs/dir.c -+++ b/fs/logfs/dir.c -@@ -183,7 +183,7 @@ static struct page *logfs_get_dd_page(struct inode *dir, struct dentry *dentry) - if (name->len != be16_to_cpu(dd->namelen) || - memcmp(name->name, dd->name, name->len)) { - kunmap_atomic(dd); -- page_cache_release(page); -+ put_page(page); - continue; - } - -@@ -238,7 +238,7 @@ static int logfs_unlink(struct inode *dir, struct dentry *dentry) - return PTR_ERR(page); - } - index = page->index; -- page_cache_release(page); -+ put_page(page); - - mutex_lock(&super->s_dirop_mutex); - logfs_add_transaction(dir, ta); -@@ -316,7 +316,7 @@ static int logfs_readdir(struct file *file, struct dir_context *ctx) - be16_to_cpu(dd->namelen), - be64_to_cpu(dd->ino), dd->type); - kunmap(page); -- page_cache_release(page); -+ put_page(page); - if (full) - break; - } -@@ -349,7 +349,7 @@ static struct dentry *logfs_lookup(struct inode *dir, struct dentry *dentry, - dd = kmap_atomic(page); - ino = be64_to_cpu(dd->ino); - kunmap_atomic(dd); -- page_cache_release(page); -+ put_page(page); - - inode = logfs_iget(dir->i_sb, ino); - if (IS_ERR(inode)) -@@ -392,7 +392,7 @@ static int logfs_write_dir(struct inode *dir, struct dentry *dentry, - - err = logfs_write_buf(dir, page, WF_LOCK); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - if (!err) - grow_dir(dir, index); - return err; -@@ -561,7 +561,7 @@ static int logfs_get_dd(struct inode *dir, struct dentry *dentry, - map = kmap_atomic(page); - memcpy(dd, map, sizeof(*dd)); - kunmap_atomic(map); -- page_cache_release(page); -+ put_page(page); - return 0; - } - -diff --git a/fs/logfs/file.c b/fs/logfs/file.c -index 61eaeb1b6cac..f01ddfb1a03b 100644 ---- a/fs/logfs/file.c -+++ b/fs/logfs/file.c -@@ -15,21 +15,21 @@ static int logfs_write_begin(struct file *file, struct address_space *mapping, - { - struct inode *inode = mapping->host; - struct page *page; -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -+ pgoff_t index = pos >> PAGE_SHIFT; - - page = grab_cache_page_write_begin(mapping, index, flags); - if (!page) - return -ENOMEM; - *pagep = page; - -- if ((len == PAGE_CACHE_SIZE) || PageUptodate(page)) -+ if ((len == PAGE_SIZE) || PageUptodate(page)) - return 0; -- if ((pos & PAGE_CACHE_MASK) >= i_size_read(inode)) { -- unsigned start = pos & (PAGE_CACHE_SIZE - 1); -+ if ((pos & PAGE_MASK) >= i_size_read(inode)) { -+ unsigned start = pos & (PAGE_SIZE - 1); - unsigned end = start + len; - - /* Reading beyond i_size is simple: memset to zero */ -- zero_user_segments(page, 0, start, end, PAGE_CACHE_SIZE); -+ zero_user_segments(page, 0, start, end, PAGE_SIZE); - return 0; - } - return logfs_readpage_nolock(page); -@@ -41,11 +41,11 @@ static int logfs_write_end(struct file *file, struct address_space *mapping, - { - struct inode *inode = mapping->host; - pgoff_t index = page->index; -- unsigned start = pos & (PAGE_CACHE_SIZE - 1); -+ unsigned start = pos & (PAGE_SIZE - 1); - unsigned end = start + copied; - int ret = 0; - -- BUG_ON(PAGE_CACHE_SIZE != inode->i_sb->s_blocksize); -+ BUG_ON(PAGE_SIZE != inode->i_sb->s_blocksize); - BUG_ON(page->index > I3_BLOCKS); - - if (copied < len) { -@@ -61,8 +61,8 @@ static int logfs_write_end(struct file *file, struct address_space *mapping, - if (copied == 0) - goto out; /* FIXME: do we need to update inode? */ - -- if (i_size_read(inode) < (index << PAGE_CACHE_SHIFT) + end) { -- i_size_write(inode, (index << PAGE_CACHE_SHIFT) + end); -+ if (i_size_read(inode) < (index << PAGE_SHIFT) + end) { -+ i_size_write(inode, (index << PAGE_SHIFT) + end); - mark_inode_dirty_sync(inode); - } - -@@ -75,7 +75,7 @@ static int logfs_write_end(struct file *file, struct address_space *mapping, - } - out: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return ret ? ret : copied; - } - -@@ -118,7 +118,7 @@ static int logfs_writepage(struct page *page, struct writeback_control *wbc) - { - struct inode *inode = page->mapping->host; - loff_t i_size = i_size_read(inode); -- pgoff_t end_index = i_size >> PAGE_CACHE_SHIFT; -+ pgoff_t end_index = i_size >> PAGE_SHIFT; - unsigned offset; - u64 bix; - level_t level; -@@ -142,7 +142,7 @@ static int logfs_writepage(struct page *page, struct writeback_control *wbc) - return __logfs_writepage(page); - - /* Is the page fully outside i_size? (truncate in progress) */ -- offset = i_size & (PAGE_CACHE_SIZE-1); -+ offset = i_size & (PAGE_SIZE-1); - if (bix > end_index || offset == 0) { - unlock_page(page); - return 0; /* don't care */ -@@ -155,7 +155,7 @@ static int logfs_writepage(struct page *page, struct writeback_control *wbc) - * the page size, the remaining memory is zeroed when mapped, and - * writes to that region are not written out to the file." - */ -- zero_user_segment(page, offset, PAGE_CACHE_SIZE); -+ zero_user_segment(page, offset, PAGE_SIZE); - return __logfs_writepage(page); - } - -diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c -index 20973c9e52f8..3fb8c6d67303 100644 ---- a/fs/logfs/readwrite.c -+++ b/fs/logfs/readwrite.c -@@ -281,7 +281,7 @@ static struct page *logfs_get_read_page(struct inode *inode, u64 bix, - static void logfs_put_read_page(struct page *page) - { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - - static void logfs_lock_write_page(struct page *page) -@@ -323,7 +323,7 @@ repeat: - return NULL; - err = add_to_page_cache_lru(page, mapping, index, GFP_NOFS); - if (unlikely(err)) { -- page_cache_release(page); -+ put_page(page); - if (err == -EEXIST) - goto repeat; - return NULL; -@@ -342,7 +342,7 @@ static void logfs_unlock_write_page(struct page *page) - static void logfs_put_write_page(struct page *page) - { - logfs_unlock_write_page(page); -- page_cache_release(page); -+ put_page(page); - } - - static struct page *logfs_get_page(struct inode *inode, u64 bix, level_t level, -@@ -562,7 +562,7 @@ static void indirect_free_block(struct super_block *sb, - - if (PagePrivate(page)) { - ClearPagePrivate(page); -- page_cache_release(page); -+ put_page(page); - set_page_private(page, 0); - } - __free_block(sb, block); -@@ -655,7 +655,7 @@ static void alloc_data_block(struct inode *inode, struct page *page) - block->page = page; - - SetPagePrivate(page); -- page_cache_get(page); -+ get_page(page); - set_page_private(page, (unsigned long) block); - - block->ops = &indirect_block_ops; -@@ -709,7 +709,7 @@ static u64 block_get_pointer(struct page *page, int index) - - static int logfs_read_empty(struct page *page) - { -- zero_user_segment(page, 0, PAGE_CACHE_SIZE); -+ zero_user_segment(page, 0, PAGE_SIZE); - return 0; - } - -@@ -1660,7 +1660,7 @@ static int truncate_data_block(struct inode *inode, struct page *page, - if (err) - return err; - -- zero_user_segment(page, size - pageofs, PAGE_CACHE_SIZE); -+ zero_user_segment(page, size - pageofs, PAGE_SIZE); - return logfs_segment_write(inode, page, shadow); - } - -@@ -1919,7 +1919,7 @@ static void move_page_to_inode(struct inode *inode, struct page *page) - block->page = NULL; - if (PagePrivate(page)) { - ClearPagePrivate(page); -- page_cache_release(page); -+ put_page(page); - set_page_private(page, 0); - } - } -@@ -1940,7 +1940,7 @@ static void move_inode_to_page(struct page *page, struct inode *inode) - - if (!PagePrivate(page)) { - SetPagePrivate(page); -- page_cache_get(page); -+ get_page(page); - set_page_private(page, (unsigned long) block); - } - -@@ -1971,7 +1971,7 @@ int logfs_read_inode(struct inode *inode) - logfs_disk_to_inode(di, inode); - kunmap_atomic(di); - move_page_to_inode(inode, page); -- page_cache_release(page); -+ put_page(page); - return 0; - } - -diff --git a/fs/logfs/segment.c b/fs/logfs/segment.c -index d270e4b2ab6b..1efd6055f4b0 100644 ---- a/fs/logfs/segment.c -+++ b/fs/logfs/segment.c -@@ -90,9 +90,9 @@ int __logfs_buf_write(struct logfs_area *area, u64 ofs, void *buf, size_t len, - - if (!PagePrivate(page)) { - SetPagePrivate(page); -- page_cache_get(page); -+ get_page(page); - } -- page_cache_release(page); -+ put_page(page); - - buf += copylen; - len -= copylen; -@@ -117,9 +117,9 @@ static void pad_partial_page(struct logfs_area *area) - memset(page_address(page) + offset, 0xff, len); - if (!PagePrivate(page)) { - SetPagePrivate(page); -- page_cache_get(page); -+ get_page(page); - } -- page_cache_release(page); -+ put_page(page); - } - } - -@@ -129,20 +129,20 @@ static void pad_full_pages(struct logfs_area *area) - struct logfs_super *super = logfs_super(sb); - u64 ofs = dev_ofs(sb, area->a_segno, area->a_used_bytes); - u32 len = super->s_segsize - area->a_used_bytes; -- pgoff_t index = PAGE_CACHE_ALIGN(ofs) >> PAGE_CACHE_SHIFT; -- pgoff_t no_indizes = len >> PAGE_CACHE_SHIFT; -+ pgoff_t index = PAGE_ALIGN(ofs) >> PAGE_SHIFT; -+ pgoff_t no_indizes = len >> PAGE_SHIFT; - struct page *page; - - while (no_indizes) { - page = get_mapping_page(sb, index, 0); - BUG_ON(!page); /* FIXME: reserve a pool */ - SetPageUptodate(page); -- memset(page_address(page), 0xff, PAGE_CACHE_SIZE); -+ memset(page_address(page), 0xff, PAGE_SIZE); - if (!PagePrivate(page)) { - SetPagePrivate(page); -- page_cache_get(page); -+ get_page(page); - } -- page_cache_release(page); -+ put_page(page); - index++; - no_indizes--; - } -@@ -411,7 +411,7 @@ int wbuf_read(struct super_block *sb, u64 ofs, size_t len, void *buf) - if (IS_ERR(page)) - return PTR_ERR(page); - memcpy(buf, page_address(page) + offset, copylen); -- page_cache_release(page); -+ put_page(page); - - buf += copylen; - len -= copylen; -@@ -499,7 +499,7 @@ static void move_btree_to_page(struct inode *inode, struct page *page, - - if (!PagePrivate(page)) { - SetPagePrivate(page); -- page_cache_get(page); -+ get_page(page); - set_page_private(page, (unsigned long) block); - } - block->ops = &indirect_block_ops; -@@ -554,7 +554,7 @@ void move_page_to_btree(struct page *page) - - if (PagePrivate(page)) { - ClearPagePrivate(page); -- page_cache_release(page); -+ put_page(page); - set_page_private(page, 0); - } - block->ops = &btree_block_ops; -@@ -723,9 +723,9 @@ void freeseg(struct super_block *sb, u32 segno) - continue; - if (PagePrivate(page)) { - ClearPagePrivate(page); -- page_cache_release(page); -+ put_page(page); - } -- page_cache_release(page); -+ put_page(page); - } - } - -diff --git a/fs/logfs/super.c b/fs/logfs/super.c -index 54360293bcb5..5751082dba52 100644 ---- a/fs/logfs/super.c -+++ b/fs/logfs/super.c -@@ -48,7 +48,7 @@ void emergency_read_end(struct page *page) - if (page == emergency_page) - mutex_unlock(&emergency_mutex); - else -- page_cache_release(page); -+ put_page(page); - } - - static void dump_segfile(struct super_block *sb) -@@ -206,7 +206,7 @@ static int write_one_sb(struct super_block *sb, - logfs_set_segment_erased(sb, segno, ec, 0); - logfs_write_ds(sb, ds, segno, ec); - err = super->s_devops->write_sb(sb, page); -- page_cache_release(page); -+ put_page(page); - return err; - } - -@@ -366,24 +366,24 @@ static struct page *find_super_block(struct super_block *sb) - return NULL; - last = super->s_devops->find_last_sb(sb, &super->s_sb_ofs[1]); - if (!last || IS_ERR(last)) { -- page_cache_release(first); -+ put_page(first); - return NULL; - } - - if (!logfs_check_ds(page_address(first))) { -- page_cache_release(last); -+ put_page(last); - return first; - } - - /* First one didn't work, try the second superblock */ - if (!logfs_check_ds(page_address(last))) { -- page_cache_release(first); -+ put_page(first); - return last; - } - - /* Neither worked, sorry folks */ -- page_cache_release(first); -- page_cache_release(last); -+ put_page(first); -+ put_page(last); - return NULL; - } - -@@ -425,7 +425,7 @@ static int __logfs_read_sb(struct super_block *sb) - super->s_data_levels = ds->ds_data_levels; - super->s_total_levels = super->s_ifile_levels + super->s_iblock_levels - + super->s_data_levels; -- page_cache_release(page); -+ put_page(page); - return 0; - } - -diff --git a/fs/minix/dir.c b/fs/minix/dir.c -index d19ac258105a..33957c07cd11 100644 ---- a/fs/minix/dir.c -+++ b/fs/minix/dir.c -@@ -28,7 +28,7 @@ const struct file_operations minix_dir_operations = { - static inline void dir_put_page(struct page *page) - { - kunmap(page); -- page_cache_release(page); -+ put_page(page); - } - - /* -@@ -38,10 +38,10 @@ static inline void dir_put_page(struct page *page) - static unsigned - minix_last_byte(struct inode *inode, unsigned long page_nr) - { -- unsigned last_byte = PAGE_CACHE_SIZE; -+ unsigned last_byte = PAGE_SIZE; - -- if (page_nr == (inode->i_size >> PAGE_CACHE_SHIFT)) -- last_byte = inode->i_size & (PAGE_CACHE_SIZE - 1); -+ if (page_nr == (inode->i_size >> PAGE_SHIFT)) -+ last_byte = inode->i_size & (PAGE_SIZE - 1); - return last_byte; - } - -@@ -92,8 +92,8 @@ static int minix_readdir(struct file *file, struct dir_context *ctx) - if (pos >= inode->i_size) - return 0; - -- offset = pos & ~PAGE_CACHE_MASK; -- n = pos >> PAGE_CACHE_SHIFT; -+ offset = pos & ~PAGE_MASK; -+ n = pos >> PAGE_SHIFT; - - for ( ; n < npages; n++, offset = 0) { - char *p, *kaddr, *limit; -@@ -229,7 +229,7 @@ int minix_add_link(struct dentry *dentry, struct inode *inode) - lock_page(page); - kaddr = (char*)page_address(page); - dir_end = kaddr + minix_last_byte(dir, n); -- limit = kaddr + PAGE_CACHE_SIZE - sbi->s_dirsize; -+ limit = kaddr + PAGE_SIZE - sbi->s_dirsize; - for (p = kaddr; p <= limit; p = minix_next_entry(p, sbi)) { - de = (minix_dirent *)p; - de3 = (minix3_dirent *)p; -@@ -327,7 +327,7 @@ int minix_make_empty(struct inode *inode, struct inode *dir) - } - - kaddr = kmap_atomic(page); -- memset(kaddr, 0, PAGE_CACHE_SIZE); -+ memset(kaddr, 0, PAGE_SIZE); - - if (sbi->s_version == MINIX_V3) { - minix3_dirent *de3 = (minix3_dirent *)kaddr; -@@ -350,7 +350,7 @@ int minix_make_empty(struct inode *inode, struct inode *dir) - - err = dir_commit_chunk(page, 0, 2 * sbi->s_dirsize); - fail: -- page_cache_release(page); -+ put_page(page); - return err; - } - -diff --git a/fs/minix/namei.c b/fs/minix/namei.c -index a795a11e50c7..2887d1d95ce2 100644 ---- a/fs/minix/namei.c -+++ b/fs/minix/namei.c -@@ -243,11 +243,11 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry, - out_dir: - if (dir_de) { - kunmap(dir_page); -- page_cache_release(dir_page); -+ put_page(dir_page); - } - out_old: - kunmap(old_page); -- page_cache_release(old_page); -+ put_page(old_page); - out: - return err; - } -diff --git a/fs/mpage.c b/fs/mpage.c -index 6bd9fd90964e..1a4076ba3e04 100644 ---- a/fs/mpage.c -+++ b/fs/mpage.c -@@ -107,7 +107,7 @@ map_buffer_to_page(struct page *page, struct buffer_head *bh, int page_block) - * don't make any buffers if there is only one buffer on - * the page and the page just needs to be set up to date - */ -- if (inode->i_blkbits == PAGE_CACHE_SHIFT && -+ if (inode->i_blkbits == PAGE_SHIFT && - buffer_uptodate(bh)) { - SetPageUptodate(page); - return; -@@ -145,7 +145,7 @@ do_mpage_readpage(struct bio *bio, struct page *page, unsigned nr_pages, - { - struct inode *inode = page->mapping->host; - const unsigned blkbits = inode->i_blkbits; -- const unsigned blocks_per_page = PAGE_CACHE_SIZE >> blkbits; -+ const unsigned blocks_per_page = PAGE_SIZE >> blkbits; - const unsigned blocksize = 1 << blkbits; - sector_t block_in_file; - sector_t last_block; -@@ -162,7 +162,7 @@ do_mpage_readpage(struct bio *bio, struct page *page, unsigned nr_pages, - if (page_has_buffers(page)) - goto confused; - -- block_in_file = (sector_t)page->index << (PAGE_CACHE_SHIFT - blkbits); -+ block_in_file = (sector_t)page->index << (PAGE_SHIFT - blkbits); - last_block = block_in_file + nr_pages * blocks_per_page; - last_block_in_file = (i_size_read(inode) + blocksize - 1) >> blkbits; - if (last_block > last_block_in_file) -@@ -249,7 +249,7 @@ do_mpage_readpage(struct bio *bio, struct page *page, unsigned nr_pages, - } - - if (first_hole != blocks_per_page) { -- zero_user_segment(page, first_hole << blkbits, PAGE_CACHE_SIZE); -+ zero_user_segment(page, first_hole << blkbits, PAGE_SIZE); - if (first_hole == 0) { - SetPageUptodate(page); - unlock_page(page); -@@ -331,7 +331,7 @@ confused: - * - * then this code just gives up and calls the buffer_head-based read function. - * It does handle a page which has holes at the end - that is a common case: -- * the end-of-file on blocksize < PAGE_CACHE_SIZE setups. -+ * the end-of-file on blocksize < PAGE_SIZE setups. - * - * BH_Boundary explanation: - * -@@ -380,7 +380,7 @@ mpage_readpages(struct address_space *mapping, struct list_head *pages, - &first_logical_block, - get_block, gfp); - } -- page_cache_release(page); -+ put_page(page); - } - BUG_ON(!list_empty(pages)); - if (bio) -@@ -472,7 +472,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc, - struct inode *inode = page->mapping->host; - const unsigned blkbits = inode->i_blkbits; - unsigned long end_index; -- const unsigned blocks_per_page = PAGE_CACHE_SIZE >> blkbits; -+ const unsigned blocks_per_page = PAGE_SIZE >> blkbits; - sector_t last_block; - sector_t block_in_file; - sector_t blocks[MAX_BUF_PER_PAGE]; -@@ -542,7 +542,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc, - * The page has no buffers: map it to disk - */ - BUG_ON(!PageUptodate(page)); -- block_in_file = (sector_t)page->index << (PAGE_CACHE_SHIFT - blkbits); -+ block_in_file = (sector_t)page->index << (PAGE_SHIFT - blkbits); - last_block = (i_size - 1) >> blkbits; - map_bh.b_page = page; - for (page_block = 0; page_block < blocks_per_page; ) { -@@ -574,7 +574,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc, - first_unmapped = page_block; - - page_is_mapped: -- end_index = i_size >> PAGE_CACHE_SHIFT; -+ end_index = i_size >> PAGE_SHIFT; - if (page->index >= end_index) { - /* - * The page straddles i_size. It must be zeroed out on each -@@ -584,11 +584,11 @@ page_is_mapped: - * is zeroed when mapped, and writes to that region are not - * written out to the file." - */ -- unsigned offset = i_size & (PAGE_CACHE_SIZE - 1); -+ unsigned offset = i_size & (PAGE_SIZE - 1); - - if (page->index > end_index || !offset) - goto confused; -- zero_user_segment(page, offset, PAGE_CACHE_SIZE); -+ zero_user_segment(page, offset, PAGE_SIZE); - } - - /* -diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c -index b7f8eaeea5d8..bfdad003ee56 100644 ---- a/fs/ncpfs/dir.c -+++ b/fs/ncpfs/dir.c -@@ -510,7 +510,7 @@ static int ncp_readdir(struct file *file, struct dir_context *ctx) - kunmap(ctl.page); - SetPageUptodate(ctl.page); - unlock_page(ctl.page); -- page_cache_release(ctl.page); -+ put_page(ctl.page); - ctl.page = NULL; - } - ctl.idx = 0; -@@ -520,7 +520,7 @@ invalid_cache: - if (ctl.page) { - kunmap(ctl.page); - unlock_page(ctl.page); -- page_cache_release(ctl.page); -+ put_page(ctl.page); - ctl.page = NULL; - } - ctl.cache = cache; -@@ -554,14 +554,14 @@ finished: - kunmap(ctl.page); - SetPageUptodate(ctl.page); - unlock_page(ctl.page); -- page_cache_release(ctl.page); -+ put_page(ctl.page); - } - if (page) { - cache->head = ctl.head; - kunmap(page); - SetPageUptodate(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - out: - return result; -@@ -649,7 +649,7 @@ ncp_fill_cache(struct file *file, struct dir_context *ctx, - kunmap(ctl.page); - SetPageUptodate(ctl.page); - unlock_page(ctl.page); -- page_cache_release(ctl.page); -+ put_page(ctl.page); - } - ctl.cache = NULL; - ctl.idx -= NCP_DIRCACHE_SIZE; -diff --git a/fs/ncpfs/ncplib_kernel.h b/fs/ncpfs/ncplib_kernel.h -index 5233fbc1747a..17cfb743b5bf 100644 ---- a/fs/ncpfs/ncplib_kernel.h -+++ b/fs/ncpfs/ncplib_kernel.h -@@ -191,7 +191,7 @@ struct ncp_cache_head { - int eof; - }; - --#define NCP_DIRCACHE_SIZE ((int)(PAGE_CACHE_SIZE/sizeof(struct dentry *))) -+#define NCP_DIRCACHE_SIZE ((int)(PAGE_SIZE/sizeof(struct dentry *))) - union ncp_dir_cache { - struct ncp_cache_head head; - struct dentry *dentry[NCP_DIRCACHE_SIZE]; -diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c -index ddd0138f410c..bba0ba9f7eb1 100644 ---- a/fs/nfs/blocklayout/blocklayout.c -+++ b/fs/nfs/blocklayout/blocklayout.c -@@ -231,7 +231,7 @@ bl_read_pagelist(struct nfs_pgio_header *header) - size_t bytes_left = header->args.count; - unsigned int pg_offset = header->args.pgbase, pg_len; - struct page **pages = header->args.pages; -- int pg_index = header->args.pgbase >> PAGE_CACHE_SHIFT; -+ int pg_index = header->args.pgbase >> PAGE_SHIFT; - const bool is_dio = (header->dreq != NULL); - struct blk_plug plug; - int i; -@@ -263,13 +263,13 @@ bl_read_pagelist(struct nfs_pgio_header *header) - } - - if (is_dio) { -- if (pg_offset + bytes_left > PAGE_CACHE_SIZE) -- pg_len = PAGE_CACHE_SIZE - pg_offset; -+ if (pg_offset + bytes_left > PAGE_SIZE) -+ pg_len = PAGE_SIZE - pg_offset; - else - pg_len = bytes_left; - } else { - BUG_ON(pg_offset != 0); -- pg_len = PAGE_CACHE_SIZE; -+ pg_len = PAGE_SIZE; - } - - if (is_hole(&be)) { -@@ -339,9 +339,9 @@ static void bl_write_cleanup(struct work_struct *work) - - if (likely(!hdr->pnfs_error)) { - struct pnfs_block_layout *bl = BLK_LSEG2EXT(hdr->lseg); -- u64 start = hdr->args.offset & (loff_t)PAGE_CACHE_MASK; -+ u64 start = hdr->args.offset & (loff_t)PAGE_MASK; - u64 end = (hdr->args.offset + hdr->args.count + -- PAGE_CACHE_SIZE - 1) & (loff_t)PAGE_CACHE_MASK; -+ PAGE_SIZE - 1) & (loff_t)PAGE_MASK; - - ext_tree_mark_written(bl, start >> SECTOR_SHIFT, - (end - start) >> SECTOR_SHIFT); -@@ -373,7 +373,7 @@ bl_write_pagelist(struct nfs_pgio_header *header, int sync) - loff_t offset = header->args.offset; - size_t count = header->args.count; - struct page **pages = header->args.pages; -- int pg_index = header->args.pgbase >> PAGE_CACHE_SHIFT; -+ int pg_index = header->args.pgbase >> PAGE_SHIFT; - unsigned int pg_len; - struct blk_plug plug; - int i; -@@ -392,7 +392,7 @@ bl_write_pagelist(struct nfs_pgio_header *header, int sync) - blk_start_plug(&plug); - - /* we always write out the whole page */ -- offset = offset & (loff_t)PAGE_CACHE_MASK; -+ offset = offset & (loff_t)PAGE_MASK; - isect = offset >> SECTOR_SHIFT; - - for (i = pg_index; i < header->page_array.npages; i++) { -@@ -408,7 +408,7 @@ bl_write_pagelist(struct nfs_pgio_header *header, int sync) - extent_length = be.be_length - (isect - be.be_f_offset); - } - -- pg_len = PAGE_CACHE_SIZE; -+ pg_len = PAGE_SIZE; - bio = do_add_page_to_bio(bio, header->page_array.npages - i, - WRITE, isect, pages[i], &map, &be, - bl_end_io_write, par, -@@ -806,7 +806,7 @@ static u64 pnfs_num_cont_bytes(struct inode *inode, pgoff_t idx) - pgoff_t end; - - /* Optimize common case that writes from 0 to end of file */ -- end = DIV_ROUND_UP(i_size_read(inode), PAGE_CACHE_SIZE); -+ end = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE); - if (end != inode->i_mapping->nrpages) { - rcu_read_lock(); - end = page_cache_next_hole(mapping, idx + 1, ULONG_MAX); -@@ -814,9 +814,9 @@ static u64 pnfs_num_cont_bytes(struct inode *inode, pgoff_t idx) - } - - if (!end) -- return i_size_read(inode) - (idx << PAGE_CACHE_SHIFT); -+ return i_size_read(inode) - (idx << PAGE_SHIFT); - else -- return (end - idx) << PAGE_CACHE_SHIFT; -+ return (end - idx) << PAGE_SHIFT; - } - - static void -diff --git a/fs/nfs/blocklayout/blocklayout.h b/fs/nfs/blocklayout/blocklayout.h -index c556640dcf3b..f99371796c63 100644 ---- a/fs/nfs/blocklayout/blocklayout.h -+++ b/fs/nfs/blocklayout/blocklayout.h -@@ -40,8 +40,8 @@ - #include "../pnfs.h" - #include "../netns.h" - --#define PAGE_CACHE_SECTORS (PAGE_CACHE_SIZE >> SECTOR_SHIFT) --#define PAGE_CACHE_SECTOR_SHIFT (PAGE_CACHE_SHIFT - SECTOR_SHIFT) -+#define PAGE_CACHE_SECTORS (PAGE_SIZE >> SECTOR_SHIFT) -+#define PAGE_CACHE_SECTOR_SHIFT (PAGE_SHIFT - SECTOR_SHIFT) - #define SECTOR_SIZE (1 << SECTOR_SHIFT) - - struct pnfs_block_dev; -diff --git a/fs/nfs/client.c b/fs/nfs/client.c -index d6d5d2a48e83..0c96528db94a 100644 ---- a/fs/nfs/client.c -+++ b/fs/nfs/client.c -@@ -736,7 +736,7 @@ static void nfs_server_set_fsinfo(struct nfs_server *server, - server->rsize = max_rpc_payload; - if (server->rsize > NFS_MAX_FILE_IO_SIZE) - server->rsize = NFS_MAX_FILE_IO_SIZE; -- server->rpages = (server->rsize + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -+ server->rpages = (server->rsize + PAGE_SIZE - 1) >> PAGE_SHIFT; - - server->backing_dev_info.name = "nfs"; - server->backing_dev_info.ra_pages = server->rpages * NFS_MAX_READAHEAD; -@@ -745,13 +745,13 @@ static void nfs_server_set_fsinfo(struct nfs_server *server, - server->wsize = max_rpc_payload; - if (server->wsize > NFS_MAX_FILE_IO_SIZE) - server->wsize = NFS_MAX_FILE_IO_SIZE; -- server->wpages = (server->wsize + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -+ server->wpages = (server->wsize + PAGE_SIZE - 1) >> PAGE_SHIFT; - - server->wtmult = nfs_block_bits(fsinfo->wtmult, NULL); - - server->dtsize = nfs_block_size(fsinfo->dtpref, NULL); -- if (server->dtsize > PAGE_CACHE_SIZE * NFS_MAX_READDIR_PAGES) -- server->dtsize = PAGE_CACHE_SIZE * NFS_MAX_READDIR_PAGES; -+ if (server->dtsize > PAGE_SIZE * NFS_MAX_READDIR_PAGES) -+ server->dtsize = PAGE_SIZE * NFS_MAX_READDIR_PAGES; - if (server->dtsize > server->rsize) - server->dtsize = server->rsize; - -diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c -index 4bfa7d8bcade..adef506c5786 100644 ---- a/fs/nfs/dir.c -+++ b/fs/nfs/dir.c -@@ -707,7 +707,7 @@ void cache_page_release(nfs_readdir_descriptor_t *desc) - { - if (!desc->page->mapping) - nfs_readdir_clear_array(desc->page); -- page_cache_release(desc->page); -+ put_page(desc->page); - desc->page = NULL; - } - -@@ -1923,7 +1923,7 @@ int nfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname) - * add_to_page_cache_lru() grabs an extra page refcount. - * Drop it here to avoid leaking this page later. - */ -- page_cache_release(page); -+ put_page(page); - } else - __free_page(page); - -diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c -index 7a0cfd3266e5..c93826e4a8c6 100644 ---- a/fs/nfs/direct.c -+++ b/fs/nfs/direct.c -@@ -269,7 +269,7 @@ static void nfs_direct_release_pages(struct page **pages, unsigned int npages) - { - unsigned int i; - for (i = 0; i < npages; i++) -- page_cache_release(pages[i]); -+ put_page(pages[i]); - } - - void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo, -@@ -1003,7 +1003,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter) - iov_iter_count(iter)); - - pos = iocb->ki_pos; -- end = (pos + iov_iter_count(iter) - 1) >> PAGE_CACHE_SHIFT; -+ end = (pos + iov_iter_count(iter) - 1) >> PAGE_SHIFT; - - inode_lock(inode); - -@@ -1013,7 +1013,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter) - - if (mapping->nrpages) { - result = invalidate_inode_pages2_range(mapping, -- pos >> PAGE_CACHE_SHIFT, end); -+ pos >> PAGE_SHIFT, end); - if (result) - goto out_unlock; - } -@@ -1042,7 +1042,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter) - - if (mapping->nrpages) { - invalidate_inode_pages2_range(mapping, -- pos >> PAGE_CACHE_SHIFT, end); -+ pos >> PAGE_SHIFT, end); - } - - inode_unlock(inode); -diff --git a/fs/nfs/file.c b/fs/nfs/file.c -index 748bb813b8ec..1ef3ac728ff4 100644 ---- a/fs/nfs/file.c -+++ b/fs/nfs/file.c -@@ -318,7 +318,7 @@ static int nfs_want_read_modify_write(struct file *file, struct page *page, - loff_t pos, unsigned len) - { - unsigned int pglen = nfs_page_length(page); -- unsigned int offset = pos & (PAGE_CACHE_SIZE - 1); -+ unsigned int offset = pos & (PAGE_SIZE - 1); - unsigned int end = offset + len; - - if (pnfs_ld_read_whole_page(file->f_mapping->host)) { -@@ -349,7 +349,7 @@ static int nfs_write_begin(struct file *file, struct address_space *mapping, - struct page **pagep, void **fsdata) - { - int ret; -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -+ pgoff_t index = pos >> PAGE_SHIFT; - struct page *page; - int once_thru = 0; - -@@ -378,12 +378,12 @@ start: - ret = nfs_flush_incompatible(file, page); - if (ret) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } else if (!once_thru && - nfs_want_read_modify_write(file, page, pos, len)) { - once_thru = 1; - ret = nfs_readpage(file, page); -- page_cache_release(page); -+ put_page(page); - if (!ret) - goto start; - } -@@ -394,7 +394,7 @@ static int nfs_write_end(struct file *file, struct address_space *mapping, - loff_t pos, unsigned len, unsigned copied, - struct page *page, void *fsdata) - { -- unsigned offset = pos & (PAGE_CACHE_SIZE - 1); -+ unsigned offset = pos & (PAGE_SIZE - 1); - struct nfs_open_context *ctx = nfs_file_open_context(file); - int status; - -@@ -411,20 +411,20 @@ static int nfs_write_end(struct file *file, struct address_space *mapping, - - if (pglen == 0) { - zero_user_segments(page, 0, offset, -- end, PAGE_CACHE_SIZE); -+ end, PAGE_SIZE); - SetPageUptodate(page); - } else if (end >= pglen) { -- zero_user_segment(page, end, PAGE_CACHE_SIZE); -+ zero_user_segment(page, end, PAGE_SIZE); - if (offset == 0) - SetPageUptodate(page); - } else -- zero_user_segment(page, pglen, PAGE_CACHE_SIZE); -+ zero_user_segment(page, pglen, PAGE_SIZE); - } - - status = nfs_updatepage(file, page, offset, copied); - - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - if (status < 0) - return status; -@@ -452,7 +452,7 @@ static void nfs_invalidate_page(struct page *page, unsigned int offset, - dfprintk(PAGECACHE, "NFS: invalidate_page(%p, %u, %u)\n", - page, offset, length); - -- if (offset != 0 || length < PAGE_CACHE_SIZE) -+ if (offset != 0 || length < PAGE_SIZE) - return; - /* Cancel any unstarted writes on this page */ - nfs_wb_page_cancel(page_file_mapping(page)->host, page); -diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h -index 9a547aa3ec8e..dd822c9a052d 100644 ---- a/fs/nfs/internal.h -+++ b/fs/nfs/internal.h -@@ -642,11 +642,11 @@ unsigned int nfs_page_length(struct page *page) - - if (i_size > 0) { - pgoff_t page_index = page_file_index(page); -- pgoff_t end_index = (i_size - 1) >> PAGE_CACHE_SHIFT; -+ pgoff_t end_index = (i_size - 1) >> PAGE_SHIFT; - if (page_index < end_index) -- return PAGE_CACHE_SIZE; -+ return PAGE_SIZE; - if (page_index == end_index) -- return ((i_size - 1) & ~PAGE_CACHE_MASK) + 1; -+ return ((i_size - 1) & ~PAGE_MASK) + 1; - } - return 0; - } -diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c -index 4e4441216804..88474a4fc669 100644 ---- a/fs/nfs/nfs4xdr.c -+++ b/fs/nfs/nfs4xdr.c -@@ -5001,7 +5001,7 @@ static int decode_space_limit(struct xdr_stream *xdr, - blocksize = be32_to_cpup(p); - maxsize = (uint64_t)nblocks * (uint64_t)blocksize; - } -- maxsize >>= PAGE_CACHE_SHIFT; -+ maxsize >>= PAGE_SHIFT; - *pagemod_limit = min_t(u64, maxsize, ULONG_MAX); - return 0; - out_overflow: -diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c -index 9aebffb40505..049c1b1f2932 100644 ---- a/fs/nfs/objlayout/objio_osd.c -+++ b/fs/nfs/objlayout/objio_osd.c -@@ -486,7 +486,7 @@ static void __r4w_put_page(void *priv, struct page *page) - dprintk("%s: index=0x%lx\n", __func__, - (page == ZERO_PAGE(0)) ? -1UL : page->index); - if (ZERO_PAGE(0) != page) -- page_cache_release(page); -+ put_page(page); - return; - } - -diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c -index 8ce4f61cbaa5..1f6db4231057 100644 ---- a/fs/nfs/pagelist.c -+++ b/fs/nfs/pagelist.c -@@ -342,7 +342,7 @@ nfs_create_request(struct nfs_open_context *ctx, struct page *page, - * update_nfs_request below if the region is not locked. */ - req->wb_page = page; - req->wb_index = page_file_index(page); -- page_cache_get(page); -+ get_page(page); - req->wb_offset = offset; - req->wb_pgbase = offset; - req->wb_bytes = count; -@@ -392,7 +392,7 @@ static void nfs_clear_request(struct nfs_page *req) - struct nfs_lock_context *l_ctx = req->wb_lock_context; - - if (page != NULL) { -- page_cache_release(page); -+ put_page(page); - req->wb_page = NULL; - } - if (l_ctx != NULL) { -@@ -904,7 +904,7 @@ static bool nfs_can_coalesce_requests(struct nfs_page *prev, - return false; - } else { - if (req->wb_pgbase != 0 || -- prev->wb_pgbase + prev->wb_bytes != PAGE_CACHE_SIZE) -+ prev->wb_pgbase + prev->wb_bytes != PAGE_SIZE) - return false; - } - } -diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c -index 2fa483e6dbe2..89a5ef4df08a 100644 ---- a/fs/nfs/pnfs.c -+++ b/fs/nfs/pnfs.c -@@ -841,7 +841,7 @@ send_layoutget(struct pnfs_layout_hdr *lo, - - i_size = i_size_read(ino); - -- lgp->args.minlength = PAGE_CACHE_SIZE; -+ lgp->args.minlength = PAGE_SIZE; - if (lgp->args.minlength > range->length) - lgp->args.minlength = range->length; - if (range->iomode == IOMODE_READ) { -@@ -1618,13 +1618,13 @@ lookup_again: - spin_unlock(&clp->cl_lock); - } - -- pg_offset = arg.offset & ~PAGE_CACHE_MASK; -+ pg_offset = arg.offset & ~PAGE_MASK; - if (pg_offset) { - arg.offset -= pg_offset; - arg.length += pg_offset; - } - if (arg.length != NFS4_MAX_UINT64) -- arg.length = PAGE_CACHE_ALIGN(arg.length); -+ arg.length = PAGE_ALIGN(arg.length); - - lseg = send_layoutget(lo, ctx, &arg, gfp_flags); - atomic_dec(&lo->plh_outstanding); -diff --git a/fs/nfs/read.c b/fs/nfs/read.c -index eb31e23e7def..6776d7a7839e 100644 ---- a/fs/nfs/read.c -+++ b/fs/nfs/read.c -@@ -46,7 +46,7 @@ static void nfs_readhdr_free(struct nfs_pgio_header *rhdr) - static - int nfs_return_empty_page(struct page *page) - { -- zero_user(page, 0, PAGE_CACHE_SIZE); -+ zero_user(page, 0, PAGE_SIZE); - SetPageUptodate(page); - unlock_page(page); - return 0; -@@ -118,8 +118,8 @@ int nfs_readpage_async(struct nfs_open_context *ctx, struct inode *inode, - unlock_page(page); - return PTR_ERR(new); - } -- if (len < PAGE_CACHE_SIZE) -- zero_user_segment(page, len, PAGE_CACHE_SIZE); -+ if (len < PAGE_SIZE) -+ zero_user_segment(page, len, PAGE_SIZE); - - nfs_pageio_init_read(&pgio, inode, false, - &nfs_async_read_completion_ops); -@@ -295,7 +295,7 @@ int nfs_readpage(struct file *file, struct page *page) - int error; - - dprintk("NFS: nfs_readpage (%p %ld@%lu)\n", -- page, PAGE_CACHE_SIZE, page_file_index(page)); -+ page, PAGE_SIZE, page_file_index(page)); - nfs_inc_stats(inode, NFSIOS_VFSREADPAGE); - nfs_add_stats(inode, NFSIOS_READPAGES, 1); - -@@ -361,8 +361,8 @@ readpage_async_filler(void *data, struct page *page) - if (IS_ERR(new)) - goto out_error; - -- if (len < PAGE_CACHE_SIZE) -- zero_user_segment(page, len, PAGE_CACHE_SIZE); -+ if (len < PAGE_SIZE) -+ zero_user_segment(page, len, PAGE_SIZE); - if (!nfs_pageio_add_request(desc->pgio, new)) { - nfs_list_remove_request(new); - nfs_readpage_release(new); -@@ -424,8 +424,8 @@ int nfs_readpages(struct file *filp, struct address_space *mapping, - - pgm = &pgio.pg_mirrors[0]; - NFS_I(inode)->read_io += pgm->pg_bytes_written; -- npages = (pgm->pg_bytes_written + PAGE_CACHE_SIZE - 1) >> -- PAGE_CACHE_SHIFT; -+ npages = (pgm->pg_bytes_written + PAGE_SIZE - 1) >> -+ PAGE_SHIFT; - nfs_add_stats(inode, NFSIOS_READPAGES, npages); - read_complete: - put_nfs_open_context(desc.ctx); -diff --git a/fs/nfs/write.c b/fs/nfs/write.c -index 5754835a2886..5f4fd53e5764 100644 ---- a/fs/nfs/write.c -+++ b/fs/nfs/write.c -@@ -150,7 +150,7 @@ static void nfs_grow_file(struct page *page, unsigned int offset, unsigned int c - - spin_lock(&inode->i_lock); - i_size = i_size_read(inode); -- end_index = (i_size - 1) >> PAGE_CACHE_SHIFT; -+ end_index = (i_size - 1) >> PAGE_SHIFT; - if (i_size > 0 && page_file_index(page) < end_index) - goto out; - end = page_file_offset(page) + ((loff_t)offset+count); -@@ -1942,7 +1942,7 @@ int nfs_wb_page_cancel(struct inode *inode, struct page *page) - int nfs_wb_single_page(struct inode *inode, struct page *page, bool launder) - { - loff_t range_start = page_file_offset(page); -- loff_t range_end = range_start + (loff_t)(PAGE_CACHE_SIZE - 1); -+ loff_t range_end = range_start + (loff_t)(PAGE_SIZE - 1); - struct writeback_control wbc = { - .sync_mode = WB_SYNC_ALL, - .nr_to_write = 0, -diff --git a/fs/nilfs2/bmap.c b/fs/nilfs2/bmap.c -index 27f75bcbeb30..a9fb3636c142 100644 ---- a/fs/nilfs2/bmap.c -+++ b/fs/nilfs2/bmap.c -@@ -458,7 +458,7 @@ __u64 nilfs_bmap_data_get_key(const struct nilfs_bmap *bmap, - struct buffer_head *pbh; - __u64 key; - -- key = page_index(bh->b_page) << (PAGE_CACHE_SHIFT - -+ key = page_index(bh->b_page) << (PAGE_SHIFT - - bmap->b_inode->i_blkbits); - for (pbh = page_buffers(bh->b_page); pbh != bh; pbh = pbh->b_this_page) - key++; -diff --git a/fs/nilfs2/btnode.c b/fs/nilfs2/btnode.c -index a35ae35e6932..e0c9daf9aa22 100644 ---- a/fs/nilfs2/btnode.c -+++ b/fs/nilfs2/btnode.c -@@ -62,7 +62,7 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr) - set_buffer_uptodate(bh); - - unlock_page(bh->b_page); -- page_cache_release(bh->b_page); -+ put_page(bh->b_page); - return bh; - } - -@@ -128,7 +128,7 @@ found: - - out_locked: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return err; - } - -@@ -146,7 +146,7 @@ void nilfs_btnode_delete(struct buffer_head *bh) - pgoff_t index = page_index(page); - int still_dirty; - -- page_cache_get(page); -+ get_page(page); - lock_page(page); - wait_on_page_writeback(page); - -@@ -154,7 +154,7 @@ void nilfs_btnode_delete(struct buffer_head *bh) - still_dirty = PageDirty(page); - mapping = page->mapping; - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - if (!still_dirty && mapping) - invalidate_inode_pages2_range(mapping, index, index); -@@ -181,7 +181,7 @@ int nilfs_btnode_prepare_change_key(struct address_space *btnc, - obh = ctxt->bh; - ctxt->newbh = NULL; - -- if (inode->i_blkbits == PAGE_CACHE_SHIFT) { -+ if (inode->i_blkbits == PAGE_SHIFT) { - lock_page(obh->b_page); - /* - * We cannot call radix_tree_preload for the kernels older -diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c -index 6b8b92b19cec..e08f064e4bd7 100644 ---- a/fs/nilfs2/dir.c -+++ b/fs/nilfs2/dir.c -@@ -58,7 +58,7 @@ static inline unsigned nilfs_chunk_size(struct inode *inode) - static inline void nilfs_put_page(struct page *page) - { - kunmap(page); -- page_cache_release(page); -+ put_page(page); - } - - /* -@@ -69,9 +69,9 @@ static unsigned nilfs_last_byte(struct inode *inode, unsigned long page_nr) - { - unsigned last_byte = inode->i_size; - -- last_byte -= page_nr << PAGE_CACHE_SHIFT; -- if (last_byte > PAGE_CACHE_SIZE) -- last_byte = PAGE_CACHE_SIZE; -+ last_byte -= page_nr << PAGE_SHIFT; -+ if (last_byte > PAGE_SIZE) -+ last_byte = PAGE_SIZE; - return last_byte; - } - -@@ -109,12 +109,12 @@ static void nilfs_check_page(struct page *page) - unsigned chunk_size = nilfs_chunk_size(dir); - char *kaddr = page_address(page); - unsigned offs, rec_len; -- unsigned limit = PAGE_CACHE_SIZE; -+ unsigned limit = PAGE_SIZE; - struct nilfs_dir_entry *p; - char *error; - -- if ((dir->i_size >> PAGE_CACHE_SHIFT) == page->index) { -- limit = dir->i_size & ~PAGE_CACHE_MASK; -+ if ((dir->i_size >> PAGE_SHIFT) == page->index) { -+ limit = dir->i_size & ~PAGE_MASK; - if (limit & (chunk_size - 1)) - goto Ebadsize; - if (!limit) -@@ -161,7 +161,7 @@ Espan: - bad_entry: - nilfs_error(sb, "nilfs_check_page", "bad entry in directory #%lu: %s - " - "offset=%lu, inode=%lu, rec_len=%d, name_len=%d", -- dir->i_ino, error, (page->index<<PAGE_CACHE_SHIFT)+offs, -+ dir->i_ino, error, (page->index<<PAGE_SHIFT)+offs, - (unsigned long) le64_to_cpu(p->inode), - rec_len, p->name_len); - goto fail; -@@ -170,7 +170,7 @@ Eend: - nilfs_error(sb, "nilfs_check_page", - "entry in directory #%lu spans the page boundary" - "offset=%lu, inode=%lu", -- dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs, -+ dir->i_ino, (page->index<<PAGE_SHIFT)+offs, - (unsigned long) le64_to_cpu(p->inode)); - fail: - SetPageChecked(page); -@@ -256,8 +256,8 @@ static int nilfs_readdir(struct file *file, struct dir_context *ctx) - loff_t pos = ctx->pos; - struct inode *inode = file_inode(file); - struct super_block *sb = inode->i_sb; -- unsigned int offset = pos & ~PAGE_CACHE_MASK; -- unsigned long n = pos >> PAGE_CACHE_SHIFT; -+ unsigned int offset = pos & ~PAGE_MASK; -+ unsigned long n = pos >> PAGE_SHIFT; - unsigned long npages = dir_pages(inode); - /* unsigned chunk_mask = ~(nilfs_chunk_size(inode)-1); */ - -@@ -272,7 +272,7 @@ static int nilfs_readdir(struct file *file, struct dir_context *ctx) - if (IS_ERR(page)) { - nilfs_error(sb, __func__, "bad page in #%lu", - inode->i_ino); -- ctx->pos += PAGE_CACHE_SIZE - offset; -+ ctx->pos += PAGE_SIZE - offset; - return -EIO; - } - kaddr = page_address(page); -@@ -361,7 +361,7 @@ nilfs_find_entry(struct inode *dir, const struct qstr *qstr, - if (++n >= npages) - n = 0; - /* next page is past the blocks we've got */ -- if (unlikely(n > (dir->i_blocks >> (PAGE_CACHE_SHIFT - 9)))) { -+ if (unlikely(n > (dir->i_blocks >> (PAGE_SHIFT - 9)))) { - nilfs_error(dir->i_sb, __func__, - "dir %lu size %lld exceeds block count %llu", - dir->i_ino, dir->i_size, -@@ -401,7 +401,7 @@ ino_t nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr) - if (de) { - res = le64_to_cpu(de->inode); - kunmap(page); -- page_cache_release(page); -+ put_page(page); - } - return res; - } -@@ -460,7 +460,7 @@ int nilfs_add_link(struct dentry *dentry, struct inode *inode) - kaddr = page_address(page); - dir_end = kaddr + nilfs_last_byte(dir, n); - de = (struct nilfs_dir_entry *)kaddr; -- kaddr += PAGE_CACHE_SIZE - reclen; -+ kaddr += PAGE_SIZE - reclen; - while ((char *)de <= kaddr) { - if ((char *)de == dir_end) { - /* We hit i_size */ -@@ -603,7 +603,7 @@ int nilfs_make_empty(struct inode *inode, struct inode *parent) - kunmap_atomic(kaddr); - nilfs_commit_chunk(page, mapping, 0, chunk_size); - fail: -- page_cache_release(page); -+ put_page(page); - return err; - } - -diff --git a/fs/nilfs2/gcinode.c b/fs/nilfs2/gcinode.c -index 748ca238915a..0224b7826ace 100644 ---- a/fs/nilfs2/gcinode.c -+++ b/fs/nilfs2/gcinode.c -@@ -115,7 +115,7 @@ int nilfs_gccache_submit_read_data(struct inode *inode, sector_t blkoff, - - failed: - unlock_page(bh->b_page); -- page_cache_release(bh->b_page); -+ put_page(bh->b_page); - return err; - } - -diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c -index 21a1e2e0d92f..534631358b13 100644 ---- a/fs/nilfs2/inode.c -+++ b/fs/nilfs2/inode.c -@@ -249,7 +249,7 @@ static int nilfs_set_page_dirty(struct page *page) - if (nr_dirty) - nilfs_set_file_dirty(inode, nr_dirty); - } else if (ret) { -- unsigned nr_dirty = 1 << (PAGE_CACHE_SHIFT - inode->i_blkbits); -+ unsigned nr_dirty = 1 << (PAGE_SHIFT - inode->i_blkbits); - - nilfs_set_file_dirty(inode, nr_dirty); - } -@@ -291,7 +291,7 @@ static int nilfs_write_end(struct file *file, struct address_space *mapping, - struct page *page, void *fsdata) - { - struct inode *inode = mapping->host; -- unsigned start = pos & (PAGE_CACHE_SIZE - 1); -+ unsigned start = pos & (PAGE_SIZE - 1); - unsigned nr_dirty; - int err; - -diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c -index 1125f40233ff..f6982b9153d5 100644 ---- a/fs/nilfs2/mdt.c -+++ b/fs/nilfs2/mdt.c -@@ -110,7 +110,7 @@ static int nilfs_mdt_create_block(struct inode *inode, unsigned long block, - - failed_bh: - unlock_page(bh->b_page); -- page_cache_release(bh->b_page); -+ put_page(bh->b_page); - brelse(bh); - - failed_unlock: -@@ -170,7 +170,7 @@ nilfs_mdt_submit_block(struct inode *inode, unsigned long blkoff, - - failed_bh: - unlock_page(bh->b_page); -- page_cache_release(bh->b_page); -+ put_page(bh->b_page); - brelse(bh); - failed: - return ret; -@@ -363,7 +363,7 @@ int nilfs_mdt_delete_block(struct inode *inode, unsigned long block) - int nilfs_mdt_forget_block(struct inode *inode, unsigned long block) - { - pgoff_t index = (pgoff_t)block >> -- (PAGE_CACHE_SHIFT - inode->i_blkbits); -+ (PAGE_SHIFT - inode->i_blkbits); - struct page *page; - unsigned long first_block; - int ret = 0; -@@ -376,7 +376,7 @@ int nilfs_mdt_forget_block(struct inode *inode, unsigned long block) - wait_on_page_writeback(page); - - first_block = (unsigned long)index << -- (PAGE_CACHE_SHIFT - inode->i_blkbits); -+ (PAGE_SHIFT - inode->i_blkbits); - if (page_has_buffers(page)) { - struct buffer_head *bh; - -@@ -385,7 +385,7 @@ int nilfs_mdt_forget_block(struct inode *inode, unsigned long block) - } - still_dirty = PageDirty(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - if (still_dirty || - invalidate_inode_pages2_range(inode->i_mapping, index, index) != 0) -@@ -578,7 +578,7 @@ int nilfs_mdt_freeze_buffer(struct inode *inode, struct buffer_head *bh) - } - - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return 0; - } - -@@ -597,7 +597,7 @@ nilfs_mdt_get_frozen_buffer(struct inode *inode, struct buffer_head *bh) - bh_frozen = nilfs_page_get_nth_block(page, n); - } - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - return bh_frozen; - } -diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c -index 7ccdb961eea9..151bc19d47c0 100644 ---- a/fs/nilfs2/namei.c -+++ b/fs/nilfs2/namei.c -@@ -431,11 +431,11 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, - out_dir: - if (dir_de) { - kunmap(dir_page); -- page_cache_release(dir_page); -+ put_page(dir_page); - } - out_old: - kunmap(old_page); -- page_cache_release(old_page); -+ put_page(old_page); - out: - nilfs_transaction_abort(old_dir->i_sb); - return err; -diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c -index c20df77eff99..489391561cda 100644 ---- a/fs/nilfs2/page.c -+++ b/fs/nilfs2/page.c -@@ -50,7 +50,7 @@ __nilfs_get_page_block(struct page *page, unsigned long block, pgoff_t index, - if (!page_has_buffers(page)) - create_empty_buffers(page, 1 << blkbits, b_state); - -- first_block = (unsigned long)index << (PAGE_CACHE_SHIFT - blkbits); -+ first_block = (unsigned long)index << (PAGE_SHIFT - blkbits); - bh = nilfs_page_get_nth_block(page, block - first_block); - - touch_buffer(bh); -@@ -64,7 +64,7 @@ struct buffer_head *nilfs_grab_buffer(struct inode *inode, - unsigned long b_state) - { - int blkbits = inode->i_blkbits; -- pgoff_t index = blkoff >> (PAGE_CACHE_SHIFT - blkbits); -+ pgoff_t index = blkoff >> (PAGE_SHIFT - blkbits); - struct page *page; - struct buffer_head *bh; - -@@ -75,7 +75,7 @@ struct buffer_head *nilfs_grab_buffer(struct inode *inode, - bh = __nilfs_get_page_block(page, blkoff, index, blkbits, b_state); - if (unlikely(!bh)) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return NULL; - } - return bh; -@@ -288,7 +288,7 @@ repeat: - __set_page_dirty_nobuffers(dpage); - - unlock_page(dpage); -- page_cache_release(dpage); -+ put_page(dpage); - unlock_page(page); - } - pagevec_release(&pvec); -@@ -333,7 +333,7 @@ repeat: - WARN_ON(PageDirty(dpage)); - nilfs_copy_page(dpage, page, 0); - unlock_page(dpage); -- page_cache_release(dpage); -+ put_page(dpage); - } else { - struct page *page2; - -@@ -350,7 +350,7 @@ repeat: - if (unlikely(err < 0)) { - WARN_ON(err == -EEXIST); - page->mapping = NULL; -- page_cache_release(page); /* for cache */ -+ put_page(page); /* for cache */ - } else { - page->mapping = dmap; - dmap->nrpages++; -@@ -523,8 +523,8 @@ unsigned long nilfs_find_uncommitted_extent(struct inode *inode, - if (inode->i_mapping->nrpages == 0) - return 0; - -- index = start_blk >> (PAGE_CACHE_SHIFT - inode->i_blkbits); -- nblocks_in_page = 1U << (PAGE_CACHE_SHIFT - inode->i_blkbits); -+ index = start_blk >> (PAGE_SHIFT - inode->i_blkbits); -+ nblocks_in_page = 1U << (PAGE_SHIFT - inode->i_blkbits); - - pagevec_init(&pvec, 0); - -@@ -537,7 +537,7 @@ repeat: - if (length > 0 && pvec.pages[0]->index > index) - goto out; - -- b = pvec.pages[0]->index << (PAGE_CACHE_SHIFT - inode->i_blkbits); -+ b = pvec.pages[0]->index << (PAGE_SHIFT - inode->i_blkbits); - i = 0; - do { - page = pvec.pages[i]; -diff --git a/fs/nilfs2/recovery.c b/fs/nilfs2/recovery.c -index 9b4f205d1173..5afa77fadc11 100644 ---- a/fs/nilfs2/recovery.c -+++ b/fs/nilfs2/recovery.c -@@ -544,14 +544,14 @@ static int nilfs_recover_dsync_blocks(struct the_nilfs *nilfs, - blocksize, page, NULL); - - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - (*nr_salvaged_blocks)++; - goto next; - - failed_page: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - failed_inode: - printk(KERN_WARNING -diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c -index 3b65adaae7e4..4317f72568e6 100644 ---- a/fs/nilfs2/segment.c -+++ b/fs/nilfs2/segment.c -@@ -2070,7 +2070,7 @@ static int nilfs_segctor_do_construct(struct nilfs_sc_info *sci, int mode) - goto failed_to_write; - - if (nilfs_sc_cstage_get(sci) == NILFS_ST_DONE || -- nilfs->ns_blocksize_bits != PAGE_CACHE_SHIFT) { -+ nilfs->ns_blocksize_bits != PAGE_SHIFT) { - /* - * At this point, we avoid double buffering - * for blocksize < pagesize because page dirty -diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c -index 7521e11db728..97768a1379f2 100644 ---- a/fs/ntfs/aops.c -+++ b/fs/ntfs/aops.c -@@ -74,7 +74,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate) - - set_buffer_uptodate(bh); - -- file_ofs = ((s64)page->index << PAGE_CACHE_SHIFT) + -+ file_ofs = ((s64)page->index << PAGE_SHIFT) + - bh_offset(bh); - read_lock_irqsave(&ni->size_lock, flags); - init_size = ni->initialized_size; -@@ -142,7 +142,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate) - u32 rec_size; - - rec_size = ni->itype.index.block_size; -- recs = PAGE_CACHE_SIZE / rec_size; -+ recs = PAGE_SIZE / rec_size; - /* Should have been verified before we got here... */ - BUG_ON(!recs); - local_irq_save(flags); -@@ -229,7 +229,7 @@ static int ntfs_read_block(struct page *page) - * fully truncated, truncate will throw it away as soon as we unlock - * it so no need to worry what we do with it. - */ -- iblock = (s64)page->index << (PAGE_CACHE_SHIFT - blocksize_bits); -+ iblock = (s64)page->index << (PAGE_SHIFT - blocksize_bits); - read_lock_irqsave(&ni->size_lock, flags); - lblock = (ni->allocated_size + blocksize - 1) >> blocksize_bits; - init_size = ni->initialized_size; -@@ -412,9 +412,9 @@ retry_readpage: - vi = page->mapping->host; - i_size = i_size_read(vi); - /* Is the page fully outside i_size? (truncate in progress) */ -- if (unlikely(page->index >= (i_size + PAGE_CACHE_SIZE - 1) >> -- PAGE_CACHE_SHIFT)) { -- zero_user(page, 0, PAGE_CACHE_SIZE); -+ if (unlikely(page->index >= (i_size + PAGE_SIZE - 1) >> -+ PAGE_SHIFT)) { -+ zero_user(page, 0, PAGE_SIZE); - ntfs_debug("Read outside i_size - truncated?"); - goto done; - } -@@ -463,7 +463,7 @@ retry_readpage: - * ok to ignore the compressed flag here. - */ - if (unlikely(page->index > 0)) { -- zero_user(page, 0, PAGE_CACHE_SIZE); -+ zero_user(page, 0, PAGE_SIZE); - goto done; - } - if (!NInoAttr(ni)) -@@ -509,7 +509,7 @@ retry_readpage: - le16_to_cpu(ctx->attr->data.resident.value_offset), - attr_len); - /* Zero the remainder of the page. */ -- memset(addr + attr_len, 0, PAGE_CACHE_SIZE - attr_len); -+ memset(addr + attr_len, 0, PAGE_SIZE - attr_len); - flush_dcache_page(page); - kunmap_atomic(addr); - put_unm_err_out: -@@ -599,7 +599,7 @@ static int ntfs_write_block(struct page *page, struct writeback_control *wbc) - /* NOTE: Different naming scheme to ntfs_read_block()! */ - - /* The first block in the page. */ -- block = (s64)page->index << (PAGE_CACHE_SHIFT - blocksize_bits); -+ block = (s64)page->index << (PAGE_SHIFT - blocksize_bits); - - read_lock_irqsave(&ni->size_lock, flags); - i_size = i_size_read(vi); -@@ -674,7 +674,7 @@ static int ntfs_write_block(struct page *page, struct writeback_control *wbc) - // in the inode. - // Again, for each page do: - // __set_page_dirty_buffers(); -- // page_cache_release() -+ // put_page() - // We don't need to wait on the writes. - // Update iblock. - } -@@ -925,7 +925,7 @@ static int ntfs_write_mst_block(struct page *page, - ntfs_volume *vol = ni->vol; - u8 *kaddr; - unsigned int rec_size = ni->itype.index.block_size; -- ntfs_inode *locked_nis[PAGE_CACHE_SIZE / rec_size]; -+ ntfs_inode *locked_nis[PAGE_SIZE / rec_size]; - struct buffer_head *bh, *head, *tbh, *rec_start_bh; - struct buffer_head *bhs[MAX_BUF_PER_PAGE]; - runlist_element *rl; -@@ -949,7 +949,7 @@ static int ntfs_write_mst_block(struct page *page, - (NInoAttr(ni) && ni->type == AT_INDEX_ALLOCATION))); - bh_size = vol->sb->s_blocksize; - bh_size_bits = vol->sb->s_blocksize_bits; -- max_bhs = PAGE_CACHE_SIZE / bh_size; -+ max_bhs = PAGE_SIZE / bh_size; - BUG_ON(!max_bhs); - BUG_ON(max_bhs > MAX_BUF_PER_PAGE); - -@@ -961,13 +961,13 @@ static int ntfs_write_mst_block(struct page *page, - BUG_ON(!bh); - - rec_size_bits = ni->itype.index.block_size_bits; -- BUG_ON(!(PAGE_CACHE_SIZE >> rec_size_bits)); -+ BUG_ON(!(PAGE_SIZE >> rec_size_bits)); - bhs_per_rec = rec_size >> bh_size_bits; - BUG_ON(!bhs_per_rec); - - /* The first block in the page. */ - rec_block = block = (sector_t)page->index << -- (PAGE_CACHE_SHIFT - bh_size_bits); -+ (PAGE_SHIFT - bh_size_bits); - - /* The first out of bounds block for the data size. */ - dblock = (i_size_read(vi) + bh_size - 1) >> bh_size_bits; -@@ -1133,7 +1133,7 @@ lock_retry_remap: - unsigned long mft_no; - - /* Get the mft record number. */ -- mft_no = (((s64)page->index << PAGE_CACHE_SHIFT) + ofs) -+ mft_no = (((s64)page->index << PAGE_SHIFT) + ofs) - >> rec_size_bits; - /* Check whether to write this mft record. */ - tni = NULL; -@@ -1249,7 +1249,7 @@ do_mirror: - continue; - ofs = bh_offset(tbh); - /* Get the mft record number. */ -- mft_no = (((s64)page->index << PAGE_CACHE_SHIFT) + ofs) -+ mft_no = (((s64)page->index << PAGE_SHIFT) + ofs) - >> rec_size_bits; - if (mft_no < vol->mftmirr_size) - ntfs_sync_mft_mirror(vol, mft_no, -@@ -1300,7 +1300,7 @@ done: - * Set page error if there is only one ntfs record in the page. - * Otherwise we would loose per-record granularity. - */ -- if (ni->itype.index.block_size == PAGE_CACHE_SIZE) -+ if (ni->itype.index.block_size == PAGE_SIZE) - SetPageError(page); - NVolSetErrors(vol); - } -@@ -1308,7 +1308,7 @@ done: - ntfs_debug("Page still contains one or more dirty ntfs " - "records. Redirtying the page starting at " - "record 0x%lx.", page->index << -- (PAGE_CACHE_SHIFT - rec_size_bits)); -+ (PAGE_SHIFT - rec_size_bits)); - redirty_page_for_writepage(wbc, page); - unlock_page(page); - } else { -@@ -1365,13 +1365,13 @@ retry_writepage: - BUG_ON(!PageLocked(page)); - i_size = i_size_read(vi); - /* Is the page fully outside i_size? (truncate in progress) */ -- if (unlikely(page->index >= (i_size + PAGE_CACHE_SIZE - 1) >> -- PAGE_CACHE_SHIFT)) { -+ if (unlikely(page->index >= (i_size + PAGE_SIZE - 1) >> -+ PAGE_SHIFT)) { - /* - * The page may have dirty, unmapped buffers. Make them - * freeable here, so the page does not leak. - */ -- block_invalidatepage(page, 0, PAGE_CACHE_SIZE); -+ block_invalidatepage(page, 0, PAGE_SIZE); - unlock_page(page); - ntfs_debug("Write outside i_size - truncated?"); - return 0; -@@ -1414,10 +1414,10 @@ retry_writepage: - /* NInoNonResident() == NInoIndexAllocPresent() */ - if (NInoNonResident(ni)) { - /* We have to zero every time due to mmap-at-end-of-file. */ -- if (page->index >= (i_size >> PAGE_CACHE_SHIFT)) { -+ if (page->index >= (i_size >> PAGE_SHIFT)) { - /* The page straddles i_size. */ -- unsigned int ofs = i_size & ~PAGE_CACHE_MASK; -- zero_user_segment(page, ofs, PAGE_CACHE_SIZE); -+ unsigned int ofs = i_size & ~PAGE_MASK; -+ zero_user_segment(page, ofs, PAGE_SIZE); - } - /* Handle mst protected attributes. */ - if (NInoMstProtected(ni)) -@@ -1500,7 +1500,7 @@ retry_writepage: - le16_to_cpu(ctx->attr->data.resident.value_offset), - addr, attr_len); - /* Zero out of bounds area in the page cache page. */ -- memset(addr + attr_len, 0, PAGE_CACHE_SIZE - attr_len); -+ memset(addr + attr_len, 0, PAGE_SIZE - attr_len); - kunmap_atomic(addr); - flush_dcache_page(page); - flush_dcache_mft_record_page(ctx->ntfs_ino); -diff --git a/fs/ntfs/aops.h b/fs/ntfs/aops.h -index caecc58f529c..820d6eabf60f 100644 ---- a/fs/ntfs/aops.h -+++ b/fs/ntfs/aops.h -@@ -40,7 +40,7 @@ - static inline void ntfs_unmap_page(struct page *page) - { - kunmap(page); -- page_cache_release(page); -+ put_page(page); - } - - /** -@@ -49,7 +49,7 @@ static inline void ntfs_unmap_page(struct page *page) - * @index: index into the page cache for @mapping of the page to map - * - * Read a page from the page cache of the address space @mapping at position -- * @index, where @index is in units of PAGE_CACHE_SIZE, and not in bytes. -+ * @index, where @index is in units of PAGE_SIZE, and not in bytes. - * - * If the page is not in memory it is loaded from disk first using the readpage - * method defined in the address space operations of @mapping and the page is -diff --git a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c -index 250ed5b20c8f..44a39a099b54 100644 ---- a/fs/ntfs/attrib.c -+++ b/fs/ntfs/attrib.c -@@ -152,7 +152,7 @@ int ntfs_map_runlist_nolock(ntfs_inode *ni, VCN vcn, ntfs_attr_search_ctx *ctx) - if (old_ctx.base_ntfs_ino && old_ctx.ntfs_ino != - old_ctx.base_ntfs_ino) { - put_this_page = old_ctx.ntfs_ino->page; -- page_cache_get(put_this_page); -+ get_page(put_this_page); - } - /* - * Reinitialize the search context so we can lookup the -@@ -275,7 +275,7 @@ retry_map: - * the pieces anyway. - */ - if (put_this_page) -- page_cache_release(put_this_page); -+ put_page(put_this_page); - } - return err; - } -@@ -1660,7 +1660,7 @@ int ntfs_attr_make_non_resident(ntfs_inode *ni, const u32 data_size) - memcpy(kaddr, (u8*)a + - le16_to_cpu(a->data.resident.value_offset), - attr_size); -- memset(kaddr + attr_size, 0, PAGE_CACHE_SIZE - attr_size); -+ memset(kaddr + attr_size, 0, PAGE_SIZE - attr_size); - kunmap_atomic(kaddr); - flush_dcache_page(page); - SetPageUptodate(page); -@@ -1748,7 +1748,7 @@ int ntfs_attr_make_non_resident(ntfs_inode *ni, const u32 data_size) - if (page) { - set_page_dirty(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - ntfs_debug("Done."); - return 0; -@@ -1835,7 +1835,7 @@ rl_err_out: - ntfs_free(rl); - page_err_out: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - if (err == -EINVAL) - err = -EIO; -@@ -2513,17 +2513,17 @@ int ntfs_attr_set(ntfs_inode *ni, const s64 ofs, const s64 cnt, const u8 val) - BUG_ON(NInoEncrypted(ni)); - mapping = VFS_I(ni)->i_mapping; - /* Work out the starting index and page offset. */ -- idx = ofs >> PAGE_CACHE_SHIFT; -- start_ofs = ofs & ~PAGE_CACHE_MASK; -+ idx = ofs >> PAGE_SHIFT; -+ start_ofs = ofs & ~PAGE_MASK; - /* Work out the ending index and page offset. */ - end = ofs + cnt; -- end_ofs = end & ~PAGE_CACHE_MASK; -+ end_ofs = end & ~PAGE_MASK; - /* If the end is outside the inode size return -ESPIPE. */ - if (unlikely(end > i_size_read(VFS_I(ni)))) { - ntfs_error(vol->sb, "Request exceeds end of attribute."); - return -ESPIPE; - } -- end >>= PAGE_CACHE_SHIFT; -+ end >>= PAGE_SHIFT; - /* If there is a first partial page, need to do it the slow way. */ - if (start_ofs) { - page = read_mapping_page(mapping, idx, NULL); -@@ -2536,7 +2536,7 @@ int ntfs_attr_set(ntfs_inode *ni, const s64 ofs, const s64 cnt, const u8 val) - * If the last page is the same as the first page, need to - * limit the write to the end offset. - */ -- size = PAGE_CACHE_SIZE; -+ size = PAGE_SIZE; - if (idx == end) - size = end_ofs; - kaddr = kmap_atomic(page); -@@ -2544,7 +2544,7 @@ int ntfs_attr_set(ntfs_inode *ni, const s64 ofs, const s64 cnt, const u8 val) - flush_dcache_page(page); - kunmap_atomic(kaddr); - set_page_dirty(page); -- page_cache_release(page); -+ put_page(page); - balance_dirty_pages_ratelimited(mapping); - cond_resched(); - if (idx == end) -@@ -2561,7 +2561,7 @@ int ntfs_attr_set(ntfs_inode *ni, const s64 ofs, const s64 cnt, const u8 val) - return -ENOMEM; - } - kaddr = kmap_atomic(page); -- memset(kaddr, val, PAGE_CACHE_SIZE); -+ memset(kaddr, val, PAGE_SIZE); - flush_dcache_page(page); - kunmap_atomic(kaddr); - /* -@@ -2585,7 +2585,7 @@ int ntfs_attr_set(ntfs_inode *ni, const s64 ofs, const s64 cnt, const u8 val) - set_page_dirty(page); - /* Finally unlock and release the page. */ - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - balance_dirty_pages_ratelimited(mapping); - cond_resched(); - } -@@ -2602,7 +2602,7 @@ int ntfs_attr_set(ntfs_inode *ni, const s64 ofs, const s64 cnt, const u8 val) - flush_dcache_page(page); - kunmap_atomic(kaddr); - set_page_dirty(page); -- page_cache_release(page); -+ put_page(page); - balance_dirty_pages_ratelimited(mapping); - cond_resched(); - } -diff --git a/fs/ntfs/bitmap.c b/fs/ntfs/bitmap.c -index 0809cf876098..ec130c588d2b 100644 ---- a/fs/ntfs/bitmap.c -+++ b/fs/ntfs/bitmap.c -@@ -67,8 +67,8 @@ int __ntfs_bitmap_set_bits_in_run(struct inode *vi, const s64 start_bit, - * Calculate the indices for the pages containing the first and last - * bits, i.e. @start_bit and @start_bit + @cnt - 1, respectively. - */ -- index = start_bit >> (3 + PAGE_CACHE_SHIFT); -- end_index = (start_bit + cnt - 1) >> (3 + PAGE_CACHE_SHIFT); -+ index = start_bit >> (3 + PAGE_SHIFT); -+ end_index = (start_bit + cnt - 1) >> (3 + PAGE_SHIFT); - - /* Get the page containing the first bit (@start_bit). */ - mapping = vi->i_mapping; -@@ -82,7 +82,7 @@ int __ntfs_bitmap_set_bits_in_run(struct inode *vi, const s64 start_bit, - kaddr = page_address(page); - - /* Set @pos to the position of the byte containing @start_bit. */ -- pos = (start_bit >> 3) & ~PAGE_CACHE_MASK; -+ pos = (start_bit >> 3) & ~PAGE_MASK; - - /* Calculate the position of @start_bit in the first byte. */ - bit = start_bit & 7; -@@ -108,7 +108,7 @@ int __ntfs_bitmap_set_bits_in_run(struct inode *vi, const s64 start_bit, - * Depending on @value, modify all remaining whole bytes in the page up - * to @cnt. - */ -- len = min_t(s64, cnt >> 3, PAGE_CACHE_SIZE - pos); -+ len = min_t(s64, cnt >> 3, PAGE_SIZE - pos); - memset(kaddr + pos, value ? 0xff : 0, len); - cnt -= len << 3; - -@@ -132,7 +132,7 @@ int __ntfs_bitmap_set_bits_in_run(struct inode *vi, const s64 start_bit, - * Depending on @value, modify all remaining whole bytes in the - * page up to @cnt. - */ -- len = min_t(s64, cnt >> 3, PAGE_CACHE_SIZE); -+ len = min_t(s64, cnt >> 3, PAGE_SIZE); - memset(kaddr, value ? 0xff : 0, len); - cnt -= len << 3; - } -diff --git a/fs/ntfs/compress.c b/fs/ntfs/compress.c -index f82498c35e78..f2b5e746f49b 100644 ---- a/fs/ntfs/compress.c -+++ b/fs/ntfs/compress.c -@@ -104,16 +104,12 @@ static void zero_partial_compressed_page(struct page *page, - unsigned int kp_ofs; - - ntfs_debug("Zeroing page region outside initialized size."); -- if (((s64)page->index << PAGE_CACHE_SHIFT) >= initialized_size) { -- /* -- * FIXME: Using clear_page() will become wrong when we get -- * PAGE_CACHE_SIZE != PAGE_SIZE but for now there is no problem. -- */ -+ if (((s64)page->index << PAGE_SHIFT) >= initialized_size) { - clear_page(kp); - return; - } -- kp_ofs = initialized_size & ~PAGE_CACHE_MASK; -- memset(kp + kp_ofs, 0, PAGE_CACHE_SIZE - kp_ofs); -+ kp_ofs = initialized_size & ~PAGE_MASK; -+ memset(kp + kp_ofs, 0, PAGE_SIZE - kp_ofs); - return; - } - -@@ -123,7 +119,7 @@ static void zero_partial_compressed_page(struct page *page, - static inline void handle_bounds_compressed_page(struct page *page, - const loff_t i_size, const s64 initialized_size) - { -- if ((page->index >= (initialized_size >> PAGE_CACHE_SHIFT)) && -+ if ((page->index >= (initialized_size >> PAGE_SHIFT)) && - (initialized_size < i_size)) - zero_partial_compressed_page(page, initialized_size); - return; -@@ -160,7 +156,7 @@ static inline void handle_bounds_compressed_page(struct page *page, - * @xpage_done indicates whether the target page (@dest_pages[@xpage]) was - * completed during the decompression of the compression block (@cb_start). - * -- * Warning: This function *REQUIRES* PAGE_CACHE_SIZE >= 4096 or it will blow up -+ * Warning: This function *REQUIRES* PAGE_SIZE >= 4096 or it will blow up - * unpredicatbly! You have been warned! - * - * Note to hackers: This function may not sleep until it has finished accessing -@@ -241,7 +237,7 @@ return_error: - if (di == xpage) - *xpage_done = 1; - else -- page_cache_release(dp); -+ put_page(dp); - dest_pages[di] = NULL; - } - } -@@ -274,7 +270,7 @@ return_error: - cb = cb_sb_end; - - /* Advance destination position to next sub-block. */ -- *dest_ofs = (*dest_ofs + NTFS_SB_SIZE) & ~PAGE_CACHE_MASK; -+ *dest_ofs = (*dest_ofs + NTFS_SB_SIZE) & ~PAGE_MASK; - if (!*dest_ofs && (++*dest_index > dest_max_index)) - goto return_overflow; - goto do_next_sb; -@@ -301,7 +297,7 @@ return_error: - - /* Advance destination position to next sub-block. */ - *dest_ofs += NTFS_SB_SIZE; -- if (!(*dest_ofs &= ~PAGE_CACHE_MASK)) { -+ if (!(*dest_ofs &= ~PAGE_MASK)) { - finalize_page: - /* - * First stage: add current page index to array of -@@ -335,7 +331,7 @@ do_next_tag: - *dest_ofs += nr_bytes; - } - /* We have finished the current sub-block. */ -- if (!(*dest_ofs &= ~PAGE_CACHE_MASK)) -+ if (!(*dest_ofs &= ~PAGE_MASK)) - goto finalize_page; - goto do_next_sb; - } -@@ -462,7 +458,7 @@ return_overflow: - * have been written to so that we would lose data if we were to just overwrite - * them with the out-of-date uncompressed data. - * -- * FIXME: For PAGE_CACHE_SIZE > cb_size we are not doing the Right Thing(TM) at -+ * FIXME: For PAGE_SIZE > cb_size we are not doing the Right Thing(TM) at - * the end of the file I think. We need to detect this case and zero the out - * of bounds remainder of the page in question and mark it as handled. At the - * moment we would just return -EIO on such a page. This bug will only become -@@ -470,7 +466,7 @@ return_overflow: - * clusters so is probably not going to be seen by anyone. Still this should - * be fixed. (AIA) - * -- * FIXME: Again for PAGE_CACHE_SIZE > cb_size we are screwing up both in -+ * FIXME: Again for PAGE_SIZE > cb_size we are screwing up both in - * handling sparse and compressed cbs. (AIA) - * - * FIXME: At the moment we don't do any zeroing out in the case that -@@ -497,14 +493,14 @@ int ntfs_read_compressed_block(struct page *page) - u64 cb_size_mask = cb_size - 1UL; - VCN vcn; - LCN lcn; -- /* The first wanted vcn (minimum alignment is PAGE_CACHE_SIZE). */ -- VCN start_vcn = (((s64)index << PAGE_CACHE_SHIFT) & ~cb_size_mask) >> -+ /* The first wanted vcn (minimum alignment is PAGE_SIZE). */ -+ VCN start_vcn = (((s64)index << PAGE_SHIFT) & ~cb_size_mask) >> - vol->cluster_size_bits; - /* - * The first vcn after the last wanted vcn (minimum alignment is again -- * PAGE_CACHE_SIZE. -+ * PAGE_SIZE. - */ -- VCN end_vcn = ((((s64)(index + 1UL) << PAGE_CACHE_SHIFT) + cb_size - 1) -+ VCN end_vcn = ((((s64)(index + 1UL) << PAGE_SHIFT) + cb_size - 1) - & ~cb_size_mask) >> vol->cluster_size_bits; - /* Number of compression blocks (cbs) in the wanted vcn range. */ - unsigned int nr_cbs = (end_vcn - start_vcn) << vol->cluster_size_bits -@@ -515,7 +511,7 @@ int ntfs_read_compressed_block(struct page *page) - * guarantees of start_vcn and end_vcn, no need to round up here. - */ - unsigned int nr_pages = (end_vcn - start_vcn) << -- vol->cluster_size_bits >> PAGE_CACHE_SHIFT; -+ vol->cluster_size_bits >> PAGE_SHIFT; - unsigned int xpage, max_page, cur_page, cur_ofs, i; - unsigned int cb_clusters, cb_max_ofs; - int block, max_block, cb_max_page, bhs_size, nr_bhs, err = 0; -@@ -549,7 +545,7 @@ int ntfs_read_compressed_block(struct page *page) - * We have already been given one page, this is the one we must do. - * Once again, the alignment guarantees keep it simple. - */ -- offset = start_vcn << vol->cluster_size_bits >> PAGE_CACHE_SHIFT; -+ offset = start_vcn << vol->cluster_size_bits >> PAGE_SHIFT; - xpage = index - offset; - pages[xpage] = page; - /* -@@ -560,13 +556,13 @@ int ntfs_read_compressed_block(struct page *page) - i_size = i_size_read(VFS_I(ni)); - initialized_size = ni->initialized_size; - read_unlock_irqrestore(&ni->size_lock, flags); -- max_page = ((i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT) - -+ max_page = ((i_size + PAGE_SIZE - 1) >> PAGE_SHIFT) - - offset; - /* Is the page fully outside i_size? (truncate in progress) */ - if (xpage >= max_page) { - kfree(bhs); - kfree(pages); -- zero_user(page, 0, PAGE_CACHE_SIZE); -+ zero_user(page, 0, PAGE_SIZE); - ntfs_debug("Compressed read outside i_size - truncated?"); - SetPageUptodate(page); - unlock_page(page); -@@ -591,7 +587,7 @@ int ntfs_read_compressed_block(struct page *page) - continue; - } - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - pages[i] = NULL; - } - } -@@ -735,9 +731,9 @@ lock_retry_remap: - ntfs_debug("Successfully read the compression block."); - - /* The last page and maximum offset within it for the current cb. */ -- cb_max_page = (cur_page << PAGE_CACHE_SHIFT) + cur_ofs + cb_size; -- cb_max_ofs = cb_max_page & ~PAGE_CACHE_MASK; -- cb_max_page >>= PAGE_CACHE_SHIFT; -+ cb_max_page = (cur_page << PAGE_SHIFT) + cur_ofs + cb_size; -+ cb_max_ofs = cb_max_page & ~PAGE_MASK; -+ cb_max_page >>= PAGE_SHIFT; - - /* Catch end of file inside a compression block. */ - if (cb_max_page > max_page) -@@ -753,16 +749,11 @@ lock_retry_remap: - for (; cur_page < cb_max_page; cur_page++) { - page = pages[cur_page]; - if (page) { -- /* -- * FIXME: Using clear_page() will become wrong -- * when we get PAGE_CACHE_SIZE != PAGE_SIZE but -- * for now there is no problem. -- */ - if (likely(!cur_ofs)) - clear_page(page_address(page)); - else - memset(page_address(page) + cur_ofs, 0, -- PAGE_CACHE_SIZE - -+ PAGE_SIZE - - cur_ofs); - flush_dcache_page(page); - kunmap(page); -@@ -771,10 +762,10 @@ lock_retry_remap: - if (cur_page == xpage) - xpage_done = 1; - else -- page_cache_release(page); -+ put_page(page); - pages[cur_page] = NULL; - } -- cb_pos += PAGE_CACHE_SIZE - cur_ofs; -+ cb_pos += PAGE_SIZE - cur_ofs; - cur_ofs = 0; - if (cb_pos >= cb_end) - break; -@@ -807,7 +798,7 @@ lock_retry_remap: - * synchronous io for the majority of pages. - * Or if we choose not to do the read-ahead/-behind stuff, we - * could just return block_read_full_page(pages[xpage]) as long -- * as PAGE_CACHE_SIZE <= cb_size. -+ * as PAGE_SIZE <= cb_size. - */ - if (cb_max_ofs) - cb_max_page--; -@@ -816,8 +807,8 @@ lock_retry_remap: - page = pages[cur_page]; - if (page) - memcpy(page_address(page) + cur_ofs, cb_pos, -- PAGE_CACHE_SIZE - cur_ofs); -- cb_pos += PAGE_CACHE_SIZE - cur_ofs; -+ PAGE_SIZE - cur_ofs); -+ cb_pos += PAGE_SIZE - cur_ofs; - cur_ofs = 0; - if (cb_pos >= cb_end) - break; -@@ -850,10 +841,10 @@ lock_retry_remap: - if (cur2_page == xpage) - xpage_done = 1; - else -- page_cache_release(page); -+ put_page(page); - pages[cur2_page] = NULL; - } -- cb_pos2 += PAGE_CACHE_SIZE - cur_ofs2; -+ cb_pos2 += PAGE_SIZE - cur_ofs2; - cur_ofs2 = 0; - if (cb_pos2 >= cb_end) - break; -@@ -884,7 +875,7 @@ lock_retry_remap: - kunmap(page); - unlock_page(page); - if (prev_cur_page != xpage) -- page_cache_release(page); -+ put_page(page); - pages[prev_cur_page] = NULL; - } - } -@@ -914,7 +905,7 @@ lock_retry_remap: - kunmap(page); - unlock_page(page); - if (cur_page != xpage) -- page_cache_release(page); -+ put_page(page); - pages[cur_page] = NULL; - } - } -@@ -961,7 +952,7 @@ err_out: - kunmap(page); - unlock_page(page); - if (i != xpage) -- page_cache_release(page); -+ put_page(page); - } - } - kfree(pages); -diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c -index b2eff5816adc..a18613579001 100644 ---- a/fs/ntfs/dir.c -+++ b/fs/ntfs/dir.c -@@ -315,11 +315,11 @@ found_it: - descend_into_child_node: - /* - * Convert vcn to index into the index allocation attribute in units -- * of PAGE_CACHE_SIZE and map the page cache page, reading it from -+ * of PAGE_SIZE and map the page cache page, reading it from - * disk if necessary. - */ - page = ntfs_map_page(ia_mapping, vcn << -- dir_ni->itype.index.vcn_size_bits >> PAGE_CACHE_SHIFT); -+ dir_ni->itype.index.vcn_size_bits >> PAGE_SHIFT); - if (IS_ERR(page)) { - ntfs_error(sb, "Failed to map directory index page, error %ld.", - -PTR_ERR(page)); -@@ -331,9 +331,9 @@ descend_into_child_node: - fast_descend_into_child_node: - /* Get to the index allocation block. */ - ia = (INDEX_ALLOCATION*)(kaddr + ((vcn << -- dir_ni->itype.index.vcn_size_bits) & ~PAGE_CACHE_MASK)); -+ dir_ni->itype.index.vcn_size_bits) & ~PAGE_MASK)); - /* Bounds checks. */ -- if ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE) { -+ if ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_SIZE) { - ntfs_error(sb, "Out of bounds check failed. Corrupt directory " - "inode 0x%lx or driver bug.", dir_ni->mft_no); - goto unm_err_out; -@@ -366,7 +366,7 @@ fast_descend_into_child_node: - goto unm_err_out; - } - index_end = (u8*)ia + dir_ni->itype.index.block_size; -- if (index_end > kaddr + PAGE_CACHE_SIZE) { -+ if (index_end > kaddr + PAGE_SIZE) { - ntfs_error(sb, "Index buffer (VCN 0x%llx) of directory inode " - "0x%lx crosses page boundary. Impossible! " - "Cannot access! This is probably a bug in the " -@@ -559,9 +559,9 @@ found_it2: - /* If vcn is in the same page cache page as old_vcn we - * recycle the mapped page. */ - if (old_vcn << vol->cluster_size_bits >> -- PAGE_CACHE_SHIFT == vcn << -+ PAGE_SHIFT == vcn << - vol->cluster_size_bits >> -- PAGE_CACHE_SHIFT) -+ PAGE_SHIFT) - goto fast_descend_into_child_node; - unlock_page(page); - ntfs_unmap_page(page); -@@ -793,11 +793,11 @@ found_it: - descend_into_child_node: - /* - * Convert vcn to index into the index allocation attribute in units -- * of PAGE_CACHE_SIZE and map the page cache page, reading it from -+ * of PAGE_SIZE and map the page cache page, reading it from - * disk if necessary. - */ - page = ntfs_map_page(ia_mapping, vcn << -- dir_ni->itype.index.vcn_size_bits >> PAGE_CACHE_SHIFT); -+ dir_ni->itype.index.vcn_size_bits >> PAGE_SHIFT); - if (IS_ERR(page)) { - ntfs_error(sb, "Failed to map directory index page, error %ld.", - -PTR_ERR(page)); -@@ -809,9 +809,9 @@ descend_into_child_node: - fast_descend_into_child_node: - /* Get to the index allocation block. */ - ia = (INDEX_ALLOCATION*)(kaddr + ((vcn << -- dir_ni->itype.index.vcn_size_bits) & ~PAGE_CACHE_MASK)); -+ dir_ni->itype.index.vcn_size_bits) & ~PAGE_MASK)); - /* Bounds checks. */ -- if ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE) { -+ if ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_SIZE) { - ntfs_error(sb, "Out of bounds check failed. Corrupt directory " - "inode 0x%lx or driver bug.", dir_ni->mft_no); - goto unm_err_out; -@@ -844,7 +844,7 @@ fast_descend_into_child_node: - goto unm_err_out; - } - index_end = (u8*)ia + dir_ni->itype.index.block_size; -- if (index_end > kaddr + PAGE_CACHE_SIZE) { -+ if (index_end > kaddr + PAGE_SIZE) { - ntfs_error(sb, "Index buffer (VCN 0x%llx) of directory inode " - "0x%lx crosses page boundary. Impossible! " - "Cannot access! This is probably a bug in the " -@@ -968,9 +968,9 @@ found_it2: - /* If vcn is in the same page cache page as old_vcn we - * recycle the mapped page. */ - if (old_vcn << vol->cluster_size_bits >> -- PAGE_CACHE_SHIFT == vcn << -+ PAGE_SHIFT == vcn << - vol->cluster_size_bits >> -- PAGE_CACHE_SHIFT) -+ PAGE_SHIFT) - goto fast_descend_into_child_node; - unlock_page(page); - ntfs_unmap_page(page); -@@ -1246,15 +1246,15 @@ skip_index_root: - goto iput_err_out; - } - /* Get the starting bit position in the current bitmap page. */ -- cur_bmp_pos = bmp_pos & ((PAGE_CACHE_SIZE * 8) - 1); -- bmp_pos &= ~(u64)((PAGE_CACHE_SIZE * 8) - 1); -+ cur_bmp_pos = bmp_pos & ((PAGE_SIZE * 8) - 1); -+ bmp_pos &= ~(u64)((PAGE_SIZE * 8) - 1); - get_next_bmp_page: - ntfs_debug("Reading bitmap with page index 0x%llx, bit ofs 0x%llx", -- (unsigned long long)bmp_pos >> (3 + PAGE_CACHE_SHIFT), -+ (unsigned long long)bmp_pos >> (3 + PAGE_SHIFT), - (unsigned long long)bmp_pos & -- (unsigned long long)((PAGE_CACHE_SIZE * 8) - 1)); -+ (unsigned long long)((PAGE_SIZE * 8) - 1)); - bmp_page = ntfs_map_page(bmp_mapping, -- bmp_pos >> (3 + PAGE_CACHE_SHIFT)); -+ bmp_pos >> (3 + PAGE_SHIFT)); - if (IS_ERR(bmp_page)) { - ntfs_error(sb, "Reading index bitmap failed."); - err = PTR_ERR(bmp_page); -@@ -1270,9 +1270,9 @@ find_next_index_buffer: - * If we have reached the end of the bitmap page, get the next - * page, and put away the old one. - */ -- if (unlikely((cur_bmp_pos >> 3) >= PAGE_CACHE_SIZE)) { -+ if (unlikely((cur_bmp_pos >> 3) >= PAGE_SIZE)) { - ntfs_unmap_page(bmp_page); -- bmp_pos += PAGE_CACHE_SIZE * 8; -+ bmp_pos += PAGE_SIZE * 8; - cur_bmp_pos = 0; - goto get_next_bmp_page; - } -@@ -1285,8 +1285,8 @@ find_next_index_buffer: - ntfs_debug("Handling index buffer 0x%llx.", - (unsigned long long)bmp_pos + cur_bmp_pos); - /* If the current index buffer is in the same page we reuse the page. */ -- if ((prev_ia_pos & (s64)PAGE_CACHE_MASK) != -- (ia_pos & (s64)PAGE_CACHE_MASK)) { -+ if ((prev_ia_pos & (s64)PAGE_MASK) != -+ (ia_pos & (s64)PAGE_MASK)) { - prev_ia_pos = ia_pos; - if (likely(ia_page != NULL)) { - unlock_page(ia_page); -@@ -1296,7 +1296,7 @@ find_next_index_buffer: - * Map the page cache page containing the current ia_pos, - * reading it from disk if necessary. - */ -- ia_page = ntfs_map_page(ia_mapping, ia_pos >> PAGE_CACHE_SHIFT); -+ ia_page = ntfs_map_page(ia_mapping, ia_pos >> PAGE_SHIFT); - if (IS_ERR(ia_page)) { - ntfs_error(sb, "Reading index allocation data failed."); - err = PTR_ERR(ia_page); -@@ -1307,10 +1307,10 @@ find_next_index_buffer: - kaddr = (u8*)page_address(ia_page); - } - /* Get the current index buffer. */ -- ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK & -- ~(s64)(ndir->itype.index.block_size - 1))); -+ ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_MASK & -+ ~(s64)(ndir->itype.index.block_size - 1))); - /* Bounds checks. */ -- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) { -+ if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_SIZE)) { - ntfs_error(sb, "Out of bounds check failed. Corrupt directory " - "inode 0x%lx or driver bug.", vdir->i_ino); - goto err_out; -@@ -1348,7 +1348,7 @@ find_next_index_buffer: - goto err_out; - } - index_end = (u8*)ia + ndir->itype.index.block_size; -- if (unlikely(index_end > kaddr + PAGE_CACHE_SIZE)) { -+ if (unlikely(index_end > kaddr + PAGE_SIZE)) { - ntfs_error(sb, "Index buffer (VCN 0x%llx) of directory inode " - "0x%lx crosses page boundary. Impossible! " - "Cannot access! This is probably a bug in the " -diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c -index bed4d427dfae..91117ada8528 100644 ---- a/fs/ntfs/file.c -+++ b/fs/ntfs/file.c -@@ -220,8 +220,8 @@ do_non_resident_extend: - m = NULL; - } - mapping = vi->i_mapping; -- index = old_init_size >> PAGE_CACHE_SHIFT; -- end_index = (new_init_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -+ index = old_init_size >> PAGE_SHIFT; -+ end_index = (new_init_size + PAGE_SIZE - 1) >> PAGE_SHIFT; - do { - /* - * Read the page. If the page is not present, this will zero -@@ -233,7 +233,7 @@ do_non_resident_extend: - goto init_err_out; - } - if (unlikely(PageError(page))) { -- page_cache_release(page); -+ put_page(page); - err = -EIO; - goto init_err_out; - } -@@ -242,13 +242,13 @@ do_non_resident_extend: - * enough to make ntfs_writepage() work. - */ - write_lock_irqsave(&ni->size_lock, flags); -- ni->initialized_size = (s64)(index + 1) << PAGE_CACHE_SHIFT; -+ ni->initialized_size = (s64)(index + 1) << PAGE_SHIFT; - if (ni->initialized_size > new_init_size) - ni->initialized_size = new_init_size; - write_unlock_irqrestore(&ni->size_lock, flags); - /* Set the page dirty so it gets written out. */ - set_page_dirty(page); -- page_cache_release(page); -+ put_page(page); - /* - * Play nice with the vm and the rest of the system. This is - * very much needed as we can potentially be modifying the -@@ -543,7 +543,7 @@ out: - err_out: - while (nr > 0) { - unlock_page(pages[--nr]); -- page_cache_release(pages[nr]); -+ put_page(pages[nr]); - } - goto out; - } -@@ -573,7 +573,7 @@ static inline int ntfs_submit_bh_for_read(struct buffer_head *bh) - * only partially being written to. - * - * If @nr_pages is greater than one, we are guaranteed that the cluster size is -- * greater than PAGE_CACHE_SIZE, that all pages in @pages are entirely inside -+ * greater than PAGE_SIZE, that all pages in @pages are entirely inside - * the same cluster and that they are the entirety of that cluster, and that - * the cluster is sparse, i.e. we need to allocate a cluster to fill the hole. - * -@@ -653,7 +653,7 @@ static int ntfs_prepare_pages_for_non_resident_write(struct page **pages, - u = 0; - do_next_page: - page = pages[u]; -- bh_pos = (s64)page->index << PAGE_CACHE_SHIFT; -+ bh_pos = (s64)page->index << PAGE_SHIFT; - bh = head = page_buffers(page); - do { - VCN cdelta; -@@ -810,11 +810,11 @@ map_buffer_cached: - - kaddr = kmap_atomic(page); - if (bh_pos < pos) { -- pofs = bh_pos & ~PAGE_CACHE_MASK; -+ pofs = bh_pos & ~PAGE_MASK; - memset(kaddr + pofs, 0, pos - bh_pos); - } - if (bh_end > end) { -- pofs = end & ~PAGE_CACHE_MASK; -+ pofs = end & ~PAGE_MASK; - memset(kaddr + pofs, 0, bh_end - end); - } - kunmap_atomic(kaddr); -@@ -942,7 +942,7 @@ rl_not_mapped_enoent: - * unmapped. This can only happen when the cluster size is - * less than the page cache size. - */ -- if (unlikely(vol->cluster_size < PAGE_CACHE_SIZE)) { -+ if (unlikely(vol->cluster_size < PAGE_SIZE)) { - bh_cend = (bh_end + vol->cluster_size - 1) >> - vol->cluster_size_bits; - if ((bh_cend <= cpos || bh_cpos >= cend)) { -@@ -1208,7 +1208,7 @@ rl_not_mapped_enoent: - wait_on_buffer(bh); - if (likely(buffer_uptodate(bh))) { - page = bh->b_page; -- bh_pos = ((s64)page->index << PAGE_CACHE_SHIFT) + -+ bh_pos = ((s64)page->index << PAGE_SHIFT) + - bh_offset(bh); - /* - * If the buffer overflows the initialized size, need -@@ -1350,7 +1350,7 @@ rl_not_mapped_enoent: - bh = head = page_buffers(page); - do { - if (u == nr_pages && -- ((s64)page->index << PAGE_CACHE_SHIFT) + -+ ((s64)page->index << PAGE_SHIFT) + - bh_offset(bh) >= end) - break; - if (!buffer_new(bh)) -@@ -1422,7 +1422,7 @@ static inline int ntfs_commit_pages_after_non_resident_write( - bool partial; - - page = pages[u]; -- bh_pos = (s64)page->index << PAGE_CACHE_SHIFT; -+ bh_pos = (s64)page->index << PAGE_SHIFT; - bh = head = page_buffers(page); - partial = false; - do { -@@ -1639,7 +1639,7 @@ static int ntfs_commit_pages_after_write(struct page **pages, - if (end < attr_len) - memcpy(kaddr + end, kattr + end, attr_len - end); - /* Zero the region outside the end of the attribute value. */ -- memset(kaddr + attr_len, 0, PAGE_CACHE_SIZE - attr_len); -+ memset(kaddr + attr_len, 0, PAGE_SIZE - attr_len); - flush_dcache_page(page); - SetPageUptodate(page); - } -@@ -1706,7 +1706,7 @@ static size_t ntfs_copy_from_user_iter(struct page **pages, unsigned nr_pages, - unsigned len, copied; - - do { -- len = PAGE_CACHE_SIZE - ofs; -+ len = PAGE_SIZE - ofs; - if (len > bytes) - len = bytes; - copied = iov_iter_copy_from_user_atomic(*pages, &data, ofs, -@@ -1724,14 +1724,14 @@ out: - return total; - err: - /* Zero the rest of the target like __copy_from_user(). */ -- len = PAGE_CACHE_SIZE - copied; -+ len = PAGE_SIZE - copied; - do { - if (len > bytes) - len = bytes; - zero_user(*pages, copied, len); - bytes -= len; - copied = 0; -- len = PAGE_CACHE_SIZE; -+ len = PAGE_SIZE; - } while (++pages < last_page); - goto out; - } -@@ -1787,8 +1787,8 @@ static ssize_t ntfs_perform_write(struct file *file, struct iov_iter *i, - * attributes. - */ - nr_pages = 1; -- if (vol->cluster_size > PAGE_CACHE_SIZE && NInoNonResident(ni)) -- nr_pages = vol->cluster_size >> PAGE_CACHE_SHIFT; -+ if (vol->cluster_size > PAGE_SIZE && NInoNonResident(ni)) -+ nr_pages = vol->cluster_size >> PAGE_SHIFT; - last_vcn = -1; - do { - VCN vcn; -@@ -1796,9 +1796,9 @@ static ssize_t ntfs_perform_write(struct file *file, struct iov_iter *i, - unsigned ofs, do_pages, u; - size_t copied; - -- start_idx = idx = pos >> PAGE_CACHE_SHIFT; -- ofs = pos & ~PAGE_CACHE_MASK; -- bytes = PAGE_CACHE_SIZE - ofs; -+ start_idx = idx = pos >> PAGE_SHIFT; -+ ofs = pos & ~PAGE_MASK; -+ bytes = PAGE_SIZE - ofs; - do_pages = 1; - if (nr_pages > 1) { - vcn = pos >> vol->cluster_size_bits; -@@ -1832,7 +1832,7 @@ static ssize_t ntfs_perform_write(struct file *file, struct iov_iter *i, - if (lcn == LCN_HOLE) { - start_idx = (pos & ~(s64) - vol->cluster_size_mask) -- >> PAGE_CACHE_SHIFT; -+ >> PAGE_SHIFT; - bytes = vol->cluster_size - (pos & - vol->cluster_size_mask); - do_pages = nr_pages; -@@ -1871,12 +1871,12 @@ again: - if (unlikely(status)) { - do { - unlock_page(pages[--do_pages]); -- page_cache_release(pages[do_pages]); -+ put_page(pages[do_pages]); - } while (do_pages); - break; - } - } -- u = (pos >> PAGE_CACHE_SHIFT) - pages[0]->index; -+ u = (pos >> PAGE_SHIFT) - pages[0]->index; - copied = ntfs_copy_from_user_iter(pages + u, do_pages - u, ofs, - i, bytes); - ntfs_flush_dcache_pages(pages + u, do_pages - u); -@@ -1889,7 +1889,7 @@ again: - } - do { - unlock_page(pages[--do_pages]); -- page_cache_release(pages[do_pages]); -+ put_page(pages[do_pages]); - } while (do_pages); - if (unlikely(status < 0)) - break; -@@ -1921,7 +1921,7 @@ again: - } - } while (iov_iter_count(i)); - if (cached_page) -- page_cache_release(cached_page); -+ put_page(cached_page); - ntfs_debug("Done. Returning %s (written 0x%lx, status %li).", - written ? "written" : "status", (unsigned long)written, - (long)status); -diff --git a/fs/ntfs/index.c b/fs/ntfs/index.c -index 096c135691ae..0d645f357930 100644 ---- a/fs/ntfs/index.c -+++ b/fs/ntfs/index.c -@@ -272,11 +272,11 @@ done: - descend_into_child_node: - /* - * Convert vcn to index into the index allocation attribute in units -- * of PAGE_CACHE_SIZE and map the page cache page, reading it from -+ * of PAGE_SIZE and map the page cache page, reading it from - * disk if necessary. - */ - page = ntfs_map_page(ia_mapping, vcn << -- idx_ni->itype.index.vcn_size_bits >> PAGE_CACHE_SHIFT); -+ idx_ni->itype.index.vcn_size_bits >> PAGE_SHIFT); - if (IS_ERR(page)) { - ntfs_error(sb, "Failed to map index page, error %ld.", - -PTR_ERR(page)); -@@ -288,9 +288,9 @@ descend_into_child_node: - fast_descend_into_child_node: - /* Get to the index allocation block. */ - ia = (INDEX_ALLOCATION*)(kaddr + ((vcn << -- idx_ni->itype.index.vcn_size_bits) & ~PAGE_CACHE_MASK)); -+ idx_ni->itype.index.vcn_size_bits) & ~PAGE_MASK)); - /* Bounds checks. */ -- if ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE) { -+ if ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_SIZE) { - ntfs_error(sb, "Out of bounds check failed. Corrupt inode " - "0x%lx or driver bug.", idx_ni->mft_no); - goto unm_err_out; -@@ -323,7 +323,7 @@ fast_descend_into_child_node: - goto unm_err_out; - } - index_end = (u8*)ia + idx_ni->itype.index.block_size; -- if (index_end > kaddr + PAGE_CACHE_SIZE) { -+ if (index_end > kaddr + PAGE_SIZE) { - ntfs_error(sb, "Index buffer (VCN 0x%llx) of inode 0x%lx " - "crosses page boundary. Impossible! Cannot " - "access! This is probably a bug in the " -@@ -427,9 +427,9 @@ ia_done: - * the mapped page. - */ - if (old_vcn << vol->cluster_size_bits >> -- PAGE_CACHE_SHIFT == vcn << -+ PAGE_SHIFT == vcn << - vol->cluster_size_bits >> -- PAGE_CACHE_SHIFT) -+ PAGE_SHIFT) - goto fast_descend_into_child_node; - unlock_page(page); - ntfs_unmap_page(page); -diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c -index d284f07eda77..f40972d6df90 100644 ---- a/fs/ntfs/inode.c -+++ b/fs/ntfs/inode.c -@@ -868,12 +868,12 @@ skip_attr_list_load: - ni->itype.index.block_size); - goto unm_err_out; - } -- if (ni->itype.index.block_size > PAGE_CACHE_SIZE) { -+ if (ni->itype.index.block_size > PAGE_SIZE) { - ntfs_error(vi->i_sb, "Index block size (%u) > " -- "PAGE_CACHE_SIZE (%ld) is not " -+ "PAGE_SIZE (%ld) is not " - "supported. Sorry.", - ni->itype.index.block_size, -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - err = -EOPNOTSUPP; - goto unm_err_out; - } -@@ -1585,10 +1585,10 @@ static int ntfs_read_locked_index_inode(struct inode *base_vi, struct inode *vi) - "two.", ni->itype.index.block_size); - goto unm_err_out; - } -- if (ni->itype.index.block_size > PAGE_CACHE_SIZE) { -- ntfs_error(vi->i_sb, "Index block size (%u) > PAGE_CACHE_SIZE " -+ if (ni->itype.index.block_size > PAGE_SIZE) { -+ ntfs_error(vi->i_sb, "Index block size (%u) > PAGE_SIZE " - "(%ld) is not supported. Sorry.", -- ni->itype.index.block_size, PAGE_CACHE_SIZE); -+ ni->itype.index.block_size, PAGE_SIZE); - err = -EOPNOTSUPP; - goto unm_err_out; - } -diff --git a/fs/ntfs/lcnalloc.c b/fs/ntfs/lcnalloc.c -index 1711b710b641..27a24a42f712 100644 ---- a/fs/ntfs/lcnalloc.c -+++ b/fs/ntfs/lcnalloc.c -@@ -283,15 +283,15 @@ runlist_element *ntfs_cluster_alloc(ntfs_volume *vol, const VCN start_vcn, - ntfs_unmap_page(page); - } - page = ntfs_map_page(mapping, last_read_pos >> -- PAGE_CACHE_SHIFT); -+ PAGE_SHIFT); - if (IS_ERR(page)) { - err = PTR_ERR(page); - ntfs_error(vol->sb, "Failed to map page."); - goto out; - } -- buf_size = last_read_pos & ~PAGE_CACHE_MASK; -+ buf_size = last_read_pos & ~PAGE_MASK; - buf = page_address(page) + buf_size; -- buf_size = PAGE_CACHE_SIZE - buf_size; -+ buf_size = PAGE_SIZE - buf_size; - if (unlikely(last_read_pos + buf_size > i_size)) - buf_size = i_size - last_read_pos; - buf_size <<= 3; -diff --git a/fs/ntfs/logfile.c b/fs/ntfs/logfile.c -index c71de292c5ad..9d71213ca81e 100644 ---- a/fs/ntfs/logfile.c -+++ b/fs/ntfs/logfile.c -@@ -381,7 +381,7 @@ static int ntfs_check_and_load_restart_page(struct inode *vi, - * completely inside @rp, just copy it from there. Otherwise map all - * the required pages and copy the data from them. - */ -- size = PAGE_CACHE_SIZE - (pos & ~PAGE_CACHE_MASK); -+ size = PAGE_SIZE - (pos & ~PAGE_MASK); - if (size >= le32_to_cpu(rp->system_page_size)) { - memcpy(trp, rp, le32_to_cpu(rp->system_page_size)); - } else { -@@ -394,8 +394,8 @@ static int ntfs_check_and_load_restart_page(struct inode *vi, - /* Copy the remaining data one page at a time. */ - have_read = size; - to_read = le32_to_cpu(rp->system_page_size) - size; -- idx = (pos + size) >> PAGE_CACHE_SHIFT; -- BUG_ON((pos + size) & ~PAGE_CACHE_MASK); -+ idx = (pos + size) >> PAGE_SHIFT; -+ BUG_ON((pos + size) & ~PAGE_MASK); - do { - page = ntfs_map_page(vi->i_mapping, idx); - if (IS_ERR(page)) { -@@ -406,7 +406,7 @@ static int ntfs_check_and_load_restart_page(struct inode *vi, - err = -EIO; - goto err_out; - } -- size = min_t(int, to_read, PAGE_CACHE_SIZE); -+ size = min_t(int, to_read, PAGE_SIZE); - memcpy((u8*)trp + have_read, page_address(page), size); - ntfs_unmap_page(page); - have_read += size; -@@ -509,11 +509,11 @@ bool ntfs_check_logfile(struct inode *log_vi, RESTART_PAGE_HEADER **rp) - * log page size if the page cache size is between the default log page - * size and twice that. - */ -- if (PAGE_CACHE_SIZE >= DefaultLogPageSize && PAGE_CACHE_SIZE <= -+ if (PAGE_SIZE >= DefaultLogPageSize && PAGE_SIZE <= - DefaultLogPageSize * 2) - log_page_size = DefaultLogPageSize; - else -- log_page_size = PAGE_CACHE_SIZE; -+ log_page_size = PAGE_SIZE; - log_page_mask = log_page_size - 1; - /* - * Use ntfs_ffs() instead of ffs() to enable the compiler to -@@ -539,7 +539,7 @@ bool ntfs_check_logfile(struct inode *log_vi, RESTART_PAGE_HEADER **rp) - * to be empty. - */ - for (pos = 0; pos < size; pos <<= 1) { -- pgoff_t idx = pos >> PAGE_CACHE_SHIFT; -+ pgoff_t idx = pos >> PAGE_SHIFT; - if (!page || page->index != idx) { - if (page) - ntfs_unmap_page(page); -@@ -550,7 +550,7 @@ bool ntfs_check_logfile(struct inode *log_vi, RESTART_PAGE_HEADER **rp) - goto err_out; - } - } -- kaddr = (u8*)page_address(page) + (pos & ~PAGE_CACHE_MASK); -+ kaddr = (u8*)page_address(page) + (pos & ~PAGE_MASK); - /* - * A non-empty block means the logfile is not empty while an - * empty block after a non-empty block has been encountered -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)) { -diff --git a/fs/ntfs/ntfs.h b/fs/ntfs/ntfs.h -index c581e26a350d..12de47b96ca9 100644 ---- a/fs/ntfs/ntfs.h -+++ b/fs/ntfs/ntfs.h -@@ -43,7 +43,7 @@ typedef enum { - NTFS_MAX_NAME_LEN = 255, - NTFS_MAX_ATTR_NAME_LEN = 255, - NTFS_MAX_CLUSTER_SIZE = 64 * 1024, /* 64kiB */ -- NTFS_MAX_PAGES_PER_CLUSTER = NTFS_MAX_CLUSTER_SIZE / PAGE_CACHE_SIZE, -+ NTFS_MAX_PAGES_PER_CLUSTER = NTFS_MAX_CLUSTER_SIZE / PAGE_SIZE, - } NTFS_CONSTANTS; - - /* Global variables. */ -diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c -index 1b38abdaa3ed..ecb49870a680 100644 ---- a/fs/ntfs/super.c -+++ b/fs/ntfs/super.c -@@ -823,14 +823,14 @@ static bool parse_ntfs_boot_sector(ntfs_volume *vol, const NTFS_BOOT_SECTOR *b) - ntfs_debug("vol->mft_record_size_bits = %i (0x%x)", - vol->mft_record_size_bits, vol->mft_record_size_bits); - /* -- * We cannot support mft record sizes above the PAGE_CACHE_SIZE since -+ * We cannot support mft record sizes above the PAGE_SIZE since - * we store $MFT/$DATA, the table of mft records in the page cache. - */ -- if (vol->mft_record_size > PAGE_CACHE_SIZE) { -+ if (vol->mft_record_size > PAGE_SIZE) { - ntfs_error(vol->sb, "Mft record size (%i) exceeds the " -- "PAGE_CACHE_SIZE on your system (%lu). " -+ "PAGE_SIZE on your system (%lu). " - "This is not supported. Sorry.", -- vol->mft_record_size, PAGE_CACHE_SIZE); -+ vol->mft_record_size, PAGE_SIZE); - return false; - } - /* We cannot support mft record sizes below the sector size. */ -@@ -1096,7 +1096,7 @@ static bool check_mft_mirror(ntfs_volume *vol) - - ntfs_debug("Entering."); - /* Compare contents of $MFT and $MFTMirr. */ -- mrecs_per_page = PAGE_CACHE_SIZE / vol->mft_record_size; -+ mrecs_per_page = PAGE_SIZE / vol->mft_record_size; - BUG_ON(!mrecs_per_page); - BUG_ON(!vol->mftmirr_size); - mft_page = mirr_page = NULL; -@@ -1615,20 +1615,20 @@ static bool load_and_init_attrdef(ntfs_volume *vol) - if (!vol->attrdef) - goto iput_failed; - index = 0; -- max_index = i_size >> PAGE_CACHE_SHIFT; -- size = PAGE_CACHE_SIZE; -+ max_index = i_size >> PAGE_SHIFT; -+ size = PAGE_SIZE; - while (index < max_index) { - /* Read the attrdef table and copy it into the linear buffer. */ - read_partial_attrdef_page: - page = ntfs_map_page(ino->i_mapping, index); - if (IS_ERR(page)) - goto free_iput_failed; -- memcpy((u8*)vol->attrdef + (index++ << PAGE_CACHE_SHIFT), -+ memcpy((u8*)vol->attrdef + (index++ << PAGE_SHIFT), - page_address(page), size); - ntfs_unmap_page(page); - }; -- if (size == PAGE_CACHE_SIZE) { -- size = i_size & ~PAGE_CACHE_MASK; -+ if (size == PAGE_SIZE) { -+ size = i_size & ~PAGE_MASK; - if (size) - goto read_partial_attrdef_page; - } -@@ -1684,20 +1684,20 @@ static bool load_and_init_upcase(ntfs_volume *vol) - if (!vol->upcase) - goto iput_upcase_failed; - index = 0; -- max_index = i_size >> PAGE_CACHE_SHIFT; -- size = PAGE_CACHE_SIZE; -+ max_index = i_size >> PAGE_SHIFT; -+ size = PAGE_SIZE; - while (index < max_index) { - /* Read the upcase table and copy it into the linear buffer. */ - read_partial_upcase_page: - page = ntfs_map_page(ino->i_mapping, index); - if (IS_ERR(page)) - goto iput_upcase_failed; -- memcpy((char*)vol->upcase + (index++ << PAGE_CACHE_SHIFT), -+ memcpy((char*)vol->upcase + (index++ << PAGE_SHIFT), - page_address(page), size); - ntfs_unmap_page(page); - }; -- if (size == PAGE_CACHE_SIZE) { -- size = i_size & ~PAGE_CACHE_MASK; -+ if (size == PAGE_SIZE) { -+ size = i_size & ~PAGE_MASK; - if (size) - goto read_partial_upcase_page; - } -@@ -2471,14 +2471,14 @@ static s64 get_nr_free_clusters(ntfs_volume *vol) - down_read(&vol->lcnbmp_lock); - /* - * Convert the number of bits into bytes rounded up, then convert into -- * multiples of PAGE_CACHE_SIZE, rounding up so that if we have one -+ * multiples of PAGE_SIZE, rounding up so that if we have one - * full and one partial page max_index = 2. - */ -- max_index = (((vol->nr_clusters + 7) >> 3) + PAGE_CACHE_SIZE - 1) >> -- PAGE_CACHE_SHIFT; -- /* Use multiples of 4 bytes, thus max_size is PAGE_CACHE_SIZE / 4. */ -+ max_index = (((vol->nr_clusters + 7) >> 3) + PAGE_SIZE - 1) >> -+ PAGE_SHIFT; -+ /* Use multiples of 4 bytes, thus max_size is PAGE_SIZE / 4. */ - ntfs_debug("Reading $Bitmap, max_index = 0x%lx, max_size = 0x%lx.", -- max_index, PAGE_CACHE_SIZE / 4); -+ max_index, PAGE_SIZE / 4); - for (index = 0; index < max_index; index++) { - unsigned long *kaddr; - -@@ -2491,7 +2491,7 @@ static s64 get_nr_free_clusters(ntfs_volume *vol) - if (IS_ERR(page)) { - ntfs_debug("read_mapping_page() error. Skipping " - "page (index 0x%lx).", index); -- nr_free -= PAGE_CACHE_SIZE * 8; -+ nr_free -= PAGE_SIZE * 8; - continue; - } - kaddr = kmap_atomic(page); -@@ -2503,9 +2503,9 @@ static s64 get_nr_free_clusters(ntfs_volume *vol) - * ntfs_readpage(). - */ - nr_free -= bitmap_weight(kaddr, -- PAGE_CACHE_SIZE * BITS_PER_BYTE); -+ PAGE_SIZE * BITS_PER_BYTE); - kunmap_atomic(kaddr); -- page_cache_release(page); -+ put_page(page); - } - ntfs_debug("Finished reading $Bitmap, last index = 0x%lx.", index - 1); - /* -@@ -2547,9 +2547,9 @@ static unsigned long __get_nr_free_mft_records(ntfs_volume *vol, - pgoff_t index; - - ntfs_debug("Entering."); -- /* Use multiples of 4 bytes, thus max_size is PAGE_CACHE_SIZE / 4. */ -+ /* Use multiples of 4 bytes, thus max_size is PAGE_SIZE / 4. */ - ntfs_debug("Reading $MFT/$BITMAP, max_index = 0x%lx, max_size = " -- "0x%lx.", max_index, PAGE_CACHE_SIZE / 4); -+ "0x%lx.", max_index, PAGE_SIZE / 4); - for (index = 0; index < max_index; index++) { - unsigned long *kaddr; - -@@ -2562,7 +2562,7 @@ static unsigned long __get_nr_free_mft_records(ntfs_volume *vol, - if (IS_ERR(page)) { - ntfs_debug("read_mapping_page() error. Skipping " - "page (index 0x%lx).", index); -- nr_free -= PAGE_CACHE_SIZE * 8; -+ nr_free -= PAGE_SIZE * 8; - continue; - } - kaddr = kmap_atomic(page); -@@ -2574,9 +2574,9 @@ static unsigned long __get_nr_free_mft_records(ntfs_volume *vol, - * ntfs_readpage(). - */ - nr_free -= bitmap_weight(kaddr, -- PAGE_CACHE_SIZE * BITS_PER_BYTE); -+ PAGE_SIZE * BITS_PER_BYTE); - kunmap_atomic(kaddr); -- page_cache_release(page); -+ put_page(page); - } - ntfs_debug("Finished reading $MFT/$BITMAP, last index = 0x%lx.", - index - 1); -@@ -2618,17 +2618,17 @@ static int ntfs_statfs(struct dentry *dentry, struct kstatfs *sfs) - /* Type of filesystem. */ - sfs->f_type = NTFS_SB_MAGIC; - /* Optimal transfer block size. */ -- sfs->f_bsize = PAGE_CACHE_SIZE; -+ sfs->f_bsize = PAGE_SIZE; - /* - * Total data blocks in filesystem in units of f_bsize and since - * inodes are also stored in data blocs ($MFT is a file) this is just - * the total clusters. - */ - sfs->f_blocks = vol->nr_clusters << vol->cluster_size_bits >> -- PAGE_CACHE_SHIFT; -+ PAGE_SHIFT; - /* Free data blocks in filesystem in units of f_bsize. */ - size = get_nr_free_clusters(vol) << vol->cluster_size_bits >> -- PAGE_CACHE_SHIFT; -+ PAGE_SHIFT; - if (size < 0LL) - size = 0LL; - /* Free blocks avail to non-superuser, same as above on NTFS. */ -@@ -2639,11 +2639,11 @@ static int ntfs_statfs(struct dentry *dentry, struct kstatfs *sfs) - size = i_size_read(vol->mft_ino) >> vol->mft_record_size_bits; - /* - * Convert the maximum number of set bits into bytes rounded up, then -- * convert into multiples of PAGE_CACHE_SIZE, rounding up so that if we -+ * convert into multiples of PAGE_SIZE, rounding up so that if we - * have one full and one partial page max_index = 2. - */ - max_index = ((((mft_ni->initialized_size >> vol->mft_record_size_bits) -- + 7) >> 3) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -+ + 7) >> 3) + PAGE_SIZE - 1) >> PAGE_SHIFT; - read_unlock_irqrestore(&mft_ni->size_lock, flags); - /* Number of inodes in filesystem (at this point in time). */ - sfs->f_files = size; -@@ -2765,15 +2765,15 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent) - if (!parse_options(vol, (char*)opt)) - goto err_out_now; - -- /* We support sector sizes up to the PAGE_CACHE_SIZE. */ -- if (bdev_logical_block_size(sb->s_bdev) > PAGE_CACHE_SIZE) { -+ /* We support sector sizes up to the PAGE_SIZE. */ -+ if (bdev_logical_block_size(sb->s_bdev) > PAGE_SIZE) { - if (!silent) - ntfs_error(sb, "Device has unsupported sector size " - "(%i). The maximum supported sector " - "size on this architecture is %lu " - "bytes.", - bdev_logical_block_size(sb->s_bdev), -- PAGE_CACHE_SIZE); -+ PAGE_SIZE); - goto err_out_now; - } - /* -diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c -index d002579c6f2b..7b45d061096e 100644 ---- a/fs/ocfs2/alloc.c -+++ b/fs/ocfs2/alloc.c -@@ -6648,7 +6648,7 @@ static void ocfs2_zero_cluster_pages(struct inode *inode, loff_t start, - { - int i; - struct page *page; -- unsigned int from, to = PAGE_CACHE_SIZE; -+ unsigned int from, to = PAGE_SIZE; - struct super_block *sb = inode->i_sb; - - BUG_ON(!ocfs2_sparse_alloc(OCFS2_SB(sb))); -@@ -6656,21 +6656,21 @@ static void ocfs2_zero_cluster_pages(struct inode *inode, loff_t start, - if (numpages == 0) - goto out; - -- to = PAGE_CACHE_SIZE; -+ to = PAGE_SIZE; - for(i = 0; i < numpages; i++) { - page = pages[i]; - -- from = start & (PAGE_CACHE_SIZE - 1); -- if ((end >> PAGE_CACHE_SHIFT) == page->index) -- to = end & (PAGE_CACHE_SIZE - 1); -+ from = start & (PAGE_SIZE - 1); -+ if ((end >> PAGE_SHIFT) == page->index) -+ to = end & (PAGE_SIZE - 1); - -- BUG_ON(from > PAGE_CACHE_SIZE); -- BUG_ON(to > PAGE_CACHE_SIZE); -+ BUG_ON(from > PAGE_SIZE); -+ BUG_ON(to > PAGE_SIZE); - - ocfs2_map_and_dirty_page(inode, handle, from, to, page, 1, - &phys); - -- start = (page->index + 1) << PAGE_CACHE_SHIFT; -+ start = (page->index + 1) << PAGE_SHIFT; - } - out: - if (pages) -@@ -6689,7 +6689,7 @@ int ocfs2_grab_pages(struct inode *inode, loff_t start, loff_t end, - - numpages = 0; - last_page_bytes = PAGE_ALIGN(end); -- index = start >> PAGE_CACHE_SHIFT; -+ index = start >> PAGE_SHIFT; - do { - pages[numpages] = find_or_create_page(mapping, index, GFP_NOFS); - if (!pages[numpages]) { -@@ -6700,7 +6700,7 @@ int ocfs2_grab_pages(struct inode *inode, loff_t start, loff_t end, - - numpages++; - index++; -- } while (index < (last_page_bytes >> PAGE_CACHE_SHIFT)); -+ } while (index < (last_page_bytes >> PAGE_SHIFT)); - - out: - if (ret != 0) { -@@ -6927,8 +6927,8 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode, - * to do that now. - */ - if (!ocfs2_sparse_alloc(osb) && -- PAGE_CACHE_SIZE < osb->s_clustersize) -- end = PAGE_CACHE_SIZE; -+ PAGE_SIZE < osb->s_clustersize) -+ end = PAGE_SIZE; - - ret = ocfs2_grab_eof_pages(inode, 0, end, pages, &num_pages); - if (ret) { -@@ -6948,8 +6948,8 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode, - goto out_unlock; - } - -- page_end = PAGE_CACHE_SIZE; -- if (PAGE_CACHE_SIZE > osb->s_clustersize) -+ page_end = PAGE_SIZE; -+ if (PAGE_SIZE > osb->s_clustersize) - page_end = osb->s_clustersize; - - for (i = 0; i < num_pages; i++) -diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c -index cda0361e95a4..af9298370d98 100644 ---- a/fs/ocfs2/aops.c -+++ b/fs/ocfs2/aops.c -@@ -234,7 +234,7 @@ int ocfs2_read_inline_data(struct inode *inode, struct page *page, - - size = i_size_read(inode); - -- if (size > PAGE_CACHE_SIZE || -+ if (size > PAGE_SIZE || - size > ocfs2_max_inline_data_with_xattr(inode->i_sb, di)) { - ocfs2_error(inode->i_sb, - "Inode %llu has with inline data has bad size: %Lu\n", -@@ -247,7 +247,7 @@ int ocfs2_read_inline_data(struct inode *inode, struct page *page, - if (size) - memcpy(kaddr, di->id2.i_data.id_data, size); - /* Clear the remaining part of the page */ -- memset(kaddr + size, 0, PAGE_CACHE_SIZE - size); -+ memset(kaddr + size, 0, PAGE_SIZE - size); - flush_dcache_page(page); - kunmap_atomic(kaddr); - -@@ -282,7 +282,7 @@ static int ocfs2_readpage(struct file *file, struct page *page) - { - struct inode *inode = page->mapping->host; - struct ocfs2_inode_info *oi = OCFS2_I(inode); -- loff_t start = (loff_t)page->index << PAGE_CACHE_SHIFT; -+ loff_t start = (loff_t)page->index << PAGE_SHIFT; - int ret, unlock = 1; - - trace_ocfs2_readpage((unsigned long long)oi->ip_blkno, -@@ -385,7 +385,7 @@ static int ocfs2_readpages(struct file *filp, struct address_space *mapping, - * drop out in that case as it's not worth handling here. - */ - last = list_entry(pages->prev, struct page, lru); -- start = (loff_t)last->index << PAGE_CACHE_SHIFT; -+ start = (loff_t)last->index << PAGE_SHIFT; - if (start >= i_size_read(inode)) - goto out_unlock; - -@@ -1015,12 +1015,12 @@ static void ocfs2_figure_cluster_boundaries(struct ocfs2_super *osb, - unsigned int *start, - unsigned int *end) - { -- unsigned int cluster_start = 0, cluster_end = PAGE_CACHE_SIZE; -+ unsigned int cluster_start = 0, cluster_end = PAGE_SIZE; - -- if (unlikely(PAGE_CACHE_SHIFT > osb->s_clustersize_bits)) { -+ if (unlikely(PAGE_SHIFT > osb->s_clustersize_bits)) { - unsigned int cpp; - -- cpp = 1 << (PAGE_CACHE_SHIFT - osb->s_clustersize_bits); -+ cpp = 1 << (PAGE_SHIFT - osb->s_clustersize_bits); - - cluster_start = cpos % cpp; - cluster_start = cluster_start << osb->s_clustersize_bits; -@@ -1188,13 +1188,13 @@ next_bh: - return ret; - } - --#if (PAGE_CACHE_SIZE >= OCFS2_MAX_CLUSTERSIZE) -+#if (PAGE_SIZE >= OCFS2_MAX_CLUSTERSIZE) - #define OCFS2_MAX_CTXT_PAGES 1 - #else --#define OCFS2_MAX_CTXT_PAGES (OCFS2_MAX_CLUSTERSIZE / PAGE_CACHE_SIZE) -+#define OCFS2_MAX_CTXT_PAGES (OCFS2_MAX_CLUSTERSIZE / PAGE_SIZE) - #endif - --#define OCFS2_MAX_CLUSTERS_PER_PAGE (PAGE_CACHE_SIZE / OCFS2_MIN_CLUSTERSIZE) -+#define OCFS2_MAX_CLUSTERS_PER_PAGE (PAGE_SIZE / OCFS2_MIN_CLUSTERSIZE) - - /* - * Describe the state of a single cluster to be written to. -@@ -1277,7 +1277,7 @@ void ocfs2_unlock_and_free_pages(struct page **pages, int num_pages) - if (pages[i]) { - unlock_page(pages[i]); - mark_page_accessed(pages[i]); -- page_cache_release(pages[i]); -+ put_page(pages[i]); - } - } - } -@@ -1300,7 +1300,7 @@ static void ocfs2_unlock_pages(struct ocfs2_write_ctxt *wc) - } - } - mark_page_accessed(wc->w_target_page); -- page_cache_release(wc->w_target_page); -+ put_page(wc->w_target_page); - } - ocfs2_unlock_and_free_pages(wc->w_pages, wc->w_num_pages); - } -@@ -1330,7 +1330,7 @@ static int ocfs2_alloc_write_ctxt(struct ocfs2_write_ctxt **wcp, - get_bh(di_bh); - wc->w_di_bh = di_bh; - -- if (unlikely(PAGE_CACHE_SHIFT > osb->s_clustersize_bits)) -+ if (unlikely(PAGE_SHIFT > osb->s_clustersize_bits)) - wc->w_large_pages = 1; - else - wc->w_large_pages = 0; -@@ -1392,7 +1392,7 @@ static void ocfs2_write_failure(struct inode *inode, - loff_t user_pos, unsigned user_len) - { - int i; -- unsigned from = user_pos & (PAGE_CACHE_SIZE - 1), -+ unsigned from = user_pos & (PAGE_SIZE - 1), - to = user_pos + user_len; - struct page *tmppage; - -@@ -1431,7 +1431,7 @@ static int ocfs2_prepare_page_for_write(struct inode *inode, u64 *p_blkno, - (page_offset(page) <= user_pos)); - - if (page == wc->w_target_page) { -- map_from = user_pos & (PAGE_CACHE_SIZE - 1); -+ map_from = user_pos & (PAGE_SIZE - 1); - map_to = map_from + user_len; - - if (new) -@@ -1505,7 +1505,7 @@ static int ocfs2_grab_pages_for_write(struct address_space *mapping, - struct inode *inode = mapping->host; - loff_t last_byte; - -- target_index = user_pos >> PAGE_CACHE_SHIFT; -+ target_index = user_pos >> PAGE_SHIFT; - - /* - * Figure out how many pages we'll be manipulating here. For -@@ -1524,7 +1524,7 @@ static int ocfs2_grab_pages_for_write(struct address_space *mapping, - */ - last_byte = max(user_pos + user_len, i_size_read(inode)); - BUG_ON(last_byte < 1); -- end_index = ((last_byte - 1) >> PAGE_CACHE_SHIFT) + 1; -+ end_index = ((last_byte - 1) >> PAGE_SHIFT) + 1; - if ((start + wc->w_num_pages) > end_index) - wc->w_num_pages = end_index - start; - } else { -@@ -1551,7 +1551,7 @@ static int ocfs2_grab_pages_for_write(struct address_space *mapping, - goto out; - } - -- page_cache_get(mmap_page); -+ get_page(mmap_page); - wc->w_pages[i] = mmap_page; - wc->w_target_locked = true; - } else { -@@ -1731,7 +1731,7 @@ static void ocfs2_set_target_boundaries(struct ocfs2_super *osb, - { - struct ocfs2_write_cluster_desc *desc; - -- wc->w_target_from = pos & (PAGE_CACHE_SIZE - 1); -+ wc->w_target_from = pos & (PAGE_SIZE - 1); - wc->w_target_to = wc->w_target_from + len; - - if (alloc == 0) -@@ -1768,7 +1768,7 @@ static void ocfs2_set_target_boundaries(struct ocfs2_super *osb, - &wc->w_target_to); - } else { - wc->w_target_from = 0; -- wc->w_target_to = PAGE_CACHE_SIZE; -+ wc->w_target_to = PAGE_SIZE; - } - } - -@@ -2368,7 +2368,7 @@ int ocfs2_write_end_nolock(struct address_space *mapping, - struct page *page, void *fsdata) - { - int i, ret; -- unsigned from, to, start = pos & (PAGE_CACHE_SIZE - 1); -+ unsigned from, to, start = pos & (PAGE_SIZE - 1); - struct inode *inode = mapping->host; - struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); - struct ocfs2_write_ctxt *wc = fsdata; -@@ -2405,8 +2405,8 @@ int ocfs2_write_end_nolock(struct address_space *mapping, - from = wc->w_target_from; - to = wc->w_target_to; - -- BUG_ON(from > PAGE_CACHE_SIZE || -- to > PAGE_CACHE_SIZE || -+ BUG_ON(from > PAGE_SIZE || -+ to > PAGE_SIZE || - to < from); - } else { - /* -@@ -2415,7 +2415,7 @@ int ocfs2_write_end_nolock(struct address_space *mapping, - * to flush their entire range. - */ - from = 0; -- to = PAGE_CACHE_SIZE; -+ to = PAGE_SIZE; - } - - if (page_has_buffers(tmppage)) { -diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c -index ef6a2ec494de..2c85f5330e12 100644 ---- a/fs/ocfs2/cluster/heartbeat.c -+++ b/fs/ocfs2/cluster/heartbeat.c -@@ -417,13 +417,13 @@ static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg, - bio->bi_private = wc; - bio->bi_end_io = o2hb_bio_end_io; - -- vec_start = (cs << bits) % PAGE_CACHE_SIZE; -+ vec_start = (cs << bits) % PAGE_SIZE; - while(cs < max_slots) { - current_page = cs / spp; - page = reg->hr_slot_data[current_page]; - -- vec_len = min(PAGE_CACHE_SIZE - vec_start, -- (max_slots-cs) * (PAGE_CACHE_SIZE/spp) ); -+ vec_len = min(PAGE_SIZE - vec_start, -+ (max_slots-cs) * (PAGE_SIZE/spp) ); - - mlog(ML_HB_BIO, "page %d, vec_len = %u, vec_start = %u\n", - current_page, vec_len, vec_start); -@@ -431,7 +431,7 @@ static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg, - len = bio_add_page(bio, page, vec_len, vec_start); - if (len != vec_len) break; - -- cs += vec_len / (PAGE_CACHE_SIZE/spp); -+ cs += vec_len / (PAGE_SIZE/spp); - vec_start = 0; - } - -@@ -1576,7 +1576,7 @@ static ssize_t o2hb_region_dev_show(struct config_item *item, char *page) - - static void o2hb_init_region_params(struct o2hb_region *reg) - { -- reg->hr_slots_per_page = PAGE_CACHE_SIZE >> reg->hr_block_bits; -+ reg->hr_slots_per_page = PAGE_SIZE >> reg->hr_block_bits; - reg->hr_timeout_ms = O2HB_REGION_TIMEOUT_MS; - - mlog(ML_HEARTBEAT, "hr_start_block = %llu, hr_blocks = %u\n", -diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c -index 03768bb3aab1..47b3b2d4e775 100644 ---- a/fs/ocfs2/dlmfs/dlmfs.c -+++ b/fs/ocfs2/dlmfs/dlmfs.c -@@ -571,8 +571,8 @@ static int dlmfs_fill_super(struct super_block * sb, - int silent) - { - sb->s_maxbytes = MAX_LFS_FILESIZE; -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ sb->s_blocksize = PAGE_SIZE; -+ sb->s_blocksize_bits = PAGE_SHIFT; - sb->s_magic = DLMFS_MAGIC; - sb->s_op = &dlmfs_ops; - sb->s_root = d_make_root(dlmfs_get_root_inode(sb)); -diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c -index 7cb38fdca229..32e19a63a4fa 100644 ---- a/fs/ocfs2/file.c -+++ b/fs/ocfs2/file.c -@@ -770,14 +770,14 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from, - { - struct address_space *mapping = inode->i_mapping; - struct page *page; -- unsigned long index = abs_from >> PAGE_CACHE_SHIFT; -+ unsigned long index = abs_from >> PAGE_SHIFT; - handle_t *handle; - int ret = 0; - unsigned zero_from, zero_to, block_start, block_end; - struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data; - - BUG_ON(abs_from >= abs_to); -- BUG_ON(abs_to > (((u64)index + 1) << PAGE_CACHE_SHIFT)); -+ BUG_ON(abs_to > (((u64)index + 1) << PAGE_SHIFT)); - BUG_ON(abs_from & (inode->i_blkbits - 1)); - - handle = ocfs2_zero_start_ordered_transaction(inode, di_bh); -@@ -794,10 +794,10 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from, - } - - /* Get the offsets within the page that we want to zero */ -- zero_from = abs_from & (PAGE_CACHE_SIZE - 1); -- zero_to = abs_to & (PAGE_CACHE_SIZE - 1); -+ zero_from = abs_from & (PAGE_SIZE - 1); -+ zero_to = abs_to & (PAGE_SIZE - 1); - if (!zero_to) -- zero_to = PAGE_CACHE_SIZE; -+ zero_to = PAGE_SIZE; - - trace_ocfs2_write_zero_page( - (unsigned long long)OCFS2_I(inode)->ip_blkno, -@@ -851,7 +851,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from, - - out_unlock: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - out_commit_trans: - if (handle) - ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle); -@@ -959,7 +959,7 @@ static int ocfs2_zero_extend_range(struct inode *inode, u64 range_start, - BUG_ON(range_start >= range_end); - - while (zero_pos < range_end) { -- next_pos = (zero_pos & PAGE_CACHE_MASK) + PAGE_CACHE_SIZE; -+ next_pos = (zero_pos & PAGE_MASK) + PAGE_SIZE; - if (next_pos > range_end) - next_pos = range_end; - rc = ocfs2_write_zero_page(inode, zero_pos, next_pos, di_bh); -diff --git a/fs/ocfs2/mmap.c b/fs/ocfs2/mmap.c -index 77ebc2bc1cca..872e6800267f 100644 ---- a/fs/ocfs2/mmap.c -+++ b/fs/ocfs2/mmap.c -@@ -65,13 +65,13 @@ static int __ocfs2_page_mkwrite(struct file *file, struct buffer_head *di_bh, - struct inode *inode = file_inode(file); - struct address_space *mapping = inode->i_mapping; - loff_t pos = page_offset(page); -- unsigned int len = PAGE_CACHE_SIZE; -+ unsigned int len = PAGE_SIZE; - pgoff_t last_index; - struct page *locked_page = NULL; - void *fsdata; - loff_t size = i_size_read(inode); - -- last_index = (size - 1) >> PAGE_CACHE_SHIFT; -+ last_index = (size - 1) >> PAGE_SHIFT; - - /* - * There are cases that lead to the page no longer bebongs to the -@@ -102,7 +102,7 @@ static int __ocfs2_page_mkwrite(struct file *file, struct buffer_head *di_bh, - * because the "write" would invalidate their data. - */ - if (page->index == last_index) -- len = ((size - 1) & ~PAGE_CACHE_MASK) + 1; -+ len = ((size - 1) & ~PAGE_MASK) + 1; - - ret = ocfs2_write_begin_nolock(file, mapping, pos, len, 0, &locked_page, - &fsdata, di_bh, page); -diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h -index 7a0126267847..7a592877c33b 100644 ---- a/fs/ocfs2/ocfs2.h -+++ b/fs/ocfs2/ocfs2.h -@@ -814,10 +814,10 @@ static inline unsigned int ocfs2_page_index_to_clusters(struct super_block *sb, - u32 clusters = pg_index; - unsigned int cbits = OCFS2_SB(sb)->s_clustersize_bits; - -- if (unlikely(PAGE_CACHE_SHIFT > cbits)) -- clusters = pg_index << (PAGE_CACHE_SHIFT - cbits); -- else if (PAGE_CACHE_SHIFT < cbits) -- clusters = pg_index >> (cbits - PAGE_CACHE_SHIFT); -+ if (unlikely(PAGE_SHIFT > cbits)) -+ clusters = pg_index << (PAGE_SHIFT - cbits); -+ else if (PAGE_SHIFT < cbits) -+ clusters = pg_index >> (cbits - PAGE_SHIFT); - - return clusters; - } -@@ -831,10 +831,10 @@ static inline pgoff_t ocfs2_align_clusters_to_page_index(struct super_block *sb, - unsigned int cbits = OCFS2_SB(sb)->s_clustersize_bits; - pgoff_t index = clusters; - -- if (PAGE_CACHE_SHIFT > cbits) { -- index = (pgoff_t)clusters >> (PAGE_CACHE_SHIFT - cbits); -- } else if (PAGE_CACHE_SHIFT < cbits) { -- index = (pgoff_t)clusters << (cbits - PAGE_CACHE_SHIFT); -+ if (PAGE_SHIFT > cbits) { -+ index = (pgoff_t)clusters >> (PAGE_SHIFT - cbits); -+ } else if (PAGE_SHIFT < cbits) { -+ index = (pgoff_t)clusters << (cbits - PAGE_SHIFT); - } - - return index; -@@ -845,8 +845,8 @@ static inline unsigned int ocfs2_pages_per_cluster(struct super_block *sb) - unsigned int cbits = OCFS2_SB(sb)->s_clustersize_bits; - unsigned int pages_per_cluster = 1; - -- if (PAGE_CACHE_SHIFT < cbits) -- pages_per_cluster = 1 << (cbits - PAGE_CACHE_SHIFT); -+ if (PAGE_SHIFT < cbits) -+ pages_per_cluster = 1 << (cbits - PAGE_SHIFT); - - return pages_per_cluster; - } -diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c -index 3eff031aaf26..744d5d90c363 100644 ---- a/fs/ocfs2/refcounttree.c -+++ b/fs/ocfs2/refcounttree.c -@@ -2937,16 +2937,16 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle, - end = i_size_read(inode); - - while (offset < end) { -- page_index = offset >> PAGE_CACHE_SHIFT; -- map_end = ((loff_t)page_index + 1) << PAGE_CACHE_SHIFT; -+ page_index = offset >> PAGE_SHIFT; -+ map_end = ((loff_t)page_index + 1) << PAGE_SHIFT; - if (map_end > end) - map_end = end; - - /* from, to is the offset within the page. */ -- from = offset & (PAGE_CACHE_SIZE - 1); -- to = PAGE_CACHE_SIZE; -- if (map_end & (PAGE_CACHE_SIZE - 1)) -- to = map_end & (PAGE_CACHE_SIZE - 1); -+ from = offset & (PAGE_SIZE - 1); -+ to = PAGE_SIZE; -+ if (map_end & (PAGE_SIZE - 1)) -+ to = map_end & (PAGE_SIZE - 1); - - page = find_or_create_page(mapping, page_index, GFP_NOFS); - if (!page) { -@@ -2956,10 +2956,10 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle, - } - - /* -- * In case PAGE_CACHE_SIZE <= CLUSTER_SIZE, This page -+ * In case PAGE_SIZE <= CLUSTER_SIZE, This page - * can't be dirtied before we CoW it out. - */ -- if (PAGE_CACHE_SIZE <= OCFS2_SB(sb)->s_clustersize) -+ if (PAGE_SIZE <= OCFS2_SB(sb)->s_clustersize) - BUG_ON(PageDirty(page)); - - if (!PageUptodate(page)) { -@@ -2987,7 +2987,7 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle, - mark_page_accessed(page); - unlock: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - page = NULL; - offset = map_end; - if (ret) -@@ -3165,8 +3165,8 @@ int ocfs2_cow_sync_writeback(struct super_block *sb, - } - - while (offset < end) { -- page_index = offset >> PAGE_CACHE_SHIFT; -- map_end = ((loff_t)page_index + 1) << PAGE_CACHE_SHIFT; -+ page_index = offset >> PAGE_SHIFT; -+ map_end = ((loff_t)page_index + 1) << PAGE_SHIFT; - if (map_end > end) - map_end = end; - -@@ -3182,7 +3182,7 @@ int ocfs2_cow_sync_writeback(struct super_block *sb, - mark_page_accessed(page); - - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - page = NULL; - offset = map_end; - if (ret) -diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c -index 302854ee0985..455155ca742e 100644 ---- a/fs/ocfs2/super.c -+++ b/fs/ocfs2/super.c -@@ -610,8 +610,8 @@ static unsigned long long ocfs2_max_file_offset(unsigned int bbits, - /* - * We might be limited by page cache size. - */ -- if (bytes > PAGE_CACHE_SIZE) { -- bytes = PAGE_CACHE_SIZE; -+ if (bytes > PAGE_SIZE) { -+ bytes = PAGE_SIZE; - trim = 1; - /* - * Shift by 31 here so that we don't get larger than -diff --git a/fs/pipe.c b/fs/pipe.c -index ab8dad3ccb6a..0d3f5165cb0b 100644 ---- a/fs/pipe.c -+++ b/fs/pipe.c -@@ -134,7 +134,7 @@ static void anon_pipe_buf_release(struct pipe_inode_info *pipe, - if (page_count(page) == 1 && !pipe->tmp_page) - pipe->tmp_page = page; - else -- page_cache_release(page); -+ put_page(page); - } - - /** -@@ -180,7 +180,7 @@ EXPORT_SYMBOL(generic_pipe_buf_steal); - */ - void generic_pipe_buf_get(struct pipe_inode_info *pipe, struct pipe_buffer *buf) - { -- page_cache_get(buf->page); -+ get_page(buf->page); - } - EXPORT_SYMBOL(generic_pipe_buf_get); - -@@ -211,7 +211,7 @@ EXPORT_SYMBOL(generic_pipe_buf_confirm); - void generic_pipe_buf_release(struct pipe_inode_info *pipe, - struct pipe_buffer *buf) - { -- page_cache_release(buf->page); -+ put_page(buf->page); - } - EXPORT_SYMBOL(generic_pipe_buf_release); - -diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c -index fa95ab2d3674..31ebd7a0f8b8 100644 ---- a/fs/proc/task_mmu.c -+++ b/fs/proc/task_mmu.c -@@ -553,7 +553,7 @@ static void smaps_pte_entry(pte_t *pte, unsigned long addr, - if (radix_tree_exceptional_entry(page)) - mss->swap += PAGE_SIZE; - else -- page_cache_release(page); -+ put_page(page); - - return; - } -diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c -index 55bb57e6a30d..8afe10cf7df8 100644 ---- a/fs/proc/vmcore.c -+++ b/fs/proc/vmcore.c -@@ -279,12 +279,12 @@ static int mmap_vmcore_fault(struct vm_area_struct *vma, struct vm_fault *vmf) - if (!page) - return VM_FAULT_OOM; - if (!PageUptodate(page)) { -- offset = (loff_t) index << PAGE_CACHE_SHIFT; -+ offset = (loff_t) index << PAGE_SHIFT; - buf = __va((page_to_pfn(page) << PAGE_SHIFT)); - rc = __read_vmcore(buf, PAGE_SIZE, &offset, 0); - if (rc < 0) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return (rc == -ENOMEM) ? VM_FAULT_OOM : VM_FAULT_SIGBUS; - } - SetPageUptodate(page); -diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c -index dc645b66cd79..45d6110744cb 100644 ---- a/fs/pstore/inode.c -+++ b/fs/pstore/inode.c -@@ -420,8 +420,8 @@ static int pstore_fill_super(struct super_block *sb, void *data, int silent) - pstore_sb = sb; - - sb->s_maxbytes = MAX_LFS_FILESIZE; -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ sb->s_blocksize = PAGE_SIZE; -+ sb->s_blocksize_bits = PAGE_SHIFT; - sb->s_magic = PSTOREFS_MAGIC; - sb->s_op = &pstore_ops; - sb->s_time_gran = 1; -diff --git a/fs/qnx6/dir.c b/fs/qnx6/dir.c -index e1f37278cf97..144ceda4948e 100644 ---- a/fs/qnx6/dir.c -+++ b/fs/qnx6/dir.c -@@ -35,9 +35,9 @@ static struct page *qnx6_get_page(struct inode *dir, unsigned long n) - static unsigned last_entry(struct inode *inode, unsigned long page_nr) - { - unsigned long last_byte = inode->i_size; -- last_byte -= page_nr << PAGE_CACHE_SHIFT; -- if (last_byte > PAGE_CACHE_SIZE) -- last_byte = PAGE_CACHE_SIZE; -+ last_byte -= page_nr << PAGE_SHIFT; -+ if (last_byte > PAGE_SIZE) -+ last_byte = PAGE_SIZE; - return last_byte / QNX6_DIR_ENTRY_SIZE; - } - -@@ -47,9 +47,9 @@ static struct qnx6_long_filename *qnx6_longname(struct super_block *sb, - { - struct qnx6_sb_info *sbi = QNX6_SB(sb); - u32 s = fs32_to_cpu(sbi, de->de_long_inode); /* in block units */ -- u32 n = s >> (PAGE_CACHE_SHIFT - sb->s_blocksize_bits); /* in pages */ -+ u32 n = s >> (PAGE_SHIFT - sb->s_blocksize_bits); /* in pages */ - /* within page */ -- u32 offs = (s << sb->s_blocksize_bits) & ~PAGE_CACHE_MASK; -+ u32 offs = (s << sb->s_blocksize_bits) & ~PAGE_MASK; - struct address_space *mapping = sbi->longfile->i_mapping; - struct page *page = read_mapping_page(mapping, n, NULL); - if (IS_ERR(page)) -@@ -115,8 +115,8 @@ static int qnx6_readdir(struct file *file, struct dir_context *ctx) - struct qnx6_sb_info *sbi = QNX6_SB(s); - loff_t pos = ctx->pos & ~(QNX6_DIR_ENTRY_SIZE - 1); - unsigned long npages = dir_pages(inode); -- unsigned long n = pos >> PAGE_CACHE_SHIFT; -- unsigned start = (pos & ~PAGE_CACHE_MASK) / QNX6_DIR_ENTRY_SIZE; -+ unsigned long n = pos >> PAGE_SHIFT; -+ unsigned start = (pos & ~PAGE_MASK) / QNX6_DIR_ENTRY_SIZE; - bool done = false; - - ctx->pos = pos; -@@ -131,7 +131,7 @@ static int qnx6_readdir(struct file *file, struct dir_context *ctx) - - if (IS_ERR(page)) { - pr_err("%s(): read failed\n", __func__); -- ctx->pos = (n + 1) << PAGE_CACHE_SHIFT; -+ ctx->pos = (n + 1) << PAGE_SHIFT; - return PTR_ERR(page); - } - de = ((struct qnx6_dir_entry *)page_address(page)) + start; -diff --git a/fs/qnx6/inode.c b/fs/qnx6/inode.c -index 47bb1de07155..1192422a1c56 100644 ---- a/fs/qnx6/inode.c -+++ b/fs/qnx6/inode.c -@@ -542,8 +542,8 @@ struct inode *qnx6_iget(struct super_block *sb, unsigned ino) - iget_failed(inode); - return ERR_PTR(-EIO); - } -- n = (ino - 1) >> (PAGE_CACHE_SHIFT - QNX6_INODE_SIZE_BITS); -- offs = (ino - 1) & (~PAGE_CACHE_MASK >> QNX6_INODE_SIZE_BITS); -+ n = (ino - 1) >> (PAGE_SHIFT - QNX6_INODE_SIZE_BITS); -+ offs = (ino - 1) & (~PAGE_MASK >> QNX6_INODE_SIZE_BITS); - mapping = sbi->inodes->i_mapping; - page = read_mapping_page(mapping, n, NULL); - if (IS_ERR(page)) { -diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h -index d3fb2b698800..f23b5c4a66ad 100644 ---- a/fs/qnx6/qnx6.h -+++ b/fs/qnx6/qnx6.h -@@ -128,7 +128,7 @@ extern struct qnx6_super_block *qnx6_mmi_fill_super(struct super_block *s, - static inline void qnx6_put_page(struct page *page) - { - kunmap(page); -- page_cache_release(page); -+ put_page(page); - } - - extern unsigned qnx6_find_entry(int len, struct inode *dir, const char *name, -diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c -index 38981b037524..1ab6e6c2e60e 100644 ---- a/fs/ramfs/inode.c -+++ b/fs/ramfs/inode.c -@@ -223,8 +223,8 @@ int ramfs_fill_super(struct super_block *sb, void *data, int silent) - return err; - - sb->s_maxbytes = MAX_LFS_FILESIZE; -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ sb->s_blocksize = PAGE_SIZE; -+ sb->s_blocksize_bits = PAGE_SHIFT; - sb->s_magic = RAMFS_MAGIC; - sb->s_op = &ramfs_ops; - sb->s_time_gran = 1; -diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c -index 9424a4ba93a9..389773711de4 100644 ---- a/fs/reiserfs/file.c -+++ b/fs/reiserfs/file.c -@@ -180,11 +180,11 @@ int reiserfs_commit_page(struct inode *inode, struct page *page, - int partial = 0; - unsigned blocksize; - struct buffer_head *bh, *head; -- unsigned long i_size_index = inode->i_size >> PAGE_CACHE_SHIFT; -+ unsigned long i_size_index = inode->i_size >> PAGE_SHIFT; - int new; - int logit = reiserfs_file_data_log(inode); - struct super_block *s = inode->i_sb; -- int bh_per_page = PAGE_CACHE_SIZE / s->s_blocksize; -+ int bh_per_page = PAGE_SIZE / s->s_blocksize; - struct reiserfs_transaction_handle th; - int ret = 0; - -diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c -index ae9e5b308cf9..d5c2e9c865de 100644 ---- a/fs/reiserfs/inode.c -+++ b/fs/reiserfs/inode.c -@@ -386,7 +386,7 @@ static int _get_block_create_0(struct inode *inode, sector_t block, - goto finished; - } - /* read file tail into part of page */ -- offset = (cpu_key_k_offset(&key) - 1) & (PAGE_CACHE_SIZE - 1); -+ offset = (cpu_key_k_offset(&key) - 1) & (PAGE_SIZE - 1); - copy_item_head(&tmp_ih, ih); - - /* -@@ -587,10 +587,10 @@ static int convert_tail_for_hole(struct inode *inode, - return -EIO; - - /* always try to read until the end of the block */ -- tail_start = tail_offset & (PAGE_CACHE_SIZE - 1); -+ tail_start = tail_offset & (PAGE_SIZE - 1); - tail_end = (tail_start | (bh_result->b_size - 1)) + 1; - -- index = tail_offset >> PAGE_CACHE_SHIFT; -+ index = tail_offset >> PAGE_SHIFT; - /* - * hole_page can be zero in case of direct_io, we are sure - * that we cannot get here if we write with O_DIRECT into tail page -@@ -629,7 +629,7 @@ static int convert_tail_for_hole(struct inode *inode, - unlock: - if (tail_page != hole_page) { - unlock_page(tail_page); -- page_cache_release(tail_page); -+ put_page(tail_page); - } - out: - return retval; -@@ -2189,11 +2189,11 @@ static int grab_tail_page(struct inode *inode, - * we want the page with the last byte in the file, - * not the page that will hold the next byte for appending - */ -- unsigned long index = (inode->i_size - 1) >> PAGE_CACHE_SHIFT; -+ unsigned long index = (inode->i_size - 1) >> PAGE_SHIFT; - unsigned long pos = 0; - unsigned long start = 0; - unsigned long blocksize = inode->i_sb->s_blocksize; -- unsigned long offset = (inode->i_size) & (PAGE_CACHE_SIZE - 1); -+ unsigned long offset = (inode->i_size) & (PAGE_SIZE - 1); - struct buffer_head *bh; - struct buffer_head *head; - struct page *page; -@@ -2251,7 +2251,7 @@ out: - - unlock: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return error; - } - -@@ -2265,7 +2265,7 @@ int reiserfs_truncate_file(struct inode *inode, int update_timestamps) - { - struct reiserfs_transaction_handle th; - /* we want the offset for the first byte after the end of the file */ -- unsigned long offset = inode->i_size & (PAGE_CACHE_SIZE - 1); -+ unsigned long offset = inode->i_size & (PAGE_SIZE - 1); - unsigned blocksize = inode->i_sb->s_blocksize; - unsigned length; - struct page *page = NULL; -@@ -2345,7 +2345,7 @@ int reiserfs_truncate_file(struct inode *inode, int update_timestamps) - } - } - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - - reiserfs_write_unlock(inode->i_sb); -@@ -2354,7 +2354,7 @@ int reiserfs_truncate_file(struct inode *inode, int update_timestamps) - out: - if (page) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - - reiserfs_write_unlock(inode->i_sb); -@@ -2426,7 +2426,7 @@ research: - } else if (is_direct_le_ih(ih)) { - char *p; - p = page_address(bh_result->b_page); -- p += (byte_offset - 1) & (PAGE_CACHE_SIZE - 1); -+ p += (byte_offset - 1) & (PAGE_SIZE - 1); - copy_size = ih_item_len(ih) - pos_in_item; - - fs_gen = get_generation(inode->i_sb); -@@ -2525,7 +2525,7 @@ static int reiserfs_write_full_page(struct page *page, - struct writeback_control *wbc) - { - struct inode *inode = page->mapping->host; -- unsigned long end_index = inode->i_size >> PAGE_CACHE_SHIFT; -+ unsigned long end_index = inode->i_size >> PAGE_SHIFT; - int error = 0; - unsigned long block; - sector_t last_block; -@@ -2535,7 +2535,7 @@ static int reiserfs_write_full_page(struct page *page, - int checked = PageChecked(page); - struct reiserfs_transaction_handle th; - struct super_block *s = inode->i_sb; -- int bh_per_page = PAGE_CACHE_SIZE / s->s_blocksize; -+ int bh_per_page = PAGE_SIZE / s->s_blocksize; - th.t_trans_id = 0; - - /* no logging allowed when nonblocking or from PF_MEMALLOC */ -@@ -2564,16 +2564,16 @@ static int reiserfs_write_full_page(struct page *page, - if (page->index >= end_index) { - unsigned last_offset; - -- last_offset = inode->i_size & (PAGE_CACHE_SIZE - 1); -+ last_offset = inode->i_size & (PAGE_SIZE - 1); - /* no file contents in this page */ - if (page->index >= end_index + 1 || !last_offset) { - unlock_page(page); - return 0; - } -- zero_user_segment(page, last_offset, PAGE_CACHE_SIZE); -+ zero_user_segment(page, last_offset, PAGE_SIZE); - } - bh = head; -- block = page->index << (PAGE_CACHE_SHIFT - s->s_blocksize_bits); -+ block = page->index << (PAGE_SHIFT - s->s_blocksize_bits); - last_block = (i_size_read(inode) - 1) >> inode->i_blkbits; - /* first map all the buffers, logging any direct items we find */ - do { -@@ -2774,7 +2774,7 @@ static int reiserfs_write_begin(struct file *file, - *fsdata = (void *)(unsigned long)flags; - } - -- index = pos >> PAGE_CACHE_SHIFT; -+ index = pos >> PAGE_SHIFT; - page = grab_cache_page_write_begin(mapping, index, flags); - if (!page) - return -ENOMEM; -@@ -2822,7 +2822,7 @@ static int reiserfs_write_begin(struct file *file, - } - if (ret) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - /* Truncate allocated blocks */ - reiserfs_truncate_failed_write(inode); - } -@@ -2909,7 +2909,7 @@ static int reiserfs_write_end(struct file *file, struct address_space *mapping, - else - th = NULL; - -- start = pos & (PAGE_CACHE_SIZE - 1); -+ start = pos & (PAGE_SIZE - 1); - if (unlikely(copied < len)) { - if (!PageUptodate(page)) - copied = 0; -@@ -2974,7 +2974,7 @@ out: - if (locked) - reiserfs_write_unlock(inode->i_sb); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - if (pos + len > inode->i_size) - reiserfs_truncate_failed_write(inode); -@@ -2996,7 +2996,7 @@ int reiserfs_commit_write(struct file *f, struct page *page, - unsigned from, unsigned to) - { - struct inode *inode = page->mapping->host; -- loff_t pos = ((loff_t) page->index << PAGE_CACHE_SHIFT) + to; -+ loff_t pos = ((loff_t) page->index << PAGE_SHIFT) + to; - int ret = 0; - int update_sd = 0; - struct reiserfs_transaction_handle *th = NULL; -@@ -3181,7 +3181,7 @@ static void reiserfs_invalidatepage(struct page *page, unsigned int offset, - struct inode *inode = page->mapping->host; - unsigned int curr_off = 0; - unsigned int stop = offset + length; -- int partial_page = (offset || length < PAGE_CACHE_SIZE); -+ int partial_page = (offset || length < PAGE_SIZE); - int ret = 1; - - BUG_ON(!PageLocked(page)); -diff --git a/fs/reiserfs/ioctl.c b/fs/reiserfs/ioctl.c -index 036a1fc0a8c3..57045f423893 100644 ---- a/fs/reiserfs/ioctl.c -+++ b/fs/reiserfs/ioctl.c -@@ -203,7 +203,7 @@ int reiserfs_unpack(struct inode *inode, struct file *filp) - * __reiserfs_write_begin on that page. This will force a - * reiserfs_get_block to unpack the tail for us. - */ -- index = inode->i_size >> PAGE_CACHE_SHIFT; -+ index = inode->i_size >> PAGE_SHIFT; - mapping = inode->i_mapping; - page = grab_cache_page(mapping, index); - retval = -ENOMEM; -@@ -221,7 +221,7 @@ int reiserfs_unpack(struct inode *inode, struct file *filp) - - out_unlock: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - out: - inode_unlock(inode); -diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c -index 44c2bdced1c8..2ace90e981f0 100644 ---- a/fs/reiserfs/journal.c -+++ b/fs/reiserfs/journal.c -@@ -599,18 +599,18 @@ static int journal_list_still_alive(struct super_block *s, - * This does a check to see if the buffer belongs to one of these - * lost pages before doing the final put_bh. If page->mapping was - * null, it tries to free buffers on the page, which should make the -- * final page_cache_release drop the page from the lru. -+ * final put_page drop the page from the lru. - */ - static void release_buffer_page(struct buffer_head *bh) - { - struct page *page = bh->b_page; - if (!page->mapping && trylock_page(page)) { -- page_cache_get(page); -+ get_page(page); - put_bh(bh); - if (!page->mapping) - try_to_free_buffers(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } else { - put_bh(bh); - } -diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c -index 24cbe013240f..5feacd689241 100644 ---- a/fs/reiserfs/stree.c -+++ b/fs/reiserfs/stree.c -@@ -1342,7 +1342,7 @@ int reiserfs_delete_item(struct reiserfs_transaction_handle *th, - */ - - data = kmap_atomic(un_bh->b_page); -- off = ((le_ih_k_offset(&s_ih) - 1) & (PAGE_CACHE_SIZE - 1)); -+ off = ((le_ih_k_offset(&s_ih) - 1) & (PAGE_SIZE - 1)); - memcpy(data + off, - ih_item_body(PATH_PLAST_BUFFER(path), &s_ih), - ret_value); -@@ -1511,7 +1511,7 @@ static void unmap_buffers(struct page *page, loff_t pos) - - if (page) { - if (page_has_buffers(page)) { -- tail_index = pos & (PAGE_CACHE_SIZE - 1); -+ tail_index = pos & (PAGE_SIZE - 1); - cur_index = 0; - head = page_buffers(page); - bh = head; -diff --git a/fs/reiserfs/tail_conversion.c b/fs/reiserfs/tail_conversion.c -index f41e19b4bb42..2d5489b0a269 100644 ---- a/fs/reiserfs/tail_conversion.c -+++ b/fs/reiserfs/tail_conversion.c -@@ -151,7 +151,7 @@ int direct2indirect(struct reiserfs_transaction_handle *th, struct inode *inode, - */ - if (up_to_date_bh) { - unsigned pgoff = -- (tail_offset + total_tail - 1) & (PAGE_CACHE_SIZE - 1); -+ (tail_offset + total_tail - 1) & (PAGE_SIZE - 1); - char *kaddr = kmap_atomic(up_to_date_bh->b_page); - memset(kaddr + pgoff, 0, blk_size - total_tail); - kunmap_atomic(kaddr); -@@ -271,7 +271,7 @@ int indirect2direct(struct reiserfs_transaction_handle *th, - * the page was locked and this part of the page was up to date when - * indirect2direct was called, so we know the bytes are still valid - */ -- tail = tail + (pos & (PAGE_CACHE_SIZE - 1)); -+ tail = tail + (pos & (PAGE_SIZE - 1)); - - PATH_LAST_POSITION(path)++; - -diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c -index 57e0b2310532..28f5f8b11370 100644 ---- a/fs/reiserfs/xattr.c -+++ b/fs/reiserfs/xattr.c -@@ -415,7 +415,7 @@ out: - static inline void reiserfs_put_page(struct page *page) - { - kunmap(page); -- page_cache_release(page); -+ put_page(page); - } - - static struct page *reiserfs_get_page(struct inode *dir, size_t n) -@@ -427,7 +427,7 @@ static struct page *reiserfs_get_page(struct inode *dir, size_t n) - * and an unlink/rmdir has just occurred - GFP_NOFS avoids this - */ - mapping_set_gfp_mask(mapping, GFP_NOFS); -- page = read_mapping_page(mapping, n >> PAGE_CACHE_SHIFT, NULL); -+ page = read_mapping_page(mapping, n >> PAGE_SHIFT, NULL); - if (!IS_ERR(page)) { - kmap(page); - if (PageError(page)) -@@ -526,10 +526,10 @@ reiserfs_xattr_set_handle(struct reiserfs_transaction_handle *th, - while (buffer_pos < buffer_size || buffer_pos == 0) { - size_t chunk; - size_t skip = 0; -- size_t page_offset = (file_pos & (PAGE_CACHE_SIZE - 1)); -+ size_t page_offset = (file_pos & (PAGE_SIZE - 1)); - -- if (buffer_size - buffer_pos > PAGE_CACHE_SIZE) -- chunk = PAGE_CACHE_SIZE; -+ if (buffer_size - buffer_pos > PAGE_SIZE) -+ chunk = PAGE_SIZE; - else - chunk = buffer_size - buffer_pos; - -@@ -546,8 +546,8 @@ reiserfs_xattr_set_handle(struct reiserfs_transaction_handle *th, - struct reiserfs_xattr_header *rxh; - - skip = file_pos = sizeof(struct reiserfs_xattr_header); -- if (chunk + skip > PAGE_CACHE_SIZE) -- chunk = PAGE_CACHE_SIZE - skip; -+ if (chunk + skip > PAGE_SIZE) -+ chunk = PAGE_SIZE - skip; - rxh = (struct reiserfs_xattr_header *)data; - rxh->h_magic = cpu_to_le32(REISERFS_XATTR_MAGIC); - rxh->h_hash = cpu_to_le32(xahash); -@@ -675,8 +675,8 @@ reiserfs_xattr_get(struct inode *inode, const char *name, void *buffer, - char *data; - size_t skip = 0; - -- if (isize - file_pos > PAGE_CACHE_SIZE) -- chunk = PAGE_CACHE_SIZE; -+ if (isize - file_pos > PAGE_SIZE) -+ chunk = PAGE_SIZE; - else - chunk = isize - file_pos; - -diff --git a/fs/splice.c b/fs/splice.c -index 9947b5c69664..b018eb485019 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -88,7 +88,7 @@ out_unlock: - static void page_cache_pipe_buf_release(struct pipe_inode_info *pipe, - struct pipe_buffer *buf) - { -- page_cache_release(buf->page); -+ put_page(buf->page); - buf->flags &= ~PIPE_BUF_FLAG_LRU; - } - -@@ -268,7 +268,7 @@ EXPORT_SYMBOL_GPL(splice_to_pipe); - - void spd_release_page(struct splice_pipe_desc *spd, unsigned int i) - { -- page_cache_release(spd->pages[i]); -+ put_page(spd->pages[i]); - } - - /* -@@ -328,9 +328,9 @@ __generic_file_splice_read(struct file *in, loff_t *ppos, - if (splice_grow_spd(pipe, &spd)) - return -ENOMEM; - -- index = *ppos >> PAGE_CACHE_SHIFT; -- loff = *ppos & ~PAGE_CACHE_MASK; -- req_pages = (len + loff + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -+ index = *ppos >> PAGE_SHIFT; -+ loff = *ppos & ~PAGE_MASK; -+ req_pages = (len + loff + PAGE_SIZE - 1) >> PAGE_SHIFT; - nr_pages = min(req_pages, spd.nr_pages_max); - - /* -@@ -365,7 +365,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos, - error = add_to_page_cache_lru(page, mapping, index, - mapping_gfp_constraint(mapping, GFP_KERNEL)); - if (unlikely(error)) { -- page_cache_release(page); -+ put_page(page); - if (error == -EEXIST) - continue; - break; -@@ -385,7 +385,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos, - * Now loop over the map and see if we need to start IO on any - * pages, fill in the partial map, etc. - */ -- index = *ppos >> PAGE_CACHE_SHIFT; -+ index = *ppos >> PAGE_SHIFT; - nr_pages = spd.nr_pages; - spd.nr_pages = 0; - for (page_nr = 0; page_nr < nr_pages; page_nr++) { -@@ -397,7 +397,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos, - /* - * this_len is the max we'll use from this page - */ -- this_len = min_t(unsigned long, len, PAGE_CACHE_SIZE - loff); -+ this_len = min_t(unsigned long, len, PAGE_SIZE - loff); - page = spd.pages[page_nr]; - - if (PageReadahead(page)) -@@ -426,7 +426,7 @@ retry_lookup: - error = -ENOMEM; - break; - } -- page_cache_release(spd.pages[page_nr]); -+ put_page(spd.pages[page_nr]); - spd.pages[page_nr] = page; - } - /* -@@ -456,7 +456,7 @@ fill_it: - * i_size must be checked after PageUptodate. - */ - isize = i_size_read(mapping->host); -- end_index = (isize - 1) >> PAGE_CACHE_SHIFT; -+ end_index = (isize - 1) >> PAGE_SHIFT; - if (unlikely(!isize || index > end_index)) - break; - -@@ -470,7 +470,7 @@ fill_it: - /* - * max good bytes in this page - */ -- plen = ((isize - 1) & ~PAGE_CACHE_MASK) + 1; -+ plen = ((isize - 1) & ~PAGE_MASK) + 1; - if (plen <= loff) - break; - -@@ -494,8 +494,8 @@ fill_it: - * we got, 'nr_pages' is how many pages are in the map. - */ - while (page_nr < nr_pages) -- page_cache_release(spd.pages[page_nr++]); -- in->f_ra.prev_pos = (loff_t)index << PAGE_CACHE_SHIFT; -+ put_page(spd.pages[page_nr++]); -+ in->f_ra.prev_pos = (loff_t)index << PAGE_SHIFT; - - if (spd.nr_pages) - error = splice_to_pipe(pipe, &spd); -@@ -636,8 +636,8 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos, - goto shrink_ret; - } - -- offset = *ppos & ~PAGE_CACHE_MASK; -- nr_pages = (len + offset + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -+ offset = *ppos & ~PAGE_MASK; -+ nr_pages = (len + offset + PAGE_SIZE - 1) >> PAGE_SHIFT; - - for (i = 0; i < nr_pages && i < spd.nr_pages_max && len; i++) { - struct page *page; -@@ -647,7 +647,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos, - if (!page) - goto err; - -- this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset); -+ this_len = min_t(size_t, len, PAGE_SIZE - offset); - vec[i].iov_base = (void __user *) page_address(page); - vec[i].iov_len = this_len; - spd.pages[i] = page; -diff --git a/fs/squashfs/block.c b/fs/squashfs/block.c -index 0cea9b9236d0..2c2618410d51 100644 ---- a/fs/squashfs/block.c -+++ b/fs/squashfs/block.c -@@ -181,11 +181,11 @@ int squashfs_read_data(struct super_block *sb, u64 index, int length, - in = min(bytes, msblk->devblksize - offset); - bytes -= in; - while (in) { -- if (pg_offset == PAGE_CACHE_SIZE) { -+ if (pg_offset == PAGE_SIZE) { - data = squashfs_next_page(output); - pg_offset = 0; - } -- avail = min_t(int, in, PAGE_CACHE_SIZE - -+ avail = min_t(int, in, PAGE_SIZE - - pg_offset); - memcpy(data + pg_offset, bh[k]->b_data + offset, - avail); -diff --git a/fs/squashfs/cache.c b/fs/squashfs/cache.c -index 1cb70a0b2168..23813c078cc9 100644 ---- a/fs/squashfs/cache.c -+++ b/fs/squashfs/cache.c -@@ -30,7 +30,7 @@ - * access the metadata and fragment caches. - * - * To avoid out of memory and fragmentation issues with vmalloc the cache -- * uses sequences of kmalloced PAGE_CACHE_SIZE buffers. -+ * uses sequences of kmalloced PAGE_SIZE buffers. - * - * It should be noted that the cache is not used for file datablocks, these - * are decompressed and cached in the page-cache in the normal way. The -@@ -231,7 +231,7 @@ void squashfs_cache_delete(struct squashfs_cache *cache) - /* - * Initialise cache allocating the specified number of entries, each of - * size block_size. To avoid vmalloc fragmentation issues each entry -- * is allocated as a sequence of kmalloced PAGE_CACHE_SIZE buffers. -+ * is allocated as a sequence of kmalloced PAGE_SIZE buffers. - */ - struct squashfs_cache *squashfs_cache_init(char *name, int entries, - int block_size) -@@ -255,7 +255,7 @@ struct squashfs_cache *squashfs_cache_init(char *name, int entries, - cache->unused = entries; - cache->entries = entries; - cache->block_size = block_size; -- cache->pages = block_size >> PAGE_CACHE_SHIFT; -+ cache->pages = block_size >> PAGE_SHIFT; - cache->pages = cache->pages ? cache->pages : 1; - cache->name = name; - cache->num_waiters = 0; -@@ -275,7 +275,7 @@ struct squashfs_cache *squashfs_cache_init(char *name, int entries, - } - - for (j = 0; j < cache->pages; j++) { -- entry->data[j] = kmalloc(PAGE_CACHE_SIZE, GFP_KERNEL); -+ entry->data[j] = kmalloc(PAGE_SIZE, GFP_KERNEL); - if (entry->data[j] == NULL) { - ERROR("Failed to allocate %s buffer\n", name); - goto cleanup; -@@ -314,10 +314,10 @@ int squashfs_copy_data(void *buffer, struct squashfs_cache_entry *entry, - return min(length, entry->length - offset); - - while (offset < entry->length) { -- void *buff = entry->data[offset / PAGE_CACHE_SIZE] -- + (offset % PAGE_CACHE_SIZE); -+ void *buff = entry->data[offset / PAGE_SIZE] -+ + (offset % PAGE_SIZE); - int bytes = min_t(int, entry->length - offset, -- PAGE_CACHE_SIZE - (offset % PAGE_CACHE_SIZE)); -+ PAGE_SIZE - (offset % PAGE_SIZE)); - - if (bytes >= remaining) { - memcpy(buffer, buff, remaining); -@@ -415,7 +415,7 @@ struct squashfs_cache_entry *squashfs_get_datablock(struct super_block *sb, - */ - void *squashfs_read_table(struct super_block *sb, u64 block, int length) - { -- int pages = (length + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -+ int pages = (length + PAGE_SIZE - 1) >> PAGE_SHIFT; - int i, res; - void *table, *buffer, **data; - struct squashfs_page_actor *actor; -@@ -436,7 +436,7 @@ void *squashfs_read_table(struct super_block *sb, u64 block, int length) - goto failed2; - } - -- for (i = 0; i < pages; i++, buffer += PAGE_CACHE_SIZE) -+ for (i = 0; i < pages; i++, buffer += PAGE_SIZE) - data[i] = buffer; - - res = squashfs_read_data(sb, block, length | -diff --git a/fs/squashfs/decompressor.c b/fs/squashfs/decompressor.c -index e9034bf6e5ae..d2bc13636f79 100644 ---- a/fs/squashfs/decompressor.c -+++ b/fs/squashfs/decompressor.c -@@ -102,7 +102,7 @@ static void *get_comp_opts(struct super_block *sb, unsigned short flags) - * Read decompressor specific options from file system if present - */ - if (SQUASHFS_COMP_OPTS(flags)) { -- buffer = kmalloc(PAGE_CACHE_SIZE, GFP_KERNEL); -+ buffer = kmalloc(PAGE_SIZE, GFP_KERNEL); - if (buffer == NULL) { - comp_opts = ERR_PTR(-ENOMEM); - goto out; -diff --git a/fs/squashfs/file.c b/fs/squashfs/file.c -index e5c9689062ba..13d80947bf9e 100644 ---- a/fs/squashfs/file.c -+++ b/fs/squashfs/file.c -@@ -175,7 +175,7 @@ static long long read_indexes(struct super_block *sb, int n, - { - int err, i; - long long block = 0; -- __le32 *blist = kmalloc(PAGE_CACHE_SIZE, GFP_KERNEL); -+ __le32 *blist = kmalloc(PAGE_SIZE, GFP_KERNEL); - - if (blist == NULL) { - ERROR("read_indexes: Failed to allocate block_list\n"); -@@ -183,7 +183,7 @@ static long long read_indexes(struct super_block *sb, int n, - } - - while (n) { -- int blocks = min_t(int, n, PAGE_CACHE_SIZE >> 2); -+ int blocks = min_t(int, n, PAGE_SIZE >> 2); - - err = squashfs_read_metadata(sb, blist, start_block, - offset, blocks << 2); -@@ -377,19 +377,19 @@ void squashfs_copy_cache(struct page *page, struct squashfs_cache_entry *buffer, - struct inode *inode = page->mapping->host; - struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info; - void *pageaddr; -- int i, mask = (1 << (msblk->block_log - PAGE_CACHE_SHIFT)) - 1; -+ int i, mask = (1 << (msblk->block_log - PAGE_SHIFT)) - 1; - int start_index = page->index & ~mask, end_index = start_index | mask; - - /* - * Loop copying datablock into pages. As the datablock likely covers -- * many PAGE_CACHE_SIZE pages (default block size is 128 KiB) explicitly -+ * many PAGE_SIZE pages (default block size is 128 KiB) explicitly - * grab the pages from the page cache, except for the page that we've - * been called to fill. - */ - for (i = start_index; i <= end_index && bytes > 0; i++, -- bytes -= PAGE_CACHE_SIZE, offset += PAGE_CACHE_SIZE) { -+ bytes -= PAGE_SIZE, offset += PAGE_SIZE) { - struct page *push_page; -- int avail = buffer ? min_t(int, bytes, PAGE_CACHE_SIZE) : 0; -+ int avail = buffer ? min_t(int, bytes, PAGE_SIZE) : 0; - - TRACE("bytes %d, i %d, available_bytes %d\n", bytes, i, avail); - -@@ -404,14 +404,14 @@ void squashfs_copy_cache(struct page *page, struct squashfs_cache_entry *buffer, - - pageaddr = kmap_atomic(push_page); - squashfs_copy_data(pageaddr, buffer, offset, avail); -- memset(pageaddr + avail, 0, PAGE_CACHE_SIZE - avail); -+ memset(pageaddr + avail, 0, PAGE_SIZE - avail); - kunmap_atomic(pageaddr); - flush_dcache_page(push_page); - SetPageUptodate(push_page); - skip_page: - unlock_page(push_page); - if (i != page->index) -- page_cache_release(push_page); -+ put_page(push_page); - } - } - -@@ -454,7 +454,7 @@ static int squashfs_readpage(struct file *file, struct page *page) - { - struct inode *inode = page->mapping->host; - struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info; -- int index = page->index >> (msblk->block_log - PAGE_CACHE_SHIFT); -+ int index = page->index >> (msblk->block_log - PAGE_SHIFT); - int file_end = i_size_read(inode) >> msblk->block_log; - int res; - void *pageaddr; -@@ -462,8 +462,8 @@ static int squashfs_readpage(struct file *file, struct page *page) - TRACE("Entered squashfs_readpage, page index %lx, start block %llx\n", - page->index, squashfs_i(inode)->start); - -- if (page->index >= ((i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> -- PAGE_CACHE_SHIFT)) -+ if (page->index >= ((i_size_read(inode) + PAGE_SIZE - 1) >> -+ PAGE_SHIFT)) - goto out; - - if (index < file_end || squashfs_i(inode)->fragment_block == -@@ -487,7 +487,7 @@ error_out: - SetPageError(page); - out: - pageaddr = kmap_atomic(page); -- memset(pageaddr, 0, PAGE_CACHE_SIZE); -+ memset(pageaddr, 0, PAGE_SIZE); - kunmap_atomic(pageaddr); - flush_dcache_page(page); - if (!PageError(page)) -diff --git a/fs/squashfs/file_direct.c b/fs/squashfs/file_direct.c -index 43e7a7eddac0..cb485d8e0e91 100644 ---- a/fs/squashfs/file_direct.c -+++ b/fs/squashfs/file_direct.c -@@ -30,8 +30,8 @@ int squashfs_readpage_block(struct page *target_page, u64 block, int bsize) - struct inode *inode = target_page->mapping->host; - struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info; - -- int file_end = (i_size_read(inode) - 1) >> PAGE_CACHE_SHIFT; -- int mask = (1 << (msblk->block_log - PAGE_CACHE_SHIFT)) - 1; -+ int file_end = (i_size_read(inode) - 1) >> PAGE_SHIFT; -+ int mask = (1 << (msblk->block_log - PAGE_SHIFT)) - 1; - int start_index = target_page->index & ~mask; - int end_index = start_index | mask; - int i, n, pages, missing_pages, bytes, res = -ENOMEM; -@@ -68,7 +68,7 @@ int squashfs_readpage_block(struct page *target_page, u64 block, int bsize) - - if (PageUptodate(page[i])) { - unlock_page(page[i]); -- page_cache_release(page[i]); -+ put_page(page[i]); - page[i] = NULL; - missing_pages++; - } -@@ -96,10 +96,10 @@ int squashfs_readpage_block(struct page *target_page, u64 block, int bsize) - goto mark_errored; - - /* Last page may have trailing bytes not filled */ -- bytes = res % PAGE_CACHE_SIZE; -+ bytes = res % PAGE_SIZE; - if (bytes) { - pageaddr = kmap_atomic(page[pages - 1]); -- memset(pageaddr + bytes, 0, PAGE_CACHE_SIZE - bytes); -+ memset(pageaddr + bytes, 0, PAGE_SIZE - bytes); - kunmap_atomic(pageaddr); - } - -@@ -109,7 +109,7 @@ int squashfs_readpage_block(struct page *target_page, u64 block, int bsize) - SetPageUptodate(page[i]); - unlock_page(page[i]); - if (page[i] != target_page) -- page_cache_release(page[i]); -+ put_page(page[i]); - } - - kfree(actor); -@@ -127,7 +127,7 @@ mark_errored: - flush_dcache_page(page[i]); - SetPageError(page[i]); - unlock_page(page[i]); -- page_cache_release(page[i]); -+ put_page(page[i]); - } - - out: -@@ -153,21 +153,21 @@ static int squashfs_read_cache(struct page *target_page, u64 block, int bsize, - } - - for (n = 0; n < pages && bytes > 0; n++, -- bytes -= PAGE_CACHE_SIZE, offset += PAGE_CACHE_SIZE) { -- int avail = min_t(int, bytes, PAGE_CACHE_SIZE); -+ bytes -= PAGE_SIZE, offset += PAGE_SIZE) { -+ int avail = min_t(int, bytes, PAGE_SIZE); - - if (page[n] == NULL) - continue; - - pageaddr = kmap_atomic(page[n]); - squashfs_copy_data(pageaddr, buffer, offset, avail); -- memset(pageaddr + avail, 0, PAGE_CACHE_SIZE - avail); -+ memset(pageaddr + avail, 0, PAGE_SIZE - avail); - kunmap_atomic(pageaddr); - flush_dcache_page(page[n]); - SetPageUptodate(page[n]); - unlock_page(page[n]); - if (page[n] != target_page) -- page_cache_release(page[n]); -+ put_page(page[n]); - } - - out: -diff --git a/fs/squashfs/lz4_wrapper.c b/fs/squashfs/lz4_wrapper.c -index c31e2bc9c081..ff4468bd18b0 100644 ---- a/fs/squashfs/lz4_wrapper.c -+++ b/fs/squashfs/lz4_wrapper.c -@@ -117,13 +117,13 @@ static int lz4_uncompress(struct squashfs_sb_info *msblk, void *strm, - data = squashfs_first_page(output); - buff = stream->output; - while (data) { -- if (bytes <= PAGE_CACHE_SIZE) { -+ if (bytes <= PAGE_SIZE) { - memcpy(data, buff, bytes); - break; - } -- memcpy(data, buff, PAGE_CACHE_SIZE); -- buff += PAGE_CACHE_SIZE; -- bytes -= PAGE_CACHE_SIZE; -+ memcpy(data, buff, PAGE_SIZE); -+ buff += PAGE_SIZE; -+ bytes -= PAGE_SIZE; - data = squashfs_next_page(output); - } - squashfs_finish_page(output); -diff --git a/fs/squashfs/lzo_wrapper.c b/fs/squashfs/lzo_wrapper.c -index 244b9fbfff7b..934c17e96590 100644 ---- a/fs/squashfs/lzo_wrapper.c -+++ b/fs/squashfs/lzo_wrapper.c -@@ -102,13 +102,13 @@ static int lzo_uncompress(struct squashfs_sb_info *msblk, void *strm, - data = squashfs_first_page(output); - buff = stream->output; - while (data) { -- if (bytes <= PAGE_CACHE_SIZE) { -+ if (bytes <= PAGE_SIZE) { - memcpy(data, buff, bytes); - break; - } else { -- memcpy(data, buff, PAGE_CACHE_SIZE); -- buff += PAGE_CACHE_SIZE; -- bytes -= PAGE_CACHE_SIZE; -+ memcpy(data, buff, PAGE_SIZE); -+ buff += PAGE_SIZE; -+ bytes -= PAGE_SIZE; - data = squashfs_next_page(output); - } - } -diff --git a/fs/squashfs/page_actor.c b/fs/squashfs/page_actor.c -index 5a1c11f56441..9b7b1b6a7892 100644 ---- a/fs/squashfs/page_actor.c -+++ b/fs/squashfs/page_actor.c -@@ -48,7 +48,7 @@ struct squashfs_page_actor *squashfs_page_actor_init(void **buffer, - if (actor == NULL) - return NULL; - -- actor->length = length ? : pages * PAGE_CACHE_SIZE; -+ actor->length = length ? : pages * PAGE_SIZE; - actor->buffer = buffer; - actor->pages = pages; - actor->next_page = 0; -@@ -88,7 +88,7 @@ struct squashfs_page_actor *squashfs_page_actor_init_special(struct page **page, - if (actor == NULL) - return NULL; - -- actor->length = length ? : pages * PAGE_CACHE_SIZE; -+ actor->length = length ? : pages * PAGE_SIZE; - actor->page = page; - actor->pages = pages; - actor->next_page = 0; -diff --git a/fs/squashfs/page_actor.h b/fs/squashfs/page_actor.h -index 26dd82008b82..98537eab27e2 100644 ---- a/fs/squashfs/page_actor.h -+++ b/fs/squashfs/page_actor.h -@@ -24,7 +24,7 @@ static inline struct squashfs_page_actor *squashfs_page_actor_init(void **page, - if (actor == NULL) - return NULL; - -- actor->length = length ? : pages * PAGE_CACHE_SIZE; -+ actor->length = length ? : pages * PAGE_SIZE; - actor->page = page; - actor->pages = pages; - actor->next_page = 0; -diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c -index 5e79bfa4f260..cf01e15a7b16 100644 ---- a/fs/squashfs/super.c -+++ b/fs/squashfs/super.c -@@ -152,7 +152,7 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent) - * Check the system page size is not larger than the filesystem - * block size (by default 128K). This is currently not supported. - */ -- if (PAGE_CACHE_SIZE > msblk->block_size) { -+ if (PAGE_SIZE > msblk->block_size) { - ERROR("Page size > filesystem block size (%d). This is " - "currently not supported!\n", msblk->block_size); - goto failed_mount; -diff --git a/fs/squashfs/symlink.c b/fs/squashfs/symlink.c -index dbcc2f54bad4..d688ef42a6a1 100644 ---- a/fs/squashfs/symlink.c -+++ b/fs/squashfs/symlink.c -@@ -48,10 +48,10 @@ static int squashfs_symlink_readpage(struct file *file, struct page *page) - struct inode *inode = page->mapping->host; - struct super_block *sb = inode->i_sb; - struct squashfs_sb_info *msblk = sb->s_fs_info; -- int index = page->index << PAGE_CACHE_SHIFT; -+ int index = page->index << PAGE_SHIFT; - u64 block = squashfs_i(inode)->start; - int offset = squashfs_i(inode)->offset; -- int length = min_t(int, i_size_read(inode) - index, PAGE_CACHE_SIZE); -+ int length = min_t(int, i_size_read(inode) - index, PAGE_SIZE); - int bytes, copied; - void *pageaddr; - struct squashfs_cache_entry *entry; -@@ -94,7 +94,7 @@ static int squashfs_symlink_readpage(struct file *file, struct page *page) - copied = squashfs_copy_data(pageaddr + bytes, entry, offset, - length - bytes); - if (copied == length - bytes) -- memset(pageaddr + length, 0, PAGE_CACHE_SIZE - length); -+ memset(pageaddr + length, 0, PAGE_SIZE - length); - else - block = entry->next_index; - kunmap_atomic(pageaddr); -diff --git a/fs/squashfs/xz_wrapper.c b/fs/squashfs/xz_wrapper.c -index c609624e4b8a..6bfaef73d065 100644 ---- a/fs/squashfs/xz_wrapper.c -+++ b/fs/squashfs/xz_wrapper.c -@@ -141,7 +141,7 @@ static int squashfs_xz_uncompress(struct squashfs_sb_info *msblk, void *strm, - stream->buf.in_pos = 0; - stream->buf.in_size = 0; - stream->buf.out_pos = 0; -- stream->buf.out_size = PAGE_CACHE_SIZE; -+ stream->buf.out_size = PAGE_SIZE; - stream->buf.out = squashfs_first_page(output); - - do { -@@ -158,7 +158,7 @@ static int squashfs_xz_uncompress(struct squashfs_sb_info *msblk, void *strm, - stream->buf.out = squashfs_next_page(output); - if (stream->buf.out != NULL) { - stream->buf.out_pos = 0; -- total += PAGE_CACHE_SIZE; -+ total += PAGE_SIZE; - } - } - -diff --git a/fs/squashfs/zlib_wrapper.c b/fs/squashfs/zlib_wrapper.c -index 8727caba6882..2ec24d128bce 100644 ---- a/fs/squashfs/zlib_wrapper.c -+++ b/fs/squashfs/zlib_wrapper.c -@@ -69,7 +69,7 @@ static int zlib_uncompress(struct squashfs_sb_info *msblk, void *strm, - int zlib_err, zlib_init = 0, k = 0; - z_stream *stream = strm; - -- stream->avail_out = PAGE_CACHE_SIZE; -+ stream->avail_out = PAGE_SIZE; - stream->next_out = squashfs_first_page(output); - stream->avail_in = 0; - -@@ -85,7 +85,7 @@ static int zlib_uncompress(struct squashfs_sb_info *msblk, void *strm, - if (stream->avail_out == 0) { - stream->next_out = squashfs_next_page(output); - if (stream->next_out != NULL) -- stream->avail_out = PAGE_CACHE_SIZE; -+ stream->avail_out = PAGE_SIZE; - } - - if (!zlib_init) { -diff --git a/fs/sync.c b/fs/sync.c -index dd5d1711c7ac..2a54c1f22035 100644 ---- a/fs/sync.c -+++ b/fs/sync.c -@@ -302,7 +302,7 @@ SYSCALL_DEFINE4(sync_file_range, int, fd, loff_t, offset, loff_t, nbytes, - goto out; - - if (sizeof(pgoff_t) == 4) { -- if (offset >= (0x100000000ULL << PAGE_CACHE_SHIFT)) { -+ if (offset >= (0x100000000ULL << PAGE_SHIFT)) { - /* - * The range starts outside a 32 bit machine's - * pagecache addressing capabilities. Let it "succeed" -@@ -310,7 +310,7 @@ SYSCALL_DEFINE4(sync_file_range, int, fd, loff_t, offset, loff_t, nbytes, - ret = 0; - goto out; - } -- if (endbyte >= (0x100000000ULL << PAGE_CACHE_SHIFT)) { -+ if (endbyte >= (0x100000000ULL << PAGE_SHIFT)) { - /* - * Out to EOF - */ -diff --git a/fs/sysv/dir.c b/fs/sysv/dir.c -index 63c1bcb224ee..c0f0a3e643eb 100644 ---- a/fs/sysv/dir.c -+++ b/fs/sysv/dir.c -@@ -30,7 +30,7 @@ const struct file_operations sysv_dir_operations = { - static inline void dir_put_page(struct page *page) - { - kunmap(page); -- page_cache_release(page); -+ put_page(page); - } - - static int dir_commit_chunk(struct page *page, loff_t pos, unsigned len) -@@ -73,8 +73,8 @@ static int sysv_readdir(struct file *file, struct dir_context *ctx) - if (pos >= inode->i_size) - return 0; - -- offset = pos & ~PAGE_CACHE_MASK; -- n = pos >> PAGE_CACHE_SHIFT; -+ offset = pos & ~PAGE_MASK; -+ n = pos >> PAGE_SHIFT; - - for ( ; n < npages; n++, offset = 0) { - char *kaddr, *limit; -@@ -85,7 +85,7 @@ static int sysv_readdir(struct file *file, struct dir_context *ctx) - continue; - kaddr = (char *)page_address(page); - de = (struct sysv_dir_entry *)(kaddr+offset); -- limit = kaddr + PAGE_CACHE_SIZE - SYSV_DIRSIZE; -+ limit = kaddr + PAGE_SIZE - SYSV_DIRSIZE; - for ( ;(char*)de <= limit; de++, ctx->pos += sizeof(*de)) { - char *name = de->name; - -@@ -146,7 +146,7 @@ struct sysv_dir_entry *sysv_find_entry(struct dentry *dentry, struct page **res_ - if (!IS_ERR(page)) { - kaddr = (char*)page_address(page); - de = (struct sysv_dir_entry *) kaddr; -- kaddr += PAGE_CACHE_SIZE - SYSV_DIRSIZE; -+ kaddr += PAGE_SIZE - SYSV_DIRSIZE; - for ( ; (char *) de <= kaddr ; de++) { - if (!de->inode) - continue; -@@ -190,7 +190,7 @@ int sysv_add_link(struct dentry *dentry, struct inode *inode) - goto out; - kaddr = (char*)page_address(page); - de = (struct sysv_dir_entry *)kaddr; -- kaddr += PAGE_CACHE_SIZE - SYSV_DIRSIZE; -+ kaddr += PAGE_SIZE - SYSV_DIRSIZE; - while ((char *)de <= kaddr) { - if (!de->inode) - goto got_it; -@@ -261,7 +261,7 @@ int sysv_make_empty(struct inode *inode, struct inode *dir) - kmap(page); - - base = (char*)page_address(page); -- memset(base, 0, PAGE_CACHE_SIZE); -+ memset(base, 0, PAGE_SIZE); - - de = (struct sysv_dir_entry *) base; - de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), inode->i_ino); -@@ -273,7 +273,7 @@ int sysv_make_empty(struct inode *inode, struct inode *dir) - kunmap(page); - err = dir_commit_chunk(page, 0, 2 * SYSV_DIRSIZE); - fail: -- page_cache_release(page); -+ put_page(page); - return err; - } - -@@ -296,7 +296,7 @@ int sysv_empty_dir(struct inode * inode) - - kaddr = (char *)page_address(page); - de = (struct sysv_dir_entry *)kaddr; -- kaddr += PAGE_CACHE_SIZE-SYSV_DIRSIZE; -+ kaddr += PAGE_SIZE-SYSV_DIRSIZE; - - for ( ;(char *)de <= kaddr; de++) { - if (!de->inode) -diff --git a/fs/sysv/namei.c b/fs/sysv/namei.c -index 11e83ed0b4bf..90b60c03b588 100644 ---- a/fs/sysv/namei.c -+++ b/fs/sysv/namei.c -@@ -264,11 +264,11 @@ static int sysv_rename(struct inode * old_dir, struct dentry * old_dentry, - out_dir: - if (dir_de) { - kunmap(dir_page); -- page_cache_release(dir_page); -+ put_page(dir_page); - } - out_old: - kunmap(old_page); -- page_cache_release(old_page); -+ put_page(old_page); - out: - return err; - } -diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c -index 065c88f8e4b8..446753d8ac34 100644 ---- a/fs/ubifs/file.c -+++ b/fs/ubifs/file.c -@@ -121,7 +121,7 @@ static int do_readpage(struct page *page) - if (block >= beyond) { - /* Reading beyond inode */ - SetPageChecked(page); -- memset(addr, 0, PAGE_CACHE_SIZE); -+ memset(addr, 0, PAGE_SIZE); - goto out; - } - -@@ -223,7 +223,7 @@ static int write_begin_slow(struct address_space *mapping, - { - struct inode *inode = mapping->host; - struct ubifs_info *c = inode->i_sb->s_fs_info; -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -+ pgoff_t index = pos >> PAGE_SHIFT; - struct ubifs_budget_req req = { .new_page = 1 }; - int uninitialized_var(err), appending = !!(pos + len > inode->i_size); - struct page *page; -@@ -254,13 +254,13 @@ static int write_begin_slow(struct address_space *mapping, - } - - if (!PageUptodate(page)) { -- if (!(pos & ~PAGE_CACHE_MASK) && len == PAGE_CACHE_SIZE) -+ if (!(pos & ~PAGE_MASK) && len == PAGE_SIZE) - SetPageChecked(page); - else { - err = do_readpage(page); - if (err) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - ubifs_release_budget(c, &req); - return err; - } -@@ -428,7 +428,7 @@ static int ubifs_write_begin(struct file *file, struct address_space *mapping, - struct inode *inode = mapping->host; - struct ubifs_info *c = inode->i_sb->s_fs_info; - struct ubifs_inode *ui = ubifs_inode(inode); -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -+ pgoff_t index = pos >> PAGE_SHIFT; - int uninitialized_var(err), appending = !!(pos + len > inode->i_size); - int skipped_read = 0; - struct page *page; -@@ -446,7 +446,7 @@ static int ubifs_write_begin(struct file *file, struct address_space *mapping, - - if (!PageUptodate(page)) { - /* The page is not loaded from the flash */ -- if (!(pos & ~PAGE_CACHE_MASK) && len == PAGE_CACHE_SIZE) { -+ if (!(pos & ~PAGE_MASK) && len == PAGE_SIZE) { - /* - * We change whole page so no need to load it. But we - * do not know whether this page exists on the media or -@@ -462,7 +462,7 @@ static int ubifs_write_begin(struct file *file, struct address_space *mapping, - err = do_readpage(page); - if (err) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return err; - } - } -@@ -494,7 +494,7 @@ static int ubifs_write_begin(struct file *file, struct address_space *mapping, - mutex_unlock(&ui->ui_mutex); - } - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - return write_begin_slow(mapping, pos, len, pagep, flags); - } -@@ -549,12 +549,12 @@ static int ubifs_write_end(struct file *file, struct address_space *mapping, - dbg_gen("ino %lu, pos %llu, pg %lu, len %u, copied %d, i_size %lld", - inode->i_ino, pos, page->index, len, copied, inode->i_size); - -- if (unlikely(copied < len && len == PAGE_CACHE_SIZE)) { -+ if (unlikely(copied < len && len == PAGE_SIZE)) { - /* - * VFS copied less data to the page that it intended and - * declared in its '->write_begin()' call via the @len - * argument. If the page was not up-to-date, and @len was -- * @PAGE_CACHE_SIZE, the 'ubifs_write_begin()' function did -+ * @PAGE_SIZE, the 'ubifs_write_begin()' function did - * not load it from the media (for optimization reasons). This - * means that part of the page contains garbage. So read the - * page now. -@@ -593,7 +593,7 @@ static int ubifs_write_end(struct file *file, struct address_space *mapping, - - out: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return copied; - } - -@@ -621,10 +621,10 @@ static int populate_page(struct ubifs_info *c, struct page *page, - - addr = zaddr = kmap(page); - -- end_index = (i_size - 1) >> PAGE_CACHE_SHIFT; -+ end_index = (i_size - 1) >> PAGE_SHIFT; - if (!i_size || page->index > end_index) { - hole = 1; -- memset(addr, 0, PAGE_CACHE_SIZE); -+ memset(addr, 0, PAGE_SIZE); - goto out_hole; - } - -@@ -673,7 +673,7 @@ static int populate_page(struct ubifs_info *c, struct page *page, - } - - if (end_index == page->index) { -- int len = i_size & (PAGE_CACHE_SIZE - 1); -+ int len = i_size & (PAGE_SIZE - 1); - - if (len && len < read) - memset(zaddr + len, 0, read - len); -@@ -773,7 +773,7 @@ static int ubifs_do_bulk_read(struct ubifs_info *c, struct bu_info *bu, - isize = i_size_read(inode); - if (isize == 0) - goto out_free; -- end_index = ((isize - 1) >> PAGE_CACHE_SHIFT); -+ end_index = ((isize - 1) >> PAGE_SHIFT); - - for (page_idx = 1; page_idx < page_cnt; page_idx++) { - pgoff_t page_offset = offset + page_idx; -@@ -788,7 +788,7 @@ static int ubifs_do_bulk_read(struct ubifs_info *c, struct bu_info *bu, - if (!PageUptodate(page)) - err = populate_page(c, page, bu, &n); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - if (err) - break; - } -@@ -905,7 +905,7 @@ static int do_writepage(struct page *page, int len) - #ifdef UBIFS_DEBUG - struct ubifs_inode *ui = ubifs_inode(inode); - spin_lock(&ui->ui_lock); -- ubifs_assert(page->index <= ui->synced_i_size >> PAGE_CACHE_SHIFT); -+ ubifs_assert(page->index <= ui->synced_i_size >> PAGE_SHIFT); - spin_unlock(&ui->ui_lock); - #endif - -@@ -1001,8 +1001,8 @@ static int ubifs_writepage(struct page *page, struct writeback_control *wbc) - struct inode *inode = page->mapping->host; - struct ubifs_inode *ui = ubifs_inode(inode); - loff_t i_size = i_size_read(inode), synced_i_size; -- pgoff_t end_index = i_size >> PAGE_CACHE_SHIFT; -- int err, len = i_size & (PAGE_CACHE_SIZE - 1); -+ pgoff_t end_index = i_size >> PAGE_SHIFT; -+ int err, len = i_size & (PAGE_SIZE - 1); - void *kaddr; - - dbg_gen("ino %lu, pg %lu, pg flags %#lx", -@@ -1021,7 +1021,7 @@ static int ubifs_writepage(struct page *page, struct writeback_control *wbc) - - /* Is the page fully inside @i_size? */ - if (page->index < end_index) { -- if (page->index >= synced_i_size >> PAGE_CACHE_SHIFT) { -+ if (page->index >= synced_i_size >> PAGE_SHIFT) { - err = inode->i_sb->s_op->write_inode(inode, NULL); - if (err) - goto out_unlock; -@@ -1034,7 +1034,7 @@ static int ubifs_writepage(struct page *page, struct writeback_control *wbc) - * with this. - */ - } -- return do_writepage(page, PAGE_CACHE_SIZE); -+ return do_writepage(page, PAGE_SIZE); - } - - /* -@@ -1045,7 +1045,7 @@ static int ubifs_writepage(struct page *page, struct writeback_control *wbc) - * writes to that region are not written out to the file." - */ - kaddr = kmap_atomic(page); -- memset(kaddr + len, 0, PAGE_CACHE_SIZE - len); -+ memset(kaddr + len, 0, PAGE_SIZE - len); - flush_dcache_page(page); - kunmap_atomic(kaddr); - -@@ -1138,7 +1138,7 @@ static int do_truncation(struct ubifs_info *c, struct inode *inode, - truncate_setsize(inode, new_size); - - if (offset) { -- pgoff_t index = new_size >> PAGE_CACHE_SHIFT; -+ pgoff_t index = new_size >> PAGE_SHIFT; - struct page *page; - - page = find_lock_page(inode->i_mapping, index); -@@ -1157,9 +1157,9 @@ static int do_truncation(struct ubifs_info *c, struct inode *inode, - clear_page_dirty_for_io(page); - if (UBIFS_BLOCKS_PER_PAGE_SHIFT) - offset = new_size & -- (PAGE_CACHE_SIZE - 1); -+ (PAGE_SIZE - 1); - err = do_writepage(page, offset); -- page_cache_release(page); -+ put_page(page); - if (err) - goto out_budg; - /* -@@ -1173,7 +1173,7 @@ static int do_truncation(struct ubifs_info *c, struct inode *inode, - * having to read it. - */ - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - } - } -@@ -1285,7 +1285,7 @@ static void ubifs_invalidatepage(struct page *page, unsigned int offset, - struct ubifs_info *c = inode->i_sb->s_fs_info; - - ubifs_assert(PagePrivate(page)); -- if (offset || length < PAGE_CACHE_SIZE) -+ if (offset || length < PAGE_SIZE) - /* Partial page remains dirty */ - return; - -diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c -index a233ba913be4..e98c24ee25a1 100644 ---- a/fs/ubifs/super.c -+++ b/fs/ubifs/super.c -@@ -2237,12 +2237,12 @@ static int __init ubifs_init(void) - BUILD_BUG_ON(UBIFS_COMPR_TYPES_CNT > 4); - - /* -- * We require that PAGE_CACHE_SIZE is greater-than-or-equal-to -+ * We require that PAGE_SIZE is greater-than-or-equal-to - * UBIFS_BLOCK_SIZE. It is assumed that both are powers of 2. - */ -- if (PAGE_CACHE_SIZE < UBIFS_BLOCK_SIZE) { -+ if (PAGE_SIZE < UBIFS_BLOCK_SIZE) { - pr_err("UBIFS error (pid %d): VFS page cache size is %u bytes, but UBIFS requires at least 4096 bytes", -- current->pid, (unsigned int)PAGE_CACHE_SIZE); -+ current->pid, (unsigned int)PAGE_SIZE); - return -EINVAL; - } - -diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h -index a5697de763f5..425e6a36637f 100644 ---- a/fs/ubifs/ubifs.h -+++ b/fs/ubifs/ubifs.h -@@ -70,8 +70,8 @@ - #define UBIFS_SUPER_MAGIC 0x24051905 - - /* Number of UBIFS blocks per VFS page */ --#define UBIFS_BLOCKS_PER_PAGE (PAGE_CACHE_SIZE / UBIFS_BLOCK_SIZE) --#define UBIFS_BLOCKS_PER_PAGE_SHIFT (PAGE_CACHE_SHIFT - UBIFS_BLOCK_SHIFT) -+#define UBIFS_BLOCKS_PER_PAGE (PAGE_SIZE / UBIFS_BLOCK_SIZE) -+#define UBIFS_BLOCKS_PER_PAGE_SHIFT (PAGE_SHIFT - UBIFS_BLOCK_SHIFT) - - /* "File system end of life" sequence number watermark */ - #define SQNUM_WARN_WATERMARK 0xFFFFFFFF00000000ULL -diff --git a/fs/udf/file.c b/fs/udf/file.c -index 1af98963d860..877ba1c9b461 100644 ---- a/fs/udf/file.c -+++ b/fs/udf/file.c -@@ -46,7 +46,7 @@ static void __udf_adinicb_readpage(struct page *page) - - kaddr = kmap(page); - memcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr, inode->i_size); -- memset(kaddr + inode->i_size, 0, PAGE_CACHE_SIZE - inode->i_size); -+ memset(kaddr + inode->i_size, 0, PAGE_SIZE - inode->i_size); - flush_dcache_page(page); - SetPageUptodate(page); - kunmap(page); -@@ -87,14 +87,14 @@ static int udf_adinicb_write_begin(struct file *file, - { - struct page *page; - -- if (WARN_ON_ONCE(pos >= PAGE_CACHE_SIZE)) -+ if (WARN_ON_ONCE(pos >= PAGE_SIZE)) - return -EIO; - page = grab_cache_page_write_begin(mapping, 0, flags); - if (!page) - return -ENOMEM; - *pagep = page; - -- if (!PageUptodate(page) && len != PAGE_CACHE_SIZE) -+ if (!PageUptodate(page) && len != PAGE_SIZE) - __udf_adinicb_readpage(page); - return 0; - } -diff --git a/fs/udf/inode.c b/fs/udf/inode.c -index 166d3ed32c39..2dc461eeb415 100644 ---- a/fs/udf/inode.c -+++ b/fs/udf/inode.c -@@ -287,7 +287,7 @@ int udf_expand_file_adinicb(struct inode *inode) - if (!PageUptodate(page)) { - kaddr = kmap(page); - memset(kaddr + iinfo->i_lenAlloc, 0x00, -- PAGE_CACHE_SIZE - iinfo->i_lenAlloc); -+ PAGE_SIZE - iinfo->i_lenAlloc); - memcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr, - iinfo->i_lenAlloc); - flush_dcache_page(page); -@@ -319,7 +319,7 @@ int udf_expand_file_adinicb(struct inode *inode) - inode->i_data.a_ops = &udf_adinicb_aops; - up_write(&iinfo->i_data_sem); - } -- page_cache_release(page); -+ put_page(page); - mark_inode_dirty(inode); - - return err; -diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c -index dc5fae601c24..0447b949c7f5 100644 ---- a/fs/ufs/balloc.c -+++ b/fs/ufs/balloc.c -@@ -237,7 +237,7 @@ static void ufs_change_blocknr(struct inode *inode, sector_t beg, - sector_t newb, struct page *locked_page) - { - const unsigned blks_per_page = -- 1 << (PAGE_CACHE_SHIFT - inode->i_blkbits); -+ 1 << (PAGE_SHIFT - inode->i_blkbits); - const unsigned mask = blks_per_page - 1; - struct address_space * const mapping = inode->i_mapping; - pgoff_t index, cur_index, last_index; -@@ -255,9 +255,9 @@ static void ufs_change_blocknr(struct inode *inode, sector_t beg, - - cur_index = locked_page->index; - end = count + beg; -- last_index = end >> (PAGE_CACHE_SHIFT - inode->i_blkbits); -+ last_index = end >> (PAGE_SHIFT - inode->i_blkbits); - for (i = beg; i < end; i = (i | mask) + 1) { -- index = i >> (PAGE_CACHE_SHIFT - inode->i_blkbits); -+ index = i >> (PAGE_SHIFT - inode->i_blkbits); - - if (likely(cur_index != index)) { - page = ufs_get_locked_page(mapping, index); -diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c -index 74f2e80288bf..0b1457292734 100644 ---- a/fs/ufs/dir.c -+++ b/fs/ufs/dir.c -@@ -62,7 +62,7 @@ static int ufs_commit_chunk(struct page *page, loff_t pos, unsigned len) - static inline void ufs_put_page(struct page *page) - { - kunmap(page); -- page_cache_release(page); -+ put_page(page); - } - - ino_t ufs_inode_by_name(struct inode *dir, const struct qstr *qstr) -@@ -111,13 +111,13 @@ static void ufs_check_page(struct page *page) - struct super_block *sb = dir->i_sb; - char *kaddr = page_address(page); - unsigned offs, rec_len; -- unsigned limit = PAGE_CACHE_SIZE; -+ unsigned limit = PAGE_SIZE; - const unsigned chunk_mask = UFS_SB(sb)->s_uspi->s_dirblksize - 1; - struct ufs_dir_entry *p; - char *error; - -- if ((dir->i_size >> PAGE_CACHE_SHIFT) == page->index) { -- limit = dir->i_size & ~PAGE_CACHE_MASK; -+ if ((dir->i_size >> PAGE_SHIFT) == page->index) { -+ limit = dir->i_size & ~PAGE_MASK; - if (limit & chunk_mask) - goto Ebadsize; - if (!limit) -@@ -170,7 +170,7 @@ Einumber: - bad_entry: - ufs_error (sb, "ufs_check_page", "bad entry in directory #%lu: %s - " - "offset=%lu, rec_len=%d, name_len=%d", -- dir->i_ino, error, (page->index<<PAGE_CACHE_SHIFT)+offs, -+ dir->i_ino, error, (page->index<<PAGE_SHIFT)+offs, - rec_len, ufs_get_de_namlen(sb, p)); - goto fail; - Eend: -@@ -178,7 +178,7 @@ Eend: - ufs_error(sb, __func__, - "entry in directory #%lu spans the page boundary" - "offset=%lu", -- dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs); -+ dir->i_ino, (page->index<<PAGE_SHIFT)+offs); - fail: - SetPageChecked(page); - SetPageError(page); -@@ -211,9 +211,9 @@ ufs_last_byte(struct inode *inode, unsigned long page_nr) - { - unsigned last_byte = inode->i_size; - -- last_byte -= page_nr << PAGE_CACHE_SHIFT; -- if (last_byte > PAGE_CACHE_SIZE) -- last_byte = PAGE_CACHE_SIZE; -+ last_byte -= page_nr << PAGE_SHIFT; -+ if (last_byte > PAGE_SIZE) -+ last_byte = PAGE_SIZE; - return last_byte; - } - -@@ -341,7 +341,7 @@ int ufs_add_link(struct dentry *dentry, struct inode *inode) - kaddr = page_address(page); - dir_end = kaddr + ufs_last_byte(dir, n); - de = (struct ufs_dir_entry *)kaddr; -- kaddr += PAGE_CACHE_SIZE - reclen; -+ kaddr += PAGE_SIZE - reclen; - while ((char *)de <= kaddr) { - if ((char *)de == dir_end) { - /* We hit i_size */ -@@ -432,8 +432,8 @@ ufs_readdir(struct file *file, struct dir_context *ctx) - loff_t pos = ctx->pos; - struct inode *inode = file_inode(file); - struct super_block *sb = inode->i_sb; -- unsigned int offset = pos & ~PAGE_CACHE_MASK; -- unsigned long n = pos >> PAGE_CACHE_SHIFT; -+ unsigned int offset = pos & ~PAGE_MASK; -+ unsigned long n = pos >> PAGE_SHIFT; - unsigned long npages = dir_pages(inode); - unsigned chunk_mask = ~(UFS_SB(sb)->s_uspi->s_dirblksize - 1); - int need_revalidate = file->f_version != inode->i_version; -@@ -454,14 +454,14 @@ ufs_readdir(struct file *file, struct dir_context *ctx) - ufs_error(sb, __func__, - "bad page in #%lu", - inode->i_ino); -- ctx->pos += PAGE_CACHE_SIZE - offset; -+ ctx->pos += PAGE_SIZE - offset; - return -EIO; - } - kaddr = page_address(page); - if (unlikely(need_revalidate)) { - if (offset) { - offset = ufs_validate_entry(sb, kaddr, offset, chunk_mask); -- ctx->pos = (n<<PAGE_CACHE_SHIFT) + offset; -+ ctx->pos = (n<<PAGE_SHIFT) + offset; - } - file->f_version = inode->i_version; - need_revalidate = 0; -@@ -574,7 +574,7 @@ int ufs_make_empty(struct inode * inode, struct inode *dir) - - kmap(page); - base = (char*)page_address(page); -- memset(base, 0, PAGE_CACHE_SIZE); -+ memset(base, 0, PAGE_SIZE); - - de = (struct ufs_dir_entry *) base; - -@@ -594,7 +594,7 @@ int ufs_make_empty(struct inode * inode, struct inode *dir) - - err = ufs_commit_chunk(page, 0, chunk_size); - fail: -- page_cache_release(page); -+ put_page(page); - return err; - } - -diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c -index d897e169ab9c..9f49431e798d 100644 ---- a/fs/ufs/inode.c -+++ b/fs/ufs/inode.c -@@ -1051,13 +1051,13 @@ static int ufs_alloc_lastblock(struct inode *inode, loff_t size) - lastfrag--; - - lastpage = ufs_get_locked_page(mapping, lastfrag >> -- (PAGE_CACHE_SHIFT - inode->i_blkbits)); -+ (PAGE_SHIFT - inode->i_blkbits)); - if (IS_ERR(lastpage)) { - err = -EIO; - goto out; - } - -- end = lastfrag & ((1 << (PAGE_CACHE_SHIFT - inode->i_blkbits)) - 1); -+ end = lastfrag & ((1 << (PAGE_SHIFT - inode->i_blkbits)) - 1); - bh = page_buffers(lastpage); - for (i = 0; i < end; ++i) - bh = bh->b_this_page; -diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c -index acf4a3b61b81..a1559f762805 100644 ---- a/fs/ufs/namei.c -+++ b/fs/ufs/namei.c -@@ -305,7 +305,7 @@ static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry, - ufs_set_link(old_inode, dir_de, dir_page, new_dir, 0); - else { - kunmap(dir_page); -- page_cache_release(dir_page); -+ put_page(dir_page); - } - inode_dec_link_count(old_dir); - } -@@ -315,11 +315,11 @@ static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry, - out_dir: - if (dir_de) { - kunmap(dir_page); -- page_cache_release(dir_page); -+ put_page(dir_page); - } - out_old: - kunmap(old_page); -- page_cache_release(old_page); -+ put_page(old_page); - out: - return err; - } -diff --git a/fs/ufs/util.c b/fs/ufs/util.c -index b6c2f94e041e..a409e3e7827a 100644 ---- a/fs/ufs/util.c -+++ b/fs/ufs/util.c -@@ -261,14 +261,14 @@ struct page *ufs_get_locked_page(struct address_space *mapping, - if (unlikely(page->mapping == NULL)) { - /* Truncate got there first */ - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - page = NULL; - goto out; - } - - if (!PageUptodate(page) || PageError(page)) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - printk(KERN_ERR "ufs_change_blocknr: " - "can not read page: ino %lu, index: %lu\n", -diff --git a/fs/ufs/util.h b/fs/ufs/util.h -index 954175928240..b7fbf53dbc81 100644 ---- a/fs/ufs/util.h -+++ b/fs/ufs/util.h -@@ -283,7 +283,7 @@ extern struct page *ufs_get_locked_page(struct address_space *mapping, - static inline void ufs_put_locked_page(struct page *page) - { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - - -diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c -index ef00156f4f96..aafecc12a8e2 100644 ---- a/fs/xfs/libxfs/xfs_bmap.c -+++ b/fs/xfs/libxfs/xfs_bmap.c -@@ -3745,11 +3745,11 @@ xfs_bmap_btalloc( - args.prod = align; - if ((args.mod = (xfs_extlen_t)do_mod(ap->offset, args.prod))) - args.mod = (xfs_extlen_t)(args.prod - args.mod); -- } else if (mp->m_sb.sb_blocksize >= PAGE_CACHE_SIZE) { -+ } else if (mp->m_sb.sb_blocksize >= PAGE_SIZE) { - args.prod = 1; - args.mod = 0; - } else { -- args.prod = PAGE_CACHE_SIZE >> mp->m_sb.sb_blocklog; -+ args.prod = PAGE_SIZE >> mp->m_sb.sb_blocklog; - if ((args.mod = (xfs_extlen_t)(do_mod(ap->offset, args.prod)))) - args.mod = (xfs_extlen_t)(args.prod - args.mod); - } -diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c -index 5c57b7b40728..d12dfcfd0cc8 100644 ---- a/fs/xfs/xfs_aops.c -+++ b/fs/xfs/xfs_aops.c -@@ -719,14 +719,14 @@ xfs_convert_page( - * Derivation: - * - * End offset is the highest offset that this page should represent. -- * If we are on the last page, (end_offset & (PAGE_CACHE_SIZE - 1)) -- * will evaluate non-zero and be less than PAGE_CACHE_SIZE and -+ * If we are on the last page, (end_offset & (PAGE_SIZE - 1)) -+ * will evaluate non-zero and be less than PAGE_SIZE and - * hence give us the correct page_dirty count. On any other page, - * it will be zero and in that case we need page_dirty to be the - * count of buffers on the page. - */ - end_offset = min_t(unsigned long long, -- (xfs_off_t)(page->index + 1) << PAGE_CACHE_SHIFT, -+ (xfs_off_t)(page->index + 1) << PAGE_SHIFT, - i_size_read(inode)); - - /* -@@ -749,9 +749,9 @@ xfs_convert_page( - goto fail_unlock_page; - - len = 1 << inode->i_blkbits; -- p_offset = min_t(unsigned long, end_offset & (PAGE_CACHE_SIZE - 1), -- PAGE_CACHE_SIZE); -- p_offset = p_offset ? roundup(p_offset, len) : PAGE_CACHE_SIZE; -+ p_offset = min_t(unsigned long, end_offset & (PAGE_SIZE - 1), -+ PAGE_SIZE); -+ p_offset = p_offset ? roundup(p_offset, len) : PAGE_SIZE; - page_dirty = p_offset / len; - - /* -@@ -927,7 +927,7 @@ next_buffer: - - xfs_iunlock(ip, XFS_ILOCK_EXCL); - out_invalidate: -- xfs_vm_invalidatepage(page, 0, PAGE_CACHE_SIZE); -+ xfs_vm_invalidatepage(page, 0, PAGE_SIZE); - return; - } - -@@ -984,8 +984,8 @@ xfs_vm_writepage( - - /* Is this page beyond the end of the file? */ - offset = i_size_read(inode); -- end_index = offset >> PAGE_CACHE_SHIFT; -- last_index = (offset - 1) >> PAGE_CACHE_SHIFT; -+ end_index = offset >> PAGE_SHIFT; -+ last_index = (offset - 1) >> PAGE_SHIFT; - - /* - * The page index is less than the end_index, adjust the end_offset -@@ -999,7 +999,7 @@ xfs_vm_writepage( - * ---------------------------------^------------------| - */ - if (page->index < end_index) -- end_offset = (xfs_off_t)(page->index + 1) << PAGE_CACHE_SHIFT; -+ end_offset = (xfs_off_t)(page->index + 1) << PAGE_SHIFT; - else { - /* - * Check whether the page to write out is beyond or straddles -@@ -1012,7 +1012,7 @@ xfs_vm_writepage( - * | | Straddles | - * ---------------------------------^-----------|--------| - */ -- unsigned offset_into_page = offset & (PAGE_CACHE_SIZE - 1); -+ unsigned offset_into_page = offset & (PAGE_SIZE - 1); - - /* - * Skip the page if it is fully outside i_size, e.g. due to a -@@ -1043,7 +1043,7 @@ xfs_vm_writepage( - * memory is zeroed when mapped, and writes to that region are - * not written out to the file." - */ -- zero_user_segment(page, offset_into_page, PAGE_CACHE_SIZE); -+ zero_user_segment(page, offset_into_page, PAGE_SIZE); - - /* Adjust the end_offset to the end of file */ - end_offset = offset; -@@ -1162,7 +1162,7 @@ xfs_vm_writepage( - end_index <<= inode->i_blkbits; - - /* to pages */ -- end_index = (end_index - 1) >> PAGE_CACHE_SHIFT; -+ end_index = (end_index - 1) >> PAGE_SHIFT; - - /* check against file size */ - if (end_index > last_index) -@@ -1753,7 +1753,7 @@ xfs_vm_write_failed( - loff_t block_offset; - loff_t block_start; - loff_t block_end; -- loff_t from = pos & (PAGE_CACHE_SIZE - 1); -+ loff_t from = pos & (PAGE_SIZE - 1); - loff_t to = from + len; - struct buffer_head *bh, *head; - -@@ -1768,7 +1768,7 @@ xfs_vm_write_failed( - * start of the page by using shifts rather than masks the mismatch - * problem. - */ -- block_offset = (pos >> PAGE_CACHE_SHIFT) << PAGE_CACHE_SHIFT; -+ block_offset = (pos >> PAGE_SHIFT) << PAGE_SHIFT; - - ASSERT(block_offset + from == pos); - -@@ -1825,11 +1825,11 @@ xfs_vm_write_begin( - struct page **pagep, - void **fsdata) - { -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -+ pgoff_t index = pos >> PAGE_SHIFT; - struct page *page; - int status; - -- ASSERT(len <= PAGE_CACHE_SIZE); -+ ASSERT(len <= PAGE_SIZE); - - page = grab_cache_page_write_begin(mapping, index, flags); - if (!page) -@@ -1854,7 +1854,7 @@ xfs_vm_write_begin( - truncate_pagecache_range(inode, start, pos + len); - } - -- page_cache_release(page); -+ put_page(page); - page = NULL; - } - -@@ -1882,7 +1882,7 @@ xfs_vm_write_end( - { - int ret; - -- ASSERT(len <= PAGE_CACHE_SIZE); -+ ASSERT(len <= PAGE_SIZE); - - ret = generic_write_end(file, mapping, pos, len, copied, page, fsdata); - if (unlikely(ret < len)) { -diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c -index 6c876012b2e5..d788858da5e1 100644 ---- a/fs/xfs/xfs_bmap_util.c -+++ b/fs/xfs/xfs_bmap_util.c -@@ -1235,7 +1235,7 @@ xfs_free_file_space( - /* wait for the completion of any pending DIOs */ - inode_dio_wait(VFS_I(ip)); - -- rounding = max_t(xfs_off_t, 1 << mp->m_sb.sb_blocklog, PAGE_CACHE_SIZE); -+ rounding = max_t(xfs_off_t, 1 << mp->m_sb.sb_blocklog, PAGE_SIZE); - ioffset = round_down(offset, rounding); - iendoffset = round_up(offset + len, rounding) - 1; - error = filemap_write_and_wait_range(VFS_I(ip)->i_mapping, ioffset, -@@ -1464,7 +1464,7 @@ xfs_shift_file_space( - if (error) - return error; - error = invalidate_inode_pages2_range(VFS_I(ip)->i_mapping, -- offset >> PAGE_CACHE_SHIFT, -1); -+ offset >> PAGE_SHIFT, -1); - if (error) - return error; - -diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c -index 52883ac3cf84..aab748adf273 100644 ---- a/fs/xfs/xfs_file.c -+++ b/fs/xfs/xfs_file.c -@@ -106,8 +106,8 @@ xfs_iozero( - unsigned offset, bytes; - void *fsdata; - -- offset = (pos & (PAGE_CACHE_SIZE -1)); /* Within page */ -- bytes = PAGE_CACHE_SIZE - offset; -+ offset = (pos & (PAGE_SIZE -1)); /* Within page */ -+ bytes = PAGE_SIZE - offset; - if (bytes > count) - bytes = count; - -@@ -799,8 +799,8 @@ xfs_file_dio_aio_write( - /* see generic_file_direct_write() for why this is necessary */ - if (mapping->nrpages) { - invalidate_inode_pages2_range(mapping, -- pos >> PAGE_CACHE_SHIFT, -- end >> PAGE_CACHE_SHIFT); -+ pos >> PAGE_SHIFT, -+ end >> PAGE_SHIFT); - } - - if (ret > 0) { -@@ -1207,9 +1207,9 @@ xfs_find_get_desired_pgoff( - - pagevec_init(&pvec, 0); - -- index = startoff >> PAGE_CACHE_SHIFT; -+ index = startoff >> PAGE_SHIFT; - endoff = XFS_FSB_TO_B(mp, map->br_startoff + map->br_blockcount); -- end = endoff >> PAGE_CACHE_SHIFT; -+ end = endoff >> PAGE_SHIFT; - do { - int want; - unsigned nr_pages; -diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h -index ec0e239a0fa9..a8192dc797dc 100644 ---- a/fs/xfs/xfs_linux.h -+++ b/fs/xfs/xfs_linux.h -@@ -135,7 +135,7 @@ typedef __u32 xfs_nlink_t; - * Size of block device i/o is parameterized here. - * Currently the system supports page-sized i/o. - */ --#define BLKDEV_IOSHIFT PAGE_CACHE_SHIFT -+#define BLKDEV_IOSHIFT PAGE_SHIFT - #define BLKDEV_IOSIZE (1<<BLKDEV_IOSHIFT) - /* number of BB's per block device block */ - #define BLKDEV_BB BTOBB(BLKDEV_IOSIZE) -diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c -index bb753b359bee..9091e2fe1e0c 100644 ---- a/fs/xfs/xfs_mount.c -+++ b/fs/xfs/xfs_mount.c -@@ -171,7 +171,7 @@ xfs_sb_validate_fsb_count( - ASSERT(sbp->sb_blocklog >= BBSHIFT); - - /* Limited by ULONG_MAX of page cache index */ -- if (nblocks >> (PAGE_CACHE_SHIFT - sbp->sb_blocklog) > ULONG_MAX) -+ if (nblocks >> (PAGE_SHIFT - sbp->sb_blocklog) > ULONG_MAX) - return -EFBIG; - return 0; - } -diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h -index b57098481c10..cd2cb5ef4c08 100644 ---- a/fs/xfs/xfs_mount.h -+++ b/fs/xfs/xfs_mount.h -@@ -221,12 +221,12 @@ static inline unsigned long - xfs_preferred_iosize(xfs_mount_t *mp) - { - if (mp->m_flags & XFS_MOUNT_COMPAT_IOSIZE) -- return PAGE_CACHE_SIZE; -+ return PAGE_SIZE; - return (mp->m_swidth ? - (mp->m_swidth << mp->m_sb.sb_blocklog) : - ((mp->m_flags & XFS_MOUNT_DFLT_IOSIZE) ? - (1 << (int)MAX(mp->m_readio_log, mp->m_writeio_log)) : -- PAGE_CACHE_SIZE)); -+ PAGE_SIZE)); - } - - #define XFS_LAST_UNMOUNT_WAS_CLEAN(mp) \ -diff --git a/fs/xfs/xfs_pnfs.c b/fs/xfs/xfs_pnfs.c -index ade236e90bb3..51ddaf2c2b8c 100644 ---- a/fs/xfs/xfs_pnfs.c -+++ b/fs/xfs/xfs_pnfs.c -@@ -293,8 +293,8 @@ xfs_fs_commit_blocks( - * Make sure reads through the pagecache see the new data. - */ - error = invalidate_inode_pages2_range(inode->i_mapping, -- start >> PAGE_CACHE_SHIFT, -- (end - 1) >> PAGE_CACHE_SHIFT); -+ start >> PAGE_SHIFT, -+ (end - 1) >> PAGE_SHIFT); - WARN_ON_ONCE(error); - - error = xfs_iomap_write_unwritten(ip, start, length); -diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c -index 59c9b7bd958d..89f1d5e064a9 100644 ---- a/fs/xfs/xfs_super.c -+++ b/fs/xfs/xfs_super.c -@@ -547,10 +547,10 @@ xfs_max_file_offset( - /* Figure out maximum filesize, on Linux this can depend on - * the filesystem blocksize (on 32 bit platforms). - * __block_write_begin does this in an [unsigned] long... -- * page->index << (PAGE_CACHE_SHIFT - bbits) -+ * page->index << (PAGE_SHIFT - bbits) - * So, for page sized blocks (4K on 32 bit platforms), - * this wraps at around 8Tb (hence MAX_LFS_FILESIZE which is -- * (((u64)PAGE_CACHE_SIZE << (BITS_PER_LONG-1))-1) -+ * (((u64)PAGE_SIZE << (BITS_PER_LONG-1))-1) - * but for smaller blocksizes it is less (bbits = log2 bsize). - * Note1: get_block_t takes a long (implicit cast from above) - * Note2: The Large Block Device (LBD and HAVE_SECTOR_T) patch -@@ -561,10 +561,10 @@ xfs_max_file_offset( - #if BITS_PER_LONG == 32 - # if defined(CONFIG_LBDAF) - ASSERT(sizeof(sector_t) == 8); -- pagefactor = PAGE_CACHE_SIZE; -+ pagefactor = PAGE_SIZE; - bitshift = BITS_PER_LONG; - # else -- pagefactor = PAGE_CACHE_SIZE >> (PAGE_CACHE_SHIFT - blockshift); -+ pagefactor = PAGE_SIZE >> (PAGE_SHIFT - blockshift); - # endif - #endif - -diff --git a/include/linux/backing-dev-defs.h b/include/linux/backing-dev-defs.h -index 1b4d69f68c33..3f103076d0bf 100644 ---- a/include/linux/backing-dev-defs.h -+++ b/include/linux/backing-dev-defs.h -@@ -135,7 +135,7 @@ struct bdi_writeback { - - struct backing_dev_info { - struct list_head bdi_list; -- unsigned long ra_pages; /* max readahead in PAGE_CACHE_SIZE units */ -+ unsigned long ra_pages; /* max readahead in PAGE_SIZE units */ - unsigned int capabilities; /* Device capabilities */ - congested_fn *congested_fn; /* Function pointer if device is md/dm */ - void *congested_data; /* Pointer to aux data for congested func */ -diff --git a/include/linux/bio.h b/include/linux/bio.h -index 88bc64f00bb5..6b7481f62218 100644 ---- a/include/linux/bio.h -+++ b/include/linux/bio.h -@@ -41,7 +41,7 @@ - #endif - - #define BIO_MAX_PAGES 256 --#define BIO_MAX_SIZE (BIO_MAX_PAGES << PAGE_CACHE_SHIFT) -+#define BIO_MAX_SIZE (BIO_MAX_PAGES << PAGE_SHIFT) - #define BIO_MAX_SECTORS (BIO_MAX_SIZE >> 9) - - /* -diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h -index 7e5d7e018bea..669e419d6234 100644 ---- a/include/linux/blkdev.h -+++ b/include/linux/blkdev.h -@@ -1372,7 +1372,7 @@ unsigned char *read_dev_sector(struct block_device *, sector_t, Sector *); - - static inline void put_dev_sector(Sector p) - { -- page_cache_release(p.v); -+ put_page(p.v); - } - - static inline bool __bvec_gap_to_prev(struct request_queue *q, -diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h -index c67f052cc5e5..d48daa3f6f20 100644 ---- a/include/linux/buffer_head.h -+++ b/include/linux/buffer_head.h -@@ -43,7 +43,7 @@ enum bh_state_bits { - */ - }; - --#define MAX_BUF_PER_PAGE (PAGE_CACHE_SIZE / 512) -+#define MAX_BUF_PER_PAGE (PAGE_SIZE / 512) - - struct page; - struct buffer_head; -@@ -263,7 +263,7 @@ void buffer_init(void); - static inline void attach_page_buffers(struct page *page, - struct buffer_head *head) - { -- page_cache_get(page); -+ get_page(page); - SetPagePrivate(page); - set_page_private(page, (unsigned long)head); - } -diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h -index 3e3799cdc6e6..9092a92400ac 100644 ---- a/include/linux/ceph/libceph.h -+++ b/include/linux/ceph/libceph.h -@@ -172,8 +172,8 @@ extern void ceph_put_snap_context(struct ceph_snap_context *sc); - */ - static inline int calc_pages_for(u64 off, u64 len) - { -- return ((off+len+PAGE_CACHE_SIZE-1) >> PAGE_CACHE_SHIFT) - -- (off >> PAGE_CACHE_SHIFT); -+ return ((off+len+PAGE_SIZE-1) >> PAGE_SHIFT) - -+ (off >> PAGE_SHIFT); - } - - extern struct kmem_cache *ceph_inode_cachep; -diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h -index e59c3be92106..4a793b045efa 100644 ---- a/include/linux/f2fs_fs.h -+++ b/include/linux/f2fs_fs.h -@@ -262,7 +262,7 @@ struct f2fs_node { - /* - * For NAT entries - */ --#define NAT_ENTRY_PER_BLOCK (PAGE_CACHE_SIZE / sizeof(struct f2fs_nat_entry)) -+#define NAT_ENTRY_PER_BLOCK (PAGE_SIZE / sizeof(struct f2fs_nat_entry)) - - struct f2fs_nat_entry { - __u8 version; /* latest version of cached nat entry */ -@@ -282,7 +282,7 @@ struct f2fs_nat_block { - * Not allow to change this. - */ - #define SIT_VBLOCK_MAP_SIZE 64 --#define SIT_ENTRY_PER_BLOCK (PAGE_CACHE_SIZE / sizeof(struct f2fs_sit_entry)) -+#define SIT_ENTRY_PER_BLOCK (PAGE_SIZE / sizeof(struct f2fs_sit_entry)) - - /* - * Note that f2fs_sit_entry->vblocks has the following bit-field information. -diff --git a/include/linux/fs.h b/include/linux/fs.h -index bb703ef728d1..8f30e69a8501 100644 ---- a/include/linux/fs.h -+++ b/include/linux/fs.h -@@ -923,7 +923,7 @@ static inline struct file *get_file(struct file *f) - /* Page cache limit. The filesystems should put that into their s_maxbytes - limits, otherwise bad things can happen in VM. */ - #if BITS_PER_LONG==32 --#define MAX_LFS_FILESIZE (((loff_t)PAGE_CACHE_SIZE << (BITS_PER_LONG-1))-1) -+#define MAX_LFS_FILESIZE (((loff_t)PAGE_SIZE << (BITS_PER_LONG-1))-1) - #elif BITS_PER_LONG==64 - #define MAX_LFS_FILESIZE ((loff_t)0x7fffffffffffffffLL) - #endif -@@ -2059,7 +2059,7 @@ extern int generic_update_time(struct inode *, struct timespec *, int); - /* /sys/fs */ - extern struct kobject *fs_kobj; - --#define MAX_RW_COUNT (INT_MAX & PAGE_CACHE_MASK) -+#define MAX_RW_COUNT (INT_MAX & PAGE_MASK) - - #ifdef CONFIG_MANDATORY_FILE_LOCKING - extern int locks_mandatory_locked(struct file *); -diff --git a/include/linux/mm.h b/include/linux/mm.h -index 7d42501c8bb4..20effd32d5f3 100644 ---- a/include/linux/mm.h -+++ b/include/linux/mm.h -@@ -603,7 +603,7 @@ void do_set_pte(struct vm_area_struct *vma, unsigned long address, - * - * A page may belong to an inode's memory mapping. In this case, page->mapping - * is the pointer to the inode, and page->index is the file offset of the page, -- * in units of PAGE_CACHE_SIZE. -+ * in units of PAGE_SIZE. - * - * If pagecache pages are not associated with an inode, they are said to be - * anonymous pages. These may become associated with the swapcache, and in that -diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h -index 944b2b37313b..c2d75b4fa86c 100644 ---- a/include/linux/mm_types.h -+++ b/include/linux/mm_types.h -@@ -341,7 +341,7 @@ struct vm_area_struct { - - /* Information about our backing store: */ - unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE -- units, *not* PAGE_CACHE_SIZE */ -+ units */ - struct file * vm_file; /* File we map to (can be NULL). */ - void * vm_private_data; /* was vm_pte (shared mem) */ - -diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h -index f2f650f136ee..957049f72290 100644 ---- a/include/linux/nfs_page.h -+++ b/include/linux/nfs_page.h -@@ -41,8 +41,8 @@ struct nfs_page { - struct page *wb_page; /* page to read in/write out */ - struct nfs_open_context *wb_context; /* File state context info */ - struct nfs_lock_context *wb_lock_context; /* lock context info */ -- pgoff_t wb_index; /* Offset >> PAGE_CACHE_SHIFT */ -- unsigned int wb_offset, /* Offset & ~PAGE_CACHE_MASK */ -+ pgoff_t wb_index; /* Offset >> PAGE_SHIFT */ -+ unsigned int wb_offset, /* Offset & ~PAGE_MASK */ - wb_pgbase, /* Start of page data */ - wb_bytes; /* Length of request */ - struct kref wb_kref; /* reference count */ -@@ -184,7 +184,7 @@ nfs_list_entry(struct list_head *head) - static inline - loff_t req_offset(struct nfs_page *req) - { -- return (((loff_t)req->wb_index) << PAGE_CACHE_SHIFT) + req->wb_offset; -+ return (((loff_t)req->wb_index) << PAGE_SHIFT) + req->wb_offset; - } - - #endif /* _LINUX_NFS_PAGE_H */ -diff --git a/include/linux/nilfs2_fs.h b/include/linux/nilfs2_fs.h -index 9abb763e4b86..e9fcf90b270d 100644 ---- a/include/linux/nilfs2_fs.h -+++ b/include/linux/nilfs2_fs.h -@@ -331,7 +331,7 @@ static inline unsigned nilfs_rec_len_from_disk(__le16 dlen) - { - unsigned len = le16_to_cpu(dlen); - --#if !defined(__KERNEL__) || (PAGE_CACHE_SIZE >= 65536) -+#if !defined(__KERNEL__) || (PAGE_SIZE >= 65536) - if (len == NILFS_MAX_REC_LEN) - return 1 << 16; - #endif -@@ -340,7 +340,7 @@ static inline unsigned nilfs_rec_len_from_disk(__le16 dlen) - - static inline __le16 nilfs_rec_len_to_disk(unsigned len) - { --#if !defined(__KERNEL__) || (PAGE_CACHE_SIZE >= 65536) -+#if !defined(__KERNEL__) || (PAGE_SIZE >= 65536) - if (len == (1 << 16)) - return cpu_to_le16(NILFS_MAX_REC_LEN); - else if (len > (1 << 16)) -diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h -index 1ebd65c91422..5372488c5da0 100644 ---- a/include/linux/pagemap.h -+++ b/include/linux/pagemap.h -@@ -86,21 +86,6 @@ static inline void mapping_set_gfp_mask(struct address_space *m, gfp_t mask) - (__force unsigned long)mask; - } - --/* -- * The page cache can be done in larger chunks than -- * one page, because it allows for more efficient -- * throughput (it can then be mapped into user -- * space in smaller chunks for same flexibility). -- * -- * Or rather, it _will_ be done in larger chunks. -- */ --#define PAGE_CACHE_SHIFT PAGE_SHIFT --#define PAGE_CACHE_SIZE PAGE_SIZE --#define PAGE_CACHE_MASK PAGE_MASK --#define PAGE_CACHE_ALIGN(addr) (((addr)+PAGE_CACHE_SIZE-1)&PAGE_CACHE_MASK) -- --#define page_cache_get(page) get_page(page) --#define page_cache_release(page) put_page(page) - void release_pages(struct page **pages, int nr, bool cold); - - /* -@@ -390,13 +375,13 @@ static inline pgoff_t page_to_pgoff(struct page *page) - return page->index << compound_order(page); - - if (likely(!PageTransTail(page))) -- return page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); -+ return page->index; - - /* - * We don't initialize ->index for tail pages: calculate based on - * head page - */ -- pgoff = compound_head(page)->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); -+ pgoff = compound_head(page)->index; - pgoff += page - compound_head(page); - return pgoff; - } -@@ -406,12 +391,12 @@ static inline pgoff_t page_to_pgoff(struct page *page) - */ - static inline loff_t page_offset(struct page *page) - { -- return ((loff_t)page->index) << PAGE_CACHE_SHIFT; -+ return ((loff_t)page->index) << PAGE_SHIFT; - } - - static inline loff_t page_file_offset(struct page *page) - { -- return ((loff_t)page_file_index(page)) << PAGE_CACHE_SHIFT; -+ return ((loff_t)page_file_index(page)) << PAGE_SHIFT; - } - - extern pgoff_t linear_hugepage_index(struct vm_area_struct *vma, -@@ -425,7 +410,7 @@ static inline pgoff_t linear_page_index(struct vm_area_struct *vma, - return linear_hugepage_index(vma, address); - pgoff = (address - vma->vm_start) >> PAGE_SHIFT; - pgoff += vma->vm_pgoff; -- return pgoff >> (PAGE_CACHE_SHIFT - PAGE_SHIFT); -+ return pgoff >> (PAGE_SHIFT - PAGE_SHIFT); - } - - extern void __lock_page(struct page *page); -@@ -535,8 +520,7 @@ extern void add_page_wait_queue(struct page *page, wait_queue_t *waiter); - /* - * Fault a userspace page into pagetables. Return non-zero on a fault. - * -- * This assumes that two userspace pages are always sufficient. That's -- * not true if PAGE_CACHE_SIZE > PAGE_SIZE. -+ * This assumes that two userspace pages are always sufficient. - */ - static inline int fault_in_pages_writeable(char __user *uaddr, int size) - { -@@ -671,8 +655,7 @@ static inline int add_to_page_cache(struct page *page, - - static inline unsigned long dir_pages(struct inode *inode) - { -- return (unsigned long)(inode->i_size + PAGE_CACHE_SIZE - 1) >> -- PAGE_CACHE_SHIFT; -+ return (unsigned long)(inode->i_size + PAGE_SIZE - 1) >> PAGE_SHIFT; - } - - #endif /* _LINUX_PAGEMAP_H */ -diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h -index cc0fc712bb82..7ca44fb5b675 100644 ---- a/include/linux/sunrpc/svc.h -+++ b/include/linux/sunrpc/svc.h -@@ -129,7 +129,7 @@ static inline void svc_get(struct svc_serv *serv) - * - * These happen to all be powers of 2, which is not strictly - * necessary but helps enforce the real limitation, which is -- * that they should be multiples of PAGE_CACHE_SIZE. -+ * that they should be multiples of PAGE_SIZE. - * - * For UDP transports, a block plus NFS,RPC, and UDP headers - * has to fit into the IP datagram limit of 64K. The largest -diff --git a/include/linux/swap.h b/include/linux/swap.h -index d18b65c53dbb..fc22c3fcb6ea 100644 ---- a/include/linux/swap.h -+++ b/include/linux/swap.h -@@ -433,9 +433,9 @@ struct backing_dev_info; - #define si_swapinfo(val) \ - do { (val)->freeswap = (val)->totalswap = 0; } while (0) - /* only sparc can not include linux/pagemap.h in this file -- * so leave page_cache_release and release_pages undeclared... */ -+ * so leave release_pages undeclared... */ - #define free_page_and_swap_cache(page) \ -- page_cache_release(page) -+ put_page(page) - #define free_pages_and_swap_cache(pages, nr) \ - release_pages((pages), (nr), false); - -diff --git a/ipc/mqueue.c b/ipc/mqueue.c -index 781c1399c6a3..ade739f67f1d 100644 ---- a/ipc/mqueue.c -+++ b/ipc/mqueue.c -@@ -307,8 +307,8 @@ static int mqueue_fill_super(struct super_block *sb, void *data, int silent) - struct inode *inode; - struct ipc_namespace *ns = data; - -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ sb->s_blocksize = PAGE_SIZE; -+ sb->s_blocksize_bits = PAGE_SHIFT; - sb->s_magic = MQUEUE_MAGIC; - sb->s_op = &mqueue_super_ops; - -diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c -index 5f6ce931f1ea..9be1cba0eb11 100644 ---- a/kernel/events/uprobes.c -+++ b/kernel/events/uprobes.c -@@ -321,7 +321,7 @@ retry: - copy_to_page(new_page, vaddr, &opcode, UPROBE_SWBP_INSN_SIZE); - - ret = __replace_page(vma, vaddr, old_page, new_page); -- page_cache_release(new_page); -+ put_page(new_page); - put_old: - put_page(old_page); - -@@ -539,14 +539,14 @@ static int __copy_insn(struct address_space *mapping, struct file *filp, - * see uprobe_register(). - */ - if (mapping->a_ops->readpage) -- page = read_mapping_page(mapping, offset >> PAGE_CACHE_SHIFT, filp); -+ page = read_mapping_page(mapping, offset >> PAGE_SHIFT, filp); - else -- page = shmem_read_mapping_page(mapping, offset >> PAGE_CACHE_SHIFT); -+ page = shmem_read_mapping_page(mapping, offset >> PAGE_SHIFT); - if (IS_ERR(page)) - return PTR_ERR(page); - - copy_from_page(page, offset, insn, nbytes); -- page_cache_release(page); -+ put_page(page); - - return 0; - } -diff --git a/mm/fadvise.c b/mm/fadvise.c -index b8a5bc66b0c0..b8024fa7101d 100644 ---- a/mm/fadvise.c -+++ b/mm/fadvise.c -@@ -97,8 +97,8 @@ SYSCALL_DEFINE4(fadvise64_64, int, fd, loff_t, offset, loff_t, len, int, advice) - break; - case POSIX_FADV_WILLNEED: - /* First and last PARTIAL page! */ -- start_index = offset >> PAGE_CACHE_SHIFT; -- end_index = endbyte >> PAGE_CACHE_SHIFT; -+ start_index = offset >> PAGE_SHIFT; -+ end_index = endbyte >> PAGE_SHIFT; - - /* Careful about overflow on the "+1" */ - nrpages = end_index - start_index + 1; -@@ -124,8 +124,8 @@ SYSCALL_DEFINE4(fadvise64_64, int, fd, loff_t, offset, loff_t, len, int, advice) - * preserved on the expectation that it is better to preserve - * needed memory than to discard unneeded memory. - */ -- start_index = (offset+(PAGE_CACHE_SIZE-1)) >> PAGE_CACHE_SHIFT; -- end_index = (endbyte >> PAGE_CACHE_SHIFT); -+ start_index = (offset+(PAGE_SIZE-1)) >> PAGE_SHIFT; -+ end_index = (endbyte >> PAGE_SHIFT); - - if (end_index >= start_index) { - unsigned long count = invalidate_mapping_pages(mapping, -diff --git a/mm/filemap.c b/mm/filemap.c -index 7c00f105845e..96f3b0322652 100644 ---- a/mm/filemap.c -+++ b/mm/filemap.c -@@ -265,7 +265,7 @@ void delete_from_page_cache(struct page *page) - - if (freepage) - freepage(page); -- page_cache_release(page); -+ put_page(page); - } - EXPORT_SYMBOL(delete_from_page_cache); - -@@ -352,8 +352,8 @@ EXPORT_SYMBOL(filemap_flush); - static int __filemap_fdatawait_range(struct address_space *mapping, - loff_t start_byte, loff_t end_byte) - { -- pgoff_t index = start_byte >> PAGE_CACHE_SHIFT; -- pgoff_t end = end_byte >> PAGE_CACHE_SHIFT; -+ pgoff_t index = start_byte >> PAGE_SHIFT; -+ pgoff_t end = end_byte >> PAGE_SHIFT; - struct pagevec pvec; - int nr_pages; - int ret = 0; -@@ -550,7 +550,7 @@ int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask) - pgoff_t offset = old->index; - freepage = mapping->a_ops->freepage; - -- page_cache_get(new); -+ get_page(new); - new->mapping = mapping; - new->index = offset; - -@@ -572,7 +572,7 @@ int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask) - radix_tree_preload_end(); - if (freepage) - freepage(old); -- page_cache_release(old); -+ put_page(old); - } - - return error; -@@ -651,7 +651,7 @@ static int __add_to_page_cache_locked(struct page *page, - return error; - } - -- page_cache_get(page); -+ get_page(page); - page->mapping = mapping; - page->index = offset; - -@@ -675,7 +675,7 @@ err_insert: - spin_unlock_irq(&mapping->tree_lock); - if (!huge) - mem_cgroup_cancel_charge(page, memcg, false); -- page_cache_release(page); -+ put_page(page); - return error; - } - -@@ -1083,7 +1083,7 @@ repeat: - * include/linux/pagemap.h for details. - */ - if (unlikely(page != *pagep)) { -- page_cache_release(page); -+ put_page(page); - goto repeat; - } - } -@@ -1121,7 +1121,7 @@ repeat: - /* Has the page been truncated? */ - if (unlikely(page->mapping != mapping)) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - goto repeat; - } - VM_BUG_ON_PAGE(page->index != offset, page); -@@ -1168,7 +1168,7 @@ repeat: - if (fgp_flags & FGP_LOCK) { - if (fgp_flags & FGP_NOWAIT) { - if (!trylock_page(page)) { -- page_cache_release(page); -+ put_page(page); - return NULL; - } - } else { -@@ -1178,7 +1178,7 @@ repeat: - /* Has the page been truncated? */ - if (unlikely(page->mapping != mapping)) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - goto repeat; - } - VM_BUG_ON_PAGE(page->index != offset, page); -@@ -1209,7 +1209,7 @@ no_page: - err = add_to_page_cache_lru(page, mapping, offset, - gfp_mask & GFP_RECLAIM_MASK); - if (unlikely(err)) { -- page_cache_release(page); -+ put_page(page); - page = NULL; - if (err == -EEXIST) - goto repeat; -@@ -1278,7 +1278,7 @@ repeat: - - /* Has the page moved? */ - if (unlikely(page != *slot)) { -- page_cache_release(page); -+ put_page(page); - goto repeat; - } - export: -@@ -1343,7 +1343,7 @@ repeat: - - /* Has the page moved? */ - if (unlikely(page != *slot)) { -- page_cache_release(page); -+ put_page(page); - goto repeat; - } - -@@ -1405,7 +1405,7 @@ repeat: - - /* Has the page moved? */ - if (unlikely(page != *slot)) { -- page_cache_release(page); -+ put_page(page); - goto repeat; - } - -@@ -1415,7 +1415,7 @@ repeat: - * negatives, which is just confusing to the caller. - */ - if (page->mapping == NULL || page->index != iter.index) { -- page_cache_release(page); -+ put_page(page); - break; - } - -@@ -1482,7 +1482,7 @@ repeat: - - /* Has the page moved? */ - if (unlikely(page != *slot)) { -- page_cache_release(page); -+ put_page(page); - goto repeat; - } - -@@ -1549,7 +1549,7 @@ repeat: - - /* Has the page moved? */ - if (unlikely(page != *slot)) { -- page_cache_release(page); -+ put_page(page); - goto repeat; - } - export: -@@ -1610,11 +1610,11 @@ static ssize_t do_generic_file_read(struct file *filp, loff_t *ppos, - unsigned int prev_offset; - int error = 0; - -- index = *ppos >> PAGE_CACHE_SHIFT; -- prev_index = ra->prev_pos >> PAGE_CACHE_SHIFT; -- prev_offset = ra->prev_pos & (PAGE_CACHE_SIZE-1); -- last_index = (*ppos + iter->count + PAGE_CACHE_SIZE-1) >> PAGE_CACHE_SHIFT; -- offset = *ppos & ~PAGE_CACHE_MASK; -+ index = *ppos >> PAGE_SHIFT; -+ prev_index = ra->prev_pos >> PAGE_SHIFT; -+ prev_offset = ra->prev_pos & (PAGE_SIZE-1); -+ last_index = (*ppos + iter->count + PAGE_SIZE-1) >> PAGE_SHIFT; -+ offset = *ppos & ~PAGE_MASK; - - for (;;) { - struct page *page; -@@ -1648,7 +1648,7 @@ find_page: - if (PageUptodate(page)) - goto page_ok; - -- if (inode->i_blkbits == PAGE_CACHE_SHIFT || -+ if (inode->i_blkbits == PAGE_SHIFT || - !mapping->a_ops->is_partially_uptodate) - goto page_not_up_to_date; - if (!trylock_page(page)) -@@ -1672,18 +1672,18 @@ page_ok: - */ - - isize = i_size_read(inode); -- end_index = (isize - 1) >> PAGE_CACHE_SHIFT; -+ end_index = (isize - 1) >> PAGE_SHIFT; - if (unlikely(!isize || index > end_index)) { -- page_cache_release(page); -+ put_page(page); - goto out; - } - - /* nr is the maximum number of bytes to copy from this page */ -- nr = PAGE_CACHE_SIZE; -+ nr = PAGE_SIZE; - if (index == end_index) { -- nr = ((isize - 1) & ~PAGE_CACHE_MASK) + 1; -+ nr = ((isize - 1) & ~PAGE_MASK) + 1; - if (nr <= offset) { -- page_cache_release(page); -+ put_page(page); - goto out; - } - } -@@ -1711,11 +1711,11 @@ page_ok: - - ret = copy_page_to_iter(page, offset, nr, iter); - offset += ret; -- index += offset >> PAGE_CACHE_SHIFT; -- offset &= ~PAGE_CACHE_MASK; -+ index += offset >> PAGE_SHIFT; -+ offset &= ~PAGE_MASK; - prev_offset = offset; - -- page_cache_release(page); -+ put_page(page); - written += ret; - if (!iov_iter_count(iter)) - goto out; -@@ -1735,7 +1735,7 @@ page_not_up_to_date_locked: - /* Did it get truncated before we got the lock? */ - if (!page->mapping) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - continue; - } - -@@ -1757,7 +1757,7 @@ readpage: - - if (unlikely(error)) { - if (error == AOP_TRUNCATED_PAGE) { -- page_cache_release(page); -+ put_page(page); - error = 0; - goto find_page; - } -@@ -1774,7 +1774,7 @@ readpage: - * invalidate_mapping_pages got it - */ - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - goto find_page; - } - unlock_page(page); -@@ -1789,7 +1789,7 @@ readpage: - - readpage_error: - /* UHHUH! A synchronous read error occurred. Report it */ -- page_cache_release(page); -+ put_page(page); - goto out; - - no_cached_page: -@@ -1805,7 +1805,7 @@ no_cached_page: - error = add_to_page_cache_lru(page, mapping, index, - mapping_gfp_constraint(mapping, GFP_KERNEL)); - if (error) { -- page_cache_release(page); -+ put_page(page); - if (error == -EEXIST) { - error = 0; - goto find_page; -@@ -1817,10 +1817,10 @@ no_cached_page: - - out: - ra->prev_pos = prev_index; -- ra->prev_pos <<= PAGE_CACHE_SHIFT; -+ ra->prev_pos <<= PAGE_SHIFT; - ra->prev_pos |= prev_offset; - -- *ppos = ((loff_t)index << PAGE_CACHE_SHIFT) + offset; -+ *ppos = ((loff_t)index << PAGE_SHIFT) + offset; - file_accessed(filp); - return written ? written : error; - } -@@ -1911,7 +1911,7 @@ static int page_cache_read(struct file *file, pgoff_t offset, gfp_t gfp_mask) - else if (ret == -EEXIST) - ret = 0; /* losing race to add is OK */ - -- page_cache_release(page); -+ put_page(page); - - } while (ret == AOP_TRUNCATED_PAGE); - -@@ -2021,8 +2021,8 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) - loff_t size; - int ret = 0; - -- size = round_up(i_size_read(inode), PAGE_CACHE_SIZE); -- if (offset >= size >> PAGE_CACHE_SHIFT) -+ size = round_up(i_size_read(inode), PAGE_SIZE); -+ if (offset >= size >> PAGE_SHIFT) - return VM_FAULT_SIGBUS; - - /* -@@ -2048,7 +2048,7 @@ retry_find: - } - - if (!lock_page_or_retry(page, vma->vm_mm, vmf->flags)) { -- page_cache_release(page); -+ put_page(page); - return ret | VM_FAULT_RETRY; - } - -@@ -2071,10 +2071,10 @@ retry_find: - * Found the page and have a reference on it. - * We must recheck i_size under page lock. - */ -- size = round_up(i_size_read(inode), PAGE_CACHE_SIZE); -- if (unlikely(offset >= size >> PAGE_CACHE_SHIFT)) { -+ size = round_up(i_size_read(inode), PAGE_SIZE); -+ if (unlikely(offset >= size >> PAGE_SHIFT)) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return VM_FAULT_SIGBUS; - } - -@@ -2119,7 +2119,7 @@ page_not_uptodate: - if (!PageUptodate(page)) - error = -EIO; - } -- page_cache_release(page); -+ put_page(page); - - if (!error || error == AOP_TRUNCATED_PAGE) - goto retry_find; -@@ -2163,7 +2163,7 @@ repeat: - - /* Has the page moved? */ - if (unlikely(page != *slot)) { -- page_cache_release(page); -+ put_page(page); - goto repeat; - } - -@@ -2177,8 +2177,8 @@ repeat: - if (page->mapping != mapping || !PageUptodate(page)) - goto unlock; - -- size = round_up(i_size_read(mapping->host), PAGE_CACHE_SIZE); -- if (page->index >= size >> PAGE_CACHE_SHIFT) -+ size = round_up(i_size_read(mapping->host), PAGE_SIZE); -+ if (page->index >= size >> PAGE_SHIFT) - goto unlock; - - pte = vmf->pte + page->index - vmf->pgoff; -@@ -2194,7 +2194,7 @@ repeat: - unlock: - unlock_page(page); - skip: -- page_cache_release(page); -+ put_page(page); - next: - if (iter.index == vmf->max_pgoff) - break; -@@ -2277,7 +2277,7 @@ static struct page *wait_on_page_read(struct page *page) - if (!IS_ERR(page)) { - wait_on_page_locked(page); - if (!PageUptodate(page)) { -- page_cache_release(page); -+ put_page(page); - page = ERR_PTR(-EIO); - } - } -@@ -2300,7 +2300,7 @@ repeat: - return ERR_PTR(-ENOMEM); - err = add_to_page_cache_lru(page, mapping, index, gfp); - if (unlikely(err)) { -- page_cache_release(page); -+ put_page(page); - if (err == -EEXIST) - goto repeat; - /* Presumably ENOMEM for radix tree node */ -@@ -2310,7 +2310,7 @@ repeat: - filler: - err = filler(data, page); - if (err < 0) { -- page_cache_release(page); -+ put_page(page); - return ERR_PTR(err); - } - -@@ -2363,7 +2363,7 @@ filler: - /* Case c or d, restart the operation */ - if (!page->mapping) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - goto repeat; - } - -@@ -2510,7 +2510,7 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos) - struct iov_iter data; - - write_len = iov_iter_count(from); -- end = (pos + write_len - 1) >> PAGE_CACHE_SHIFT; -+ end = (pos + write_len - 1) >> PAGE_SHIFT; - - written = filemap_write_and_wait_range(mapping, pos, pos + write_len - 1); - if (written) -@@ -2524,7 +2524,7 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos) - */ - if (mapping->nrpages) { - written = invalidate_inode_pages2_range(mapping, -- pos >> PAGE_CACHE_SHIFT, end); -+ pos >> PAGE_SHIFT, end); - /* - * If a page can not be invalidated, return 0 to fall back - * to buffered write. -@@ -2549,7 +2549,7 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos) - */ - if (mapping->nrpages) { - invalidate_inode_pages2_range(mapping, -- pos >> PAGE_CACHE_SHIFT, end); -+ pos >> PAGE_SHIFT, end); - } - - if (written > 0) { -@@ -2610,8 +2610,8 @@ ssize_t generic_perform_write(struct file *file, - size_t copied; /* Bytes copied from user */ - void *fsdata; - -- offset = (pos & (PAGE_CACHE_SIZE - 1)); -- bytes = min_t(unsigned long, PAGE_CACHE_SIZE - offset, -+ offset = (pos & (PAGE_SIZE - 1)); -+ bytes = min_t(unsigned long, PAGE_SIZE - offset, - iov_iter_count(i)); - - again: -@@ -2664,7 +2664,7 @@ again: - * because not all segments in the iov can be copied at - * once without a pagefault. - */ -- bytes = min_t(unsigned long, PAGE_CACHE_SIZE - offset, -+ bytes = min_t(unsigned long, PAGE_SIZE - offset, - iov_iter_single_seg_count(i)); - goto again; - } -@@ -2751,8 +2751,8 @@ ssize_t __generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from) - iocb->ki_pos = endbyte + 1; - written += status; - invalidate_mapping_pages(mapping, -- pos >> PAGE_CACHE_SHIFT, -- endbyte >> PAGE_CACHE_SHIFT); -+ pos >> PAGE_SHIFT, -+ endbyte >> PAGE_SHIFT); - } else { - /* - * We don't know how much we wrote, so just return -diff --git a/mm/gup.c b/mm/gup.c -index 7bf19ffa2199..8c050724e498 100644 ---- a/mm/gup.c -+++ b/mm/gup.c -@@ -1058,7 +1058,7 @@ int __mm_populate(unsigned long start, unsigned long len, int ignore_errors) - * @addr: user address - * - * Returns struct page pointer of user page pinned for dump, -- * to be freed afterwards by page_cache_release() or put_page(). -+ * to be freed afterwards by put_page(). - * - * Returns NULL on any kind of failure - a hole must then be inserted into - * the corefile, to preserve alignment with its headers; and also returns -diff --git a/mm/hugetlb.c b/mm/hugetlb.c -index 06058eaa173b..19d0d08b396f 100644 ---- a/mm/hugetlb.c -+++ b/mm/hugetlb.c -@@ -3346,7 +3346,7 @@ retry_avoidcopy: - old_page != pagecache_page) - outside_reserve = 1; - -- page_cache_get(old_page); -+ get_page(old_page); - - /* - * Drop page table lock as buddy allocator may be called. It will -@@ -3364,7 +3364,7 @@ retry_avoidcopy: - * may get SIGKILLed if it later faults. - */ - if (outside_reserve) { -- page_cache_release(old_page); -+ put_page(old_page); - BUG_ON(huge_pte_none(pte)); - unmap_ref_private(mm, vma, old_page, address); - BUG_ON(huge_pte_none(pte)); -@@ -3425,9 +3425,9 @@ retry_avoidcopy: - spin_unlock(ptl); - mmu_notifier_invalidate_range_end(mm, mmun_start, mmun_end); - out_release_all: -- page_cache_release(new_page); -+ put_page(new_page); - out_release_old: -- page_cache_release(old_page); -+ put_page(old_page); - - spin_lock(ptl); /* Caller expects lock to be held */ - return ret; -diff --git a/mm/madvise.c b/mm/madvise.c -index a01147359f3b..07427d3fcead 100644 ---- a/mm/madvise.c -+++ b/mm/madvise.c -@@ -170,7 +170,7 @@ static int swapin_walk_pmd_entry(pmd_t *pmd, unsigned long start, - page = read_swap_cache_async(entry, GFP_HIGHUSER_MOVABLE, - vma, index); - if (page) -- page_cache_release(page); -+ put_page(page); - } - - return 0; -@@ -204,14 +204,14 @@ static void force_shm_swapin_readahead(struct vm_area_struct *vma, - page = find_get_entry(mapping, index); - if (!radix_tree_exceptional_entry(page)) { - if (page) -- page_cache_release(page); -+ put_page(page); - continue; - } - swap = radix_to_swp_entry(page); - page = read_swap_cache_async(swap, GFP_HIGHUSER_MOVABLE, - NULL, 0); - if (page) -- page_cache_release(page); -+ put_page(page); - } - - lru_add_drain(); /* Push any new pages onto the LRU now */ -diff --git a/mm/memory-failure.c b/mm/memory-failure.c -index 5a544c6c0717..78f5f2641b91 100644 ---- a/mm/memory-failure.c -+++ b/mm/memory-failure.c -@@ -538,7 +538,7 @@ static int delete_from_lru_cache(struct page *p) - /* - * drop the page count elevated by isolate_lru_page() - */ -- page_cache_release(p); -+ put_page(p); - return 0; - } - return -EIO; -diff --git a/mm/memory.c b/mm/memory.c -index ac6bc15c19be..847e24cab5bb 100644 ---- a/mm/memory.c -+++ b/mm/memory.c -@@ -2050,7 +2050,7 @@ static inline int wp_page_reuse(struct mm_struct *mm, - VM_BUG_ON_PAGE(PageAnon(page), page); - mapping = page->mapping; - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - if ((dirtied || page_mkwrite) && mapping) { - /* -@@ -2184,7 +2184,7 @@ static int wp_page_copy(struct mm_struct *mm, struct vm_area_struct *vma, - } - - if (new_page) -- page_cache_release(new_page); -+ put_page(new_page); - - pte_unmap_unlock(page_table, ptl); - mmu_notifier_invalidate_range_end(mm, mmun_start, mmun_end); -@@ -2199,14 +2199,14 @@ static int wp_page_copy(struct mm_struct *mm, struct vm_area_struct *vma, - munlock_vma_page(old_page); - unlock_page(old_page); - } -- page_cache_release(old_page); -+ put_page(old_page); - } - return page_copied ? VM_FAULT_WRITE : 0; - oom_free_new: -- page_cache_release(new_page); -+ put_page(new_page); - oom: - if (old_page) -- page_cache_release(old_page); -+ put_page(old_page); - return VM_FAULT_OOM; - } - -@@ -2254,7 +2254,7 @@ static int wp_page_shared(struct mm_struct *mm, struct vm_area_struct *vma, - { - int page_mkwrite = 0; - -- page_cache_get(old_page); -+ get_page(old_page); - - if (vma->vm_ops && vma->vm_ops->page_mkwrite) { - int tmp; -@@ -2263,7 +2263,7 @@ static int wp_page_shared(struct mm_struct *mm, struct vm_area_struct *vma, - tmp = do_page_mkwrite(vma, old_page, address); - if (unlikely(!tmp || (tmp & - (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))) { -- page_cache_release(old_page); -+ put_page(old_page); - return tmp; - } - /* -@@ -2277,7 +2277,7 @@ static int wp_page_shared(struct mm_struct *mm, struct vm_area_struct *vma, - if (!pte_same(*page_table, orig_pte)) { - unlock_page(old_page); - pte_unmap_unlock(page_table, ptl); -- page_cache_release(old_page); -+ put_page(old_page); - return 0; - } - page_mkwrite = 1; -@@ -2337,7 +2337,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, - */ - if (PageAnon(old_page) && !PageKsm(old_page)) { - if (!trylock_page(old_page)) { -- page_cache_get(old_page); -+ get_page(old_page); - pte_unmap_unlock(page_table, ptl); - lock_page(old_page); - page_table = pte_offset_map_lock(mm, pmd, address, -@@ -2345,10 +2345,10 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, - if (!pte_same(*page_table, orig_pte)) { - unlock_page(old_page); - pte_unmap_unlock(page_table, ptl); -- page_cache_release(old_page); -+ put_page(old_page); - return 0; - } -- page_cache_release(old_page); -+ put_page(old_page); - } - if (reuse_swap_page(old_page)) { - /* -@@ -2371,7 +2371,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, - /* - * Ok, we need to copy. Oh, well.. - */ -- page_cache_get(old_page); -+ get_page(old_page); - - pte_unmap_unlock(page_table, ptl); - return wp_page_copy(mm, vma, address, page_table, pmd, -@@ -2396,7 +2396,6 @@ static inline void unmap_mapping_range_tree(struct rb_root *root, - - vba = vma->vm_pgoff; - vea = vba + vma_pages(vma) - 1; -- /* Assume for now that PAGE_CACHE_SHIFT == PAGE_SHIFT */ - zba = details->first_index; - if (zba < vba) - zba = vba; -@@ -2615,7 +2614,7 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma, - * parallel locked swapcache. - */ - unlock_page(swapcache); -- page_cache_release(swapcache); -+ put_page(swapcache); - } - - if (flags & FAULT_FLAG_WRITE) { -@@ -2637,10 +2636,10 @@ out_nomap: - out_page: - unlock_page(page); - out_release: -- page_cache_release(page); -+ put_page(page); - if (page != swapcache) { - unlock_page(swapcache); -- page_cache_release(swapcache); -+ put_page(swapcache); - } - return ret; - } -@@ -2748,7 +2747,7 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, - if (userfaultfd_missing(vma)) { - pte_unmap_unlock(page_table, ptl); - mem_cgroup_cancel_charge(page, memcg, false); -- page_cache_release(page); -+ put_page(page); - return handle_userfault(vma, address, flags, - VM_UFFD_MISSING); - } -@@ -2767,10 +2766,10 @@ unlock: - return 0; - release: - mem_cgroup_cancel_charge(page, memcg, false); -- page_cache_release(page); -+ put_page(page); - goto unlock; - oom_free_page: -- page_cache_release(page); -+ put_page(page); - oom: - return VM_FAULT_OOM; - } -@@ -2803,7 +2802,7 @@ static int __do_fault(struct vm_area_struct *vma, unsigned long address, - if (unlikely(PageHWPoison(vmf.page))) { - if (ret & VM_FAULT_LOCKED) - unlock_page(vmf.page); -- page_cache_release(vmf.page); -+ put_page(vmf.page); - return VM_FAULT_HWPOISON; - } - -@@ -2992,7 +2991,7 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma, - if (unlikely(!pte_same(*pte, orig_pte))) { - pte_unmap_unlock(pte, ptl); - unlock_page(fault_page); -- page_cache_release(fault_page); -+ put_page(fault_page); - return ret; - } - do_set_pte(vma, address, fault_page, pte, false, false); -@@ -3020,7 +3019,7 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma, - return VM_FAULT_OOM; - - if (mem_cgroup_try_charge(new_page, mm, GFP_KERNEL, &memcg, false)) { -- page_cache_release(new_page); -+ put_page(new_page); - return VM_FAULT_OOM; - } - -@@ -3037,7 +3036,7 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma, - pte_unmap_unlock(pte, ptl); - if (fault_page) { - unlock_page(fault_page); -- page_cache_release(fault_page); -+ put_page(fault_page); - } else { - /* - * The fault handler has no page to lock, so it holds -@@ -3053,7 +3052,7 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma, - pte_unmap_unlock(pte, ptl); - if (fault_page) { - unlock_page(fault_page); -- page_cache_release(fault_page); -+ put_page(fault_page); - } else { - /* - * The fault handler has no page to lock, so it holds -@@ -3064,7 +3063,7 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma, - return ret; - uncharge_out: - mem_cgroup_cancel_charge(new_page, memcg, false); -- page_cache_release(new_page); -+ put_page(new_page); - return ret; - } - -@@ -3092,7 +3091,7 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma, - tmp = do_page_mkwrite(vma, fault_page, address); - if (unlikely(!tmp || - (tmp & (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))) { -- page_cache_release(fault_page); -+ put_page(fault_page); - return tmp; - } - } -@@ -3101,7 +3100,7 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma, - if (unlikely(!pte_same(*pte, orig_pte))) { - pte_unmap_unlock(pte, ptl); - unlock_page(fault_page); -- page_cache_release(fault_page); -+ put_page(fault_page); - return ret; - } - do_set_pte(vma, address, fault_page, pte, true, false); -@@ -3727,7 +3726,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, - buf, maddr + offset, bytes); - } - kunmap(page); -- page_cache_release(page); -+ put_page(page); - } - len -= bytes; - buf += bytes; -diff --git a/mm/mincore.c b/mm/mincore.c -index 563f32045490..012a4659e273 100644 ---- a/mm/mincore.c -+++ b/mm/mincore.c -@@ -75,7 +75,7 @@ static unsigned char mincore_page(struct address_space *mapping, pgoff_t pgoff) - #endif - if (page) { - present = PageUptodate(page); -- page_cache_release(page); -+ put_page(page); - } - - return present; -@@ -211,7 +211,7 @@ static long do_mincore(unsigned long addr, unsigned long pages, unsigned char *v - * return values: - * zero - success - * -EFAULT - vec points to an illegal address -- * -EINVAL - addr is not a multiple of PAGE_CACHE_SIZE -+ * -EINVAL - addr is not a multiple of PAGE_SIZE - * -ENOMEM - Addresses in the range [addr, addr + len] are - * invalid for the address space of this process, or - * specify one or more pages which are not currently -@@ -226,14 +226,14 @@ SYSCALL_DEFINE3(mincore, unsigned long, start, size_t, len, - unsigned char *tmp; - - /* Check the start address: needs to be page-aligned.. */ -- if (start & ~PAGE_CACHE_MASK) -+ if (start & ~PAGE_MASK) - return -EINVAL; - - /* ..and we need to be passed a valid user-space range */ - if (!access_ok(VERIFY_READ, (void __user *) start, len)) - return -ENOMEM; - -- /* This also avoids any overflows on PAGE_CACHE_ALIGN */ -+ /* This also avoids any overflows on PAGE_ALIGN */ - pages = len >> PAGE_SHIFT; - pages += (offset_in_page(len)) != 0; - -diff --git a/mm/nommu.c b/mm/nommu.c -index 6402f2715d48..9e5d855472a3 100644 ---- a/mm/nommu.c -+++ b/mm/nommu.c -@@ -139,7 +139,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, - if (pages) { - pages[i] = virt_to_page(start); - if (pages[i]) -- page_cache_get(pages[i]); -+ get_page(pages[i]); - } - if (vmas) - vmas[i] = vma; -diff --git a/mm/page-writeback.c b/mm/page-writeback.c -index 11ff8f758631..999792d35ccc 100644 ---- a/mm/page-writeback.c -+++ b/mm/page-writeback.c -@@ -2176,8 +2176,8 @@ int write_cache_pages(struct address_space *mapping, - cycled = 0; - end = -1; - } else { -- index = wbc->range_start >> PAGE_CACHE_SHIFT; -- end = wbc->range_end >> PAGE_CACHE_SHIFT; -+ index = wbc->range_start >> PAGE_SHIFT; -+ end = wbc->range_end >> PAGE_SHIFT; - if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) - range_whole = 1; - cycled = 1; /* ignore range_cyclic tests */ -@@ -2382,14 +2382,14 @@ int write_one_page(struct page *page, int wait) - wait_on_page_writeback(page); - - if (clear_page_dirty_for_io(page)) { -- page_cache_get(page); -+ get_page(page); - ret = mapping->a_ops->writepage(page, &wbc); - if (ret == 0 && wait) { - wait_on_page_writeback(page); - if (PageError(page)) - ret = -EIO; - } -- page_cache_release(page); -+ put_page(page); - } else { - unlock_page(page); - } -@@ -2431,7 +2431,7 @@ void account_page_dirtied(struct page *page, struct address_space *mapping) - __inc_zone_page_state(page, NR_DIRTIED); - __inc_wb_stat(wb, WB_RECLAIMABLE); - __inc_wb_stat(wb, WB_DIRTIED); -- task_io_account_write(PAGE_CACHE_SIZE); -+ task_io_account_write(PAGE_SIZE); - current->nr_dirtied++; - this_cpu_inc(bdp_ratelimits); - } -@@ -2450,7 +2450,7 @@ void account_page_cleaned(struct page *page, struct address_space *mapping, - mem_cgroup_dec_page_stat(page, MEM_CGROUP_STAT_DIRTY); - dec_zone_page_state(page, NR_FILE_DIRTY); - dec_wb_stat(wb, WB_RECLAIMABLE); -- task_io_account_cancelled_write(PAGE_CACHE_SIZE); -+ task_io_account_cancelled_write(PAGE_SIZE); - } - } - -diff --git a/mm/page_io.c b/mm/page_io.c -index ff74e512f029..729cc6ee21a6 100644 ---- a/mm/page_io.c -+++ b/mm/page_io.c -@@ -246,7 +246,7 @@ out: - - static sector_t swap_page_sector(struct page *page) - { -- return (sector_t)__page_file_index(page) << (PAGE_CACHE_SHIFT - 9); -+ return (sector_t)__page_file_index(page) << (PAGE_SHIFT - 9); - } - - int __swap_writepage(struct page *page, struct writeback_control *wbc, -diff --git a/mm/readahead.c b/mm/readahead.c -index 20e58e820e44..40be3ae0afe3 100644 ---- a/mm/readahead.c -+++ b/mm/readahead.c -@@ -47,11 +47,11 @@ static void read_cache_pages_invalidate_page(struct address_space *mapping, - if (!trylock_page(page)) - BUG(); - page->mapping = mapping; -- do_invalidatepage(page, 0, PAGE_CACHE_SIZE); -+ do_invalidatepage(page, 0, PAGE_SIZE); - page->mapping = NULL; - unlock_page(page); - } -- page_cache_release(page); -+ put_page(page); - } - - /* -@@ -93,14 +93,14 @@ int read_cache_pages(struct address_space *mapping, struct list_head *pages, - read_cache_pages_invalidate_page(mapping, page); - continue; - } -- page_cache_release(page); -+ put_page(page); - - ret = filler(data, page); - if (unlikely(ret)) { - read_cache_pages_invalidate_pages(mapping, pages); - break; - } -- task_io_account_read(PAGE_CACHE_SIZE); -+ task_io_account_read(PAGE_SIZE); - } - return ret; - } -@@ -130,7 +130,7 @@ static int read_pages(struct address_space *mapping, struct file *filp, - mapping_gfp_constraint(mapping, GFP_KERNEL))) { - mapping->a_ops->readpage(filp, page); - } -- page_cache_release(page); -+ put_page(page); - } - ret = 0; - -@@ -163,7 +163,7 @@ int __do_page_cache_readahead(struct address_space *mapping, struct file *filp, - if (isize == 0) - goto out; - -- end_index = ((isize - 1) >> PAGE_CACHE_SHIFT); -+ end_index = ((isize - 1) >> PAGE_SHIFT); - - /* - * Preallocate as many pages as we will need. -@@ -216,7 +216,7 @@ int force_page_cache_readahead(struct address_space *mapping, struct file *filp, - while (nr_to_read) { - int err; - -- unsigned long this_chunk = (2 * 1024 * 1024) / PAGE_CACHE_SIZE; -+ unsigned long this_chunk = (2 * 1024 * 1024) / PAGE_SIZE; - - if (this_chunk > nr_to_read) - this_chunk = nr_to_read; -@@ -425,7 +425,7 @@ ondemand_readahead(struct address_space *mapping, - * trivial case: (offset - prev_offset) == 1 - * unaligned reads: (offset - prev_offset) == 0 - */ -- prev_offset = (unsigned long long)ra->prev_pos >> PAGE_CACHE_SHIFT; -+ prev_offset = (unsigned long long)ra->prev_pos >> PAGE_SHIFT; - if (offset - prev_offset <= 1UL) - goto initial_readahead; - -@@ -558,8 +558,8 @@ SYSCALL_DEFINE3(readahead, int, fd, loff_t, offset, size_t, count) - if (f.file) { - if (f.file->f_mode & FMODE_READ) { - struct address_space *mapping = f.file->f_mapping; -- pgoff_t start = offset >> PAGE_CACHE_SHIFT; -- pgoff_t end = (offset + count - 1) >> PAGE_CACHE_SHIFT; -+ pgoff_t start = offset >> PAGE_SHIFT; -+ pgoff_t end = (offset + count - 1) >> PAGE_SHIFT; - unsigned long len = end - start + 1; - ret = do_readahead(mapping, f.file, start, len); - } -diff --git a/mm/rmap.c b/mm/rmap.c -index c399a0d41b31..525b92f866a7 100644 ---- a/mm/rmap.c -+++ b/mm/rmap.c -@@ -1555,7 +1555,7 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma, - - discard: - page_remove_rmap(page, PageHuge(page)); -- page_cache_release(page); -+ put_page(page); - - out_unmap: - pte_unmap_unlock(pte, ptl); -diff --git a/mm/shmem.c b/mm/shmem.c -index 9428c51ab2d6..719bd6b88d98 100644 ---- a/mm/shmem.c -+++ b/mm/shmem.c -@@ -75,8 +75,8 @@ static struct vfsmount *shm_mnt; - - #include "internal.h" - --#define BLOCKS_PER_PAGE (PAGE_CACHE_SIZE/512) --#define VM_ACCT(size) (PAGE_CACHE_ALIGN(size) >> PAGE_SHIFT) -+#define BLOCKS_PER_PAGE (PAGE_SIZE/512) -+#define VM_ACCT(size) (PAGE_ALIGN(size) >> PAGE_SHIFT) - - /* Pretend that each entry is of this size in directory's i_size */ - #define BOGO_DIRENT_SIZE 20 -@@ -176,13 +176,13 @@ static inline int shmem_reacct_size(unsigned long flags, - static inline int shmem_acct_block(unsigned long flags) - { - return (flags & VM_NORESERVE) ? -- security_vm_enough_memory_mm(current->mm, VM_ACCT(PAGE_CACHE_SIZE)) : 0; -+ security_vm_enough_memory_mm(current->mm, VM_ACCT(PAGE_SIZE)) : 0; - } - - static inline void shmem_unacct_blocks(unsigned long flags, long pages) - { - if (flags & VM_NORESERVE) -- vm_unacct_memory(pages * VM_ACCT(PAGE_CACHE_SIZE)); -+ vm_unacct_memory(pages * VM_ACCT(PAGE_SIZE)); - } - - static const struct super_operations shmem_ops; -@@ -300,7 +300,7 @@ static int shmem_add_to_page_cache(struct page *page, - VM_BUG_ON_PAGE(!PageLocked(page), page); - VM_BUG_ON_PAGE(!PageSwapBacked(page), page); - -- page_cache_get(page); -+ get_page(page); - page->mapping = mapping; - page->index = index; - -@@ -318,7 +318,7 @@ static int shmem_add_to_page_cache(struct page *page, - } else { - page->mapping = NULL; - spin_unlock_irq(&mapping->tree_lock); -- page_cache_release(page); -+ put_page(page); - } - return error; - } -@@ -338,7 +338,7 @@ static void shmem_delete_from_page_cache(struct page *page, void *radswap) - __dec_zone_page_state(page, NR_FILE_PAGES); - __dec_zone_page_state(page, NR_SHMEM); - spin_unlock_irq(&mapping->tree_lock); -- page_cache_release(page); -+ put_page(page); - BUG_ON(error); - } - -@@ -474,10 +474,10 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, - { - struct address_space *mapping = inode->i_mapping; - struct shmem_inode_info *info = SHMEM_I(inode); -- pgoff_t start = (lstart + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -- pgoff_t end = (lend + 1) >> PAGE_CACHE_SHIFT; -- unsigned int partial_start = lstart & (PAGE_CACHE_SIZE - 1); -- unsigned int partial_end = (lend + 1) & (PAGE_CACHE_SIZE - 1); -+ pgoff_t start = (lstart + PAGE_SIZE - 1) >> PAGE_SHIFT; -+ pgoff_t end = (lend + 1) >> PAGE_SHIFT; -+ unsigned int partial_start = lstart & (PAGE_SIZE - 1); -+ unsigned int partial_end = (lend + 1) & (PAGE_SIZE - 1); - struct pagevec pvec; - pgoff_t indices[PAGEVEC_SIZE]; - long nr_swaps_freed = 0; -@@ -530,7 +530,7 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, - struct page *page = NULL; - shmem_getpage(inode, start - 1, &page, SGP_READ, NULL); - if (page) { -- unsigned int top = PAGE_CACHE_SIZE; -+ unsigned int top = PAGE_SIZE; - if (start > end) { - top = partial_end; - partial_end = 0; -@@ -538,7 +538,7 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, - zero_user_segment(page, partial_start, top); - set_page_dirty(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - } - if (partial_end) { -@@ -548,7 +548,7 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, - zero_user_segment(page, 0, partial_end); - set_page_dirty(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - } - if (start >= end) -@@ -833,7 +833,7 @@ int shmem_unuse(swp_entry_t swap, struct page *page) - mem_cgroup_commit_charge(page, memcg, true, false); - out: - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return error; - } - -@@ -1080,7 +1080,7 @@ static int shmem_replace_page(struct page **pagep, gfp_t gfp, - if (!newpage) - return -ENOMEM; - -- page_cache_get(newpage); -+ get_page(newpage); - copy_highpage(newpage, oldpage); - flush_dcache_page(newpage); - -@@ -1120,8 +1120,8 @@ static int shmem_replace_page(struct page **pagep, gfp_t gfp, - set_page_private(oldpage, 0); - - unlock_page(oldpage); -- page_cache_release(oldpage); -- page_cache_release(oldpage); -+ put_page(oldpage); -+ put_page(oldpage); - return error; - } - -@@ -1145,7 +1145,7 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index, - int once = 0; - int alloced = 0; - -- if (index > (MAX_LFS_FILESIZE >> PAGE_CACHE_SHIFT)) -+ if (index > (MAX_LFS_FILESIZE >> PAGE_SHIFT)) - return -EFBIG; - repeat: - swap.val = 0; -@@ -1156,7 +1156,7 @@ repeat: - } - - if (sgp != SGP_WRITE && sgp != SGP_FALLOC && -- ((loff_t)index << PAGE_CACHE_SHIFT) >= i_size_read(inode)) { -+ ((loff_t)index << PAGE_SHIFT) >= i_size_read(inode)) { - error = -EINVAL; - goto unlock; - } -@@ -1169,7 +1169,7 @@ repeat: - if (sgp != SGP_READ) - goto clear; - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - page = NULL; - } - if (page || (sgp == SGP_READ && !swap.val)) { -@@ -1327,7 +1327,7 @@ clear: - - /* Perhaps the file has been truncated since we checked */ - if (sgp != SGP_WRITE && sgp != SGP_FALLOC && -- ((loff_t)index << PAGE_CACHE_SHIFT) >= i_size_read(inode)) { -+ ((loff_t)index << PAGE_SHIFT) >= i_size_read(inode)) { - if (alloced) { - ClearPageDirty(page); - delete_from_page_cache(page); -@@ -1355,7 +1355,7 @@ failed: - unlock: - if (page) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - if (error == -ENOSPC && !once++) { - info = SHMEM_I(inode); -@@ -1577,7 +1577,7 @@ shmem_write_begin(struct file *file, struct address_space *mapping, - { - struct inode *inode = mapping->host; - struct shmem_inode_info *info = SHMEM_I(inode); -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -+ pgoff_t index = pos >> PAGE_SHIFT; - - /* i_mutex is held by caller */ - if (unlikely(info->seals)) { -@@ -1601,16 +1601,16 @@ shmem_write_end(struct file *file, struct address_space *mapping, - i_size_write(inode, pos + copied); - - if (!PageUptodate(page)) { -- if (copied < PAGE_CACHE_SIZE) { -- unsigned from = pos & (PAGE_CACHE_SIZE - 1); -+ if (copied < PAGE_SIZE) { -+ unsigned from = pos & (PAGE_SIZE - 1); - zero_user_segments(page, 0, from, -- from + copied, PAGE_CACHE_SIZE); -+ from + copied, PAGE_SIZE); - } - SetPageUptodate(page); - } - set_page_dirty(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - return copied; - } -@@ -1635,8 +1635,8 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to) - if (!iter_is_iovec(to)) - sgp = SGP_DIRTY; - -- index = *ppos >> PAGE_CACHE_SHIFT; -- offset = *ppos & ~PAGE_CACHE_MASK; -+ index = *ppos >> PAGE_SHIFT; -+ offset = *ppos & ~PAGE_MASK; - - for (;;) { - struct page *page = NULL; -@@ -1644,11 +1644,11 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to) - unsigned long nr, ret; - loff_t i_size = i_size_read(inode); - -- end_index = i_size >> PAGE_CACHE_SHIFT; -+ end_index = i_size >> PAGE_SHIFT; - if (index > end_index) - break; - if (index == end_index) { -- nr = i_size & ~PAGE_CACHE_MASK; -+ nr = i_size & ~PAGE_MASK; - if (nr <= offset) - break; - } -@@ -1666,14 +1666,14 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to) - * We must evaluate after, since reads (unlike writes) - * are called without i_mutex protection against truncate - */ -- nr = PAGE_CACHE_SIZE; -+ nr = PAGE_SIZE; - i_size = i_size_read(inode); -- end_index = i_size >> PAGE_CACHE_SHIFT; -+ end_index = i_size >> PAGE_SHIFT; - if (index == end_index) { -- nr = i_size & ~PAGE_CACHE_MASK; -+ nr = i_size & ~PAGE_MASK; - if (nr <= offset) { - if (page) -- page_cache_release(page); -+ put_page(page); - break; - } - } -@@ -1694,7 +1694,7 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to) - mark_page_accessed(page); - } else { - page = ZERO_PAGE(0); -- page_cache_get(page); -+ get_page(page); - } - - /* -@@ -1704,10 +1704,10 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to) - ret = copy_page_to_iter(page, offset, nr, to); - retval += ret; - offset += ret; -- index += offset >> PAGE_CACHE_SHIFT; -- offset &= ~PAGE_CACHE_MASK; -+ index += offset >> PAGE_SHIFT; -+ offset &= ~PAGE_MASK; - -- page_cache_release(page); -+ put_page(page); - if (!iov_iter_count(to)) - break; - if (ret < nr) { -@@ -1717,7 +1717,7 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to) - cond_resched(); - } - -- *ppos = ((loff_t) index << PAGE_CACHE_SHIFT) + offset; -+ *ppos = ((loff_t) index << PAGE_SHIFT) + offset; - file_accessed(file); - return retval ? retval : error; - } -@@ -1755,9 +1755,9 @@ static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos, - if (splice_grow_spd(pipe, &spd)) - return -ENOMEM; - -- index = *ppos >> PAGE_CACHE_SHIFT; -- loff = *ppos & ~PAGE_CACHE_MASK; -- req_pages = (len + loff + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -+ index = *ppos >> PAGE_SHIFT; -+ loff = *ppos & ~PAGE_MASK; -+ req_pages = (len + loff + PAGE_SIZE - 1) >> PAGE_SHIFT; - nr_pages = min(req_pages, spd.nr_pages_max); - - spd.nr_pages = find_get_pages_contig(mapping, index, -@@ -1774,7 +1774,7 @@ static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos, - index++; - } - -- index = *ppos >> PAGE_CACHE_SHIFT; -+ index = *ppos >> PAGE_SHIFT; - nr_pages = spd.nr_pages; - spd.nr_pages = 0; - -@@ -1784,7 +1784,7 @@ static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos, - if (!len) - break; - -- this_len = min_t(unsigned long, len, PAGE_CACHE_SIZE - loff); -+ this_len = min_t(unsigned long, len, PAGE_SIZE - loff); - page = spd.pages[page_nr]; - - if (!PageUptodate(page) || page->mapping != mapping) { -@@ -1793,19 +1793,19 @@ static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos, - if (error) - break; - unlock_page(page); -- page_cache_release(spd.pages[page_nr]); -+ put_page(spd.pages[page_nr]); - spd.pages[page_nr] = page; - } - - isize = i_size_read(inode); -- end_index = (isize - 1) >> PAGE_CACHE_SHIFT; -+ end_index = (isize - 1) >> PAGE_SHIFT; - if (unlikely(!isize || index > end_index)) - break; - - if (end_index == index) { - unsigned int plen; - -- plen = ((isize - 1) & ~PAGE_CACHE_MASK) + 1; -+ plen = ((isize - 1) & ~PAGE_MASK) + 1; - if (plen <= loff) - break; - -@@ -1822,7 +1822,7 @@ static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos, - } - - while (page_nr < nr_pages) -- page_cache_release(spd.pages[page_nr++]); -+ put_page(spd.pages[page_nr++]); - - if (spd.nr_pages) - error = splice_to_pipe(pipe, &spd); -@@ -1904,10 +1904,10 @@ static loff_t shmem_file_llseek(struct file *file, loff_t offset, int whence) - else if (offset >= inode->i_size) - offset = -ENXIO; - else { -- start = offset >> PAGE_CACHE_SHIFT; -- end = (inode->i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -+ start = offset >> PAGE_SHIFT; -+ end = (inode->i_size + PAGE_SIZE - 1) >> PAGE_SHIFT; - new_offset = shmem_seek_hole_data(mapping, start, end, whence); -- new_offset <<= PAGE_CACHE_SHIFT; -+ new_offset <<= PAGE_SHIFT; - if (new_offset > offset) { - if (new_offset < inode->i_size) - offset = new_offset; -@@ -2203,8 +2203,8 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset, - goto out; - } - -- start = offset >> PAGE_CACHE_SHIFT; -- end = (offset + len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -+ start = offset >> PAGE_SHIFT; -+ end = (offset + len + PAGE_SIZE - 1) >> PAGE_SHIFT; - /* Try to avoid a swapstorm if len is impossible to satisfy */ - if (sbinfo->max_blocks && end - start > sbinfo->max_blocks) { - error = -ENOSPC; -@@ -2237,8 +2237,8 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset, - if (error) { - /* Remove the !PageUptodate pages we added */ - shmem_undo_range(inode, -- (loff_t)start << PAGE_CACHE_SHIFT, -- (loff_t)index << PAGE_CACHE_SHIFT, true); -+ (loff_t)start << PAGE_SHIFT, -+ (loff_t)index << PAGE_SHIFT, true); - goto undone; - } - -@@ -2259,7 +2259,7 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset, - */ - set_page_dirty(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - cond_resched(); - } - -@@ -2280,7 +2280,7 @@ static int shmem_statfs(struct dentry *dentry, struct kstatfs *buf) - struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); - - buf->f_type = TMPFS_MAGIC; -- buf->f_bsize = PAGE_CACHE_SIZE; -+ buf->f_bsize = PAGE_SIZE; - buf->f_namelen = NAME_MAX; - if (sbinfo->max_blocks) { - buf->f_blocks = sbinfo->max_blocks; -@@ -2523,7 +2523,7 @@ static int shmem_symlink(struct inode *dir, struct dentry *dentry, const char *s - struct shmem_inode_info *info; - - len = strlen(symname) + 1; -- if (len > PAGE_CACHE_SIZE) -+ if (len > PAGE_SIZE) - return -ENAMETOOLONG; - - inode = shmem_get_inode(dir->i_sb, dir, S_IFLNK|S_IRWXUGO, 0, VM_NORESERVE); -@@ -2562,7 +2562,7 @@ static int shmem_symlink(struct inode *dir, struct dentry *dentry, const char *s - SetPageUptodate(page); - set_page_dirty(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - dir->i_size += BOGO_DIRENT_SIZE; - dir->i_ctime = dir->i_mtime = CURRENT_TIME; -@@ -2835,7 +2835,7 @@ static int shmem_parse_options(char *options, struct shmem_sb_info *sbinfo, - if (*rest) - goto bad_val; - sbinfo->max_blocks = -- DIV_ROUND_UP(size, PAGE_CACHE_SIZE); -+ DIV_ROUND_UP(size, PAGE_SIZE); - } else if (!strcmp(this_char,"nr_blocks")) { - sbinfo->max_blocks = memparse(value, &rest); - if (*rest) -@@ -2940,7 +2940,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root) - - if (sbinfo->max_blocks != shmem_default_max_blocks()) - seq_printf(seq, ",size=%luk", -- sbinfo->max_blocks << (PAGE_CACHE_SHIFT - 10)); -+ sbinfo->max_blocks << (PAGE_SHIFT - 10)); - if (sbinfo->max_inodes != shmem_default_max_inodes()) - seq_printf(seq, ",nr_inodes=%lu", sbinfo->max_inodes); - if (sbinfo->mode != (S_IRWXUGO | S_ISVTX)) -@@ -3082,8 +3082,8 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent) - sbinfo->free_inodes = sbinfo->max_inodes; - - sb->s_maxbytes = MAX_LFS_FILESIZE; -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ sb->s_blocksize = PAGE_SIZE; -+ sb->s_blocksize_bits = PAGE_SHIFT; - sb->s_magic = TMPFS_MAGIC; - sb->s_op = &shmem_ops; - sb->s_time_gran = 1; -diff --git a/mm/swap.c b/mm/swap.c -index 09fe5e97714a..a0bc206b4ac6 100644 ---- a/mm/swap.c -+++ b/mm/swap.c -@@ -114,7 +114,7 @@ void put_pages_list(struct list_head *pages) - - victim = list_entry(pages->prev, struct page, lru); - list_del(&victim->lru); -- page_cache_release(victim); -+ put_page(victim); - } - } - EXPORT_SYMBOL(put_pages_list); -@@ -142,7 +142,7 @@ int get_kernel_pages(const struct kvec *kiov, int nr_segs, int write, - return seg; - - pages[seg] = kmap_to_page(kiov[seg].iov_base); -- page_cache_get(pages[seg]); -+ get_page(pages[seg]); - } - - return seg; -@@ -236,7 +236,7 @@ void rotate_reclaimable_page(struct page *page) - struct pagevec *pvec; - unsigned long flags; - -- page_cache_get(page); -+ get_page(page); - local_irq_save(flags); - pvec = this_cpu_ptr(&lru_rotate_pvecs); - if (!pagevec_add(pvec, page)) -@@ -294,7 +294,7 @@ void activate_page(struct page *page) - if (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) { - struct pagevec *pvec = &get_cpu_var(activate_page_pvecs); - -- page_cache_get(page); -+ get_page(page); - if (!pagevec_add(pvec, page)) - pagevec_lru_move_fn(pvec, __activate_page, NULL); - put_cpu_var(activate_page_pvecs); -@@ -389,7 +389,7 @@ static void __lru_cache_add(struct page *page) - { - struct pagevec *pvec = &get_cpu_var(lru_add_pvec); - -- page_cache_get(page); -+ get_page(page); - if (!pagevec_space(pvec)) - __pagevec_lru_add(pvec); - pagevec_add(pvec, page); -@@ -646,7 +646,7 @@ void deactivate_page(struct page *page) - if (PageLRU(page) && PageActive(page) && !PageUnevictable(page)) { - struct pagevec *pvec = &get_cpu_var(lru_deactivate_pvecs); - -- page_cache_get(page); -+ get_page(page); - if (!pagevec_add(pvec, page)) - pagevec_lru_move_fn(pvec, lru_deactivate_fn, NULL); - put_cpu_var(lru_deactivate_pvecs); -@@ -698,7 +698,7 @@ void lru_add_drain_all(void) - } - - /** -- * release_pages - batched page_cache_release() -+ * release_pages - batched put_page() - * @pages: array of pages to release - * @nr: number of pages - * @cold: whether the pages are cache cold -diff --git a/mm/swap_state.c b/mm/swap_state.c -index 69cb2464e7dc..366ce3518703 100644 ---- a/mm/swap_state.c -+++ b/mm/swap_state.c -@@ -85,7 +85,7 @@ int __add_to_swap_cache(struct page *page, swp_entry_t entry) - VM_BUG_ON_PAGE(PageSwapCache(page), page); - VM_BUG_ON_PAGE(!PageSwapBacked(page), page); - -- page_cache_get(page); -+ get_page(page); - SetPageSwapCache(page); - set_page_private(page, entry.val); - -@@ -109,7 +109,7 @@ int __add_to_swap_cache(struct page *page, swp_entry_t entry) - VM_BUG_ON(error == -EEXIST); - set_page_private(page, 0UL); - ClearPageSwapCache(page); -- page_cache_release(page); -+ put_page(page); - } - - return error; -@@ -226,7 +226,7 @@ void delete_from_swap_cache(struct page *page) - spin_unlock_irq(&address_space->tree_lock); - - swapcache_free(entry); -- page_cache_release(page); -+ put_page(page); - } - - /* -@@ -252,7 +252,7 @@ static inline void free_swap_cache(struct page *page) - void free_page_and_swap_cache(struct page *page) - { - free_swap_cache(page); -- page_cache_release(page); -+ put_page(page); - } - - /* -@@ -380,7 +380,7 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, - } while (err != -ENOMEM); - - if (new_page) -- page_cache_release(new_page); -+ put_page(new_page); - return found_page; - } - -@@ -495,7 +495,7 @@ struct page *swapin_readahead(swp_entry_t entry, gfp_t gfp_mask, - continue; - if (offset != entry_offset) - SetPageReadahead(page); -- page_cache_release(page); -+ put_page(page); - } - blk_finish_plug(&plug); - -diff --git a/mm/swapfile.c b/mm/swapfile.c -index b86cf26a586b..555069ca3eae 100644 ---- a/mm/swapfile.c -+++ b/mm/swapfile.c -@@ -113,7 +113,7 @@ __try_to_reclaim_swap(struct swap_info_struct *si, unsigned long offset) - ret = try_to_free_swap(page); - unlock_page(page); - } -- page_cache_release(page); -+ put_page(page); - return ret; - } - -@@ -994,7 +994,7 @@ int free_swap_and_cache(swp_entry_t entry) - page = find_get_page(swap_address_space(entry), - entry.val); - if (page && !trylock_page(page)) { -- page_cache_release(page); -+ put_page(page); - page = NULL; - } - } -@@ -1011,7 +1011,7 @@ int free_swap_and_cache(swp_entry_t entry) - SetPageDirty(page); - } - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - return p != NULL; - } -@@ -1512,7 +1512,7 @@ int try_to_unuse(unsigned int type, bool frontswap, - } - if (retval) { - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - break; - } - -@@ -1564,7 +1564,7 @@ int try_to_unuse(unsigned int type, bool frontswap, - */ - SetPageDirty(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - - /* - * Make sure that we aren't completely killing -@@ -2568,7 +2568,7 @@ bad_swap: - out: - if (page && !IS_ERR(page)) { - kunmap(page); -- page_cache_release(page); -+ put_page(page); - } - if (name) - putname(name); -diff --git a/mm/truncate.c b/mm/truncate.c -index 7598b552ae03..b00272810871 100644 ---- a/mm/truncate.c -+++ b/mm/truncate.c -@@ -118,7 +118,7 @@ truncate_complete_page(struct address_space *mapping, struct page *page) - return -EIO; - - if (page_has_private(page)) -- do_invalidatepage(page, 0, PAGE_CACHE_SIZE); -+ do_invalidatepage(page, 0, PAGE_SIZE); - - /* - * Some filesystems seem to re-dirty the page even after -@@ -159,8 +159,8 @@ int truncate_inode_page(struct address_space *mapping, struct page *page) - { - if (page_mapped(page)) { - unmap_mapping_range(mapping, -- (loff_t)page->index << PAGE_CACHE_SHIFT, -- PAGE_CACHE_SIZE, 0); -+ (loff_t)page->index << PAGE_SHIFT, -+ PAGE_SIZE, 0); - } - return truncate_complete_page(mapping, page); - } -@@ -241,8 +241,8 @@ void truncate_inode_pages_range(struct address_space *mapping, - return; - - /* Offsets within partial pages */ -- partial_start = lstart & (PAGE_CACHE_SIZE - 1); -- partial_end = (lend + 1) & (PAGE_CACHE_SIZE - 1); -+ partial_start = lstart & (PAGE_SIZE - 1); -+ partial_end = (lend + 1) & (PAGE_SIZE - 1); - - /* - * 'start' and 'end' always covers the range of pages to be fully -@@ -250,7 +250,7 @@ void truncate_inode_pages_range(struct address_space *mapping, - * start of the range and 'partial_end' at the end of the range. - * Note that 'end' is exclusive while 'lend' is inclusive. - */ -- start = (lstart + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; -+ start = (lstart + PAGE_SIZE - 1) >> PAGE_SHIFT; - if (lend == -1) - /* - * lend == -1 indicates end-of-file so we have to set 'end' -@@ -259,7 +259,7 @@ void truncate_inode_pages_range(struct address_space *mapping, - */ - end = -1; - else -- end = (lend + 1) >> PAGE_CACHE_SHIFT; -+ end = (lend + 1) >> PAGE_SHIFT; - - pagevec_init(&pvec, 0); - index = start; -@@ -298,7 +298,7 @@ void truncate_inode_pages_range(struct address_space *mapping, - if (partial_start) { - struct page *page = find_lock_page(mapping, start - 1); - if (page) { -- unsigned int top = PAGE_CACHE_SIZE; -+ unsigned int top = PAGE_SIZE; - if (start > end) { - /* Truncation within a single page */ - top = partial_end; -@@ -311,7 +311,7 @@ void truncate_inode_pages_range(struct address_space *mapping, - do_invalidatepage(page, partial_start, - top - partial_start); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - } - if (partial_end) { -@@ -324,7 +324,7 @@ void truncate_inode_pages_range(struct address_space *mapping, - do_invalidatepage(page, 0, - partial_end); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - } - /* -@@ -538,7 +538,7 @@ invalidate_complete_page2(struct address_space *mapping, struct page *page) - if (mapping->a_ops->freepage) - mapping->a_ops->freepage(page); - -- page_cache_release(page); /* pagecache ref */ -+ put_page(page); /* pagecache ref */ - return 1; - failed: - spin_unlock_irqrestore(&mapping->tree_lock, flags); -@@ -608,18 +608,18 @@ int invalidate_inode_pages2_range(struct address_space *mapping, - * Zap the rest of the file in one hit. - */ - unmap_mapping_range(mapping, -- (loff_t)index << PAGE_CACHE_SHIFT, -+ (loff_t)index << PAGE_SHIFT, - (loff_t)(1 + end - index) -- << PAGE_CACHE_SHIFT, -- 0); -+ << PAGE_SHIFT, -+ 0); - did_range_unmap = 1; - } else { - /* - * Just zap this page - */ - unmap_mapping_range(mapping, -- (loff_t)index << PAGE_CACHE_SHIFT, -- PAGE_CACHE_SIZE, 0); -+ (loff_t)index << PAGE_SHIFT, -+ PAGE_SIZE, 0); - } - } - BUG_ON(page_mapped(page)); -@@ -744,14 +744,14 @@ void pagecache_isize_extended(struct inode *inode, loff_t from, loff_t to) - - WARN_ON(to > inode->i_size); - -- if (from >= to || bsize == PAGE_CACHE_SIZE) -+ if (from >= to || bsize == PAGE_SIZE) - return; - /* Page straddling @from will not have any hole block created? */ - rounded_from = round_up(from, bsize); -- if (to <= rounded_from || !(rounded_from & (PAGE_CACHE_SIZE - 1))) -+ if (to <= rounded_from || !(rounded_from & (PAGE_SIZE - 1))) - return; - -- index = from >> PAGE_CACHE_SHIFT; -+ index = from >> PAGE_SHIFT; - page = find_lock_page(inode->i_mapping, index); - /* Page not cached? Nothing to do */ - if (!page) -@@ -763,7 +763,7 @@ void pagecache_isize_extended(struct inode *inode, loff_t from, loff_t to) - if (page_mkclean(page)) - set_page_dirty(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - } - EXPORT_SYMBOL(pagecache_isize_extended); - -diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c -index 9f3a0290b273..af817e5060fb 100644 ---- a/mm/userfaultfd.c -+++ b/mm/userfaultfd.c -@@ -93,7 +93,7 @@ out_release_uncharge_unlock: - pte_unmap_unlock(dst_pte, ptl); - mem_cgroup_cancel_charge(page, memcg, false); - out_release: -- page_cache_release(page); -+ put_page(page); - goto out; - } - -@@ -287,7 +287,7 @@ out_unlock: - up_read(&dst_mm->mmap_sem); - out: - if (page) -- page_cache_release(page); -+ put_page(page); - BUG_ON(copied < 0); - BUG_ON(err > 0); - BUG_ON(!copied && !err); -diff --git a/mm/zswap.c b/mm/zswap.c -index bf14508afd64..91dad80d068b 100644 ---- a/mm/zswap.c -+++ b/mm/zswap.c -@@ -869,7 +869,7 @@ static int zswap_writeback_entry(struct zpool *pool, unsigned long handle) - - case ZSWAP_SWAPCACHE_EXIST: - /* page is already in the swap cache, ignore for now */ -- page_cache_release(page); -+ put_page(page); - ret = -EEXIST; - goto fail; - -@@ -897,7 +897,7 @@ static int zswap_writeback_entry(struct zpool *pool, unsigned long handle) - - /* start writeback */ - __swap_writepage(page, &wbc, end_swap_bio_write); -- page_cache_release(page); -+ put_page(page); - zswap_written_back_pages++; - - spin_lock(&tree->lock); -diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c -index 9382619a405b..298770cf66e5 100644 ---- a/net/ceph/messenger.c -+++ b/net/ceph/messenger.c -@@ -275,7 +275,7 @@ static void _ceph_msgr_exit(void) - } - - BUG_ON(zero_page == NULL); -- page_cache_release(zero_page); -+ put_page(zero_page); - zero_page = NULL; - - ceph_msgr_slab_exit(); -@@ -288,7 +288,7 @@ int ceph_msgr_init(void) - - BUG_ON(zero_page != NULL); - zero_page = ZERO_PAGE(0); -- page_cache_get(zero_page); -+ get_page(zero_page); - - /* - * The number of active work items is limited by the number of -@@ -1614,7 +1614,7 @@ static int write_partial_skip(struct ceph_connection *con) - - dout("%s %p %d left\n", __func__, con, con->out_skip); - while (con->out_skip > 0) { -- size_t size = min(con->out_skip, (int) PAGE_CACHE_SIZE); -+ size_t size = min(con->out_skip, (int) PAGE_SIZE); - - ret = ceph_tcp_sendpage(con->sock, zero_page, 0, size, true); - if (ret <= 0) -diff --git a/net/ceph/pagelist.c b/net/ceph/pagelist.c -index c7c220a736e5..6864007e64fc 100644 ---- a/net/ceph/pagelist.c -+++ b/net/ceph/pagelist.c -@@ -56,7 +56,7 @@ int ceph_pagelist_append(struct ceph_pagelist *pl, const void *buf, size_t len) - size_t bit = pl->room; - int ret; - -- memcpy(pl->mapped_tail + (pl->length & ~PAGE_CACHE_MASK), -+ memcpy(pl->mapped_tail + (pl->length & ~PAGE_MASK), - buf, bit); - pl->length += bit; - pl->room -= bit; -@@ -67,7 +67,7 @@ int ceph_pagelist_append(struct ceph_pagelist *pl, const void *buf, size_t len) - return ret; - } - -- memcpy(pl->mapped_tail + (pl->length & ~PAGE_CACHE_MASK), buf, len); -+ memcpy(pl->mapped_tail + (pl->length & ~PAGE_MASK), buf, len); - pl->length += len; - pl->room -= len; - return 0; -diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c -index d4f5f220a8e5..72ca9651562a 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? */ -diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c -index cabf586f47d7..a9fc819429ef 100644 ---- a/net/sunrpc/auth_gss/auth_gss.c -+++ b/net/sunrpc/auth_gss/auth_gss.c -@@ -1728,8 +1728,8 @@ alloc_enc_pages(struct rpc_rqst *rqstp) - return 0; - } - -- first = snd_buf->page_base >> PAGE_CACHE_SHIFT; -- last = (snd_buf->page_base + snd_buf->page_len - 1) >> PAGE_CACHE_SHIFT; -+ first = snd_buf->page_base >> PAGE_SHIFT; -+ last = (snd_buf->page_base + snd_buf->page_len - 1) >> PAGE_SHIFT; - rqstp->rq_enc_pages_num = last - first + 1 + 1; - rqstp->rq_enc_pages - = kmalloc(rqstp->rq_enc_pages_num * sizeof(struct page *), -@@ -1775,10 +1775,10 @@ gss_wrap_req_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx, - status = alloc_enc_pages(rqstp); - if (status) - return status; -- first = snd_buf->page_base >> PAGE_CACHE_SHIFT; -+ first = snd_buf->page_base >> PAGE_SHIFT; - inpages = snd_buf->pages + first; - snd_buf->pages = rqstp->rq_enc_pages; -- snd_buf->page_base -= first << PAGE_CACHE_SHIFT; -+ snd_buf->page_base -= first << PAGE_SHIFT; - /* - * Give the tail its own page, in case we need extra space in the - * head when wrapping: -diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c -index d94a8e1e9f05..045e11ecd332 100644 ---- a/net/sunrpc/auth_gss/gss_krb5_crypto.c -+++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c -@@ -465,7 +465,7 @@ encryptor(struct scatterlist *sg, void *data) - page_pos = desc->pos - outbuf->head[0].iov_len; - if (page_pos >= 0 && page_pos < outbuf->page_len) { - /* pages are not in place: */ -- int i = (page_pos + outbuf->page_base) >> PAGE_CACHE_SHIFT; -+ int i = (page_pos + outbuf->page_base) >> PAGE_SHIFT; - in_page = desc->pages[i]; - } else { - in_page = sg_page(sg); -diff --git a/net/sunrpc/auth_gss/gss_krb5_wrap.c b/net/sunrpc/auth_gss/gss_krb5_wrap.c -index 765088e4ad84..a737c2da0837 100644 ---- a/net/sunrpc/auth_gss/gss_krb5_wrap.c -+++ b/net/sunrpc/auth_gss/gss_krb5_wrap.c -@@ -79,9 +79,9 @@ gss_krb5_remove_padding(struct xdr_buf *buf, int blocksize) - len -= buf->head[0].iov_len; - if (len <= buf->page_len) { - unsigned int last = (buf->page_base + len - 1) -- >>PAGE_CACHE_SHIFT; -+ >>PAGE_SHIFT; - unsigned int offset = (buf->page_base + len - 1) -- & (PAGE_CACHE_SIZE - 1); -+ & (PAGE_SIZE - 1); - ptr = kmap_atomic(buf->pages[last]); - pad = *(ptr + offset); - kunmap_atomic(ptr); -diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c -index 273bc3a35425..e59a6d952b57 100644 ---- a/net/sunrpc/cache.c -+++ b/net/sunrpc/cache.c -@@ -881,7 +881,7 @@ static ssize_t cache_downcall(struct address_space *mapping, - char *kaddr; - ssize_t ret = -ENOMEM; - -- if (count >= PAGE_CACHE_SIZE) -+ if (count >= PAGE_SIZE) - goto out_slow; - - page = find_or_create_page(mapping, 0, GFP_KERNEL); -@@ -892,7 +892,7 @@ static ssize_t cache_downcall(struct address_space *mapping, - ret = cache_do_downcall(kaddr, buf, count, cd); - kunmap(page); - unlock_page(page); -- page_cache_release(page); -+ put_page(page); - return ret; - out_slow: - return cache_slow_downcall(buf, count, cd); -diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c -index 31789ef3e614..fc48eca21fd2 100644 ---- a/net/sunrpc/rpc_pipe.c -+++ b/net/sunrpc/rpc_pipe.c -@@ -1390,8 +1390,8 @@ rpc_fill_super(struct super_block *sb, void *data, int silent) - struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); - int err; - -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ sb->s_blocksize = PAGE_SIZE; -+ sb->s_blocksize_bits = PAGE_SHIFT; - sb->s_magic = RPCAUTH_GSSMAGIC; - sb->s_op = &s_ops; - sb->s_d_op = &simple_dentry_operations; -diff --git a/net/sunrpc/socklib.c b/net/sunrpc/socklib.c -index 2df87f78e518..de70c78025d7 100644 ---- a/net/sunrpc/socklib.c -+++ b/net/sunrpc/socklib.c -@@ -96,8 +96,8 @@ ssize_t xdr_partial_copy_from_skb(struct xdr_buf *xdr, unsigned int base, struct - if (base || xdr->page_base) { - pglen -= base; - base += xdr->page_base; -- ppage += base >> PAGE_CACHE_SHIFT; -- base &= ~PAGE_CACHE_MASK; -+ ppage += base >> PAGE_SHIFT; -+ base &= ~PAGE_MASK; - } - do { - char *kaddr; -@@ -113,7 +113,7 @@ ssize_t xdr_partial_copy_from_skb(struct xdr_buf *xdr, unsigned int base, struct - } - } - -- len = PAGE_CACHE_SIZE; -+ len = PAGE_SIZE; - kaddr = kmap_atomic(*ppage); - if (base) { - len -= base; -diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c -index 4439ac4c1b53..6bdb3865212d 100644 ---- a/net/sunrpc/xdr.c -+++ b/net/sunrpc/xdr.c -@@ -164,7 +164,7 @@ EXPORT_SYMBOL_GPL(xdr_inline_pages); - * Note: the addresses pgto_base and pgfrom_base are both calculated in - * the same way: - * if a memory area starts at byte 'base' in page 'pages[i]', -- * then its address is given as (i << PAGE_CACHE_SHIFT) + base -+ * then its address is given as (i << PAGE_SHIFT) + base - * Also note: pgfrom_base must be < pgto_base, but the memory areas - * they point to may overlap. - */ -@@ -181,20 +181,20 @@ _shift_data_right_pages(struct page **pages, size_t pgto_base, - pgto_base += len; - pgfrom_base += len; - -- pgto = pages + (pgto_base >> PAGE_CACHE_SHIFT); -- pgfrom = pages + (pgfrom_base >> PAGE_CACHE_SHIFT); -+ pgto = pages + (pgto_base >> PAGE_SHIFT); -+ pgfrom = pages + (pgfrom_base >> PAGE_SHIFT); - -- pgto_base &= ~PAGE_CACHE_MASK; -- pgfrom_base &= ~PAGE_CACHE_MASK; -+ pgto_base &= ~PAGE_MASK; -+ pgfrom_base &= ~PAGE_MASK; - - do { - /* Are any pointers crossing a page boundary? */ - if (pgto_base == 0) { -- pgto_base = PAGE_CACHE_SIZE; -+ pgto_base = PAGE_SIZE; - pgto--; - } - if (pgfrom_base == 0) { -- pgfrom_base = PAGE_CACHE_SIZE; -+ pgfrom_base = PAGE_SIZE; - pgfrom--; - } - -@@ -236,11 +236,11 @@ _copy_to_pages(struct page **pages, size_t pgbase, const char *p, size_t len) - char *vto; - size_t copy; - -- pgto = pages + (pgbase >> PAGE_CACHE_SHIFT); -- pgbase &= ~PAGE_CACHE_MASK; -+ pgto = pages + (pgbase >> PAGE_SHIFT); -+ pgbase &= ~PAGE_MASK; - - for (;;) { -- copy = PAGE_CACHE_SIZE - pgbase; -+ copy = PAGE_SIZE - pgbase; - if (copy > len) - copy = len; - -@@ -253,7 +253,7 @@ _copy_to_pages(struct page **pages, size_t pgbase, const char *p, size_t len) - break; - - pgbase += copy; -- if (pgbase == PAGE_CACHE_SIZE) { -+ if (pgbase == PAGE_SIZE) { - flush_dcache_page(*pgto); - pgbase = 0; - pgto++; -@@ -280,11 +280,11 @@ _copy_from_pages(char *p, struct page **pages, size_t pgbase, size_t len) - char *vfrom; - size_t copy; - -- pgfrom = pages + (pgbase >> PAGE_CACHE_SHIFT); -- pgbase &= ~PAGE_CACHE_MASK; -+ pgfrom = pages + (pgbase >> PAGE_SHIFT); -+ pgbase &= ~PAGE_MASK; - - do { -- copy = PAGE_CACHE_SIZE - pgbase; -+ copy = PAGE_SIZE - pgbase; - if (copy > len) - copy = len; - -@@ -293,7 +293,7 @@ _copy_from_pages(char *p, struct page **pages, size_t pgbase, size_t len) - kunmap_atomic(vfrom); - - pgbase += copy; -- if (pgbase == PAGE_CACHE_SIZE) { -+ if (pgbase == PAGE_SIZE) { - pgbase = 0; - pgfrom++; - } -@@ -1038,8 +1038,8 @@ xdr_buf_subsegment(struct xdr_buf *buf, struct xdr_buf *subbuf, - if (base < buf->page_len) { - subbuf->page_len = min(buf->page_len - base, len); - base += buf->page_base; -- subbuf->page_base = base & ~PAGE_CACHE_MASK; -- subbuf->pages = &buf->pages[base >> PAGE_CACHE_SHIFT]; -+ subbuf->page_base = base & ~PAGE_MASK; -+ subbuf->pages = &buf->pages[base >> PAGE_SHIFT]; - len -= subbuf->page_len; - base = 0; - } else { -@@ -1297,9 +1297,9 @@ xdr_xcode_array2(struct xdr_buf *buf, unsigned int base, - todo -= avail_here; - - base += buf->page_base; -- ppages = buf->pages + (base >> PAGE_CACHE_SHIFT); -- base &= ~PAGE_CACHE_MASK; -- avail_page = min_t(unsigned int, PAGE_CACHE_SIZE - base, -+ ppages = buf->pages + (base >> PAGE_SHIFT); -+ base &= ~PAGE_MASK; -+ avail_page = min_t(unsigned int, PAGE_SIZE - base, - avail_here); - c = kmap(*ppages) + base; - -@@ -1383,7 +1383,7 @@ xdr_xcode_array2(struct xdr_buf *buf, unsigned int base, - } - - avail_page = min(avail_here, -- (unsigned int) PAGE_CACHE_SIZE); -+ (unsigned int) PAGE_SIZE); - } - base = buf->page_len; /* align to start of tail */ - } -@@ -1479,9 +1479,9 @@ xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len, - if (page_len > len) - page_len = len; - len -= page_len; -- page_offset = (offset + buf->page_base) & (PAGE_CACHE_SIZE - 1); -- i = (offset + buf->page_base) >> PAGE_CACHE_SHIFT; -- thislen = PAGE_CACHE_SIZE - page_offset; -+ page_offset = (offset + buf->page_base) & (PAGE_SIZE - 1); -+ i = (offset + buf->page_base) >> PAGE_SHIFT; -+ thislen = PAGE_SIZE - page_offset; - do { - if (thislen > page_len) - thislen = page_len; -@@ -1492,7 +1492,7 @@ xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len, - page_len -= thislen; - i++; - page_offset = 0; -- thislen = PAGE_CACHE_SIZE; -+ thislen = PAGE_SIZE; - } while (page_len != 0); - offset = 0; - } --- - Kirill A. Shutemov - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N1/content_digest index 460a355..2160eeb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -20,22615 +20,6 @@ "> \n" "> It doesn't help legibility or testing, so let's just do it in one big go.\n" "\n" - "Okay, here's folded version of the patchset.\n" - "\n" - ">From f54a8ec6a451f343306d6bd17a7258d4e589c673 Mon Sep 17 00:00:00 2001\n" - "From: \"Kirill A. Shutemov\" <kirill.shutemov@linux.intel.com>\n" - "Date: Sat, 19 Mar 2016 19:57:17 +0300\n" - "Subject: [PATCH] mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release}\n" - " macros\n" - "\n" - "PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time ago\n" - "with promise that one day it will be possible to implement page cache with\n" - "bigger chunks than PAGE_SIZE.\n" - "\n" - "This promise never materialized. And unlikely will.\n" - "\n" - "We have many places where PAGE_CACHE_SIZE assumed to be equal to\n" - "PAGE_SIZE. And it's constant source of confusion on whether PAGE_CACHE_*\n" - "or PAGE_* constant should be used in a particular case, especially on the\n" - "border between fs and mm.\n" - "\n" - "Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much\n" - "breakage to be doable.\n" - "\n" - "Let's stop pretending that pages in page cache are special. They are not.\n" - "\n" - "The changes are pretty straight-forward:\n" - "\n" - " - <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;\n" - "\n" - " - PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};\n" - "\n" - " - page_cache_get() -> get_page();\n" - "\n" - " - page_cache_release() -> put_page();\n" - "\n" - "Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>\n" - "---\n" - " Documentation/filesystems/cramfs.txt | 2 +-\n" - " Documentation/filesystems/tmpfs.txt | 2 +-\n" - " Documentation/filesystems/vfs.txt | 4 +-\n" - " arch/arc/mm/cache.c | 2 +-\n" - " arch/arm/mm/flush.c | 4 +-\n" - " arch/parisc/kernel/cache.c | 2 +-\n" - " arch/parisc/mm/init.c | 2 +-\n" - " arch/powerpc/platforms/cell/spufs/inode.c | 4 +-\n" - " arch/s390/hypfs/inode.c | 4 +-\n" - " block/bio.c | 12 +-\n" - " block/blk-core.c | 2 +-\n" - " block/blk-settings.c | 12 +-\n" - " block/blk-sysfs.c | 8 +-\n" - " block/cfq-iosched.c | 2 +-\n" - " block/compat_ioctl.c | 4 +-\n" - " block/ioctl.c | 4 +-\n" - " block/partition-generic.c | 8 +-\n" - " drivers/block/aoe/aoeblk.c | 2 +-\n" - " drivers/block/brd.c | 2 +-\n" - " drivers/block/drbd/drbd_int.h | 4 +-\n" - " drivers/block/drbd/drbd_nl.c | 2 +-\n" - " drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-\n" - " drivers/gpu/drm/armada/armada_gem.c | 4 +-\n" - " drivers/gpu/drm/drm_gem.c | 4 +-\n" - " drivers/gpu/drm/i915/i915_gem.c | 8 +-\n" - " drivers/gpu/drm/i915/i915_gem_userptr.c | 2 +-\n" - " drivers/gpu/drm/radeon/radeon_ttm.c | 2 +-\n" - " drivers/gpu/drm/ttm/ttm_tt.c | 4 +-\n" - " drivers/gpu/drm/via/via_dmablit.c | 2 +-\n" - " drivers/md/bitmap.c | 2 +-\n" - " drivers/media/v4l2-core/videobuf-dma-sg.c | 2 +-\n" - " drivers/misc/ibmasm/ibmasmfs.c | 4 +-\n" - " drivers/misc/vmw_vmci/vmci_queue_pair.c | 2 +-\n" - " drivers/mmc/core/host.c | 6 +-\n" - " drivers/mmc/host/sh_mmcif.c | 2 +-\n" - " drivers/mmc/host/tmio_mmc_dma.c | 4 +-\n" - " drivers/mmc/host/tmio_mmc_pio.c | 2 +-\n" - " drivers/mmc/host/usdhi6rol0.c | 2 +-\n" - " drivers/mtd/devices/block2mtd.c | 6 +-\n" - " drivers/mtd/nand/nandsim.c | 6 +-\n" - " drivers/nvdimm/btt.c | 2 +-\n" - " drivers/nvdimm/pmem.c | 2 +-\n" - " drivers/oprofile/oprofilefs.c | 4 +-\n" - " drivers/scsi/sd.c | 2 +-\n" - " drivers/scsi/st.c | 4 +-\n" - " .../lustre/include/linux/libcfs/libcfs_private.h | 2 +-\n" - " .../lustre/include/linux/libcfs/linux/linux-mem.h | 4 +-\n" - " drivers/staging/lustre/include/linux/lnet/types.h | 2 +-\n" - " .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 2 +-\n" - " drivers/staging/lustre/lnet/libcfs/debug.c | 2 +-\n" - " drivers/staging/lustre/lnet/libcfs/tracefile.c | 16 +-\n" - " drivers/staging/lustre/lnet/libcfs/tracefile.h | 6 +-\n" - " drivers/staging/lustre/lnet/lnet/lib-md.c | 2 +-\n" - " drivers/staging/lustre/lnet/lnet/lib-move.c | 6 +-\n" - " drivers/staging/lustre/lnet/lnet/lib-socket.c | 4 +-\n" - " drivers/staging/lustre/lnet/lnet/router.c | 6 +-\n" - " drivers/staging/lustre/lnet/selftest/brw_test.c | 20 +-\n" - " drivers/staging/lustre/lnet/selftest/conctl.c | 4 +-\n" - " drivers/staging/lustre/lnet/selftest/conrpc.c | 10 +-\n" - " drivers/staging/lustre/lnet/selftest/framework.c | 2 +-\n" - " drivers/staging/lustre/lnet/selftest/rpc.c | 2 +-\n" - " drivers/staging/lustre/lnet/selftest/selftest.h | 4 +-\n" - " .../lustre/include/linux/lustre_patchless_compat.h | 2 +-\n" - " drivers/staging/lustre/lustre/include/lu_object.h | 2 +-\n" - " .../lustre/lustre/include/lustre/lustre_idl.h | 6 +-\n" - " drivers/staging/lustre/lustre/include/lustre_mdc.h | 4 +-\n" - " drivers/staging/lustre/lustre/include/lustre_net.h | 10 +-\n" - " drivers/staging/lustre/lustre/include/obd.h | 4 +-\n" - " .../staging/lustre/lustre/include/obd_support.h | 2 +-\n" - " drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 4 +-\n" - " drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 12 +-\n" - " drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 2 +-\n" - " drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 2 +-\n" - " drivers/staging/lustre/lustre/llite/dir.c | 20 +-\n" - " .../staging/lustre/lustre/llite/llite_internal.h | 8 +-\n" - " drivers/staging/lustre/lustre/llite/llite_lib.c | 8 +-\n" - " drivers/staging/lustre/lustre/llite/llite_mmap.c | 8 +-\n" - " drivers/staging/lustre/lustre/llite/lloop.c | 12 +-\n" - " drivers/staging/lustre/lustre/llite/lproc_llite.c | 18 +-\n" - " drivers/staging/lustre/lustre/llite/rw.c | 24 +-\n" - " drivers/staging/lustre/lustre/llite/rw26.c | 28 +--\n" - " drivers/staging/lustre/lustre/llite/vvp_io.c | 11 +-\n" - " drivers/staging/lustre/lustre/llite/vvp_page.c | 8 +-\n" - " drivers/staging/lustre/lustre/lmv/lmv_obd.c | 12 +-\n" - " drivers/staging/lustre/lustre/mdc/mdc_request.c | 6 +-\n" - " drivers/staging/lustre/lustre/mgc/mgc_request.c | 22 +-\n" - " drivers/staging/lustre/lustre/obdclass/cl_page.c | 6 +-\n" - " drivers/staging/lustre/lustre/obdclass/class_obd.c | 6 +-\n" - " .../lustre/lustre/obdclass/linux/linux-obdo.c | 5 +-\n" - " .../lustre/lustre/obdclass/linux/linux-sysctl.c | 6 +-\n" - " drivers/staging/lustre/lustre/obdclass/lu_object.c | 6 +-\n" - " .../staging/lustre/lustre/obdecho/echo_client.c | 30 +--\n" - " drivers/staging/lustre/lustre/osc/lproc_osc.c | 16 +-\n" - " drivers/staging/lustre/lustre/osc/osc_cache.c | 44 ++--\n" - " drivers/staging/lustre/lustre/osc/osc_page.c | 6 +-\n" - " drivers/staging/lustre/lustre/osc/osc_request.c | 26 +-\n" - " drivers/staging/lustre/lustre/ptlrpc/client.c | 6 +-\n" - " drivers/staging/lustre/lustre/ptlrpc/import.c | 2 +-\n" - " .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 4 +-\n" - " drivers/staging/lustre/lustre/ptlrpc/recover.c | 2 +-\n" - " drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 2 +-\n" - " drivers/usb/gadget/function/f_fs.c | 4 +-\n" - " drivers/usb/gadget/legacy/inode.c | 4 +-\n" - " drivers/usb/storage/scsiglue.c | 2 +-\n" - " drivers/video/fbdev/pvr2fb.c | 2 +-\n" - " fs/9p/vfs_addr.c | 18 +-\n" - " fs/9p/vfs_file.c | 4 +-\n" - " fs/9p/vfs_super.c | 2 +-\n" - " fs/affs/file.c | 26 +-\n" - " fs/afs/dir.c | 2 +-\n" - " fs/afs/file.c | 4 +-\n" - " fs/afs/mntpt.c | 6 +-\n" - " fs/afs/super.c | 4 +-\n" - " fs/afs/write.c | 26 +-\n" - " fs/binfmt_elf.c | 2 +-\n" - " fs/binfmt_elf_fdpic.c | 2 +-\n" - " fs/block_dev.c | 4 +-\n" - " fs/btrfs/check-integrity.c | 64 ++---\n" - " fs/btrfs/compression.c | 84 +++----\n" - " fs/btrfs/ctree.c | 8 +-\n" - " fs/btrfs/disk-io.c | 14 +-\n" - " fs/btrfs/extent-tree.c | 4 +-\n" - " fs/btrfs/extent_io.c | 262 ++++++++++-----------\n" - " fs/btrfs/extent_io.h | 6 +-\n" - " fs/btrfs/file-item.c | 4 +-\n" - " fs/btrfs/file.c | 62 ++---\n" - " fs/btrfs/free-space-cache.c | 30 +--\n" - " fs/btrfs/inode-map.c | 10 +-\n" - " fs/btrfs/inode.c | 120 +++++-----\n" - " fs/btrfs/ioctl.c | 82 +++----\n" - " fs/btrfs/lzo.c | 32 +--\n" - " fs/btrfs/raid56.c | 28 +--\n" - " fs/btrfs/reada.c | 30 +--\n" - " fs/btrfs/relocation.c | 16 +-\n" - " fs/btrfs/scrub.c | 24 +-\n" - " fs/btrfs/send.c | 16 +-\n" - " fs/btrfs/struct-funcs.c | 4 +-\n" - " fs/btrfs/tests/extent-io-tests.c | 44 ++--\n" - " fs/btrfs/tests/free-space-tests.c | 2 +-\n" - " fs/btrfs/volumes.c | 14 +-\n" - " fs/btrfs/zlib.c | 38 +--\n" - " fs/buffer.c | 100 ++++----\n" - " fs/cachefiles/rdwr.c | 38 +--\n" - " fs/ceph/addr.c | 106 ++++-----\n" - " fs/ceph/caps.c | 2 +-\n" - " fs/ceph/dir.c | 4 +-\n" - " fs/ceph/file.c | 32 +--\n" - " fs/ceph/inode.c | 4 +-\n" - " fs/ceph/mds_client.c | 2 +-\n" - " fs/ceph/mds_client.h | 2 +-\n" - " fs/ceph/super.c | 8 +-\n" - " fs/cifs/cifsfs.c | 2 +-\n" - " fs/cifs/cifsglob.h | 4 +-\n" - " fs/cifs/cifssmb.c | 16 +-\n" - " fs/cifs/connect.c | 2 +-\n" - " fs/cifs/file.c | 96 ++++----\n" - " fs/cifs/inode.c | 10 +-\n" - " fs/configfs/mount.c | 4 +-\n" - " fs/cramfs/README | 26 +-\n" - " fs/cramfs/inode.c | 32 +--\n" - " fs/dax.c | 34 +--\n" - " fs/direct-io.c | 26 +-\n" - " fs/dlm/lowcomms.c | 8 +-\n" - " fs/ecryptfs/crypto.c | 22 +-\n" - " fs/ecryptfs/inode.c | 8 +-\n" - " fs/ecryptfs/keystore.c | 2 +-\n" - " fs/ecryptfs/main.c | 8 +-\n" - " fs/ecryptfs/mmap.c | 44 ++--\n" - " fs/ecryptfs/read_write.c | 14 +-\n" - " fs/efivarfs/super.c | 4 +-\n" - " fs/exofs/dir.c | 30 +--\n" - " fs/exofs/inode.c | 34 +--\n" - " fs/exofs/namei.c | 4 +-\n" - " fs/ext2/dir.c | 36 +--\n" - " fs/ext2/namei.c | 6 +-\n" - " fs/ext4/crypto.c | 8 +-\n" - " fs/ext4/dir.c | 4 +-\n" - " fs/ext4/ext4.h | 4 +-\n" - " fs/ext4/file.c | 4 +-\n" - " fs/ext4/inline.c | 18 +-\n" - " fs/ext4/inode.c | 118 +++++-----\n" - " fs/ext4/mballoc.c | 40 ++--\n" - " fs/ext4/move_extent.c | 16 +-\n" - " fs/ext4/page-io.c | 4 +-\n" - " fs/ext4/readpage.c | 12 +-\n" - " fs/ext4/super.c | 4 +-\n" - " fs/ext4/symlink.c | 4 +-\n" - " fs/f2fs/crypto.c | 6 +-\n" - " fs/f2fs/data.c | 50 ++--\n" - " fs/f2fs/debug.c | 6 +-\n" - " fs/f2fs/dir.c | 4 +-\n" - " fs/f2fs/f2fs.h | 2 +-\n" - " fs/f2fs/file.c | 74 +++---\n" - " fs/f2fs/inline.c | 12 +-\n" - " fs/f2fs/namei.c | 4 +-\n" - " fs/f2fs/node.c | 10 +-\n" - " fs/f2fs/recovery.c | 2 +-\n" - " fs/f2fs/segment.c | 18 +-\n" - " fs/f2fs/super.c | 4 +-\n" - " fs/freevxfs/vxfs_immed.c | 4 +-\n" - " fs/freevxfs/vxfs_lookup.c | 12 +-\n" - " fs/freevxfs/vxfs_subr.c | 2 +-\n" - " fs/fs-writeback.c | 2 +-\n" - " fs/fscache/page.c | 10 +-\n" - " fs/fuse/dev.c | 26 +-\n" - " fs/fuse/file.c | 72 +++---\n" - " fs/fuse/inode.c | 16 +-\n" - " fs/gfs2/aops.c | 44 ++--\n" - " fs/gfs2/bmap.c | 12 +-\n" - " fs/gfs2/file.c | 16 +-\n" - " fs/gfs2/meta_io.c | 4 +-\n" - " fs/gfs2/quota.c | 14 +-\n" - " fs/gfs2/rgrp.c | 5 +-\n" - " fs/hfs/bnode.c | 12 +-\n" - " fs/hfs/btree.c | 20 +-\n" - " fs/hfs/inode.c | 8 +-\n" - " fs/hfsplus/bitmap.c | 2 +-\n" - " fs/hfsplus/bnode.c | 90 +++----\n" - " fs/hfsplus/btree.c | 22 +-\n" - " fs/hfsplus/inode.c | 8 +-\n" - " fs/hfsplus/super.c | 2 +-\n" - " fs/hfsplus/xattr.c | 6 +-\n" - " fs/hostfs/hostfs_kern.c | 18 +-\n" - " fs/hugetlbfs/inode.c | 10 +-\n" - " fs/isofs/compress.c | 36 +--\n" - " fs/isofs/inode.c | 2 +-\n" - " fs/jbd2/commit.c | 4 +-\n" - " fs/jbd2/journal.c | 2 +-\n" - " fs/jbd2/transaction.c | 4 +-\n" - " fs/jffs2/debug.c | 8 +-\n" - " fs/jffs2/file.c | 23 +-\n" - " fs/jffs2/fs.c | 8 +-\n" - " fs/jffs2/gc.c | 8 +-\n" - " fs/jffs2/nodelist.c | 8 +-\n" - " fs/jffs2/write.c | 7 +-\n" - " fs/jfs/jfs_metapage.c | 42 ++--\n" - " fs/jfs/jfs_metapage.h | 4 +-\n" - " fs/jfs/super.c | 2 +-\n" - " fs/kernfs/mount.c | 4 +-\n" - " fs/libfs.c | 24 +-\n" - " fs/logfs/dev_bdev.c | 2 +-\n" - " fs/logfs/dev_mtd.c | 10 +-\n" - " fs/logfs/dir.c | 12 +-\n" - " fs/logfs/file.c | 26 +-\n" - " fs/logfs/readwrite.c | 20 +-\n" - " fs/logfs/segment.c | 28 +--\n" - " fs/logfs/super.c | 16 +-\n" - " fs/minix/dir.c | 18 +-\n" - " fs/minix/namei.c | 4 +-\n" - " fs/mpage.c | 22 +-\n" - " fs/ncpfs/dir.c | 10 +-\n" - " fs/ncpfs/ncplib_kernel.h | 2 +-\n" - " fs/nfs/blocklayout/blocklayout.c | 24 +-\n" - " fs/nfs/blocklayout/blocklayout.h | 4 +-\n" - " fs/nfs/client.c | 8 +-\n" - " fs/nfs/dir.c | 4 +-\n" - " fs/nfs/direct.c | 8 +-\n" - " fs/nfs/file.c | 20 +-\n" - " fs/nfs/internal.h | 6 +-\n" - " fs/nfs/nfs4xdr.c | 2 +-\n" - " fs/nfs/objlayout/objio_osd.c | 2 +-\n" - " fs/nfs/pagelist.c | 6 +-\n" - " fs/nfs/pnfs.c | 6 +-\n" - " fs/nfs/read.c | 16 +-\n" - " fs/nfs/write.c | 4 +-\n" - " fs/nilfs2/bmap.c | 2 +-\n" - " fs/nilfs2/btnode.c | 10 +-\n" - " fs/nilfs2/dir.c | 32 +--\n" - " fs/nilfs2/gcinode.c | 2 +-\n" - " fs/nilfs2/inode.c | 4 +-\n" - " fs/nilfs2/mdt.c | 14 +-\n" - " fs/nilfs2/namei.c | 4 +-\n" - " fs/nilfs2/page.c | 18 +-\n" - " fs/nilfs2/recovery.c | 4 +-\n" - " fs/nilfs2/segment.c | 2 +-\n" - " fs/ntfs/aops.c | 50 ++--\n" - " fs/ntfs/aops.h | 4 +-\n" - " fs/ntfs/attrib.c | 28 +--\n" - " fs/ntfs/bitmap.c | 10 +-\n" - " fs/ntfs/compress.c | 77 +++---\n" - " fs/ntfs/dir.c | 56 ++---\n" - " fs/ntfs/file.c | 56 ++---\n" - " fs/ntfs/index.c | 14 +-\n" - " fs/ntfs/inode.c | 12 +-\n" - " fs/ntfs/lcnalloc.c | 6 +-\n" - " fs/ntfs/logfile.c | 16 +-\n" - " fs/ntfs/mft.c | 34 +--\n" - " fs/ntfs/ntfs.h | 2 +-\n" - " fs/ntfs/super.c | 72 +++---\n" - " fs/ocfs2/alloc.c | 28 +--\n" - " fs/ocfs2/aops.c | 48 ++--\n" - " fs/ocfs2/cluster/heartbeat.c | 10 +-\n" - " fs/ocfs2/dlmfs/dlmfs.c | 4 +-\n" - " fs/ocfs2/file.c | 14 +-\n" - " fs/ocfs2/mmap.c | 6 +-\n" - " fs/ocfs2/ocfs2.h | 20 +-\n" - " fs/ocfs2/refcounttree.c | 24 +-\n" - " fs/ocfs2/super.c | 4 +-\n" - " fs/pipe.c | 6 +-\n" - " fs/proc/task_mmu.c | 2 +-\n" - " fs/proc/vmcore.c | 4 +-\n" - " fs/pstore/inode.c | 4 +-\n" - " fs/qnx6/dir.c | 16 +-\n" - " fs/qnx6/inode.c | 4 +-\n" - " fs/qnx6/qnx6.h | 2 +-\n" - " fs/ramfs/inode.c | 4 +-\n" - " fs/reiserfs/file.c | 4 +-\n" - " fs/reiserfs/inode.c | 44 ++--\n" - " fs/reiserfs/ioctl.c | 4 +-\n" - " fs/reiserfs/journal.c | 6 +-\n" - " fs/reiserfs/stree.c | 4 +-\n" - " fs/reiserfs/tail_conversion.c | 4 +-\n" - " fs/reiserfs/xattr.c | 18 +-\n" - " fs/splice.c | 32 +--\n" - " fs/squashfs/block.c | 4 +-\n" - " fs/squashfs/cache.c | 18 +-\n" - " fs/squashfs/decompressor.c | 2 +-\n" - " fs/squashfs/file.c | 24 +-\n" - " fs/squashfs/file_direct.c | 22 +-\n" - " fs/squashfs/lz4_wrapper.c | 8 +-\n" - " fs/squashfs/lzo_wrapper.c | 8 +-\n" - " fs/squashfs/page_actor.c | 4 +-\n" - " fs/squashfs/page_actor.h | 2 +-\n" - " fs/squashfs/super.c | 2 +-\n" - " fs/squashfs/symlink.c | 6 +-\n" - " fs/squashfs/xz_wrapper.c | 4 +-\n" - " fs/squashfs/zlib_wrapper.c | 4 +-\n" - " fs/sync.c | 4 +-\n" - " fs/sysv/dir.c | 18 +-\n" - " fs/sysv/namei.c | 4 +-\n" - " fs/ubifs/file.c | 54 ++---\n" - " fs/ubifs/super.c | 6 +-\n" - " fs/ubifs/ubifs.h | 4 +-\n" - " fs/udf/file.c | 6 +-\n" - " fs/udf/inode.c | 4 +-\n" - " fs/ufs/balloc.c | 6 +-\n" - " fs/ufs/dir.c | 32 +--\n" - " fs/ufs/inode.c | 4 +-\n" - " fs/ufs/namei.c | 6 +-\n" - " fs/ufs/util.c | 4 +-\n" - " fs/ufs/util.h | 2 +-\n" - " fs/xfs/libxfs/xfs_bmap.c | 4 +-\n" - " fs/xfs/xfs_aops.c | 38 +--\n" - " fs/xfs/xfs_bmap_util.c | 4 +-\n" - " fs/xfs/xfs_file.c | 12 +-\n" - " fs/xfs/xfs_linux.h | 2 +-\n" - " fs/xfs/xfs_mount.c | 2 +-\n" - " fs/xfs/xfs_mount.h | 4 +-\n" - " fs/xfs/xfs_pnfs.c | 4 +-\n" - " fs/xfs/xfs_super.c | 8 +-\n" - " include/linux/backing-dev-defs.h | 2 +-\n" - " include/linux/bio.h | 2 +-\n" - " include/linux/blkdev.h | 2 +-\n" - " include/linux/buffer_head.h | 4 +-\n" - " include/linux/ceph/libceph.h | 4 +-\n" - " include/linux/f2fs_fs.h | 4 +-\n" - " include/linux/fs.h | 4 +-\n" - " include/linux/mm.h | 2 +-\n" - " include/linux/mm_types.h | 2 +-\n" - " include/linux/nfs_page.h | 6 +-\n" - " include/linux/nilfs2_fs.h | 4 +-\n" - " include/linux/pagemap.h | 31 +--\n" - " include/linux/sunrpc/svc.h | 2 +-\n" - " include/linux/swap.h | 4 +-\n" - " ipc/mqueue.c | 4 +-\n" - " kernel/events/uprobes.c | 8 +-\n" - " mm/fadvise.c | 8 +-\n" - " mm/filemap.c | 126 +++++-----\n" - " mm/gup.c | 2 +-\n" - " mm/hugetlb.c | 8 +-\n" - " mm/madvise.c | 6 +-\n" - " mm/memory-failure.c | 2 +-\n" - " mm/memory.c | 55 +++--\n" - " mm/mincore.c | 8 +-\n" - " mm/nommu.c | 2 +-\n" - " mm/page-writeback.c | 12 +-\n" - " mm/page_io.c | 2 +-\n" - " mm/readahead.c | 20 +-\n" - " mm/rmap.c | 2 +-\n" - " mm/shmem.c | 130 +++++-----\n" - " mm/swap.c | 14 +-\n" - " mm/swap_state.c | 12 +-\n" - " mm/swapfile.c | 12 +-\n" - " mm/truncate.c | 40 ++--\n" - " mm/userfaultfd.c | 4 +-\n" - " mm/zswap.c | 4 +-\n" - " net/ceph/messenger.c | 6 +-\n" - " net/ceph/pagelist.c | 4 +-\n" - " net/ceph/pagevec.c | 30 +--\n" - " net/sunrpc/auth_gss/auth_gss.c | 8 +-\n" - " net/sunrpc/auth_gss/gss_krb5_crypto.c | 2 +-\n" - " net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 +-\n" - " net/sunrpc/cache.c | 4 +-\n" - " net/sunrpc/rpc_pipe.c | 4 +-\n" - " net/sunrpc/socklib.c | 6 +-\n" - " net/sunrpc/xdr.c | 50 ++--\n" - " 396 files changed, 2851 insertions(+), 2881 deletions(-)\n" - "\n" - "diff --git a/Documentation/filesystems/cramfs.txt b/Documentation/filesystems/cramfs.txt\n" - "index 31f53f0ab957..4006298f6707 100644\n" - "--- a/Documentation/filesystems/cramfs.txt\n" - "+++ b/Documentation/filesystems/cramfs.txt\n" - "@@ -38,7 +38,7 @@ the update lasts only as long as the inode is cached in memory, after\n" - " which the timestamp reverts to 1970, i.e. moves backwards in time.\n" - " \n" - " Currently, cramfs must be written and read with architectures of the\n" - "-same endianness, and can be read only by kernels with PAGE_CACHE_SIZE\n" - "+same endianness, and can be read only by kernels with PAGE_SIZE\n" - " == 4096. At least the latter of these is a bug, but it hasn't been\n" - " decided what the best fix is. For the moment if you have larger pages\n" - " you can just change the #define in mkcramfs.c, so long as you don't\n" - "diff --git a/Documentation/filesystems/tmpfs.txt b/Documentation/filesystems/tmpfs.txt\n" - "index d392e1505f17..d9c11d25bf02 100644\n" - "--- a/Documentation/filesystems/tmpfs.txt\n" - "+++ b/Documentation/filesystems/tmpfs.txt\n" - "@@ -60,7 +60,7 @@ size: The limit of allocated bytes for this tmpfs instance. The\n" - " default is half of your physical RAM without swap. If you\n" - " oversize your tmpfs instances the machine will deadlock\n" - " since the OOM handler will not be able to free that memory.\n" - "-nr_blocks: The same as size, but in blocks of PAGE_CACHE_SIZE.\n" - "+nr_blocks: The same as size, but in blocks of PAGE_SIZE.\n" - " nr_inodes: The maximum number of inodes for this instance. The default\n" - " is half of the number of your physical RAM pages, or (on a\n" - " machine with highmem) the number of lowmem RAM pages,\n" - "diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt\n" - "index b02a7d598258..4164bd6397a2 100644\n" - "--- a/Documentation/filesystems/vfs.txt\n" - "+++ b/Documentation/filesystems/vfs.txt\n" - "@@ -708,9 +708,9 @@ struct address_space_operations {\n" - " \tfrom the address space. This generally corresponds to either a\n" - " \ttruncation, punch hole or a complete invalidation of the address\n" - " \tspace (in the latter case 'offset' will always be 0 and 'length'\n" - "-\twill be PAGE_CACHE_SIZE). Any private data associated with the page\n" - "+\twill be PAGE_SIZE). Any private data associated with the page\n" - " \tshould be updated to reflect this truncation. If offset is 0 and\n" - "-\tlength is PAGE_CACHE_SIZE, then the private data should be released,\n" - "+\tlength is PAGE_SIZE, then the private data should be released,\n" - " \tbecause the page must be able to be completely discarded. This may\n" - " \tbe done by calling the ->releasepage function, but in this case the\n" - " \trelease MUST succeed.\n" - "diff --git a/arch/arc/mm/cache.c b/arch/arc/mm/cache.c\n" - "index b65f797e9ad6..d9bacb4199ea 100644\n" - "--- a/arch/arc/mm/cache.c\n" - "+++ b/arch/arc/mm/cache.c\n" - "@@ -621,7 +621,7 @@ void flush_dcache_page(struct page *page)\n" - " \n" - " \t\t/* kernel reading from page with U-mapping */\n" - " \t\tphys_addr_t paddr = (unsigned long)page_address(page);\n" - "-\t\tunsigned long vaddr = page->index << PAGE_CACHE_SHIFT;\n" - "+\t\tunsigned long vaddr = page->index << PAGE_SHIFT;\n" - " \n" - " \t\tif (addr_not_cache_congruent(paddr, vaddr))\n" - " \t\t\t__flush_dcache_page(paddr, vaddr);\n" - "diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c\n" - "index d0ba3551d49a..3cced8455727 100644\n" - "--- a/arch/arm/mm/flush.c\n" - "+++ b/arch/arm/mm/flush.c\n" - "@@ -235,7 +235,7 @@ void __flush_dcache_page(struct address_space *mapping, struct page *page)\n" - " \t */\n" - " \tif (mapping && cache_is_vipt_aliasing())\n" - " \t\tflush_pfn_alias(page_to_pfn(page),\n" - "-\t\t\t\tpage->index << PAGE_CACHE_SHIFT);\n" - "+\t\t\t\tpage->index << PAGE_SHIFT);\n" - " }\n" - " \n" - " static void __flush_dcache_aliases(struct address_space *mapping, struct page *page)\n" - "@@ -250,7 +250,7 @@ static void __flush_dcache_aliases(struct address_space *mapping, struct page *p\n" - " \t * data in the current VM view associated with this page.\n" - " \t * - aliasing VIPT: we only need to find one mapping of this page.\n" - " \t */\n" - "-\tpgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);\n" - "+\tpgoff = page->index;\n" - " \n" - " \tflush_dcache_mmap_lock(mapping);\n" - " \tvma_interval_tree_foreach(mpnt, &mapping->i_mmap, pgoff, pgoff) {\n" - "diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c\n" - "index 91c2a39cd5aa..67001277256c 100644\n" - "--- a/arch/parisc/kernel/cache.c\n" - "+++ b/arch/parisc/kernel/cache.c\n" - "@@ -319,7 +319,7 @@ void flush_dcache_page(struct page *page)\n" - " \tif (!mapping)\n" - " \t\treturn;\n" - " \n" - "-\tpgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);\n" - "+\tpgoff = page->index;\n" - " \n" - " \t/* We have carefully arranged in arch_get_unmapped_area() that\n" - " \t * *any* mappings of a file are always congruently mapped (whether\n" - "diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c\n" - "index 3c07d6b96877..6b3e7c6ee096 100644\n" - "--- a/arch/parisc/mm/init.c\n" - "+++ b/arch/parisc/mm/init.c\n" - "@@ -22,7 +22,7 @@\n" - " #include <linux/swap.h>\n" - " #include <linux/unistd.h>\n" - " #include <linux/nodemask.h>\t/* for node_online_map */\n" - "-#include <linux/pagemap.h>\t/* for release_pages and page_cache_release */\n" - "+#include <linux/pagemap.h>\t/* for release_pages */\n" - " #include <linux/compat.h>\n" - " \n" - " #include <asm/pgalloc.h>\n" - "diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c\n" - "index dfa863876778..6ca5f0525e57 100644\n" - "--- a/arch/powerpc/platforms/cell/spufs/inode.c\n" - "+++ b/arch/powerpc/platforms/cell/spufs/inode.c\n" - "@@ -732,8 +732,8 @@ spufs_fill_super(struct super_block *sb, void *data, int silent)\n" - " \t\treturn -ENOMEM;\n" - " \n" - " \tsb->s_maxbytes = MAX_LFS_FILESIZE;\n" - "-\tsb->s_blocksize = PAGE_CACHE_SIZE;\n" - "-\tsb->s_blocksize_bits = PAGE_CACHE_SHIFT;\n" - "+\tsb->s_blocksize = PAGE_SIZE;\n" - "+\tsb->s_blocksize_bits = PAGE_SHIFT;\n" - " \tsb->s_magic = SPUFS_MAGIC;\n" - " \tsb->s_op = &s_ops;\n" - " \tsb->s_fs_info = info;\n" - "diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c\n" - "index 0f3da2cb2bd6..255c7eec4481 100644\n" - "--- a/arch/s390/hypfs/inode.c\n" - "+++ b/arch/s390/hypfs/inode.c\n" - "@@ -278,8 +278,8 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent)\n" - " \tsbi->uid = current_uid();\n" - " \tsbi->gid = current_gid();\n" - " \tsb->s_fs_info = sbi;\n" - "-\tsb->s_blocksize = PAGE_CACHE_SIZE;\n" - "-\tsb->s_blocksize_bits = PAGE_CACHE_SHIFT;\n" - "+\tsb->s_blocksize = PAGE_SIZE;\n" - "+\tsb->s_blocksize_bits = PAGE_SHIFT;\n" - " \tsb->s_magic = HYPFS_MAGIC;\n" - " \tsb->s_op = &hypfs_s_ops;\n" - " \tif (hypfs_parse_options(data, sb))\n" - "diff --git a/block/bio.c b/block/bio.c\n" - "index f124a0a624fc..807d25e466ec 100644\n" - "--- a/block/bio.c\n" - "+++ b/block/bio.c\n" - "@@ -1339,7 +1339,7 @@ struct bio *bio_map_user_iov(struct request_queue *q,\n" - " \t\t * release the pages we didn't map into the bio, if any\n" - " \t\t */\n" - " \t\twhile (j < page_limit)\n" - "-\t\t\tpage_cache_release(pages[j++]);\n" - "+\t\t\tput_page(pages[j++]);\n" - " \t}\n" - " \n" - " \tkfree(pages);\n" - "@@ -1365,7 +1365,7 @@ struct bio *bio_map_user_iov(struct request_queue *q,\n" - " \tfor (j = 0; j < nr_pages; j++) {\n" - " \t\tif (!pages[j])\n" - " \t\t\tbreak;\n" - "-\t\tpage_cache_release(pages[j]);\n" - "+\t\tput_page(pages[j]);\n" - " \t}\n" - " out:\n" - " \tkfree(pages);\n" - "@@ -1385,7 +1385,7 @@ static void __bio_unmap_user(struct bio *bio)\n" - " \t\tif (bio_data_dir(bio) == READ)\n" - " \t\t\tset_page_dirty_lock(bvec->bv_page);\n" - " \n" - "-\t\tpage_cache_release(bvec->bv_page);\n" - "+\t\tput_page(bvec->bv_page);\n" - " \t}\n" - " \n" - " \tbio_put(bio);\n" - "@@ -1615,8 +1615,8 @@ static void bio_release_pages(struct bio *bio)\n" - " * the BIO and the offending pages and re-dirty the pages in process context.\n" - " *\n" - " * It is expected that bio_check_pages_dirty() will wholly own the BIO from\n" - "- * here on. It will run one page_cache_release() against each page and will\n" - "- * run one bio_put() against the BIO.\n" - "+ * here on. It will run one put_page() against each page and will run one\n" - "+ * bio_put() against the BIO.\n" - " */\n" - " \n" - " static void bio_dirty_fn(struct work_struct *work);\n" - "@@ -1658,7 +1658,7 @@ void bio_check_pages_dirty(struct bio *bio)\n" - " \t\tstruct page *page = bvec->bv_page;\n" - " \n" - " \t\tif (PageDirty(page) || PageCompound(page)) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tbvec->bv_page = NULL;\n" - " \t\t} else {\n" - " \t\t\tnr_clean_pages++;\n" - "diff --git a/block/blk-core.c b/block/blk-core.c\n" - "index 827f8badd143..b60537b2c35b 100644\n" - "--- a/block/blk-core.c\n" - "+++ b/block/blk-core.c\n" - "@@ -706,7 +706,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)\n" - " \t\tgoto fail_id;\n" - " \n" - " \tq->backing_dev_info.ra_pages =\n" - "-\t\t\t(VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;\n" - "+\t\t\t(VM_MAX_READAHEAD * 1024) / PAGE_SIZE;\n" - " \tq->backing_dev_info.capabilities = BDI_CAP_CGROUP_WRITEBACK;\n" - " \tq->backing_dev_info.name = \"block\";\n" - " \tq->node = node_id;\n" - "diff --git a/block/blk-settings.c b/block/blk-settings.c\n" - "index c7bb666aafd1..331e4eee0dda 100644\n" - "--- a/block/blk-settings.c\n" - "+++ b/block/blk-settings.c\n" - "@@ -239,8 +239,8 @@ void blk_queue_max_hw_sectors(struct request_queue *q, unsigned int max_hw_secto\n" - " \tstruct queue_limits *limits = &q->limits;\n" - " \tunsigned int max_sectors;\n" - " \n" - "-\tif ((max_hw_sectors << 9) < PAGE_CACHE_SIZE) {\n" - "-\t\tmax_hw_sectors = 1 << (PAGE_CACHE_SHIFT - 9);\n" - "+\tif ((max_hw_sectors << 9) < PAGE_SIZE) {\n" - "+\t\tmax_hw_sectors = 1 << (PAGE_SHIFT - 9);\n" - " \t\tprintk(KERN_INFO \"%s: set to minimum %d\\n\",\n" - " \t\t __func__, max_hw_sectors);\n" - " \t}\n" - "@@ -329,8 +329,8 @@ EXPORT_SYMBOL(blk_queue_max_segments);\n" - " **/\n" - " void blk_queue_max_segment_size(struct request_queue *q, unsigned int max_size)\n" - " {\n" - "-\tif (max_size < PAGE_CACHE_SIZE) {\n" - "-\t\tmax_size = PAGE_CACHE_SIZE;\n" - "+\tif (max_size < PAGE_SIZE) {\n" - "+\t\tmax_size = PAGE_SIZE;\n" - " \t\tprintk(KERN_INFO \"%s: set to minimum %d\\n\",\n" - " \t\t __func__, max_size);\n" - " \t}\n" - "@@ -760,8 +760,8 @@ EXPORT_SYMBOL_GPL(blk_queue_dma_drain);\n" - " **/\n" - " void blk_queue_segment_boundary(struct request_queue *q, unsigned long mask)\n" - " {\n" - "-\tif (mask < PAGE_CACHE_SIZE - 1) {\n" - "-\t\tmask = PAGE_CACHE_SIZE - 1;\n" - "+\tif (mask < PAGE_SIZE - 1) {\n" - "+\t\tmask = PAGE_SIZE - 1;\n" - " \t\tprintk(KERN_INFO \"%s: set to minimum %lx\\n\",\n" - " \t\t __func__, mask);\n" - " \t}\n" - "diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c\n" - "index dd93763057ce..995b58d46ed1 100644\n" - "--- a/block/blk-sysfs.c\n" - "+++ b/block/blk-sysfs.c\n" - "@@ -76,7 +76,7 @@ queue_requests_store(struct request_queue *q, const char *page, size_t count)\n" - " static ssize_t queue_ra_show(struct request_queue *q, char *page)\n" - " {\n" - " \tunsigned long ra_kb = q->backing_dev_info.ra_pages <<\n" - "-\t\t\t\t\t(PAGE_CACHE_SHIFT - 10);\n" - "+\t\t\t\t\t(PAGE_SHIFT - 10);\n" - " \n" - " \treturn queue_var_show(ra_kb, (page));\n" - " }\n" - "@@ -90,7 +90,7 @@ queue_ra_store(struct request_queue *q, const char *page, size_t count)\n" - " \tif (ret < 0)\n" - " \t\treturn ret;\n" - " \n" - "-\tq->backing_dev_info.ra_pages = ra_kb >> (PAGE_CACHE_SHIFT - 10);\n" - "+\tq->backing_dev_info.ra_pages = ra_kb >> (PAGE_SHIFT - 10);\n" - " \n" - " \treturn ret;\n" - " }\n" - "@@ -117,7 +117,7 @@ static ssize_t queue_max_segment_size_show(struct request_queue *q, char *page)\n" - " \tif (blk_queue_cluster(q))\n" - " \t\treturn queue_var_show(queue_max_segment_size(q), (page));\n" - " \n" - "-\treturn queue_var_show(PAGE_CACHE_SIZE, (page));\n" - "+\treturn queue_var_show(PAGE_SIZE, (page));\n" - " }\n" - " \n" - " static ssize_t queue_logical_block_size_show(struct request_queue *q, char *page)\n" - "@@ -198,7 +198,7 @@ queue_max_sectors_store(struct request_queue *q, const char *page, size_t count)\n" - " {\n" - " \tunsigned long max_sectors_kb,\n" - " \t\tmax_hw_sectors_kb = queue_max_hw_sectors(q) >> 1,\n" - "-\t\t\tpage_kb = 1 << (PAGE_CACHE_SHIFT - 10);\n" - "+\t\t\tpage_kb = 1 << (PAGE_SHIFT - 10);\n" - " \tssize_t ret = queue_var_store(&max_sectors_kb, page, count);\n" - " \n" - " \tif (ret < 0)\n" - "diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c\n" - "index e3c591dd8f19..4a349787bc62 100644\n" - "--- a/block/cfq-iosched.c\n" - "+++ b/block/cfq-iosched.c\n" - "@@ -4075,7 +4075,7 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,\n" - " \t\t * idle timer unplug to continue working.\n" - " \t\t */\n" - " \t\tif (cfq_cfqq_wait_request(cfqq)) {\n" - "-\t\t\tif (blk_rq_bytes(rq) > PAGE_CACHE_SIZE ||\n" - "+\t\t\tif (blk_rq_bytes(rq) > PAGE_SIZE ||\n" - " \t\t\t cfqd->busy_queues > 1) {\n" - " \t\t\t\tcfq_del_timer(cfqd, cfqq);\n" - " \t\t\t\tcfq_clear_cfqq_wait_request(cfqq);\n" - "diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c\n" - "index f678c733df40..556826ac7cb4 100644\n" - "--- a/block/compat_ioctl.c\n" - "+++ b/block/compat_ioctl.c\n" - "@@ -710,7 +710,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)\n" - " \t\t\treturn -EINVAL;\n" - " \t\tbdi = blk_get_backing_dev_info(bdev);\n" - " \t\treturn compat_put_long(arg,\n" - "-\t\t\t\t (bdi->ra_pages * PAGE_CACHE_SIZE) / 512);\n" - "+\t\t\t\t (bdi->ra_pages * PAGE_SIZE) / 512);\n" - " \tcase BLKROGET: /* compatible */\n" - " \t\treturn compat_put_int(arg, bdev_read_only(bdev) != 0);\n" - " \tcase BLKBSZGET_32: /* get the logical block size (cf. BLKSSZGET) */\n" - "@@ -729,7 +729,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)\n" - " \t\tif (!capable(CAP_SYS_ADMIN))\n" - " \t\t\treturn -EACCES;\n" - " \t\tbdi = blk_get_backing_dev_info(bdev);\n" - "-\t\tbdi->ra_pages = (arg * 512) / PAGE_CACHE_SIZE;\n" - "+\t\tbdi->ra_pages = (arg * 512) / PAGE_SIZE;\n" - " \t\treturn 0;\n" - " \tcase BLKGETSIZE:\n" - " \t\tsize = i_size_read(bdev->bd_inode);\n" - "diff --git a/block/ioctl.c b/block/ioctl.c\n" - "index d8996bbd7f12..4ff1f92f89ca 100644\n" - "--- a/block/ioctl.c\n" - "+++ b/block/ioctl.c\n" - "@@ -550,7 +550,7 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,\n" - " \t\tif (!arg)\n" - " \t\t\treturn -EINVAL;\n" - " \t\tbdi = blk_get_backing_dev_info(bdev);\n" - "-\t\treturn put_long(arg, (bdi->ra_pages * PAGE_CACHE_SIZE) / 512);\n" - "+\t\treturn put_long(arg, (bdi->ra_pages * PAGE_SIZE) / 512);\n" - " \tcase BLKROGET:\n" - " \t\treturn put_int(arg, bdev_read_only(bdev) != 0);\n" - " \tcase BLKBSZGET: /* get block device soft block size (cf. BLKSSZGET) */\n" - "@@ -578,7 +578,7 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,\n" - " \t\tif(!capable(CAP_SYS_ADMIN))\n" - " \t\t\treturn -EACCES;\n" - " \t\tbdi = blk_get_backing_dev_info(bdev);\n" - "-\t\tbdi->ra_pages = (arg * 512) / PAGE_CACHE_SIZE;\n" - "+\t\tbdi->ra_pages = (arg * 512) / PAGE_SIZE;\n" - " \t\treturn 0;\n" - " \tcase BLKBSZSET:\n" - " \t\treturn blkdev_bszset(bdev, mode, argp);\n" - "diff --git a/block/partition-generic.c b/block/partition-generic.c\n" - "index 5d8701941054..2c6ae2aed2c4 100644\n" - "--- a/block/partition-generic.c\n" - "+++ b/block/partition-generic.c\n" - "@@ -566,8 +566,8 @@ static struct page *read_pagecache_sector(struct block_device *bdev, sector_t n)\n" - " {\n" - " \tstruct address_space *mapping = bdev->bd_inode->i_mapping;\n" - " \n" - "-\treturn read_mapping_page(mapping, (pgoff_t)(n >> (PAGE_CACHE_SHIFT-9)),\n" - "-\t\t\tNULL);\n" - "+\treturn read_mapping_page(mapping, (pgoff_t)(n >> (PAGE_SHIFT-9)),\n" - "+\t\t\t\t NULL);\n" - " }\n" - " \n" - " unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)\n" - "@@ -584,9 +584,9 @@ unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)\n" - " \t\tif (PageError(page))\n" - " \t\t\tgoto fail;\n" - " \t\tp->v = page;\n" - "-\t\treturn (unsigned char *)page_address(page) + ((n & ((1 << (PAGE_CACHE_SHIFT - 9)) - 1)) << 9);\n" - "+\t\treturn (unsigned char *)page_address(page) + ((n & ((1 << (PAGE_SHIFT - 9)) - 1)) << 9);\n" - " fail:\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \tp->v = NULL;\n" - " \treturn NULL;\n" - "diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c\n" - "index dd73e1ff1759..ec9d8610b25f 100644\n" - "--- a/drivers/block/aoe/aoeblk.c\n" - "+++ b/drivers/block/aoe/aoeblk.c\n" - "@@ -397,7 +397,7 @@ aoeblk_gdalloc(void *vp)\n" - " \tWARN_ON(d->flags & DEVFL_UP);\n" - " \tblk_queue_max_hw_sectors(q, BLK_DEF_MAX_SECTORS);\n" - " \tq->backing_dev_info.name = \"aoe\";\n" - "-\tq->backing_dev_info.ra_pages = READ_AHEAD / PAGE_CACHE_SIZE;\n" - "+\tq->backing_dev_info.ra_pages = READ_AHEAD / PAGE_SIZE;\n" - " \td->bufpool = mp;\n" - " \td->blkq = gd->queue = q;\n" - " \tq->queuedata = d;\n" - "diff --git a/drivers/block/brd.c b/drivers/block/brd.c\n" - "index f7ecc287d733..51a071e32221 100644\n" - "--- a/drivers/block/brd.c\n" - "+++ b/drivers/block/brd.c\n" - "@@ -374,7 +374,7 @@ static int brd_rw_page(struct block_device *bdev, sector_t sector,\n" - " \t\t struct page *page, int rw)\n" - " {\n" - " \tstruct brd_device *brd = bdev->bd_disk->private_data;\n" - "-\tint err = brd_do_bvec(brd, page, PAGE_CACHE_SIZE, 0, rw, sector);\n" - "+\tint err = brd_do_bvec(brd, page, PAGE_SIZE, 0, rw, sector);\n" - " \tpage_endio(page, rw & WRITE, err);\n" - " \treturn err;\n" - " }\n" - "diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h\n" - "index c227fd4cad75..7a1cf7eaa71d 100644\n" - "--- a/drivers/block/drbd/drbd_int.h\n" - "+++ b/drivers/block/drbd/drbd_int.h\n" - "@@ -1327,8 +1327,8 @@ struct bm_extent {\n" - " #endif\n" - " #endif\n" - " \n" - "-/* BIO_MAX_SIZE is 256 * PAGE_CACHE_SIZE,\n" - "- * so for typical PAGE_CACHE_SIZE of 4k, that is (1<<20) Byte.\n" - "+/* BIO_MAX_SIZE is 256 * PAGE_SIZE,\n" - "+ * so for typical PAGE_SIZE of 4k, that is (1<<20) Byte.\n" - " * Since we may live in a mixed-platform cluster,\n" - " * we limit us to a platform agnostic constant here for now.\n" - " * A followup commit may allow even bigger BIO sizes,\n" - "diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c\n" - "index 226eb0c9f0fb..1fd1dccebb6b 100644\n" - "--- a/drivers/block/drbd/drbd_nl.c\n" - "+++ b/drivers/block/drbd/drbd_nl.c\n" - "@@ -1178,7 +1178,7 @@ static void drbd_setup_queue_param(struct drbd_device *device, struct drbd_backi\n" - " \tblk_queue_max_hw_sectors(q, max_hw_sectors);\n" - " \t/* This is the workaround for \"bio would need to, but cannot, be split\" */\n" - " \tblk_queue_max_segments(q, max_segments ? max_segments : BLK_MAX_SEGMENTS);\n" - "-\tblk_queue_segment_boundary(q, PAGE_CACHE_SIZE-1);\n" - "+\tblk_queue_segment_boundary(q, PAGE_SIZE-1);\n" - " \n" - " \tif (b) {\n" - " \t\tstruct drbd_connection *connection = first_peer_device(device)->connection;\n" - "diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c\n" - "index 1cbb16e15307..d20a485c3aac 100644\n" - "--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c\n" - "+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c\n" - "@@ -574,7 +574,7 @@ static void amdgpu_ttm_tt_unpin_userptr(struct ttm_tt *ttm)\n" - " \t\t\tset_page_dirty(page);\n" - " \n" - " \t\tmark_page_accessed(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \n" - " \tsg_free_table(ttm->sg);\n" - "diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c\n" - "index 6e731db31aa4..aca7f9cc6109 100644\n" - "--- a/drivers/gpu/drm/armada/armada_gem.c\n" - "+++ b/drivers/gpu/drm/armada/armada_gem.c\n" - "@@ -481,7 +481,7 @@ armada_gem_prime_map_dma_buf(struct dma_buf_attachment *attach,\n" - " \n" - " release:\n" - " \tfor_each_sg(sgt->sgl, sg, num, i)\n" - "-\t\tpage_cache_release(sg_page(sg));\n" - "+\t\tput_page(sg_page(sg));\n" - " free_table:\n" - " \tsg_free_table(sgt);\n" - " free_sgt:\n" - "@@ -502,7 +502,7 @@ static void armada_gem_prime_unmap_dma_buf(struct dma_buf_attachment *attach,\n" - " \tif (dobj->obj.filp) {\n" - " \t\tstruct scatterlist *sg;\n" - " \t\tfor_each_sg(sgt->sgl, sg, sgt->nents, i)\n" - "-\t\t\tpage_cache_release(sg_page(sg));\n" - "+\t\t\tput_page(sg_page(sg));\n" - " \t}\n" - " \n" - " \tsg_free_table(sgt);\n" - "diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c\n" - "index 2e8c77e71e1f..da0c5320789f 100644\n" - "--- a/drivers/gpu/drm/drm_gem.c\n" - "+++ b/drivers/gpu/drm/drm_gem.c\n" - "@@ -534,7 +534,7 @@ struct page **drm_gem_get_pages(struct drm_gem_object *obj)\n" - " \n" - " fail:\n" - " \twhile (i--)\n" - "-\t\tpage_cache_release(pages[i]);\n" - "+\t\tput_page(pages[i]);\n" - " \n" - " \tdrm_free_large(pages);\n" - " \treturn ERR_CAST(p);\n" - "@@ -569,7 +569,7 @@ void drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages,\n" - " \t\t\tmark_page_accessed(pages[i]);\n" - " \n" - " \t\t/* Undo the reference we took when populating the table */\n" - "-\t\tpage_cache_release(pages[i]);\n" - "+\t\tput_page(pages[i]);\n" - " \t}\n" - " \n" - " \tdrm_free_large(pages);\n" - "diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c\n" - "index bb44bad15403..7d6468407fd6 100644\n" - "--- a/drivers/gpu/drm/i915/i915_gem.c\n" - "+++ b/drivers/gpu/drm/i915/i915_gem.c\n" - "@@ -177,7 +177,7 @@ i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj)\n" - " \t\tdrm_clflush_virt_range(vaddr, PAGE_SIZE);\n" - " \t\tkunmap_atomic(src);\n" - " \n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tvaddr += PAGE_SIZE;\n" - " \t}\n" - " \n" - "@@ -243,7 +243,7 @@ i915_gem_object_put_pages_phys(struct drm_i915_gem_object *obj)\n" - " \t\t\tset_page_dirty(page);\n" - " \t\t\tif (obj->madv == I915_MADV_WILLNEED)\n" - " \t\t\t\tmark_page_accessed(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tvaddr += PAGE_SIZE;\n" - " \t\t}\n" - " \t\tobj->dirty = 0;\n" - "@@ -2204,7 +2204,7 @@ i915_gem_object_put_pages_gtt(struct drm_i915_gem_object *obj)\n" - " \t\tif (obj->madv == I915_MADV_WILLNEED)\n" - " \t\t\tmark_page_accessed(page);\n" - " \n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \tobj->dirty = 0;\n" - " \n" - "@@ -2344,7 +2344,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)\n" - " err_pages:\n" - " \tsg_mark_end(sg);\n" - " \tfor_each_sg_page(st->sgl, &sg_iter, st->nents, 0)\n" - "-\t\tpage_cache_release(sg_page_iter_page(&sg_iter));\n" - "+\t\tput_page(sg_page_iter_page(&sg_iter));\n" - " \tsg_free_table(st);\n" - " \tkfree(st);\n" - " \n" - "diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c\n" - "index 59e45b3a6937..7b5b6091bfdc 100644\n" - "--- a/drivers/gpu/drm/i915/i915_gem_userptr.c\n" - "+++ b/drivers/gpu/drm/i915/i915_gem_userptr.c\n" - "@@ -764,7 +764,7 @@ i915_gem_userptr_put_pages(struct drm_i915_gem_object *obj)\n" - " \t\t\tset_page_dirty(page);\n" - " \n" - " \t\tmark_page_accessed(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \tobj->dirty = 0;\n" - " \n" - "diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c\n" - "index e06ac546a90f..19fdacb6cf75 100644\n" - "--- a/drivers/gpu/drm/radeon/radeon_ttm.c\n" - "+++ b/drivers/gpu/drm/radeon/radeon_ttm.c\n" - "@@ -610,7 +610,7 @@ static void radeon_ttm_tt_unpin_userptr(struct ttm_tt *ttm)\n" - " \t\t\tset_page_dirty(page);\n" - " \n" - " \t\tmark_page_accessed(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \n" - " \tsg_free_table(ttm->sg);\n" - "diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c\n" - "index 4e19d0f9cc30..077ae9b2865d 100644\n" - "--- a/drivers/gpu/drm/ttm/ttm_tt.c\n" - "+++ b/drivers/gpu/drm/ttm/ttm_tt.c\n" - "@@ -311,7 +311,7 @@ int ttm_tt_swapin(struct ttm_tt *ttm)\n" - " \t\t\tgoto out_err;\n" - " \n" - " \t\tcopy_highpage(to_page, from_page);\n" - "-\t\tpage_cache_release(from_page);\n" - "+\t\tput_page(from_page);\n" - " \t}\n" - " \n" - " \tif (!(ttm->page_flags & TTM_PAGE_FLAG_PERSISTENT_SWAP))\n" - "@@ -361,7 +361,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage)\n" - " \t\tcopy_highpage(to_page, from_page);\n" - " \t\tset_page_dirty(to_page);\n" - " \t\tmark_page_accessed(to_page);\n" - "-\t\tpage_cache_release(to_page);\n" - "+\t\tput_page(to_page);\n" - " \t}\n" - " \n" - " \tttm_tt_unpopulate(ttm);\n" - "diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c\n" - "index d0cbd5ecd7f0..0c76a4d429f2 100644\n" - "--- a/drivers/gpu/drm/via/via_dmablit.c\n" - "+++ b/drivers/gpu/drm/via/via_dmablit.c\n" - "@@ -188,7 +188,7 @@ via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg)\n" - " \t\t\tif (NULL != (page = vsg->pages[i])) {\n" - " \t\t\t\tif (!PageReserved(page) && (DMA_FROM_DEVICE == vsg->direction))\n" - " \t\t\t\t\tSetPageDirty(page);\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t}\n" - " \t\t}\n" - " \tcase dr_via_pages_alloc:\n" - "diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c\n" - "index d80cce499a56..df77ddc96467 100644\n" - "--- a/drivers/md/bitmap.c\n" - "+++ b/drivers/md/bitmap.c\n" - "@@ -323,7 +323,7 @@ __clear_page_buffers(struct page *page)\n" - " {\n" - " \tClearPagePrivate(page);\n" - " \tset_page_private(page, 0);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " static void free_buffers(struct page *page)\n" - " {\n" - "diff --git a/drivers/media/v4l2-core/videobuf-dma-sg.c b/drivers/media/v4l2-core/videobuf-dma-sg.c\n" - "index f669cedca8bd..f4c212911b44 100644\n" - "--- a/drivers/media/v4l2-core/videobuf-dma-sg.c\n" - "+++ b/drivers/media/v4l2-core/videobuf-dma-sg.c\n" - "@@ -350,7 +350,7 @@ int videobuf_dma_free(struct videobuf_dmabuf *dma)\n" - " \n" - " \tif (dma->pages) {\n" - " \t\tfor (i = 0; i < dma->nr_pages; i++)\n" - "-\t\t\tpage_cache_release(dma->pages[i]);\n" - "+\t\t\tput_page(dma->pages[i]);\n" - " \t\tkfree(dma->pages);\n" - " \t\tdma->pages = NULL;\n" - " \t}\n" - "diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c\n" - "index e8b933111e0d..9c677f3f3c26 100644\n" - "--- a/drivers/misc/ibmasm/ibmasmfs.c\n" - "+++ b/drivers/misc/ibmasm/ibmasmfs.c\n" - "@@ -116,8 +116,8 @@ static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent)\n" - " {\n" - " \tstruct inode *root;\n" - " \n" - "-\tsb->s_blocksize = PAGE_CACHE_SIZE;\n" - "-\tsb->s_blocksize_bits = PAGE_CACHE_SHIFT;\n" - "+\tsb->s_blocksize = PAGE_SIZE;\n" - "+\tsb->s_blocksize_bits = PAGE_SHIFT;\n" - " \tsb->s_magic = IBMASMFS_MAGIC;\n" - " \tsb->s_op = &ibmasmfs_s_ops;\n" - " \tsb->s_time_gran = 1;\n" - "diff --git a/drivers/misc/vmw_vmci/vmci_queue_pair.c b/drivers/misc/vmw_vmci/vmci_queue_pair.c\n" - "index f42d9c4e4561..f84a4275ca29 100644\n" - "--- a/drivers/misc/vmw_vmci/vmci_queue_pair.c\n" - "+++ b/drivers/misc/vmw_vmci/vmci_queue_pair.c\n" - "@@ -728,7 +728,7 @@ static void qp_release_pages(struct page **pages,\n" - " \t\tif (dirty)\n" - " \t\t\tset_page_dirty(pages[i]);\n" - " \n" - "-\t\tpage_cache_release(pages[i]);\n" - "+\t\tput_page(pages[i]);\n" - " \t\tpages[i] = NULL;\n" - " \t}\n" - " }\n" - "diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c\n" - "index 0aecd5c00b86..8f86feff3e3a 100644\n" - "--- a/drivers/mmc/core/host.c\n" - "+++ b/drivers/mmc/core/host.c\n" - "@@ -355,11 +355,11 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)\n" - " \t * They have to set these according to their abilities.\n" - " \t */\n" - " \thost->max_segs = 1;\n" - "-\thost->max_seg_size = PAGE_CACHE_SIZE;\n" - "+\thost->max_seg_size = PAGE_SIZE;\n" - " \n" - "-\thost->max_req_size = PAGE_CACHE_SIZE;\n" - "+\thost->max_req_size = PAGE_SIZE;\n" - " \thost->max_blk_size = 512;\n" - "-\thost->max_blk_count = PAGE_CACHE_SIZE / 512;\n" - "+\thost->max_blk_count = PAGE_SIZE / 512;\n" - " \n" - " \treturn host;\n" - " }\n" - "diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c\n" - "index 6234eab38ff3..a8f001d44683 100644\n" - "--- a/drivers/mmc/host/sh_mmcif.c\n" - "+++ b/drivers/mmc/host/sh_mmcif.c\n" - "@@ -1513,7 +1513,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)\n" - " \t\tmmc->caps |= pd->caps;\n" - " \tmmc->max_segs = 32;\n" - " \tmmc->max_blk_size = 512;\n" - "-\tmmc->max_req_size = PAGE_CACHE_SIZE * mmc->max_segs;\n" - "+\tmmc->max_req_size = PAGE_SIZE * mmc->max_segs;\n" - " \tmmc->max_blk_count = mmc->max_req_size / mmc->max_blk_size;\n" - " \tmmc->max_seg_size = mmc->max_req_size;\n" - " \n" - "diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c\n" - "index 4a0d6b80eaa3..c3122c9e468f 100644\n" - "--- a/drivers/mmc/host/tmio_mmc_dma.c\n" - "+++ b/drivers/mmc/host/tmio_mmc_dma.c\n" - "@@ -63,7 +63,7 @@ static void tmio_mmc_start_dma_rx(struct tmio_mmc_host *host)\n" - " \t\t}\n" - " \t}\n" - " \n" - "-\tif ((!aligned && (host->sg_len > 1 || sg->length > PAGE_CACHE_SIZE ||\n" - "+\tif ((!aligned && (host->sg_len > 1 || sg->length > PAGE_SIZE ||\n" - " \t\t\t (align & PAGE_MASK))) || !multiple) {\n" - " \t\tret = -EINVAL;\n" - " \t\tgoto pio;\n" - "@@ -139,7 +139,7 @@ static void tmio_mmc_start_dma_tx(struct tmio_mmc_host *host)\n" - " \t\t}\n" - " \t}\n" - " \n" - "-\tif ((!aligned && (host->sg_len > 1 || sg->length > PAGE_CACHE_SIZE ||\n" - "+\tif ((!aligned && (host->sg_len > 1 || sg->length > PAGE_SIZE ||\n" - " \t\t\t (align & PAGE_MASK))) || !multiple) {\n" - " \t\tret = -EINVAL;\n" - " \t\tgoto pio;\n" - "diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c\n" - "index a10fde40b6c3..233627e20299 100644\n" - "--- a/drivers/mmc/host/tmio_mmc_pio.c\n" - "+++ b/drivers/mmc/host/tmio_mmc_pio.c\n" - "@@ -1122,7 +1122,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host,\n" - " \tmmc->caps2 |= pdata->capabilities2;\n" - " \tmmc->max_segs = 32;\n" - " \tmmc->max_blk_size = 512;\n" - "-\tmmc->max_blk_count = (PAGE_CACHE_SIZE / mmc->max_blk_size) *\n" - "+\tmmc->max_blk_count = (PAGE_SIZE / mmc->max_blk_size) *\n" - " \t\tmmc->max_segs;\n" - " \tmmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;\n" - " \tmmc->max_seg_size = mmc->max_req_size;\n" - "diff --git a/drivers/mmc/host/usdhi6rol0.c b/drivers/mmc/host/usdhi6rol0.c\n" - "index b47122d3e8d8..8eeca2b0f34a 100644\n" - "--- a/drivers/mmc/host/usdhi6rol0.c\n" - "+++ b/drivers/mmc/host/usdhi6rol0.c\n" - "@@ -1789,7 +1789,7 @@ static int usdhi6_probe(struct platform_device *pdev)\n" - " \t/* Set .max_segs to some random number. Feel free to adjust. */\n" - " \tmmc->max_segs = 32;\n" - " \tmmc->max_blk_size = 512;\n" - "-\tmmc->max_req_size = PAGE_CACHE_SIZE * mmc->max_segs;\n" - "+\tmmc->max_req_size = PAGE_SIZE * mmc->max_segs;\n" - " \tmmc->max_blk_count = mmc->max_req_size / mmc->max_blk_size;\n" - " \t/*\n" - " \t * Setting .max_seg_size to 1 page would simplify our page-mapping code,\n" - "diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c\n" - "index e2c0057737e6..7c887f111a7d 100644\n" - "--- a/drivers/mtd/devices/block2mtd.c\n" - "+++ b/drivers/mtd/devices/block2mtd.c\n" - "@@ -75,7 +75,7 @@ static int _block2mtd_erase(struct block2mtd_dev *dev, loff_t to, size_t len)\n" - " \t\t\t\tbreak;\n" - " \t\t\t}\n" - " \n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tpages--;\n" - " \t\tindex++;\n" - " \t}\n" - "@@ -124,7 +124,7 @@ static int block2mtd_read(struct mtd_info *mtd, loff_t from, size_t len,\n" - " \t\t\treturn PTR_ERR(page);\n" - " \n" - " \t\tmemcpy(buf, page_address(page) + offset, cpylen);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \n" - " \t\tif (retlen)\n" - " \t\t\t*retlen += cpylen;\n" - "@@ -164,7 +164,7 @@ static int _block2mtd_write(struct block2mtd_dev *dev, const u_char *buf,\n" - " \t\t\tunlock_page(page);\n" - " \t\t\tbalance_dirty_pages_ratelimited(mapping);\n" - " \t\t}\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \n" - " \t\tif (retlen)\n" - " \t\t\t*retlen += cpylen;\n" - "diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c\n" - "index 1fd519503bb1..a58169a28741 100644\n" - "--- a/drivers/mtd/nand/nandsim.c\n" - "+++ b/drivers/mtd/nand/nandsim.c\n" - "@@ -1339,7 +1339,7 @@ static void put_pages(struct nandsim *ns)\n" - " \tint i;\n" - " \n" - " \tfor (i = 0; i < ns->held_cnt; i++)\n" - "-\t\tpage_cache_release(ns->held_pages[i]);\n" - "+\t\tput_page(ns->held_pages[i]);\n" - " }\n" - " \n" - " /* Get page cache pages in advance to provide NOFS memory allocation */\n" - "@@ -1349,8 +1349,8 @@ static int get_pages(struct nandsim *ns, struct file *file, size_t count, loff_t\n" - " \tstruct page *page;\n" - " \tstruct address_space *mapping = file->f_mapping;\n" - " \n" - "-\tstart_index = pos >> PAGE_CACHE_SHIFT;\n" - "-\tend_index = (pos + count - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tstart_index = pos >> PAGE_SHIFT;\n" - "+\tend_index = (pos + count - 1) >> PAGE_SHIFT;\n" - " \tif (end_index - start_index + 1 > NS_MAX_HELD_PAGES)\n" - " \t\treturn -EINVAL;\n" - " \tns->held_cnt = 0;\n" - "diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c\n" - "index c32cbb593600..f068b6513cd2 100644\n" - "--- a/drivers/nvdimm/btt.c\n" - "+++ b/drivers/nvdimm/btt.c\n" - "@@ -1204,7 +1204,7 @@ static int btt_rw_page(struct block_device *bdev, sector_t sector,\n" - " {\n" - " \tstruct btt *btt = bdev->bd_disk->private_data;\n" - " \n" - "-\tbtt_do_bvec(btt, NULL, page, PAGE_CACHE_SIZE, 0, rw, sector);\n" - "+\tbtt_do_bvec(btt, NULL, page, PAGE_SIZE, 0, rw, sector);\n" - " \tpage_endio(page, rw & WRITE, 0);\n" - " \treturn 0;\n" - " }\n" - "diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c\n" - "index ca5721c306bb..a1a29c711532 100644\n" - "--- a/drivers/nvdimm/pmem.c\n" - "+++ b/drivers/nvdimm/pmem.c\n" - "@@ -151,7 +151,7 @@ static int pmem_rw_page(struct block_device *bdev, sector_t sector,\n" - " \tstruct pmem_device *pmem = bdev->bd_disk->private_data;\n" - " \tint rc;\n" - " \n" - "-\trc = pmem_do_bvec(pmem, page, PAGE_CACHE_SIZE, 0, rw, sector);\n" - "+\trc = pmem_do_bvec(pmem, page, PAGE_SIZE, 0, rw, sector);\n" - " \tif (rw & WRITE)\n" - " \t\twmb_pmem();\n" - " \n" - "diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c\n" - "index b48ac6300c79..a0e5260bd006 100644\n" - "--- a/drivers/oprofile/oprofilefs.c\n" - "+++ b/drivers/oprofile/oprofilefs.c\n" - "@@ -239,8 +239,8 @@ static int oprofilefs_fill_super(struct super_block *sb, void *data, int silent)\n" - " {\n" - " \tstruct inode *root_inode;\n" - " \n" - "-\tsb->s_blocksize = PAGE_CACHE_SIZE;\n" - "-\tsb->s_blocksize_bits = PAGE_CACHE_SHIFT;\n" - "+\tsb->s_blocksize = PAGE_SIZE;\n" - "+\tsb->s_blocksize_bits = PAGE_SHIFT;\n" - " \tsb->s_magic = OPROFILEFS_MAGIC;\n" - " \tsb->s_op = &s_ops;\n" - " \tsb->s_time_gran = 1;\n" - "diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c\n" - "index 5a5457ac9cdb..1bd0753f678a 100644\n" - "--- a/drivers/scsi/sd.c\n" - "+++ b/drivers/scsi/sd.c\n" - "@@ -2891,7 +2891,7 @@ static int sd_revalidate_disk(struct gendisk *disk)\n" - " \tif (sdkp->opt_xfer_blocks &&\n" - " \t sdkp->opt_xfer_blocks <= dev_max &&\n" - " \t sdkp->opt_xfer_blocks <= SD_DEF_XFER_BLOCKS &&\n" - "-\t sdkp->opt_xfer_blocks * sdp->sector_size >= PAGE_CACHE_SIZE)\n" - "+\t sdkp->opt_xfer_blocks * sdp->sector_size >= PAGE_SIZE)\n" - " \t\trw_max = q->limits.io_opt =\n" - " \t\t\tsdkp->opt_xfer_blocks * sdp->sector_size;\n" - " \telse\n" - "diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c\n" - "index 607b0a505844..0177a9a4849f 100644\n" - "--- a/drivers/scsi/st.c\n" - "+++ b/drivers/scsi/st.c\n" - "@@ -4943,7 +4943,7 @@ static int sgl_map_user_pages(struct st_buffer *STbp,\n" - " out_unmap:\n" - " \tif (res > 0) {\n" - " \t\tfor (j=0; j < res; j++)\n" - "-\t\t\tpage_cache_release(pages[j]);\n" - "+\t\t\tput_page(pages[j]);\n" - " \t\tres = 0;\n" - " \t}\n" - " \tkfree(pages);\n" - "@@ -4965,7 +4965,7 @@ static int sgl_unmap_user_pages(struct st_buffer *STbp,\n" - " \t\t/* FIXME: cache flush missing for rw==READ\n" - " \t\t * FIXME: call the correct reference counting function\n" - " \t\t */\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \tkfree(STbp->mapped_pages);\n" - " \tSTbp->mapped_pages = NULL;\n" - "diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h\n" - "index dab486261154..13335437c69c 100644\n" - "--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h\n" - "+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h\n" - "@@ -88,7 +88,7 @@ do {\t\t\t\t\t\t\t\t \\\n" - " } while (0)\n" - " \n" - " #ifndef LIBCFS_VMALLOC_SIZE\n" - "-#define LIBCFS_VMALLOC_SIZE\t(2 << PAGE_CACHE_SHIFT) /* 2 pages */\n" - "+#define LIBCFS_VMALLOC_SIZE\t(2 << PAGE_SHIFT) /* 2 pages */\n" - " #endif\n" - " \n" - " #define LIBCFS_ALLOC_PRE(size, mask)\t\t\t\t\t \\\n" - "diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h\n" - "index 0f2fd79e5ec8..837eb22749c3 100644\n" - "--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h\n" - "+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h\n" - "@@ -57,7 +57,7 @@\n" - " #include \"../libcfs_cpu.h\"\n" - " #endif\n" - " \n" - "-#define CFS_PAGE_MASK\t\t (~((__u64)PAGE_CACHE_SIZE-1))\n" - "+#define CFS_PAGE_MASK\t\t (~((__u64)PAGE_SIZE-1))\n" - " #define page_index(p) ((p)->index)\n" - " \n" - " #define memory_pressure_get() (current->flags & PF_MEMALLOC)\n" - "@@ -67,7 +67,7 @@\n" - " #if BITS_PER_LONG == 32\n" - " /* limit to lowmem on 32-bit systems */\n" - " #define NUM_CACHEPAGES \\\n" - "-\tmin(totalram_pages, 1UL << (30 - PAGE_CACHE_SHIFT) * 3 / 4)\n" - "+\tmin(totalram_pages, 1UL << (30 - PAGE_SHIFT) * 3 / 4)\n" - " #else\n" - " #define NUM_CACHEPAGES totalram_pages\n" - " #endif\n" - "diff --git a/drivers/staging/lustre/include/linux/lnet/types.h b/drivers/staging/lustre/include/linux/lnet/types.h\n" - "index 08f193c341c5..1c679cb72785 100644\n" - "--- a/drivers/staging/lustre/include/linux/lnet/types.h\n" - "+++ b/drivers/staging/lustre/include/linux/lnet/types.h\n" - "@@ -514,7 +514,7 @@ typedef struct {\n" - " \t/**\n" - " \t * Starting offset of the fragment within the page. Note that the\n" - " \t * end of the fragment must not pass the end of the page; i.e.,\n" - "-\t * kiov_len + kiov_offset <= PAGE_CACHE_SIZE.\n" - "+\t * kiov_len + kiov_offset <= PAGE_SIZE.\n" - " \t */\n" - " \tunsigned int\t kiov_offset;\n" - " } lnet_kiov_t;\n" - "diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c\n" - "index 3e1f24e77f64..d4ce06d0aeeb 100644\n" - "--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c\n" - "+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c\n" - "@@ -291,7 +291,7 @@ ksocknal_lib_kiov_vmap(lnet_kiov_t *kiov, int niov,\n" - " \n" - " \tfor (nob = i = 0; i < niov; i++) {\n" - " \t\tif ((kiov[i].kiov_offset && i > 0) ||\n" - "-\t\t (kiov[i].kiov_offset + kiov[i].kiov_len != PAGE_CACHE_SIZE && i < niov - 1))\n" - "+\t\t (kiov[i].kiov_offset + kiov[i].kiov_len != PAGE_SIZE && i < niov - 1))\n" - " \t\t\treturn NULL;\n" - " \n" - " \t\tpages[i] = kiov[i].kiov_page;\n" - "diff --git a/drivers/staging/lustre/lnet/libcfs/debug.c b/drivers/staging/lustre/lnet/libcfs/debug.c\n" - "index c90e5102fe06..c3d628bac5b8 100644\n" - "--- a/drivers/staging/lustre/lnet/libcfs/debug.c\n" - "+++ b/drivers/staging/lustre/lnet/libcfs/debug.c\n" - "@@ -517,7 +517,7 @@ int libcfs_debug_init(unsigned long bufsize)\n" - " \t\tmax = TCD_MAX_PAGES;\n" - " \t} else {\n" - " \t\tmax = max / num_possible_cpus();\n" - "-\t\tmax <<= (20 - PAGE_CACHE_SHIFT);\n" - "+\t\tmax <<= (20 - PAGE_SHIFT);\n" - " \t}\n" - " \trc = cfs_tracefile_init(max);\n" - " \n" - "diff --git a/drivers/staging/lustre/lnet/libcfs/tracefile.c b/drivers/staging/lustre/lnet/libcfs/tracefile.c\n" - "index ec3bc04bd89f..244eb89eef68 100644\n" - "--- a/drivers/staging/lustre/lnet/libcfs/tracefile.c\n" - "+++ b/drivers/staging/lustre/lnet/libcfs/tracefile.c\n" - "@@ -182,7 +182,7 @@ cfs_trace_get_tage_try(struct cfs_trace_cpu_data *tcd, unsigned long len)\n" - " \tif (tcd->tcd_cur_pages > 0) {\n" - " \t\t__LASSERT(!list_empty(&tcd->tcd_pages));\n" - " \t\ttage = cfs_tage_from_list(tcd->tcd_pages.prev);\n" - "-\t\tif (tage->used + len <= PAGE_CACHE_SIZE)\n" - "+\t\tif (tage->used + len <= PAGE_SIZE)\n" - " \t\t\treturn tage;\n" - " \t}\n" - " \n" - "@@ -260,7 +260,7 @@ static struct cfs_trace_page *cfs_trace_get_tage(struct cfs_trace_cpu_data *tcd,\n" - " \t * from here: this will lead to infinite recursion.\n" - " \t */\n" - " \n" - "-\tif (len > PAGE_CACHE_SIZE) {\n" - "+\tif (len > PAGE_SIZE) {\n" - " \t\tpr_err(\"cowardly refusing to write %lu bytes in a page\\n\", len);\n" - " \t\treturn NULL;\n" - " \t}\n" - "@@ -349,7 +349,7 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata,\n" - " \tfor (i = 0; i < 2; i++) {\n" - " \t\ttage = cfs_trace_get_tage(tcd, needed + known_size + 1);\n" - " \t\tif (!tage) {\n" - "-\t\t\tif (needed + known_size > PAGE_CACHE_SIZE)\n" - "+\t\t\tif (needed + known_size > PAGE_SIZE)\n" - " \t\t\t\tmask |= D_ERROR;\n" - " \n" - " \t\t\tcfs_trace_put_tcd(tcd);\n" - "@@ -360,7 +360,7 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata,\n" - " \t\tstring_buf = (char *)page_address(tage->page) +\n" - " \t\t\t\t\ttage->used + known_size;\n" - " \n" - "-\t\tmax_nob = PAGE_CACHE_SIZE - tage->used - known_size;\n" - "+\t\tmax_nob = PAGE_SIZE - tage->used - known_size;\n" - " \t\tif (max_nob <= 0) {\n" - " \t\t\tprintk(KERN_EMERG \"negative max_nob: %d\\n\",\n" - " \t\t\t max_nob);\n" - "@@ -424,7 +424,7 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata,\n" - " \t__LASSERT(debug_buf == string_buf);\n" - " \n" - " \ttage->used += needed;\n" - "-\t__LASSERT(tage->used <= PAGE_CACHE_SIZE);\n" - "+\t__LASSERT(tage->used <= PAGE_SIZE);\n" - " \n" - " console:\n" - " \tif ((mask & libcfs_printk) == 0) {\n" - "@@ -835,7 +835,7 @@ EXPORT_SYMBOL(cfs_trace_copyout_string);\n" - " \n" - " int cfs_trace_allocate_string_buffer(char **str, int nob)\n" - " {\n" - "-\tif (nob > 2 * PAGE_CACHE_SIZE)\t /* string must be \"sensible\" */\n" - "+\tif (nob > 2 * PAGE_SIZE)\t /* string must be \"sensible\" */\n" - " \t\treturn -EINVAL;\n" - " \n" - " \t*str = kmalloc(nob, GFP_KERNEL | __GFP_ZERO);\n" - "@@ -951,7 +951,7 @@ int cfs_trace_set_debug_mb(int mb)\n" - " \t}\n" - " \n" - " \tmb /= num_possible_cpus();\n" - "-\tpages = mb << (20 - PAGE_CACHE_SHIFT);\n" - "+\tpages = mb << (20 - PAGE_SHIFT);\n" - " \n" - " \tcfs_tracefile_write_lock();\n" - " \n" - "@@ -977,7 +977,7 @@ int cfs_trace_get_debug_mb(void)\n" - " \n" - " \tcfs_tracefile_read_unlock();\n" - " \n" - "-\treturn (total_pages >> (20 - PAGE_CACHE_SHIFT)) + 1;\n" - "+\treturn (total_pages >> (20 - PAGE_SHIFT)) + 1;\n" - " }\n" - " \n" - " static int tracefiled(void *arg)\n" - "diff --git a/drivers/staging/lustre/lnet/libcfs/tracefile.h b/drivers/staging/lustre/lnet/libcfs/tracefile.h\n" - "index 4c77f9044dd3..ac84e7f4c859 100644\n" - "--- a/drivers/staging/lustre/lnet/libcfs/tracefile.h\n" - "+++ b/drivers/staging/lustre/lnet/libcfs/tracefile.h\n" - "@@ -87,7 +87,7 @@ void libcfs_unregister_panic_notifier(void);\n" - " extern int libcfs_panic_in_progress;\n" - " int cfs_trace_max_debug_mb(void);\n" - " \n" - "-#define TCD_MAX_PAGES (5 << (20 - PAGE_CACHE_SHIFT))\n" - "+#define TCD_MAX_PAGES (5 << (20 - PAGE_SHIFT))\n" - " #define TCD_STOCK_PAGES (TCD_MAX_PAGES)\n" - " #define CFS_TRACEFILE_SIZE (500 << 20)\n" - " \n" - "@@ -96,7 +96,7 @@ int cfs_trace_max_debug_mb(void);\n" - " /*\n" - " * Private declare for tracefile\n" - " */\n" - "-#define TCD_MAX_PAGES (5 << (20 - PAGE_CACHE_SHIFT))\n" - "+#define TCD_MAX_PAGES (5 << (20 - PAGE_SHIFT))\n" - " #define TCD_STOCK_PAGES (TCD_MAX_PAGES)\n" - " \n" - " #define CFS_TRACEFILE_SIZE (500 << 20)\n" - "@@ -257,7 +257,7 @@ do {\t\t\t\t\t\t\t\t \\\n" - " do {\t\t\t\t\t\t\t\t \\\n" - " \t__LASSERT(tage);\t\t\t\t\t\\\n" - " \t__LASSERT(tage->page);\t\t\t\t \\\n" - "-\t__LASSERT(tage->used <= PAGE_CACHE_SIZE);\t\t\t \\\n" - "+\t__LASSERT(tage->used <= PAGE_SIZE);\t\t\t \\\n" - " \t__LASSERT(page_count(tage->page) > 0);\t\t \\\n" - " } while (0)\n" - " \n" - "diff --git a/drivers/staging/lustre/lnet/lnet/lib-md.c b/drivers/staging/lustre/lnet/lnet/lib-md.c\n" - "index c74514f99f90..75d31217bf92 100644\n" - "--- a/drivers/staging/lustre/lnet/lnet/lib-md.c\n" - "+++ b/drivers/staging/lustre/lnet/lnet/lib-md.c\n" - "@@ -139,7 +139,7 @@ lnet_md_build(lnet_libmd_t *lmd, lnet_md_t *umd, int unlink)\n" - " \t\tfor (i = 0; i < (int)niov; i++) {\n" - " \t\t\t/* We take the page pointer on trust */\n" - " \t\t\tif (lmd->md_iov.kiov[i].kiov_offset +\n" - "-\t\t\t lmd->md_iov.kiov[i].kiov_len > PAGE_CACHE_SIZE)\n" - "+\t\t\t lmd->md_iov.kiov[i].kiov_len > PAGE_SIZE)\n" - " \t\t\t\treturn -EINVAL; /* invalid length */\n" - " \n" - " \t\t\ttotal_length += lmd->md_iov.kiov[i].kiov_len;\n" - "diff --git a/drivers/staging/lustre/lnet/lnet/lib-move.c b/drivers/staging/lustre/lnet/lnet/lib-move.c\n" - "index 0009a8de77d5..f19aa9320e34 100644\n" - "--- a/drivers/staging/lustre/lnet/lnet/lib-move.c\n" - "+++ b/drivers/staging/lustre/lnet/lnet/lib-move.c\n" - "@@ -549,12 +549,12 @@ lnet_extract_kiov(int dst_niov, lnet_kiov_t *dst,\n" - " \t\tif (len <= frag_len) {\n" - " \t\t\tdst->kiov_len = len;\n" - " \t\t\tLASSERT(dst->kiov_offset + dst->kiov_len\n" - "-\t\t\t\t\t<= PAGE_CACHE_SIZE);\n" - "+\t\t\t\t\t<= PAGE_SIZE);\n" - " \t\t\treturn niov;\n" - " \t\t}\n" - " \n" - " \t\tdst->kiov_len = frag_len;\n" - "-\t\tLASSERT(dst->kiov_offset + dst->kiov_len <= PAGE_CACHE_SIZE);\n" - "+\t\tLASSERT(dst->kiov_offset + dst->kiov_len <= PAGE_SIZE);\n" - " \n" - " \t\tlen -= frag_len;\n" - " \t\tdst++;\n" - "@@ -887,7 +887,7 @@ lnet_msg2bufpool(lnet_msg_t *msg)\n" - " \trbp = &the_lnet.ln_rtrpools[cpt][0];\n" - " \n" - " \tLASSERT(msg->msg_len <= LNET_MTU);\n" - "-\twhile (msg->msg_len > (unsigned int)rbp->rbp_npages * PAGE_CACHE_SIZE) {\n" - "+\twhile (msg->msg_len > (unsigned int)rbp->rbp_npages * PAGE_SIZE) {\n" - " \t\trbp++;\n" - " \t\tLASSERT(rbp < &the_lnet.ln_rtrpools[cpt][LNET_NRBPOOLS]);\n" - " \t}\n" - "diff --git a/drivers/staging/lustre/lnet/lnet/lib-socket.c b/drivers/staging/lustre/lnet/lnet/lib-socket.c\n" - "index cc0c2753dd63..891fd59401d7 100644\n" - "--- a/drivers/staging/lustre/lnet/lnet/lib-socket.c\n" - "+++ b/drivers/staging/lustre/lnet/lnet/lib-socket.c\n" - "@@ -166,9 +166,9 @@ lnet_ipif_enumerate(char ***namesp)\n" - " \tnalloc = 16;\t/* first guess at max interfaces */\n" - " \ttoobig = 0;\n" - " \tfor (;;) {\n" - "-\t\tif (nalloc * sizeof(*ifr) > PAGE_CACHE_SIZE) {\n" - "+\t\tif (nalloc * sizeof(*ifr) > PAGE_SIZE) {\n" - " \t\t\ttoobig = 1;\n" - "-\t\t\tnalloc = PAGE_CACHE_SIZE / sizeof(*ifr);\n" - "+\t\t\tnalloc = PAGE_SIZE / sizeof(*ifr);\n" - " \t\t\tCWARN(\"Too many interfaces: only enumerating first %d\\n\",\n" - " \t\t\t nalloc);\n" - " \t\t}\n" - "diff --git a/drivers/staging/lustre/lnet/lnet/router.c b/drivers/staging/lustre/lnet/lnet/router.c\n" - "index 61459cf9d58f..b01dc424c514 100644\n" - "--- a/drivers/staging/lustre/lnet/lnet/router.c\n" - "+++ b/drivers/staging/lustre/lnet/lnet/router.c\n" - "@@ -27,8 +27,8 @@\n" - " #define LNET_NRB_SMALL_PAGES\t1\n" - " #define LNET_NRB_LARGE_MIN\t256\t/* min value for each CPT */\n" - " #define LNET_NRB_LARGE\t\t(LNET_NRB_LARGE_MIN * 4)\n" - "-#define LNET_NRB_LARGE_PAGES ((LNET_MTU + PAGE_CACHE_SIZE - 1) >> \\\n" - "-\t\t\t\t PAGE_CACHE_SHIFT)\n" - "+#define LNET_NRB_LARGE_PAGES ((LNET_MTU + PAGE_SIZE - 1) >> \\\n" - "+\t\t\t\t PAGE_SHIFT)\n" - " \n" - " static char *forwarding = \"\";\n" - " module_param(forwarding, charp, 0444);\n" - "@@ -1338,7 +1338,7 @@ lnet_new_rtrbuf(lnet_rtrbufpool_t *rbp, int cpt)\n" - " \t\t\treturn NULL;\n" - " \t\t}\n" - " \n" - "-\t\trb->rb_kiov[i].kiov_len = PAGE_CACHE_SIZE;\n" - "+\t\trb->rb_kiov[i].kiov_len = PAGE_SIZE;\n" - " \t\trb->rb_kiov[i].kiov_offset = 0;\n" - " \t\trb->rb_kiov[i].kiov_page = page;\n" - " \t}\n" - "diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c\n" - "index eebc92412061..dcb6e506f592 100644\n" - "--- a/drivers/staging/lustre/lnet/selftest/brw_test.c\n" - "+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c\n" - "@@ -90,7 +90,7 @@ brw_client_init(sfw_test_instance_t *tsi)\n" - " \t\t * NB: this is not going to work for variable page size,\n" - " \t\t * but we have to keep it for compatibility\n" - " \t\t */\n" - "-\t\tlen = npg * PAGE_CACHE_SIZE;\n" - "+\t\tlen = npg * PAGE_SIZE;\n" - " \n" - " \t} else {\n" - " \t\ttest_bulk_req_v1_t *breq = &tsi->tsi_u.bulk_v1;\n" - "@@ -104,7 +104,7 @@ brw_client_init(sfw_test_instance_t *tsi)\n" - " \t\topc = breq->blk_opc;\n" - " \t\tflags = breq->blk_flags;\n" - " \t\tlen = breq->blk_len;\n" - "-\t\tnpg = (len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "+\t\tnpg = (len + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \t}\n" - " \n" - " \tif (npg > LNET_MAX_IOV || npg <= 0)\n" - "@@ -167,13 +167,13 @@ brw_fill_page(struct page *pg, int pattern, __u64 magic)\n" - " \n" - " \tif (pattern == LST_BRW_CHECK_SIMPLE) {\n" - " \t\tmemcpy(addr, &magic, BRW_MSIZE);\n" - "-\t\taddr += PAGE_CACHE_SIZE - BRW_MSIZE;\n" - "+\t\taddr += PAGE_SIZE - BRW_MSIZE;\n" - " \t\tmemcpy(addr, &magic, BRW_MSIZE);\n" - " \t\treturn;\n" - " \t}\n" - " \n" - " \tif (pattern == LST_BRW_CHECK_FULL) {\n" - "-\t\tfor (i = 0; i < PAGE_CACHE_SIZE / BRW_MSIZE; i++)\n" - "+\t\tfor (i = 0; i < PAGE_SIZE / BRW_MSIZE; i++)\n" - " \t\t\tmemcpy(addr + i * BRW_MSIZE, &magic, BRW_MSIZE);\n" - " \t\treturn;\n" - " \t}\n" - "@@ -198,7 +198,7 @@ brw_check_page(struct page *pg, int pattern, __u64 magic)\n" - " \t\tif (data != magic)\n" - " \t\t\tgoto bad_data;\n" - " \n" - "-\t\taddr += PAGE_CACHE_SIZE - BRW_MSIZE;\n" - "+\t\taddr += PAGE_SIZE - BRW_MSIZE;\n" - " \t\tdata = *((__u64 *)addr);\n" - " \t\tif (data != magic)\n" - " \t\t\tgoto bad_data;\n" - "@@ -207,7 +207,7 @@ brw_check_page(struct page *pg, int pattern, __u64 magic)\n" - " \t}\n" - " \n" - " \tif (pattern == LST_BRW_CHECK_FULL) {\n" - "-\t\tfor (i = 0; i < PAGE_CACHE_SIZE / BRW_MSIZE; i++) {\n" - "+\t\tfor (i = 0; i < PAGE_SIZE / BRW_MSIZE; i++) {\n" - " \t\t\tdata = *(((__u64 *)addr) + i);\n" - " \t\t\tif (data != magic)\n" - " \t\t\t\tgoto bad_data;\n" - "@@ -278,7 +278,7 @@ brw_client_prep_rpc(sfw_test_unit_t *tsu,\n" - " \t\topc = breq->blk_opc;\n" - " \t\tflags = breq->blk_flags;\n" - " \t\tnpg = breq->blk_npg;\n" - "-\t\tlen = npg * PAGE_CACHE_SIZE;\n" - "+\t\tlen = npg * PAGE_SIZE;\n" - " \n" - " \t} else {\n" - " \t\ttest_bulk_req_v1_t *breq = &tsi->tsi_u.bulk_v1;\n" - "@@ -292,7 +292,7 @@ brw_client_prep_rpc(sfw_test_unit_t *tsu,\n" - " \t\topc = breq->blk_opc;\n" - " \t\tflags = breq->blk_flags;\n" - " \t\tlen = breq->blk_len;\n" - "-\t\tnpg = (len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "+\t\tnpg = (len + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \t}\n" - " \n" - " \trc = sfw_create_test_rpc(tsu, dest, sn->sn_features, npg, len, &rpc);\n" - "@@ -463,10 +463,10 @@ brw_server_handle(struct srpc_server_rpc *rpc)\n" - " \t\t\treply->brw_status = EINVAL;\n" - " \t\t\treturn 0;\n" - " \t\t}\n" - "-\t\tnpg = reqst->brw_len >> PAGE_CACHE_SHIFT;\n" - "+\t\tnpg = reqst->brw_len >> PAGE_SHIFT;\n" - " \n" - " \t} else {\n" - "-\t\tnpg = (reqst->brw_len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "+\t\tnpg = (reqst->brw_len + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \t}\n" - " \n" - " \treplymsg->msg_ses_feats = reqstmsg->msg_ses_feats;\n" - "diff --git a/drivers/staging/lustre/lnet/selftest/conctl.c b/drivers/staging/lustre/lnet/selftest/conctl.c\n" - "index 5c7cb72eac9a..79ee6c0bf7c1 100644\n" - "--- a/drivers/staging/lustre/lnet/selftest/conctl.c\n" - "+++ b/drivers/staging/lustre/lnet/selftest/conctl.c\n" - "@@ -743,7 +743,7 @@ static int lst_test_add_ioctl(lstio_test_args_t *args)\n" - " \tif (args->lstio_tes_param &&\n" - " \t (args->lstio_tes_param_len <= 0 ||\n" - " \t args->lstio_tes_param_len >\n" - "-\t PAGE_CACHE_SIZE - sizeof(lstcon_test_t)))\n" - "+\t PAGE_SIZE - sizeof(lstcon_test_t)))\n" - " \t\treturn -EINVAL;\n" - " \n" - " \tLIBCFS_ALLOC(batch_name, args->lstio_tes_bat_nmlen + 1);\n" - "@@ -819,7 +819,7 @@ lstcon_ioctl_entry(unsigned int cmd, struct libcfs_ioctl_hdr *hdr)\n" - " \n" - " \topc = data->ioc_u32[0];\n" - " \n" - "-\tif (data->ioc_plen1 > PAGE_CACHE_SIZE)\n" - "+\tif (data->ioc_plen1 > PAGE_SIZE)\n" - " \t\treturn -EINVAL;\n" - " \n" - " \tLIBCFS_ALLOC(buf, data->ioc_plen1);\n" - "diff --git a/drivers/staging/lustre/lnet/selftest/conrpc.c b/drivers/staging/lustre/lnet/selftest/conrpc.c\n" - "index bcd78888f9cc..35a227d0c657 100644\n" - "--- a/drivers/staging/lustre/lnet/selftest/conrpc.c\n" - "+++ b/drivers/staging/lustre/lnet/selftest/conrpc.c\n" - "@@ -786,8 +786,8 @@ lstcon_bulkrpc_v0_prep(lst_test_bulk_param_t *param, srpc_test_reqst_t *req)\n" - " \ttest_bulk_req_t *brq = &req->tsr_u.bulk_v0;\n" - " \n" - " \tbrq->blk_opc = param->blk_opc;\n" - "-\tbrq->blk_npg = (param->blk_size + PAGE_CACHE_SIZE - 1) /\n" - "-\t\t\tPAGE_CACHE_SIZE;\n" - "+\tbrq->blk_npg = (param->blk_size + PAGE_SIZE - 1) /\n" - "+\t\t\tPAGE_SIZE;\n" - " \tbrq->blk_flags = param->blk_flags;\n" - " \n" - " \treturn 0;\n" - "@@ -822,7 +822,7 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, unsigned feats,\n" - " \tif (transop == LST_TRANS_TSBCLIADD) {\n" - " \t\tnpg = sfw_id_pages(test->tes_span);\n" - " \t\tnob = !(feats & LST_FEAT_BULK_LEN) ?\n" - "-\t\t npg * PAGE_CACHE_SIZE :\n" - "+\t\t npg * PAGE_SIZE :\n" - " \t\t sizeof(lnet_process_id_packed_t) * test->tes_span;\n" - " \t}\n" - " \n" - "@@ -851,8 +851,8 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, unsigned feats,\n" - " \t\t\tLASSERT(nob > 0);\n" - " \n" - " \t\t\tlen = !(feats & LST_FEAT_BULK_LEN) ?\n" - "-\t\t\t PAGE_CACHE_SIZE :\n" - "-\t\t\t min_t(int, nob, PAGE_CACHE_SIZE);\n" - "+\t\t\t PAGE_SIZE :\n" - "+\t\t\t min_t(int, nob, PAGE_SIZE);\n" - " \t\t\tnob -= len;\n" - " \n" - " \t\t\tbulk->bk_iovs[i].kiov_offset = 0;\n" - "diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c\n" - "index 926c3970c498..e2c532399366 100644\n" - "--- a/drivers/staging/lustre/lnet/selftest/framework.c\n" - "+++ b/drivers/staging/lustre/lnet/selftest/framework.c\n" - "@@ -1161,7 +1161,7 @@ sfw_add_test(struct srpc_server_rpc *rpc)\n" - " \t\tint len;\n" - " \n" - " \t\tif (!(sn->sn_features & LST_FEAT_BULK_LEN)) {\n" - "-\t\t\tlen = npg * PAGE_CACHE_SIZE;\n" - "+\t\t\tlen = npg * PAGE_SIZE;\n" - " \n" - " \t\t} else {\n" - " \t\t\tlen = sizeof(lnet_process_id_packed_t) *\n" - "diff --git a/drivers/staging/lustre/lnet/selftest/rpc.c b/drivers/staging/lustre/lnet/selftest/rpc.c\n" - "index 69be7d6f48fa..7d7748d96332 100644\n" - "--- a/drivers/staging/lustre/lnet/selftest/rpc.c\n" - "+++ b/drivers/staging/lustre/lnet/selftest/rpc.c\n" - "@@ -90,7 +90,7 @@ void srpc_set_counters(const srpc_counters_t *cnt)\n" - " static int\n" - " srpc_add_bulk_page(srpc_bulk_t *bk, struct page *pg, int i, int nob)\n" - " {\n" - "-\tnob = min_t(int, nob, PAGE_CACHE_SIZE);\n" - "+\tnob = min_t(int, nob, PAGE_SIZE);\n" - " \n" - " \tLASSERT(nob > 0);\n" - " \tLASSERT(i >= 0 && i < bk->bk_niov);\n" - "diff --git a/drivers/staging/lustre/lnet/selftest/selftest.h b/drivers/staging/lustre/lnet/selftest/selftest.h\n" - "index 288522d4d7b9..c85b52e2da13 100644\n" - "--- a/drivers/staging/lustre/lnet/selftest/selftest.h\n" - "+++ b/drivers/staging/lustre/lnet/selftest/selftest.h\n" - "@@ -390,10 +390,10 @@ typedef struct sfw_test_instance {\n" - " \t} tsi_u;\n" - " } sfw_test_instance_t;\n" - " \n" - "-/* XXX: trailing (PAGE_CACHE_SIZE % sizeof(lnet_process_id_t)) bytes at\n" - "+/* XXX: trailing (PAGE_SIZE % sizeof(lnet_process_id_t)) bytes at\n" - " * the end of pages are not used */\n" - " #define SFW_MAX_CONCUR\t LST_MAX_CONCUR\n" - "-#define SFW_ID_PER_PAGE (PAGE_CACHE_SIZE / sizeof(lnet_process_id_packed_t))\n" - "+#define SFW_ID_PER_PAGE (PAGE_SIZE / sizeof(lnet_process_id_packed_t))\n" - " #define SFW_MAX_NDESTS\t (LNET_MAX_IOV * SFW_ID_PER_PAGE)\n" - " #define sfw_id_pages(n) (((n) + SFW_ID_PER_PAGE - 1) / SFW_ID_PER_PAGE)\n" - " \n" - "diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h b/drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h\n" - "index 33e0b99e1fb4..c6c7f54637fb 100644\n" - "--- a/drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h\n" - "+++ b/drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h\n" - "@@ -52,7 +52,7 @@ truncate_complete_page(struct address_space *mapping, struct page *page)\n" - " \t\treturn;\n" - " \n" - " \tif (PagePrivate(page))\n" - "-\t\tpage->mapping->a_ops->invalidatepage(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\tpage->mapping->a_ops->invalidatepage(page, 0, PAGE_SIZE);\n" - " \n" - " \tcancel_dirty_page(page);\n" - " \tClearPageMappedToDisk(page);\n" - "diff --git a/drivers/staging/lustre/lustre/include/lu_object.h b/drivers/staging/lustre/lustre/include/lu_object.h\n" - "index b5088b13a305..242bb1ef6245 100644\n" - "--- a/drivers/staging/lustre/lustre/include/lu_object.h\n" - "+++ b/drivers/staging/lustre/lustre/include/lu_object.h\n" - "@@ -1118,7 +1118,7 @@ struct lu_context_key {\n" - " \t{\t\t\t\t\t\t\t \\\n" - " \t\ttype *value;\t\t\t\t \\\n" - " \t\t\t\t\t\t\t\t \\\n" - "-\t\tCLASSERT(PAGE_CACHE_SIZE >= sizeof (*value)); \\\n" - "+\t\tCLASSERT(PAGE_SIZE >= sizeof (*value)); \\\n" - " \t\t\t\t\t\t\t\t \\\n" - " \t\tvalue = kzalloc(sizeof(*value), GFP_NOFS);\t\\\n" - " \t\tif (!value)\t\t\t\t\\\n" - "diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h\n" - "index da8bc6eadd13..5aae1d06a5fa 100644\n" - "--- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h\n" - "+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h\n" - "@@ -1022,16 +1022,16 @@ static inline int lu_dirent_size(struct lu_dirent *ent)\n" - " * MDS_READPAGE page size\n" - " *\n" - " * This is the directory page size packed in MDS_READPAGE RPC.\n" - "- * It's different than PAGE_CACHE_SIZE because the client needs to\n" - "+ * It's different than PAGE_SIZE because the client needs to\n" - " * access the struct lu_dirpage header packed at the beginning of\n" - " * the \"page\" and without this there isn't any way to know find the\n" - "- * lu_dirpage header is if client and server PAGE_CACHE_SIZE differ.\n" - "+ * lu_dirpage header is if client and server PAGE_SIZE differ.\n" - " */\n" - " #define LU_PAGE_SHIFT 12\n" - " #define LU_PAGE_SIZE (1UL << LU_PAGE_SHIFT)\n" - " #define LU_PAGE_MASK (~(LU_PAGE_SIZE - 1))\n" - " \n" - "-#define LU_PAGE_COUNT (1 << (PAGE_CACHE_SHIFT - LU_PAGE_SHIFT))\n" - "+#define LU_PAGE_COUNT (1 << (PAGE_SHIFT - LU_PAGE_SHIFT))\n" - " \n" - " /** @} lu_dir */\n" - " \n" - "diff --git a/drivers/staging/lustre/lustre/include/lustre_mdc.h b/drivers/staging/lustre/lustre/include/lustre_mdc.h\n" - "index df94f9f3bef2..af77eb359c43 100644\n" - "--- a/drivers/staging/lustre/lustre/include/lustre_mdc.h\n" - "+++ b/drivers/staging/lustre/lustre/include/lustre_mdc.h\n" - "@@ -155,12 +155,12 @@ static inline void mdc_update_max_ea_from_body(struct obd_export *exp,\n" - " \t\tif (cli->cl_max_mds_easize < body->max_mdsize) {\n" - " \t\t\tcli->cl_max_mds_easize = body->max_mdsize;\n" - " \t\t\tcli->cl_default_mds_easize =\n" - "-\t\t\t min_t(__u32, body->max_mdsize, PAGE_CACHE_SIZE);\n" - "+\t\t\t min_t(__u32, body->max_mdsize, PAGE_SIZE);\n" - " \t\t}\n" - " \t\tif (cli->cl_max_mds_cookiesize < body->max_cookiesize) {\n" - " \t\t\tcli->cl_max_mds_cookiesize = body->max_cookiesize;\n" - " \t\t\tcli->cl_default_mds_cookiesize =\n" - "-\t\t\t min_t(__u32, body->max_cookiesize, PAGE_CACHE_SIZE);\n" - "+\t\t\t min_t(__u32, body->max_cookiesize, PAGE_SIZE);\n" - " \t\t}\n" - " \t}\n" - " }\n" - "diff --git a/drivers/staging/lustre/lustre/include/lustre_net.h b/drivers/staging/lustre/lustre/include/lustre_net.h\n" - "index 4fa1a18b7d15..69586a522eb7 100644\n" - "--- a/drivers/staging/lustre/lustre/include/lustre_net.h\n" - "+++ b/drivers/staging/lustre/lustre/include/lustre_net.h\n" - "@@ -99,21 +99,21 @@\n" - " */\n" - " #define PTLRPC_MAX_BRW_BITS\t(LNET_MTU_BITS + PTLRPC_BULK_OPS_BITS)\n" - " #define PTLRPC_MAX_BRW_SIZE\t(1 << PTLRPC_MAX_BRW_BITS)\n" - "-#define PTLRPC_MAX_BRW_PAGES\t(PTLRPC_MAX_BRW_SIZE >> PAGE_CACHE_SHIFT)\n" - "+#define PTLRPC_MAX_BRW_PAGES\t(PTLRPC_MAX_BRW_SIZE >> PAGE_SHIFT)\n" - " \n" - " #define ONE_MB_BRW_SIZE\t\t(1 << LNET_MTU_BITS)\n" - " #define MD_MAX_BRW_SIZE\t\t(1 << LNET_MTU_BITS)\n" - "-#define MD_MAX_BRW_PAGES\t(MD_MAX_BRW_SIZE >> PAGE_CACHE_SHIFT)\n" - "+#define MD_MAX_BRW_PAGES\t(MD_MAX_BRW_SIZE >> PAGE_SHIFT)\n" - " #define DT_MAX_BRW_SIZE\t\tPTLRPC_MAX_BRW_SIZE\n" - "-#define DT_MAX_BRW_PAGES\t(DT_MAX_BRW_SIZE >> PAGE_CACHE_SHIFT)\n" - "+#define DT_MAX_BRW_PAGES\t(DT_MAX_BRW_SIZE >> PAGE_SHIFT)\n" - " #define OFD_MAX_BRW_SIZE\t(1 << LNET_MTU_BITS)\n" - " \n" - " /* When PAGE_SIZE is a constant, we can check our arithmetic here with cpp! */\n" - " # if ((PTLRPC_MAX_BRW_PAGES & (PTLRPC_MAX_BRW_PAGES - 1)) != 0)\n" - " # error \"PTLRPC_MAX_BRW_PAGES isn't a power of two\"\n" - " # endif\n" - "-# if (PTLRPC_MAX_BRW_SIZE != (PTLRPC_MAX_BRW_PAGES * PAGE_CACHE_SIZE))\n" - "-# error \"PTLRPC_MAX_BRW_SIZE isn't PTLRPC_MAX_BRW_PAGES * PAGE_CACHE_SIZE\"\n" - "+# if (PTLRPC_MAX_BRW_SIZE != (PTLRPC_MAX_BRW_PAGES * PAGE_SIZE))\n" - "+# error \"PTLRPC_MAX_BRW_SIZE isn't PTLRPC_MAX_BRW_PAGES * PAGE_SIZE\"\n" - " # endif\n" - " # if (PTLRPC_MAX_BRW_SIZE > LNET_MTU * PTLRPC_BULK_OPS_COUNT)\n" - " # error \"PTLRPC_MAX_BRW_SIZE too big\"\n" - "diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h\n" - "index 4a0f2e8b19f6..4264d97650ec 100644\n" - "--- a/drivers/staging/lustre/lustre/include/obd.h\n" - "+++ b/drivers/staging/lustre/lustre/include/obd.h\n" - "@@ -272,7 +272,7 @@ struct client_obd {\n" - " \tint\t\t cl_grant_shrink_interval; /* seconds */\n" - " \n" - " \t/* A chunk is an optimal size used by osc_extent to determine\n" - "-\t * the extent size. A chunk is max(PAGE_CACHE_SIZE, OST block size)\n" - "+\t * the extent size. A chunk is max(PAGE_SIZE, OST block size)\n" - " \t */\n" - " \tint\t\t cl_chunkbits;\n" - " \tint\t\t cl_chunk;\n" - "@@ -1318,7 +1318,7 @@ bad_format:\n" - " \n" - " static inline int cli_brw_size(struct obd_device *obd)\n" - " {\n" - "-\treturn obd->u.cli.cl_max_pages_per_rpc << PAGE_CACHE_SHIFT;\n" - "+\treturn obd->u.cli.cl_max_pages_per_rpc << PAGE_SHIFT;\n" - " }\n" - " \n" - " #endif /* __OBD_H */\n" - "diff --git a/drivers/staging/lustre/lustre/include/obd_support.h b/drivers/staging/lustre/lustre/include/obd_support.h\n" - "index 225262fa67b6..f8ee3a3254ba 100644\n" - "--- a/drivers/staging/lustre/lustre/include/obd_support.h\n" - "+++ b/drivers/staging/lustre/lustre/include/obd_support.h\n" - "@@ -500,7 +500,7 @@ extern char obd_jobid_var[];\n" - " \n" - " #ifdef POISON_BULK\n" - " #define POISON_PAGE(page, val) do {\t\t \\\n" - "-\tmemset(kmap(page), val, PAGE_CACHE_SIZE); \\\n" - "+\tmemset(kmap(page), val, PAGE_SIZE); \\\n" - " \tkunmap(page);\t\t\t\t \\\n" - " } while (0)\n" - " #else\n" - "diff --git a/drivers/staging/lustre/lustre/lclient/lcommon_cl.c b/drivers/staging/lustre/lustre/lclient/lcommon_cl.c\n" - "index aced41ab93a1..96141d17d07f 100644\n" - "--- a/drivers/staging/lustre/lustre/lclient/lcommon_cl.c\n" - "+++ b/drivers/staging/lustre/lustre/lclient/lcommon_cl.c\n" - "@@ -758,9 +758,9 @@ int ccc_prep_size(const struct lu_env *env, struct cl_object *obj,\n" - " \t\t\t\t * --bug 17336\n" - " \t\t\t\t */\n" - " \t\t\t\tloff_t size = cl_isize_read(inode);\n" - "-\t\t\t\tloff_t cur_index = start >> PAGE_CACHE_SHIFT;\n" - "+\t\t\t\tloff_t cur_index = start >> PAGE_SHIFT;\n" - " \t\t\t\tloff_t size_index = (size - 1) >>\n" - "-\t\t\t\t\t\t PAGE_CACHE_SHIFT;\n" - "+\t\t\t\t\t\t PAGE_SHIFT;\n" - " \n" - " \t\t\t\tif ((size == 0 && cur_index != 0) ||\n" - " \t\t\t\t size_index < cur_index)\n" - "diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c\n" - "index b586d5a88d00..7dd7df59aa1f 100644\n" - "--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c\n" - "+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c\n" - "@@ -307,8 +307,8 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)\n" - " \tcli->cl_avail_grant = 0;\n" - " \t/* FIXME: Should limit this for the sum of all cl_dirty_max. */\n" - " \tcli->cl_dirty_max = OSC_MAX_DIRTY_DEFAULT * 1024 * 1024;\n" - "-\tif (cli->cl_dirty_max >> PAGE_CACHE_SHIFT > totalram_pages / 8)\n" - "-\t\tcli->cl_dirty_max = totalram_pages << (PAGE_CACHE_SHIFT - 3);\n" - "+\tif (cli->cl_dirty_max >> PAGE_SHIFT > totalram_pages / 8)\n" - "+\t\tcli->cl_dirty_max = totalram_pages << (PAGE_SHIFT - 3);\n" - " \tINIT_LIST_HEAD(&cli->cl_cache_waiters);\n" - " \tINIT_LIST_HEAD(&cli->cl_loi_ready_list);\n" - " \tINIT_LIST_HEAD(&cli->cl_loi_hp_ready_list);\n" - "@@ -353,15 +353,15 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)\n" - " \t * In the future this should likely be increased. LU-1431\n" - " \t */\n" - " \tcli->cl_max_pages_per_rpc = min_t(int, PTLRPC_MAX_BRW_PAGES,\n" - "-\t\t\t\t\t LNET_MTU >> PAGE_CACHE_SHIFT);\n" - "+\t\t\t\t\t LNET_MTU >> PAGE_SHIFT);\n" - " \n" - " \tif (!strcmp(name, LUSTRE_MDC_NAME)) {\n" - " \t\tcli->cl_max_rpcs_in_flight = MDC_MAX_RIF_DEFAULT;\n" - "-\t} else if (totalram_pages >> (20 - PAGE_CACHE_SHIFT) <= 128 /* MB */) {\n" - "+\t} else if (totalram_pages >> (20 - PAGE_SHIFT) <= 128 /* MB */) {\n" - " \t\tcli->cl_max_rpcs_in_flight = 2;\n" - "-\t} else if (totalram_pages >> (20 - PAGE_CACHE_SHIFT) <= 256 /* MB */) {\n" - "+\t} else if (totalram_pages >> (20 - PAGE_SHIFT) <= 256 /* MB */) {\n" - " \t\tcli->cl_max_rpcs_in_flight = 3;\n" - "-\t} else if (totalram_pages >> (20 - PAGE_CACHE_SHIFT) <= 512 /* MB */) {\n" - "+\t} else if (totalram_pages >> (20 - PAGE_SHIFT) <= 512 /* MB */) {\n" - " \t\tcli->cl_max_rpcs_in_flight = 4;\n" - " \t} else {\n" - " \t\tcli->cl_max_rpcs_in_flight = OSC_MAX_RIF_DEFAULT;\n" - "diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c\n" - "index 3e937b050203..b913ba9cf97c 100644\n" - "--- a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c\n" - "+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c\n" - "@@ -107,7 +107,7 @@\n" - " /*\n" - " * 50 ldlm locks for 1MB of RAM.\n" - " */\n" - "-#define LDLM_POOL_HOST_L ((NUM_CACHEPAGES >> (20 - PAGE_CACHE_SHIFT)) * 50)\n" - "+#define LDLM_POOL_HOST_L ((NUM_CACHEPAGES >> (20 - PAGE_SHIFT)) * 50)\n" - " \n" - " /*\n" - " * Maximal possible grant step plan in %.\n" - "diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c\n" - "index c7904a96f9af..74e193e52cd6 100644\n" - "--- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c\n" - "+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c\n" - "@@ -546,7 +546,7 @@ static inline int ldlm_req_handles_avail(int req_size, int off)\n" - " {\n" - " \tint avail;\n" - " \n" - "-\tavail = min_t(int, LDLM_MAXREQSIZE, PAGE_CACHE_SIZE - 512) - req_size;\n" - "+\tavail = min_t(int, LDLM_MAXREQSIZE, PAGE_SIZE - 512) - req_size;\n" - " \tif (likely(avail >= 0))\n" - " \t\tavail /= (int)sizeof(struct lustre_handle);\n" - " \telse\n" - "diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c\n" - "index 4e0a3e583330..ed66b844aa5d 100644\n" - "--- a/drivers/staging/lustre/lustre/llite/dir.c\n" - "+++ b/drivers/staging/lustre/lustre/llite/dir.c\n" - "@@ -134,7 +134,7 @@\n" - " * a header lu_dirpage which describes the start/end hash, and whether this\n" - " * page is empty (contains no dir entry) or hash collide with next page.\n" - " * After client receives reply, several pages will be integrated into dir page\n" - "- * in PAGE_CACHE_SIZE (if PAGE_CACHE_SIZE greater than LU_PAGE_SIZE), and the\n" - "+ * in PAGE_SIZE (if PAGE_SIZE greater than LU_PAGE_SIZE), and the\n" - " * lu_dirpage for this integrated page will be adjusted. See\n" - " * lmv_adjust_dirpages().\n" - " *\n" - "@@ -153,7 +153,7 @@ static int ll_dir_filler(void *_hash, struct page *page0)\n" - " \tstruct page **page_pool;\n" - " \tstruct page *page;\n" - " \tstruct lu_dirpage *dp;\n" - "-\tint max_pages = ll_i2sbi(inode)->ll_md_brw_size >> PAGE_CACHE_SHIFT;\n" - "+\tint max_pages = ll_i2sbi(inode)->ll_md_brw_size >> PAGE_SHIFT;\n" - " \tint nrdpgs = 0; /* number of pages read actually */\n" - " \tint npages;\n" - " \tint i;\n" - "@@ -193,8 +193,8 @@ static int ll_dir_filler(void *_hash, struct page *page0)\n" - " \t\tif (body->valid & OBD_MD_FLSIZE)\n" - " \t\t\tcl_isize_write(inode, body->size);\n" - " \n" - "-\t\tnrdpgs = (request->rq_bulk->bd_nob_transferred+PAGE_CACHE_SIZE-1)\n" - "-\t\t\t >> PAGE_CACHE_SHIFT;\n" - "+\t\tnrdpgs = (request->rq_bulk->bd_nob_transferred+PAGE_SIZE-1)\n" - "+\t\t\t >> PAGE_SHIFT;\n" - " \t\tSetPageUptodate(page0);\n" - " \t}\n" - " \tunlock_page(page0);\n" - "@@ -209,7 +209,7 @@ static int ll_dir_filler(void *_hash, struct page *page0)\n" - " \t\tpage = page_pool[i];\n" - " \n" - " \t\tif (rc < 0 || i >= nrdpgs) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tcontinue;\n" - " \t\t}\n" - " \n" - "@@ -230,7 +230,7 @@ static int ll_dir_filler(void *_hash, struct page *page0)\n" - " \t\t\tCDEBUG(D_VFSTRACE, \"page %lu add to page cache failed: %d\\n\",\n" - " \t\t\t offset, ret);\n" - " \t\t}\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \n" - " \tif (page_pool != &page0)\n" - "@@ -247,7 +247,7 @@ void ll_release_page(struct page *page, int remove)\n" - " \t\t\ttruncate_complete_page(page->mapping, page);\n" - " \t\tunlock_page(page);\n" - " \t}\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " /*\n" - "@@ -273,7 +273,7 @@ static struct page *ll_dir_page_locate(struct inode *dir, __u64 *hash,\n" - " \tif (found > 0 && !radix_tree_exceptional_entry(page)) {\n" - " \t\tstruct lu_dirpage *dp;\n" - " \n" - "-\t\tpage_cache_get(page);\n" - "+\t\tget_page(page);\n" - " \t\tspin_unlock_irq(&mapping->tree_lock);\n" - " \t\t/*\n" - " \t\t * In contrast to find_lock_page() we are sure that directory\n" - "@@ -313,7 +313,7 @@ static struct page *ll_dir_page_locate(struct inode *dir, __u64 *hash,\n" - " \t\t\t\tpage = NULL;\n" - " \t\t\t}\n" - " \t\t} else {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tpage = ERR_PTR(-EIO);\n" - " \t\t}\n" - " \n" - "@@ -1507,7 +1507,7 @@ skip_lmm:\n" - " \t\t\tst.st_gid = body->gid;\n" - " \t\t\tst.st_rdev = body->rdev;\n" - " \t\t\tst.st_size = body->size;\n" - "-\t\t\tst.st_blksize = PAGE_CACHE_SIZE;\n" - "+\t\t\tst.st_blksize = PAGE_SIZE;\n" - " \t\t\tst.st_blocks = body->blocks;\n" - " \t\t\tst.st_atime = body->atime;\n" - " \t\t\tst.st_mtime = body->mtime;\n" - "diff --git a/drivers/staging/lustre/lustre/llite/llite_internal.h b/drivers/staging/lustre/lustre/llite/llite_internal.h\n" - "index 973f5cdec192..5394365cc595 100644\n" - "--- a/drivers/staging/lustre/lustre/llite/llite_internal.h\n" - "+++ b/drivers/staging/lustre/lustre/llite/llite_internal.h\n" - "@@ -310,10 +310,10 @@ static inline struct ll_inode_info *ll_i2info(struct inode *inode)\n" - " /* default to about 40meg of readahead on a given system. That much tied\n" - " * up in 512k readahead requests serviced at 40ms each is about 1GB/s.\n" - " */\n" - "-#define SBI_DEFAULT_READAHEAD_MAX (40UL << (20 - PAGE_CACHE_SHIFT))\n" - "+#define SBI_DEFAULT_READAHEAD_MAX (40UL << (20 - PAGE_SHIFT))\n" - " \n" - " /* default to read-ahead full files smaller than 2MB on the second read */\n" - "-#define SBI_DEFAULT_READAHEAD_WHOLE_MAX (2UL << (20 - PAGE_CACHE_SHIFT))\n" - "+#define SBI_DEFAULT_READAHEAD_WHOLE_MAX (2UL << (20 - PAGE_SHIFT))\n" - " \n" - " enum ra_stat {\n" - " \tRA_STAT_HIT = 0,\n" - "@@ -975,13 +975,13 @@ struct vm_area_struct *our_vma(struct mm_struct *mm, unsigned long addr,\n" - " static inline void ll_invalidate_page(struct page *vmpage)\n" - " {\n" - " \tstruct address_space *mapping = vmpage->mapping;\n" - "-\tloff_t offset = vmpage->index << PAGE_CACHE_SHIFT;\n" - "+\tloff_t offset = vmpage->index << PAGE_SHIFT;\n" - " \n" - " \tLASSERT(PageLocked(vmpage));\n" - " \tif (!mapping)\n" - " \t\treturn;\n" - " \n" - "-\tll_teardown_mmaps(mapping, offset, offset + PAGE_CACHE_SIZE);\n" - "+\tll_teardown_mmaps(mapping, offset, offset + PAGE_SIZE);\n" - " \ttruncate_complete_page(mapping, vmpage);\n" - " }\n" - " \n" - "diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c\n" - "index 6d6bb33e3655..b57a992688a8 100644\n" - "--- a/drivers/staging/lustre/lustre/llite/llite_lib.c\n" - "+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c\n" - "@@ -85,7 +85,7 @@ static struct ll_sb_info *ll_init_sbi(struct super_block *sb)\n" - " \n" - " \tsi_meminfo(&si);\n" - " \tpages = si.totalram - si.totalhigh;\n" - "-\tif (pages >> (20 - PAGE_CACHE_SHIFT) < 512)\n" - "+\tif (pages >> (20 - PAGE_SHIFT) < 512)\n" - " \t\tlru_page_max = pages / 2;\n" - " \telse\n" - " \t\tlru_page_max = (pages / 4) * 3;\n" - "@@ -272,12 +272,12 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,\n" - " \t valid != CLIENT_CONNECT_MDT_REQD) {\n" - " \t\tchar *buf;\n" - " \n" - "-\t\tbuf = kzalloc(PAGE_CACHE_SIZE, GFP_KERNEL);\n" - "+\t\tbuf = kzalloc(PAGE_SIZE, GFP_KERNEL);\n" - " \t\tif (!buf) {\n" - " \t\t\terr = -ENOMEM;\n" - " \t\t\tgoto out_md_fid;\n" - " \t\t}\n" - "-\t\tobd_connect_flags2str(buf, PAGE_CACHE_SIZE,\n" - "+\t\tobd_connect_flags2str(buf, PAGE_SIZE,\n" - " \t\t\t\t valid ^ CLIENT_CONNECT_MDT_REQD, \",\");\n" - " \t\tLCONSOLE_ERROR_MSG(0x170, \"Server %s does not support feature(s) needed for correct operation of this client (%s). Please upgrade server or downgrade client.\\n\",\n" - " \t\t\t\t sbi->ll_md_exp->exp_obd->obd_name, buf);\n" - "@@ -335,7 +335,7 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,\n" - " \tif (data->ocd_connect_flags & OBD_CONNECT_BRW_SIZE)\n" - " \t\tsbi->ll_md_brw_size = data->ocd_brw_size;\n" - " \telse\n" - "-\t\tsbi->ll_md_brw_size = PAGE_CACHE_SIZE;\n" - "+\t\tsbi->ll_md_brw_size = PAGE_SIZE;\n" - " \n" - " \tif (data->ocd_connect_flags & OBD_CONNECT_LAYOUTLOCK) {\n" - " \t\tLCONSOLE_INFO(\"Layout lock feature supported.\\n\");\n" - "diff --git a/drivers/staging/lustre/lustre/llite/llite_mmap.c b/drivers/staging/lustre/lustre/llite/llite_mmap.c\n" - "index 69445a9f2011..5b484e62ffd0 100644\n" - "--- a/drivers/staging/lustre/lustre/llite/llite_mmap.c\n" - "+++ b/drivers/staging/lustre/lustre/llite/llite_mmap.c\n" - "@@ -58,7 +58,7 @@ void policy_from_vma(ldlm_policy_data_t *policy,\n" - " \t\t size_t count)\n" - " {\n" - " \tpolicy->l_extent.start = ((addr - vma->vm_start) & CFS_PAGE_MASK) +\n" - "-\t\t\t\t (vma->vm_pgoff << PAGE_CACHE_SHIFT);\n" - "+\t\t\t\t (vma->vm_pgoff << PAGE_SHIFT);\n" - " \tpolicy->l_extent.end = (policy->l_extent.start + count - 1) |\n" - " \t\t\t ~CFS_PAGE_MASK;\n" - " }\n" - "@@ -321,7 +321,7 @@ static int ll_fault0(struct vm_area_struct *vma, struct vm_fault *vmf)\n" - " \n" - " \t\tvmpage = vio->u.fault.ft_vmpage;\n" - " \t\tif (result != 0 && vmpage) {\n" - "-\t\t\tpage_cache_release(vmpage);\n" - "+\t\t\tput_page(vmpage);\n" - " \t\t\tvmf->page = NULL;\n" - " \t\t}\n" - " \t}\n" - "@@ -360,7 +360,7 @@ restart:\n" - " \t\tlock_page(vmpage);\n" - " \t\tif (unlikely(!vmpage->mapping)) { /* unlucky */\n" - " \t\t\tunlock_page(vmpage);\n" - "-\t\t\tpage_cache_release(vmpage);\n" - "+\t\t\tput_page(vmpage);\n" - " \t\t\tvmf->page = NULL;\n" - " \n" - " \t\t\tif (!printed && ++count > 16) {\n" - "@@ -457,7 +457,7 @@ int ll_teardown_mmaps(struct address_space *mapping, __u64 first, __u64 last)\n" - " \tLASSERTF(last > first, \"last %llu first %llu\\n\", last, first);\n" - " \tif (mapping_mapped(mapping)) {\n" - " \t\trc = 0;\n" - "-\t\tunmap_mapping_range(mapping, first + PAGE_CACHE_SIZE - 1,\n" - "+\t\tunmap_mapping_range(mapping, first + PAGE_SIZE - 1,\n" - " \t\t\t\t last - first + 1, 0);\n" - " \t}\n" - " \n" - "diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c\n" - "index b725fc16cf49..f169c0db63b4 100644\n" - "--- a/drivers/staging/lustre/lustre/llite/lloop.c\n" - "+++ b/drivers/staging/lustre/lustre/llite/lloop.c\n" - "@@ -218,7 +218,7 @@ static int do_bio_lustrebacked(struct lloop_device *lo, struct bio *head)\n" - " \t\toffset = (pgoff_t)(bio->bi_iter.bi_sector << 9) + lo->lo_offset;\n" - " \t\tbio_for_each_segment(bvec, bio, iter) {\n" - " \t\t\tBUG_ON(bvec.bv_offset != 0);\n" - "-\t\t\tBUG_ON(bvec.bv_len != PAGE_CACHE_SIZE);\n" - "+\t\t\tBUG_ON(bvec.bv_len != PAGE_SIZE);\n" - " \n" - " \t\t\tpages[page_count] = bvec.bv_page;\n" - " \t\t\toffsets[page_count] = offset;\n" - "@@ -232,7 +232,7 @@ static int do_bio_lustrebacked(struct lloop_device *lo, struct bio *head)\n" - " \t\t\t(rw == WRITE) ? LPROC_LL_BRW_WRITE : LPROC_LL_BRW_READ,\n" - " \t\t\tpage_count);\n" - " \n" - "-\tpvec->ldp_size = page_count << PAGE_CACHE_SHIFT;\n" - "+\tpvec->ldp_size = page_count << PAGE_SHIFT;\n" - " \tpvec->ldp_nr = page_count;\n" - " \n" - " \t/* FIXME: in ll_direct_rw_pages, it has to allocate many cl_page{}s to\n" - "@@ -507,7 +507,7 @@ static int loop_set_fd(struct lloop_device *lo, struct file *unused,\n" - " \n" - " \tset_device_ro(bdev, (lo_flags & LO_FLAGS_READ_ONLY) != 0);\n" - " \n" - "-\tlo->lo_blocksize = PAGE_CACHE_SIZE;\n" - "+\tlo->lo_blocksize = PAGE_SIZE;\n" - " \tlo->lo_device = bdev;\n" - " \tlo->lo_flags = lo_flags;\n" - " \tlo->lo_backing_file = file;\n" - "@@ -525,11 +525,11 @@ static int loop_set_fd(struct lloop_device *lo, struct file *unused,\n" - " \tlo->lo_queue->queuedata = lo;\n" - " \n" - " \t/* queue parameters */\n" - "-\tCLASSERT(PAGE_CACHE_SIZE < (1 << (sizeof(unsigned short) * 8)));\n" - "+\tCLASSERT(PAGE_SIZE < (1 << (sizeof(unsigned short) * 8)));\n" - " \tblk_queue_logical_block_size(lo->lo_queue,\n" - "-\t\t\t\t (unsigned short)PAGE_CACHE_SIZE);\n" - "+\t\t\t\t (unsigned short)PAGE_SIZE);\n" - " \tblk_queue_max_hw_sectors(lo->lo_queue,\n" - "-\t\t\t\t LLOOP_MAX_SEGMENTS << (PAGE_CACHE_SHIFT - 9));\n" - "+\t\t\t\t LLOOP_MAX_SEGMENTS << (PAGE_SHIFT - 9));\n" - " \tblk_queue_max_segments(lo->lo_queue, LLOOP_MAX_SEGMENTS);\n" - " \n" - " \tset_capacity(disks[lo->lo_number], size);\n" - "diff --git a/drivers/staging/lustre/lustre/llite/lproc_llite.c b/drivers/staging/lustre/lustre/llite/lproc_llite.c\n" - "index 45941a6600fe..27ab1261400e 100644\n" - "--- a/drivers/staging/lustre/lustre/llite/lproc_llite.c\n" - "+++ b/drivers/staging/lustre/lustre/llite/lproc_llite.c\n" - "@@ -233,7 +233,7 @@ static ssize_t max_read_ahead_mb_show(struct kobject *kobj,\n" - " \tpages_number = sbi->ll_ra_info.ra_max_pages;\n" - " \tspin_unlock(&sbi->ll_lock);\n" - " \n" - "-\tmult = 1 << (20 - PAGE_CACHE_SHIFT);\n" - "+\tmult = 1 << (20 - PAGE_SHIFT);\n" - " \treturn lprocfs_read_frac_helper(buf, PAGE_SIZE, pages_number, mult);\n" - " }\n" - " \n" - "@@ -251,12 +251,12 @@ static ssize_t max_read_ahead_mb_store(struct kobject *kobj,\n" - " \tif (rc)\n" - " \t\treturn rc;\n" - " \n" - "-\tpages_number *= 1 << (20 - PAGE_CACHE_SHIFT); /* MB -> pages */\n" - "+\tpages_number *= 1 << (20 - PAGE_SHIFT); /* MB -> pages */\n" - " \n" - " \tif (pages_number > totalram_pages / 2) {\n" - " \n" - " \t\tCERROR(\"can't set file readahead more than %lu MB\\n\",\n" - "-\t\t totalram_pages >> (20 - PAGE_CACHE_SHIFT + 1)); /*1/2 of RAM*/\n" - "+\t\t totalram_pages >> (20 - PAGE_SHIFT + 1)); /*1/2 of RAM*/\n" - " \t\treturn -ERANGE;\n" - " \t}\n" - " \n" - "@@ -281,7 +281,7 @@ static ssize_t max_read_ahead_per_file_mb_show(struct kobject *kobj,\n" - " \tpages_number = sbi->ll_ra_info.ra_max_pages_per_file;\n" - " \tspin_unlock(&sbi->ll_lock);\n" - " \n" - "-\tmult = 1 << (20 - PAGE_CACHE_SHIFT);\n" - "+\tmult = 1 << (20 - PAGE_SHIFT);\n" - " \treturn lprocfs_read_frac_helper(buf, PAGE_SIZE, pages_number, mult);\n" - " }\n" - " \n" - "@@ -326,7 +326,7 @@ static ssize_t max_read_ahead_whole_mb_show(struct kobject *kobj,\n" - " \tpages_number = sbi->ll_ra_info.ra_max_read_ahead_whole_pages;\n" - " \tspin_unlock(&sbi->ll_lock);\n" - " \n" - "-\tmult = 1 << (20 - PAGE_CACHE_SHIFT);\n" - "+\tmult = 1 << (20 - PAGE_SHIFT);\n" - " \treturn lprocfs_read_frac_helper(buf, PAGE_SIZE, pages_number, mult);\n" - " }\n" - " \n" - "@@ -349,7 +349,7 @@ static ssize_t max_read_ahead_whole_mb_store(struct kobject *kobj,\n" - " \t */\n" - " \tif (pages_number > sbi->ll_ra_info.ra_max_pages_per_file) {\n" - " \t\tCERROR(\"can't set max_read_ahead_whole_mb more than max_read_ahead_per_file_mb: %lu\\n\",\n" - "-\t\t sbi->ll_ra_info.ra_max_pages_per_file >> (20 - PAGE_CACHE_SHIFT));\n" - "+\t\t sbi->ll_ra_info.ra_max_pages_per_file >> (20 - PAGE_SHIFT));\n" - " \t\treturn -ERANGE;\n" - " \t}\n" - " \n" - "@@ -366,7 +366,7 @@ static int ll_max_cached_mb_seq_show(struct seq_file *m, void *v)\n" - " \tstruct super_block *sb = m->private;\n" - " \tstruct ll_sb_info *sbi = ll_s2sbi(sb);\n" - " \tstruct cl_client_cache *cache = &sbi->ll_cache;\n" - "-\tint shift = 20 - PAGE_CACHE_SHIFT;\n" - "+\tint shift = 20 - PAGE_SHIFT;\n" - " \tint max_cached_mb;\n" - " \tint unused_mb;\n" - " \n" - "@@ -405,7 +405,7 @@ static ssize_t ll_max_cached_mb_seq_write(struct file *file,\n" - " \t\treturn -EFAULT;\n" - " \tkernbuf[count] = 0;\n" - " \n" - "-\tmult = 1 << (20 - PAGE_CACHE_SHIFT);\n" - "+\tmult = 1 << (20 - PAGE_SHIFT);\n" - " \tbuffer += lprocfs_find_named_value(kernbuf, \"max_cached_mb:\", &count) -\n" - " \t\t kernbuf;\n" - " \trc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult);\n" - "@@ -415,7 +415,7 @@ static ssize_t ll_max_cached_mb_seq_write(struct file *file,\n" - " \tif (pages_number < 0 || pages_number > totalram_pages) {\n" - " \t\tCERROR(\"%s: can't set max cache more than %lu MB\\n\",\n" - " \t\t ll_get_fsname(sb, NULL, 0),\n" - "-\t\t totalram_pages >> (20 - PAGE_CACHE_SHIFT));\n" - "+\t\t totalram_pages >> (20 - PAGE_SHIFT));\n" - " \t\treturn -ERANGE;\n" - " \t}\n" - " \n" - "diff --git a/drivers/staging/lustre/lustre/llite/rw.c b/drivers/staging/lustre/lustre/llite/rw.c\n" - "index 34614acf3f8e..edab6c5b7e50 100644\n" - "--- a/drivers/staging/lustre/lustre/llite/rw.c\n" - "+++ b/drivers/staging/lustre/lustre/llite/rw.c\n" - "@@ -146,10 +146,10 @@ static struct ll_cl_context *ll_cl_init(struct file *file,\n" - " \t\t */\n" - " \t\tio->ci_lockreq = CILR_NEVER;\n" - " \n" - "-\t\tpos = vmpage->index << PAGE_CACHE_SHIFT;\n" - "+\t\tpos = vmpage->index << PAGE_SHIFT;\n" - " \n" - " \t\t/* Create a temp IO to serve write. */\n" - "-\t\tresult = cl_io_rw_init(env, io, CIT_WRITE, pos, PAGE_CACHE_SIZE);\n" - "+\t\tresult = cl_io_rw_init(env, io, CIT_WRITE, pos, PAGE_SIZE);\n" - " \t\tif (result == 0) {\n" - " \t\t\tcio->cui_fd = LUSTRE_FPRIVATE(file);\n" - " \t\t\tcio->cui_iter = NULL;\n" - "@@ -498,7 +498,7 @@ static int ll_read_ahead_page(const struct lu_env *env, struct cl_io *io,\n" - " \t\t}\n" - " \t\tif (rc != 1)\n" - " \t\t\tunlock_page(vmpage);\n" - "-\t\tpage_cache_release(vmpage);\n" - "+\t\tput_page(vmpage);\n" - " \t} else {\n" - " \t\twhich = RA_STAT_FAILED_GRAB_PAGE;\n" - " \t\tmsg = \"g_c_p_n failed\";\n" - "@@ -521,13 +521,13 @@ static int ll_read_ahead_page(const struct lu_env *env, struct cl_io *io,\n" - " * striped over, rather than having a constant value for all files here.\n" - " */\n" - " \n" - "-/* RAS_INCREASE_STEP should be (1UL << (inode->i_blkbits - PAGE_CACHE_SHIFT)).\n" - "+/* RAS_INCREASE_STEP should be (1UL << (inode->i_blkbits - PAGE_SHIFT)).\n" - " * Temporarily set RAS_INCREASE_STEP to 1MB. After 4MB RPC is enabled\n" - " * by default, this should be adjusted corresponding with max_read_ahead_mb\n" - " * and max_read_ahead_per_file_mb otherwise the readahead budget can be used\n" - " * up quickly which will affect read performance significantly. See LU-2816\n" - " */\n" - "-#define RAS_INCREASE_STEP(inode) (ONE_MB_BRW_SIZE >> PAGE_CACHE_SHIFT)\n" - "+#define RAS_INCREASE_STEP(inode) (ONE_MB_BRW_SIZE >> PAGE_SHIFT)\n" - " \n" - " static inline int stride_io_mode(struct ll_readahead_state *ras)\n" - " {\n" - "@@ -739,7 +739,7 @@ int ll_readahead(const struct lu_env *env, struct cl_io *io,\n" - " \t\t\tend = rpc_boundary;\n" - " \n" - " \t\t/* Truncate RA window to end of file */\n" - "-\t\tend = min(end, (unsigned long)((kms - 1) >> PAGE_CACHE_SHIFT));\n" - "+\t\tend = min(end, (unsigned long)((kms - 1) >> PAGE_SHIFT));\n" - " \n" - " \t\tras->ras_next_readahead = max(end, end + 1);\n" - " \t\tRAS_CDEBUG(ras);\n" - "@@ -776,7 +776,7 @@ int ll_readahead(const struct lu_env *env, struct cl_io *io,\n" - " \tif (reserved != 0)\n" - " \t\tll_ra_count_put(ll_i2sbi(inode), reserved);\n" - " \n" - "-\tif (ra_end == end + 1 && ra_end == (kms >> PAGE_CACHE_SHIFT))\n" - "+\tif (ra_end == end + 1 && ra_end == (kms >> PAGE_SHIFT))\n" - " \t\tll_ra_stats_inc(mapping, RA_STAT_EOF);\n" - " \n" - " \t/* if we didn't get to the end of the region we reserved from\n" - "@@ -985,8 +985,8 @@ void ras_update(struct ll_sb_info *sbi, struct inode *inode,\n" - " \tif (ras->ras_requests == 2 && !ras->ras_request_index) {\n" - " \t\t__u64 kms_pages;\n" - " \n" - "-\t\tkms_pages = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >>\n" - "-\t\t\t PAGE_CACHE_SHIFT;\n" - "+\t\tkms_pages = (i_size_read(inode) + PAGE_SIZE - 1) >>\n" - "+\t\t\t PAGE_SHIFT;\n" - " \n" - " \t\tCDEBUG(D_READA, \"kmsp %llu mwp %lu mp %lu\\n\", kms_pages,\n" - " \t\t ra->ra_max_read_ahead_whole_pages, ra->ra_max_pages_per_file);\n" - "@@ -1173,7 +1173,7 @@ int ll_writepage(struct page *vmpage, struct writeback_control *wbc)\n" - " \t\t * PageWriteback or clean the page.\n" - " \t\t */\n" - " \t\tresult = cl_sync_file_range(inode, offset,\n" - "-\t\t\t\t\t offset + PAGE_CACHE_SIZE - 1,\n" - "+\t\t\t\t\t offset + PAGE_SIZE - 1,\n" - " \t\t\t\t\t CL_FSYNC_LOCAL, 1);\n" - " \t\tif (result > 0) {\n" - " \t\t\t/* actually we may have written more than one page.\n" - "@@ -1211,7 +1211,7 @@ int ll_writepages(struct address_space *mapping, struct writeback_control *wbc)\n" - " \tint ignore_layout = 0;\n" - " \n" - " \tif (wbc->range_cyclic) {\n" - "-\t\tstart = mapping->writeback_index << PAGE_CACHE_SHIFT;\n" - "+\t\tstart = mapping->writeback_index << PAGE_SHIFT;\n" - " \t\tend = OBD_OBJECT_EOF;\n" - " \t} else {\n" - " \t\tstart = wbc->range_start;\n" - "@@ -1241,7 +1241,7 @@ int ll_writepages(struct address_space *mapping, struct writeback_control *wbc)\n" - " \tif (wbc->range_cyclic || (range_whole && wbc->nr_to_write > 0)) {\n" - " \t\tif (end == OBD_OBJECT_EOF)\n" - " \t\t\tend = i_size_read(inode);\n" - "-\t\tmapping->writeback_index = (end >> PAGE_CACHE_SHIFT) + 1;\n" - "+\t\tmapping->writeback_index = (end >> PAGE_SHIFT) + 1;\n" - " \t}\n" - " \treturn result;\n" - " }\n" - "diff --git a/drivers/staging/lustre/lustre/llite/rw26.c b/drivers/staging/lustre/lustre/llite/rw26.c\n" - "index 7a5db67bc680..69aa15e8e3ef 100644\n" - "--- a/drivers/staging/lustre/lustre/llite/rw26.c\n" - "+++ b/drivers/staging/lustre/lustre/llite/rw26.c\n" - "@@ -87,7 +87,7 @@ static void ll_invalidatepage(struct page *vmpage, unsigned int offset,\n" - " \t * below because they are run with page locked and all our io is\n" - " \t * happening with locked page too\n" - " \t */\n" - "-\tif (offset == 0 && length == PAGE_CACHE_SIZE) {\n" - "+\tif (offset == 0 && length == PAGE_SIZE) {\n" - " \t\tenv = cl_env_get(&refcheck);\n" - " \t\tif (!IS_ERR(env)) {\n" - " \t\t\tinode = vmpage->mapping->host;\n" - "@@ -193,8 +193,8 @@ static inline int ll_get_user_pages(int rw, unsigned long user_addr,\n" - " \t\treturn -EFBIG;\n" - " \t}\n" - " \n" - "-\t*max_pages = (user_addr + size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "-\t*max_pages -= user_addr >> PAGE_CACHE_SHIFT;\n" - "+\t*max_pages = (user_addr + size + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - "+\t*max_pages -= user_addr >> PAGE_SHIFT;\n" - " \n" - " \t*pages = libcfs_kvzalloc(*max_pages * sizeof(**pages), GFP_NOFS);\n" - " \tif (*pages) {\n" - "@@ -217,7 +217,7 @@ static void ll_free_user_pages(struct page **pages, int npages, int do_dirty)\n" - " \tfor (i = 0; i < npages; i++) {\n" - " \t\tif (do_dirty)\n" - " \t\t\tset_page_dirty_lock(pages[i]);\n" - "-\t\tpage_cache_release(pages[i]);\n" - "+\t\tput_page(pages[i]);\n" - " \t}\n" - " \tkvfree(pages);\n" - " }\n" - "@@ -357,7 +357,7 @@ static ssize_t ll_direct_IO_26_seg(const struct lu_env *env, struct cl_io *io,\n" - " * up to 22MB for 128kB kmalloc and up to 682MB for 4MB kmalloc.\n" - " */\n" - " #define MAX_DIO_SIZE ((KMALLOC_MAX_SIZE / sizeof(struct brw_page) *\t \\\n" - "-\t\t PAGE_CACHE_SIZE) & ~(DT_MAX_BRW_SIZE - 1))\n" - "+\t\t PAGE_SIZE) & ~(DT_MAX_BRW_SIZE - 1))\n" - " static ssize_t ll_direct_IO_26(struct kiocb *iocb, struct iov_iter *iter,\n" - " \t\t\t loff_t file_offset)\n" - " {\n" - "@@ -382,8 +382,8 @@ static ssize_t ll_direct_IO_26(struct kiocb *iocb, struct iov_iter *iter,\n" - " \tCDEBUG(D_VFSTRACE,\n" - " \t \"VFS Op:inode=%lu/%u(%p), size=%zd (max %lu), offset=%lld=%llx, pages %zd (max %lu)\\n\",\n" - " \t inode->i_ino, inode->i_generation, inode, count, MAX_DIO_SIZE,\n" - "-\t file_offset, file_offset, count >> PAGE_CACHE_SHIFT,\n" - "-\t MAX_DIO_SIZE >> PAGE_CACHE_SHIFT);\n" - "+\t file_offset, file_offset, count >> PAGE_SHIFT,\n" - "+\t MAX_DIO_SIZE >> PAGE_SHIFT);\n" - " \n" - " \t/* Check that all user buffers are aligned as well */\n" - " \tif (iov_iter_alignment(iter) & ~CFS_PAGE_MASK)\n" - "@@ -432,8 +432,8 @@ static ssize_t ll_direct_IO_26(struct kiocb *iocb, struct iov_iter *iter,\n" - " \t\t\t * page worth of page pointers = 4MB on i386.\n" - " \t\t\t */\n" - " \t\t\tif (result == -ENOMEM &&\n" - "-\t\t\t size > (PAGE_CACHE_SIZE / sizeof(*pages)) *\n" - "-\t\t\t\t PAGE_CACHE_SIZE) {\n" - "+\t\t\t size > (PAGE_SIZE / sizeof(*pages)) *\n" - "+\t\t\t PAGE_SIZE) {\n" - " \t\t\t\tsize = ((((size / 2) - 1) |\n" - " \t\t\t\t\t ~CFS_PAGE_MASK) + 1) &\n" - " \t\t\t\t\tCFS_PAGE_MASK;\n" - "@@ -474,10 +474,10 @@ static int ll_write_begin(struct file *file, struct address_space *mapping,\n" - " \t\t\t loff_t pos, unsigned len, unsigned flags,\n" - " \t\t\t struct page **pagep, void **fsdata)\n" - " {\n" - "-\tpgoff_t index = pos >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = pos >> PAGE_SHIFT;\n" - " \tstruct page *page;\n" - " \tint rc;\n" - "-\tunsigned from = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tunsigned from = pos & (PAGE_SIZE - 1);\n" - " \n" - " \tpage = grab_cache_page_write_begin(mapping, index, flags);\n" - " \tif (!page)\n" - "@@ -488,7 +488,7 @@ static int ll_write_begin(struct file *file, struct address_space *mapping,\n" - " \trc = ll_prepare_write(file, page, from, from + len);\n" - " \tif (rc) {\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \treturn rc;\n" - " }\n" - "@@ -497,12 +497,12 @@ static int ll_write_end(struct file *file, struct address_space *mapping,\n" - " \t\t\tloff_t pos, unsigned len, unsigned copied,\n" - " \t\t\tstruct page *page, void *fsdata)\n" - " {\n" - "-\tunsigned from = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tunsigned from = pos & (PAGE_SIZE - 1);\n" - " \tint rc;\n" - " \n" - " \trc = ll_commit_write(file, page, from, from + copied);\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \treturn rc ?: copied;\n" - " }\n" - "diff --git a/drivers/staging/lustre/lustre/llite/vvp_io.c b/drivers/staging/lustre/lustre/llite/vvp_io.c\n" - "index fb0c26ee7ff3..0eb905e4fe40 100644\n" - "--- a/drivers/staging/lustre/lustre/llite/vvp_io.c\n" - "+++ b/drivers/staging/lustre/lustre/llite/vvp_io.c\n" - "@@ -511,10 +511,7 @@ static int vvp_io_read_start(const struct lu_env *env,\n" - " \tif (!vio->cui_ra_window_set) {\n" - " \t\tvio->cui_ra_window_set = 1;\n" - " \t\tbead->lrr_start = cl_index(obj, pos);\n" - "-\t\t/*\n" - "-\t\t * XXX: explicit PAGE_CACHE_SIZE\n" - "-\t\t */\n" - "-\t\tbead->lrr_count = cl_index(obj, tot + PAGE_CACHE_SIZE - 1);\n" - "+\t\tbead->lrr_count = cl_index(obj, tot + PAGE_SIZE - 1);\n" - " \t\tll_ra_read_in(file, bead);\n" - " \t}\n" - " \n" - "@@ -959,7 +956,7 @@ static int vvp_io_prepare_write(const struct lu_env *env,\n" - " \t\t * We're completely overwriting an existing page, so _don't_\n" - " \t\t * set it up to date until commit_write\n" - " \t\t */\n" - "-\t\tif (from == 0 && to == PAGE_CACHE_SIZE) {\n" - "+\t\tif (from == 0 && to == PAGE_SIZE) {\n" - " \t\t\tCL_PAGE_HEADER(D_PAGE, env, pg, \"full page write\\n\");\n" - " \t\t\tPOISON_PAGE(page, 0x11);\n" - " \t\t} else\n" - "@@ -1022,7 +1019,7 @@ static int vvp_io_commit_write(const struct lu_env *env,\n" - " \t\t\tset_page_dirty(vmpage);\n" - " \t\t\tvvp_write_pending(cl2ccc(obj), cp);\n" - " \t\t} else if (result == -EDQUOT) {\n" - "-\t\t\tpgoff_t last_index = i_size_read(inode) >> PAGE_CACHE_SHIFT;\n" - "+\t\t\tpgoff_t last_index = i_size_read(inode) >> PAGE_SHIFT;\n" - " \t\t\tbool need_clip = true;\n" - " \n" - " \t\t\t/*\n" - "@@ -1040,7 +1037,7 @@ static int vvp_io_commit_write(const struct lu_env *env,\n" - " \t\t\t * being.\n" - " \t\t\t */\n" - " \t\t\tif (last_index > pg->cp_index) {\n" - "-\t\t\t\tto = PAGE_CACHE_SIZE;\n" - "+\t\t\t\tto = PAGE_SIZE;\n" - " \t\t\t\tneed_clip = false;\n" - " \t\t\t} else if (last_index == pg->cp_index) {\n" - " \t\t\t\tint size_to = i_size_read(inode) & ~CFS_PAGE_MASK;\n" - "diff --git a/drivers/staging/lustre/lustre/llite/vvp_page.c b/drivers/staging/lustre/lustre/llite/vvp_page.c\n" - "index 850bae734075..33ca3eb34965 100644\n" - "--- a/drivers/staging/lustre/lustre/llite/vvp_page.c\n" - "+++ b/drivers/staging/lustre/lustre/llite/vvp_page.c\n" - "@@ -57,7 +57,7 @@ static void vvp_page_fini_common(struct ccc_page *cp)\n" - " \tstruct page *vmpage = cp->cpg_page;\n" - " \n" - " \tLASSERT(vmpage);\n" - "-\tpage_cache_release(vmpage);\n" - "+\tput_page(vmpage);\n" - " }\n" - " \n" - " static void vvp_page_fini(const struct lu_env *env,\n" - "@@ -164,12 +164,12 @@ static int vvp_page_unmap(const struct lu_env *env,\n" - " \tLASSERT(vmpage);\n" - " \tLASSERT(PageLocked(vmpage));\n" - " \n" - "-\toffset = vmpage->index << PAGE_CACHE_SHIFT;\n" - "+\toffset = vmpage->index << PAGE_SHIFT;\n" - " \n" - " \t/*\n" - " \t * XXX is it safe to call this with the page lock held?\n" - " \t */\n" - "-\tll_teardown_mmaps(vmpage->mapping, offset, offset + PAGE_CACHE_SIZE);\n" - "+\tll_teardown_mmaps(vmpage->mapping, offset, offset + PAGE_SIZE);\n" - " \treturn 0;\n" - " }\n" - " \n" - "@@ -537,7 +537,7 @@ int vvp_page_init(const struct lu_env *env, struct cl_object *obj,\n" - " \tCLOBINVRNT(env, obj, ccc_object_invariant(obj));\n" - " \n" - " \tcpg->cpg_page = vmpage;\n" - "-\tpage_cache_get(vmpage);\n" - "+\tget_page(vmpage);\n" - " \n" - " \tINIT_LIST_HEAD(&cpg->cpg_pending_linkage);\n" - " \tif (page->cp_type == CPT_CACHEABLE) {\n" - "diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c b/drivers/staging/lustre/lustre/lmv/lmv_obd.c\n" - "index 0f776cf8a5aa..9abb7c2b9231 100644\n" - "--- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c\n" - "+++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c\n" - "@@ -2017,7 +2017,7 @@ static int lmv_sync(struct obd_export *exp, const struct lu_fid *fid,\n" - " * |s|e|f|p|ent| 0 | ... | 0 |\n" - " * '----------------- -----'\n" - " *\n" - "- * However, on hosts where the native VM page size (PAGE_CACHE_SIZE) is\n" - "+ * However, on hosts where the native VM page size (PAGE_SIZE) is\n" - " * larger than LU_PAGE_SIZE, a single host page may contain multiple\n" - " * lu_dirpages. After reading the lu_dirpages from the MDS, the\n" - " * ldp_hash_end of the first lu_dirpage refers to the one immediately\n" - "@@ -2048,7 +2048,7 @@ static int lmv_sync(struct obd_export *exp, const struct lu_fid *fid,\n" - " * - Adjust the lde_reclen of the ending entry of each lu_dirpage to span\n" - " * to the first entry of the next lu_dirpage.\n" - " */\n" - "-#if PAGE_CACHE_SIZE > LU_PAGE_SIZE\n" - "+#if PAGE_SIZE > LU_PAGE_SIZE\n" - " static void lmv_adjust_dirpages(struct page **pages, int ncfspgs, int nlupgs)\n" - " {\n" - " \tint i;\n" - "@@ -2101,7 +2101,7 @@ static void lmv_adjust_dirpages(struct page **pages, int ncfspgs, int nlupgs)\n" - " }\n" - " #else\n" - " #define lmv_adjust_dirpages(pages, ncfspgs, nlupgs) do {} while (0)\n" - "-#endif\t/* PAGE_CACHE_SIZE > LU_PAGE_SIZE */\n" - "+#endif\t/* PAGE_SIZE > LU_PAGE_SIZE */\n" - " \n" - " static int lmv_readpage(struct obd_export *exp, struct md_op_data *op_data,\n" - " \t\t\tstruct page **pages, struct ptlrpc_request **request)\n" - "@@ -2110,7 +2110,7 @@ static int lmv_readpage(struct obd_export *exp, struct md_op_data *op_data,\n" - " \tstruct lmv_obd\t\t*lmv = &obd->u.lmv;\n" - " \t__u64\t\t\toffset = op_data->op_offset;\n" - " \tint\t\t\trc;\n" - "-\tint\t\t\tncfspgs; /* pages read in PAGE_CACHE_SIZE */\n" - "+\tint\t\t\tncfspgs; /* pages read in PAGE_SIZE */\n" - " \tint\t\t\tnlupgs; /* pages read in LU_PAGE_SIZE */\n" - " \tstruct lmv_tgt_desc\t*tgt;\n" - " \n" - "@@ -2129,8 +2129,8 @@ static int lmv_readpage(struct obd_export *exp, struct md_op_data *op_data,\n" - " \tif (rc != 0)\n" - " \t\treturn rc;\n" - " \n" - "-\tncfspgs = ((*request)->rq_bulk->bd_nob_transferred + PAGE_CACHE_SIZE - 1)\n" - "-\t\t >> PAGE_CACHE_SHIFT;\n" - "+\tncfspgs = ((*request)->rq_bulk->bd_nob_transferred + PAGE_SIZE - 1)\n" - "+\t\t >> PAGE_SHIFT;\n" - " \tnlupgs = (*request)->rq_bulk->bd_nob_transferred >> LU_PAGE_SHIFT;\n" - " \tLASSERT(!((*request)->rq_bulk->bd_nob_transferred & ~LU_PAGE_MASK));\n" - " \tLASSERT(ncfspgs > 0 && ncfspgs <= op_data->op_npages);\n" - "diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c\n" - "index 55dd8ef9525b..b91d3ff18b02 100644\n" - "--- a/drivers/staging/lustre/lustre/mdc/mdc_request.c\n" - "+++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c\n" - "@@ -1002,10 +1002,10 @@ restart_bulk:\n" - " \n" - " \t/* NB req now owns desc and will free it when it gets freed */\n" - " \tfor (i = 0; i < op_data->op_npages; i++)\n" - "-\t\tptlrpc_prep_bulk_page_pin(desc, pages[i], 0, PAGE_CACHE_SIZE);\n" - "+\t\tptlrpc_prep_bulk_page_pin(desc, pages[i], 0, PAGE_SIZE);\n" - " \n" - " \tmdc_readdir_pack(req, op_data->op_offset,\n" - "-\t\t\t PAGE_CACHE_SIZE * op_data->op_npages,\n" - "+\t\t\t PAGE_SIZE * op_data->op_npages,\n" - " \t\t\t &op_data->op_fid1);\n" - " \n" - " \tptlrpc_request_set_replen(req);\n" - "@@ -1037,7 +1037,7 @@ restart_bulk:\n" - " \tif (req->rq_bulk->bd_nob_transferred & ~LU_PAGE_MASK) {\n" - " \t\tCERROR(\"Unexpected # bytes transferred: %d (%ld expected)\\n\",\n" - " \t\t req->rq_bulk->bd_nob_transferred,\n" - "-\t\t PAGE_CACHE_SIZE * op_data->op_npages);\n" - "+\t\t PAGE_SIZE * op_data->op_npages);\n" - " \t\tptlrpc_req_finished(req);\n" - " \t\treturn -EPROTO;\n" - " \t}\n" - "diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c\n" - "index 65caffe8c42e..830ca10507d4 100644\n" - "--- a/drivers/staging/lustre/lustre/mgc/mgc_request.c\n" - "+++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c\n" - "@@ -1113,7 +1113,7 @@ static int mgc_import_event(struct obd_device *obd,\n" - " }\n" - " \n" - " enum {\n" - "-\tCONFIG_READ_NRPAGES_INIT = 1 << (20 - PAGE_CACHE_SHIFT),\n" - "+\tCONFIG_READ_NRPAGES_INIT = 1 << (20 - PAGE_SHIFT),\n" - " \tCONFIG_READ_NRPAGES = 4\n" - " };\n" - " \n" - "@@ -1137,19 +1137,19 @@ static int mgc_apply_recover_logs(struct obd_device *mgc,\n" - " \tLASSERT(cfg->cfg_instance);\n" - " \tLASSERT(cfg->cfg_sb == cfg->cfg_instance);\n" - " \n" - "-\tinst = kzalloc(PAGE_CACHE_SIZE, GFP_KERNEL);\n" - "+\tinst = kzalloc(PAGE_SIZE, GFP_KERNEL);\n" - " \tif (!inst)\n" - " \t\treturn -ENOMEM;\n" - " \n" - "-\tpos = snprintf(inst, PAGE_CACHE_SIZE, \"%p\", cfg->cfg_instance);\n" - "-\tif (pos >= PAGE_CACHE_SIZE) {\n" - "+\tpos = snprintf(inst, PAGE_SIZE, \"%p\", cfg->cfg_instance);\n" - "+\tif (pos >= PAGE_SIZE) {\n" - " \t\tkfree(inst);\n" - " \t\treturn -E2BIG;\n" - " \t}\n" - " \n" - " \t++pos;\n" - " \tbuf = inst + pos;\n" - "-\tbufsz = PAGE_CACHE_SIZE - pos;\n" - "+\tbufsz = PAGE_SIZE - pos;\n" - " \n" - " \twhile (datalen > 0) {\n" - " \t\tint entry_len = sizeof(*entry);\n" - "@@ -1181,7 +1181,7 @@ static int mgc_apply_recover_logs(struct obd_device *mgc,\n" - " \t\t/* Keep this swab for normal mixed endian handling. LU-1644 */\n" - " \t\tif (mne_swab)\n" - " \t\t\tlustre_swab_mgs_nidtbl_entry(entry);\n" - "-\t\tif (entry->mne_length > PAGE_CACHE_SIZE) {\n" - "+\t\tif (entry->mne_length > PAGE_SIZE) {\n" - " \t\t\tCERROR(\"MNE too large (%u)\\n\", entry->mne_length);\n" - " \t\t\tbreak;\n" - " \t\t}\n" - "@@ -1371,7 +1371,7 @@ again:\n" - " \t}\n" - " \tbody->mcb_offset = cfg->cfg_last_idx + 1;\n" - " \tbody->mcb_type = cld->cld_type;\n" - "-\tbody->mcb_bits = PAGE_CACHE_SHIFT;\n" - "+\tbody->mcb_bits = PAGE_SHIFT;\n" - " \tbody->mcb_units = nrpages;\n" - " \n" - " \t/* allocate bulk transfer descriptor */\n" - "@@ -1383,7 +1383,7 @@ again:\n" - " \t}\n" - " \n" - " \tfor (i = 0; i < nrpages; i++)\n" - "-\t\tptlrpc_prep_bulk_page_pin(desc, pages[i], 0, PAGE_CACHE_SIZE);\n" - "+\t\tptlrpc_prep_bulk_page_pin(desc, pages[i], 0, PAGE_SIZE);\n" - " \n" - " \tptlrpc_request_set_replen(req);\n" - " \trc = ptlrpc_queue_wait(req);\n" - "@@ -1411,7 +1411,7 @@ again:\n" - " \t\tgoto out;\n" - " \t}\n" - " \n" - "-\tif (ealen > nrpages << PAGE_CACHE_SHIFT) {\n" - "+\tif (ealen > nrpages << PAGE_SHIFT) {\n" - " \t\trc = -EINVAL;\n" - " \t\tgoto out;\n" - " \t}\n" - "@@ -1439,7 +1439,7 @@ again:\n" - " \n" - " \t\tptr = kmap(pages[i]);\n" - " \t\trc2 = mgc_apply_recover_logs(obd, cld, res->mcr_offset, ptr,\n" - "-\t\t\t\t\t min_t(int, ealen, PAGE_CACHE_SIZE),\n" - "+\t\t\t\t\t min_t(int, ealen, PAGE_SIZE),\n" - " \t\t\t\t\t mne_swab);\n" - " \t\tkunmap(pages[i]);\n" - " \t\tif (rc2 < 0) {\n" - "@@ -1448,7 +1448,7 @@ again:\n" - " \t\t\tbreak;\n" - " \t\t}\n" - " \n" - "-\t\tealen -= PAGE_CACHE_SIZE;\n" - "+\t\tealen -= PAGE_SIZE;\n" - " \t}\n" - " \n" - " out:\n" - "diff --git a/drivers/staging/lustre/lustre/obdclass/cl_page.c b/drivers/staging/lustre/lustre/obdclass/cl_page.c\n" - "index 231a2f26c693..394580016638 100644\n" - "--- a/drivers/staging/lustre/lustre/obdclass/cl_page.c\n" - "+++ b/drivers/staging/lustre/lustre/obdclass/cl_page.c\n" - "@@ -1477,7 +1477,7 @@ loff_t cl_offset(const struct cl_object *obj, pgoff_t idx)\n" - " \t/*\n" - " \t * XXX for now.\n" - " \t */\n" - "-\treturn (loff_t)idx << PAGE_CACHE_SHIFT;\n" - "+\treturn (loff_t)idx << PAGE_SHIFT;\n" - " }\n" - " EXPORT_SYMBOL(cl_offset);\n" - " \n" - "@@ -1489,13 +1489,13 @@ pgoff_t cl_index(const struct cl_object *obj, loff_t offset)\n" - " \t/*\n" - " \t * XXX for now.\n" - " \t */\n" - "-\treturn offset >> PAGE_CACHE_SHIFT;\n" - "+\treturn offset >> PAGE_SHIFT;\n" - " }\n" - " EXPORT_SYMBOL(cl_index);\n" - " \n" - " int cl_page_size(const struct cl_object *obj)\n" - " {\n" - "-\treturn 1 << PAGE_CACHE_SHIFT;\n" - "+\treturn 1 << PAGE_SHIFT;\n" - " }\n" - " EXPORT_SYMBOL(cl_page_size);\n" - " \n" - "diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c\n" - "index 1a938e1376f9..c2cf015962dd 100644\n" - "--- a/drivers/staging/lustre/lustre/obdclass/class_obd.c\n" - "+++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c\n" - "@@ -461,9 +461,9 @@ static int obd_init_checks(void)\n" - " \t\tCWARN(\"LPD64 wrong length! strlen(%s)=%d != 2\\n\", buf, len);\n" - " \t\tret = -EINVAL;\n" - " \t}\n" - "-\tif ((u64val & ~CFS_PAGE_MASK) >= PAGE_CACHE_SIZE) {\n" - "+\tif ((u64val & ~CFS_PAGE_MASK) >= PAGE_SIZE) {\n" - " \t\tCWARN(\"mask failed: u64val %llu >= %llu\\n\", u64val,\n" - "-\t\t (__u64)PAGE_CACHE_SIZE);\n" - "+\t\t (__u64)PAGE_SIZE);\n" - " \t\tret = -EINVAL;\n" - " \t}\n" - " \n" - "@@ -509,7 +509,7 @@ static int __init obdclass_init(void)\n" - " \t * For clients with less memory, a larger fraction is needed\n" - " \t * for other purposes (mostly for BGL).\n" - " \t */\n" - "-\tif (totalram_pages <= 512 << (20 - PAGE_CACHE_SHIFT))\n" - "+\tif (totalram_pages <= 512 << (20 - PAGE_SHIFT))\n" - " \t\tobd_max_dirty_pages = totalram_pages / 4;\n" - " \telse\n" - " \t\tobd_max_dirty_pages = totalram_pages / 2;\n" - "diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c\n" - "index 9496c09b2b69..b41b65e2f021 100644\n" - "--- a/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c\n" - "+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c\n" - "@@ -47,7 +47,6 @@\n" - " #include \"../../include/lustre/lustre_idl.h\"\n" - " \n" - " #include <linux/fs.h>\n" - "-#include <linux/pagemap.h> /* for PAGE_CACHE_SIZE */\n" - " \n" - " void obdo_refresh_inode(struct inode *dst, struct obdo *src, u32 valid)\n" - " {\n" - "@@ -71,8 +70,8 @@ void obdo_refresh_inode(struct inode *dst, struct obdo *src, u32 valid)\n" - " \tif (valid & OBD_MD_FLBLKSZ && src->o_blksize > (1 << dst->i_blkbits))\n" - " \t\tdst->i_blkbits = ffs(src->o_blksize) - 1;\n" - " \n" - "-\tif (dst->i_blkbits < PAGE_CACHE_SHIFT)\n" - "-\t\tdst->i_blkbits = PAGE_CACHE_SHIFT;\n" - "+\tif (dst->i_blkbits < PAGE_SHIFT)\n" - "+\t\tdst->i_blkbits = PAGE_SHIFT;\n" - " \n" - " \t/* allocation of space */\n" - " \tif (valid & OBD_MD_FLBLOCKS && src->o_blocks > dst->i_blocks)\n" - "diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c\n" - "index fd333b9e968c..e6bf414a4444 100644\n" - "--- a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c\n" - "+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c\n" - "@@ -100,7 +100,7 @@ static ssize_t max_dirty_mb_show(struct kobject *kobj, struct attribute *attr,\n" - " \t\t\t\t char *buf)\n" - " {\n" - " \treturn sprintf(buf, \"%ul\\n\",\n" - "-\t\t\tobd_max_dirty_pages / (1 << (20 - PAGE_CACHE_SHIFT)));\n" - "+\t\t\tobd_max_dirty_pages / (1 << (20 - PAGE_SHIFT)));\n" - " }\n" - " \n" - " static ssize_t max_dirty_mb_store(struct kobject *kobj, struct attribute *attr,\n" - "@@ -113,14 +113,14 @@ static ssize_t max_dirty_mb_store(struct kobject *kobj, struct attribute *attr,\n" - " \tif (rc)\n" - " \t\treturn rc;\n" - " \n" - "-\tval *= 1 << (20 - PAGE_CACHE_SHIFT); /* convert to pages */\n" - "+\tval *= 1 << (20 - PAGE_SHIFT); /* convert to pages */\n" - " \n" - " \tif (val > ((totalram_pages / 10) * 9)) {\n" - " \t\t/* Somebody wants to assign too much memory to dirty pages */\n" - " \t\treturn -EINVAL;\n" - " \t}\n" - " \n" - "-\tif (val < 4 << (20 - PAGE_CACHE_SHIFT)) {\n" - "+\tif (val < 4 << (20 - PAGE_SHIFT)) {\n" - " \t\t/* Less than 4 Mb for dirty cache is also bad */\n" - " \t\treturn -EINVAL;\n" - " \t}\n" - "diff --git a/drivers/staging/lustre/lustre/obdclass/lu_object.c b/drivers/staging/lustre/lustre/obdclass/lu_object.c\n" - "index 65a4746c89ca..978568ada8e9 100644\n" - "--- a/drivers/staging/lustre/lustre/obdclass/lu_object.c\n" - "+++ b/drivers/staging/lustre/lustre/obdclass/lu_object.c\n" - "@@ -840,8 +840,8 @@ static int lu_htable_order(void)\n" - " \n" - " #if BITS_PER_LONG == 32\n" - " \t/* limit hashtable size for lowmem systems to low RAM */\n" - "-\tif (cache_size > 1 << (30 - PAGE_CACHE_SHIFT))\n" - "-\t\tcache_size = 1 << (30 - PAGE_CACHE_SHIFT) * 3 / 4;\n" - "+\tif (cache_size > 1 << (30 - PAGE_SHIFT))\n" - "+\t\tcache_size = 1 << (30 - PAGE_SHIFT) * 3 / 4;\n" - " #endif\n" - " \n" - " \t/* clear off unreasonable cache setting. */\n" - "@@ -853,7 +853,7 @@ static int lu_htable_order(void)\n" - " \t\tlu_cache_percent = LU_CACHE_PERCENT_DEFAULT;\n" - " \t}\n" - " \tcache_size = cache_size / 100 * lu_cache_percent *\n" - "-\t\t(PAGE_CACHE_SIZE / 1024);\n" - "+\t\t(PAGE_SIZE / 1024);\n" - " \n" - " \tfor (bits = 1; (1 << bits) < cache_size; ++bits) {\n" - " \t\t;\n" - "diff --git a/drivers/staging/lustre/lustre/obdecho/echo_client.c b/drivers/staging/lustre/lustre/obdecho/echo_client.c\n" - "index 64ffe243f870..1e83669c204d 100644\n" - "--- a/drivers/staging/lustre/lustre/obdecho/echo_client.c\n" - "+++ b/drivers/staging/lustre/lustre/obdecho/echo_client.c\n" - "@@ -278,7 +278,7 @@ static void echo_page_fini(const struct lu_env *env,\n" - " \tstruct page *vmpage = ep->ep_vmpage;\n" - " \n" - " \tatomic_dec(&eco->eo_npages);\n" - "-\tpage_cache_release(vmpage);\n" - "+\tput_page(vmpage);\n" - " }\n" - " \n" - " static int echo_page_prep(const struct lu_env *env,\n" - "@@ -373,7 +373,7 @@ static int echo_page_init(const struct lu_env *env, struct cl_object *obj,\n" - " \tstruct echo_object *eco = cl2echo_obj(obj);\n" - " \n" - " \tep->ep_vmpage = vmpage;\n" - "-\tpage_cache_get(vmpage);\n" - "+\tget_page(vmpage);\n" - " \tmutex_init(&ep->ep_lock);\n" - " \tcl_page_slice_add(page, &ep->ep_cl, obj, &echo_page_ops);\n" - " \tatomic_inc(&eco->eo_npages);\n" - "@@ -1138,7 +1138,7 @@ static int cl_echo_object_brw(struct echo_object *eco, int rw, u64 offset,\n" - " \tLASSERT(rc == 0);\n" - " \n" - " \trc = cl_echo_enqueue0(env, eco, offset,\n" - "-\t\t\t offset + npages * PAGE_CACHE_SIZE - 1,\n" - "+\t\t\t offset + npages * PAGE_SIZE - 1,\n" - " \t\t\t rw == READ ? LCK_PR : LCK_PW, &lh.cookie,\n" - " \t\t\t CEF_NEVER);\n" - " \tif (rc < 0)\n" - "@@ -1311,11 +1311,11 @@ echo_client_page_debug_setup(struct page *page, int rw, u64 id,\n" - " \tint delta;\n" - " \n" - " \t/* no partial pages on the client */\n" - "-\tLASSERT(count == PAGE_CACHE_SIZE);\n" - "+\tLASSERT(count == PAGE_SIZE);\n" - " \n" - " \taddr = kmap(page);\n" - " \n" - "-\tfor (delta = 0; delta < PAGE_CACHE_SIZE; delta += OBD_ECHO_BLOCK_SIZE) {\n" - "+\tfor (delta = 0; delta < PAGE_SIZE; delta += OBD_ECHO_BLOCK_SIZE) {\n" - " \t\tif (rw == OBD_BRW_WRITE) {\n" - " \t\t\tstripe_off = offset + delta;\n" - " \t\t\tstripe_id = id;\n" - "@@ -1341,11 +1341,11 @@ static int echo_client_page_debug_check(struct page *page, u64 id,\n" - " \tint rc2;\n" - " \n" - " \t/* no partial pages on the client */\n" - "-\tLASSERT(count == PAGE_CACHE_SIZE);\n" - "+\tLASSERT(count == PAGE_SIZE);\n" - " \n" - " \taddr = kmap(page);\n" - " \n" - "-\tfor (rc = delta = 0; delta < PAGE_CACHE_SIZE; delta += OBD_ECHO_BLOCK_SIZE) {\n" - "+\tfor (rc = delta = 0; delta < PAGE_SIZE; delta += OBD_ECHO_BLOCK_SIZE) {\n" - " \t\tstripe_off = offset + delta;\n" - " \t\tstripe_id = id;\n" - " \n" - "@@ -1391,7 +1391,7 @@ static int echo_client_kbrw(struct echo_device *ed, int rw, struct obdo *oa,\n" - " \t\treturn -EINVAL;\n" - " \n" - " \t/* XXX think again with misaligned I/O */\n" - "-\tnpages = count >> PAGE_CACHE_SHIFT;\n" - "+\tnpages = count >> PAGE_SHIFT;\n" - " \n" - " \tif (rw == OBD_BRW_WRITE)\n" - " \t\tbrw_flags = OBD_BRW_ASYNC;\n" - "@@ -1408,7 +1408,7 @@ static int echo_client_kbrw(struct echo_device *ed, int rw, struct obdo *oa,\n" - " \n" - " \tfor (i = 0, pgp = pga, off = offset;\n" - " \t i < npages;\n" - "-\t i++, pgp++, off += PAGE_CACHE_SIZE) {\n" - "+\t i++, pgp++, off += PAGE_SIZE) {\n" - " \n" - " \t\tLASSERT(!pgp->pg); /* for cleanup */\n" - " \n" - "@@ -1418,7 +1418,7 @@ static int echo_client_kbrw(struct echo_device *ed, int rw, struct obdo *oa,\n" - " \t\t\tgoto out;\n" - " \n" - " \t\tpages[i] = pgp->pg;\n" - "-\t\tpgp->count = PAGE_CACHE_SIZE;\n" - "+\t\tpgp->count = PAGE_SIZE;\n" - " \t\tpgp->off = off;\n" - " \t\tpgp->flag = brw_flags;\n" - " \n" - "@@ -1473,8 +1473,8 @@ static int echo_client_prep_commit(const struct lu_env *env,\n" - " \tif (count <= 0 || (count & (~CFS_PAGE_MASK)) != 0)\n" - " \t\treturn -EINVAL;\n" - " \n" - "-\tnpages = batch >> PAGE_CACHE_SHIFT;\n" - "-\ttot_pages = count >> PAGE_CACHE_SHIFT;\n" - "+\tnpages = batch >> PAGE_SHIFT;\n" - "+\ttot_pages = count >> PAGE_SHIFT;\n" - " \n" - " \tlnb = kcalloc(npages, sizeof(struct niobuf_local), GFP_NOFS);\n" - " \trnb = kcalloc(npages, sizeof(struct niobuf_remote), GFP_NOFS);\n" - "@@ -1497,9 +1497,9 @@ static int echo_client_prep_commit(const struct lu_env *env,\n" - " \t\tif (tot_pages < npages)\n" - " \t\t\tnpages = tot_pages;\n" - " \n" - "-\t\tfor (i = 0; i < npages; i++, off += PAGE_CACHE_SIZE) {\n" - "+\t\tfor (i = 0; i < npages; i++, off += PAGE_SIZE) {\n" - " \t\t\trnb[i].offset = off;\n" - "-\t\t\trnb[i].len = PAGE_CACHE_SIZE;\n" - "+\t\t\trnb[i].len = PAGE_SIZE;\n" - " \t\t\trnb[i].flags = brw_flags;\n" - " \t\t}\n" - " \n" - "@@ -1878,7 +1878,7 @@ static int __init obdecho_init(void)\n" - " {\n" - " \tLCONSOLE_INFO(\"Echo OBD driver; http://www.lustre.org/\\n\");\n" - " \n" - "-\tLASSERT(PAGE_CACHE_SIZE % OBD_ECHO_BLOCK_SIZE == 0);\n" - "+\tLASSERT(PAGE_SIZE % OBD_ECHO_BLOCK_SIZE == 0);\n" - " \n" - " \treturn echo_client_init();\n" - " }\n" - "diff --git a/drivers/staging/lustre/lustre/osc/lproc_osc.c b/drivers/staging/lustre/lustre/osc/lproc_osc.c\n" - "index 57c43c506ef2..a3358c39b2f1 100644\n" - "--- a/drivers/staging/lustre/lustre/osc/lproc_osc.c\n" - "+++ b/drivers/staging/lustre/lustre/osc/lproc_osc.c\n" - "@@ -162,15 +162,15 @@ static ssize_t max_dirty_mb_store(struct kobject *kobj,\n" - " \tif (rc)\n" - " \t\treturn rc;\n" - " \n" - "-\tpages_number *= 1 << (20 - PAGE_CACHE_SHIFT); /* MB -> pages */\n" - "+\tpages_number *= 1 << (20 - PAGE_SHIFT); /* MB -> pages */\n" - " \n" - " \tif (pages_number <= 0 ||\n" - "-\t pages_number > OSC_MAX_DIRTY_MB_MAX << (20 - PAGE_CACHE_SHIFT) ||\n" - "+\t pages_number > OSC_MAX_DIRTY_MB_MAX << (20 - PAGE_SHIFT) ||\n" - " \t pages_number > totalram_pages / 4) /* 1/4 of RAM */\n" - " \t\treturn -ERANGE;\n" - " \n" - " \tclient_obd_list_lock(&cli->cl_loi_list_lock);\n" - "-\tcli->cl_dirty_max = (u32)(pages_number << PAGE_CACHE_SHIFT);\n" - "+\tcli->cl_dirty_max = (u32)(pages_number << PAGE_SHIFT);\n" - " \tosc_wake_cache_waiters(cli);\n" - " \tclient_obd_list_unlock(&cli->cl_loi_list_lock);\n" - " \n" - "@@ -182,7 +182,7 @@ static int osc_cached_mb_seq_show(struct seq_file *m, void *v)\n" - " {\n" - " \tstruct obd_device *dev = m->private;\n" - " \tstruct client_obd *cli = &dev->u.cli;\n" - "-\tint shift = 20 - PAGE_CACHE_SHIFT;\n" - "+\tint shift = 20 - PAGE_SHIFT;\n" - " \n" - " \tseq_printf(m,\n" - " \t\t \"used_mb: %d\\n\"\n" - "@@ -211,7 +211,7 @@ static ssize_t osc_cached_mb_seq_write(struct file *file,\n" - " \t\treturn -EFAULT;\n" - " \tkernbuf[count] = 0;\n" - " \n" - "-\tmult = 1 << (20 - PAGE_CACHE_SHIFT);\n" - "+\tmult = 1 << (20 - PAGE_SHIFT);\n" - " \tbuffer += lprocfs_find_named_value(kernbuf, \"used_mb:\", &count) -\n" - " \t\t kernbuf;\n" - " \trc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult);\n" - "@@ -569,12 +569,12 @@ static ssize_t max_pages_per_rpc_store(struct kobject *kobj,\n" - " \n" - " \t/* if the max_pages is specified in bytes, convert to pages */\n" - " \tif (val >= ONE_MB_BRW_SIZE)\n" - "-\t\tval >>= PAGE_CACHE_SHIFT;\n" - "+\t\tval >>= PAGE_SHIFT;\n" - " \n" - "-\tchunk_mask = ~((1 << (cli->cl_chunkbits - PAGE_CACHE_SHIFT)) - 1);\n" - "+\tchunk_mask = ~((1 << (cli->cl_chunkbits - PAGE_SHIFT)) - 1);\n" - " \t/* max_pages_per_rpc must be chunk aligned */\n" - " \tval = (val + ~chunk_mask) & chunk_mask;\n" - "-\tif (val == 0 || val > ocd->ocd_brw_size >> PAGE_CACHE_SHIFT) {\n" - "+\tif (val == 0 || val > ocd->ocd_brw_size >> PAGE_SHIFT) {\n" - " \t\treturn -ERANGE;\n" - " \t}\n" - " \tclient_obd_list_lock(&cli->cl_loi_list_lock);\n" - "diff --git a/drivers/staging/lustre/lustre/osc/osc_cache.c b/drivers/staging/lustre/lustre/osc/osc_cache.c\n" - "index 63363111380c..5f25bf83dcfc 100644\n" - "--- a/drivers/staging/lustre/lustre/osc/osc_cache.c\n" - "+++ b/drivers/staging/lustre/lustre/osc/osc_cache.c\n" - "@@ -544,7 +544,7 @@ static int osc_extent_merge(const struct lu_env *env, struct osc_extent *cur,\n" - " \t\treturn -ERANGE;\n" - " \n" - " \tLASSERT(cur->oe_osclock == victim->oe_osclock);\n" - "-\tppc_bits = osc_cli(obj)->cl_chunkbits - PAGE_CACHE_SHIFT;\n" - "+\tppc_bits = osc_cli(obj)->cl_chunkbits - PAGE_SHIFT;\n" - " \tchunk_start = cur->oe_start >> ppc_bits;\n" - " \tchunk_end = cur->oe_end >> ppc_bits;\n" - " \tif (chunk_start != (victim->oe_end >> ppc_bits) + 1 &&\n" - "@@ -647,8 +647,8 @@ static struct osc_extent *osc_extent_find(const struct lu_env *env,\n" - " \tlock = cl_lock_at_pgoff(env, osc2cl(obj), index, NULL, 1, 0);\n" - " \tLASSERT(lock->cll_descr.cld_mode >= CLM_WRITE);\n" - " \n" - "-\tLASSERT(cli->cl_chunkbits >= PAGE_CACHE_SHIFT);\n" - "-\tppc_bits = cli->cl_chunkbits - PAGE_CACHE_SHIFT;\n" - "+\tLASSERT(cli->cl_chunkbits >= PAGE_SHIFT);\n" - "+\tppc_bits = cli->cl_chunkbits - PAGE_SHIFT;\n" - " \tchunk_mask = ~((1 << ppc_bits) - 1);\n" - " \tchunksize = 1 << cli->cl_chunkbits;\n" - " \tchunk = index >> ppc_bits;\n" - "@@ -871,8 +871,8 @@ int osc_extent_finish(const struct lu_env *env, struct osc_extent *ext,\n" - " \n" - " \tif (!sent) {\n" - " \t\tlost_grant = ext->oe_grants;\n" - "-\t} else if (blocksize < PAGE_CACHE_SIZE &&\n" - "-\t\t last_count != PAGE_CACHE_SIZE) {\n" - "+\t} else if (blocksize < PAGE_SIZE &&\n" - "+\t\t last_count != PAGE_SIZE) {\n" - " \t\t/* For short writes we shouldn't count parts of pages that\n" - " \t\t * span a whole chunk on the OST side, or our accounting goes\n" - " \t\t * wrong. Should match the code in filter_grant_check.\n" - "@@ -884,7 +884,7 @@ int osc_extent_finish(const struct lu_env *env, struct osc_extent *ext,\n" - " \t\tif (end)\n" - " \t\t\tcount += blocksize - end;\n" - " \n" - "-\t\tlost_grant = PAGE_CACHE_SIZE - count;\n" - "+\t\tlost_grant = PAGE_SIZE - count;\n" - " \t}\n" - " \tif (ext->oe_grants > 0)\n" - " \t\tosc_free_grant(cli, nr_pages, lost_grant);\n" - "@@ -967,7 +967,7 @@ static int osc_extent_truncate(struct osc_extent *ext, pgoff_t trunc_index,\n" - " \tstruct osc_async_page *oap;\n" - " \tstruct osc_async_page *tmp;\n" - " \tint pages_in_chunk = 0;\n" - "-\tint ppc_bits = cli->cl_chunkbits - PAGE_CACHE_SHIFT;\n" - "+\tint ppc_bits = cli->cl_chunkbits - PAGE_SHIFT;\n" - " \t__u64 trunc_chunk = trunc_index >> ppc_bits;\n" - " \tint grants = 0;\n" - " \tint nr_pages = 0;\n" - "@@ -1125,7 +1125,7 @@ static int osc_extent_make_ready(const struct lu_env *env,\n" - " \tif (!(last->oap_async_flags & ASYNC_COUNT_STABLE)) {\n" - " \t\tlast->oap_count = osc_refresh_count(env, last, OBD_BRW_WRITE);\n" - " \t\tLASSERT(last->oap_count > 0);\n" - "-\t\tLASSERT(last->oap_page_off + last->oap_count <= PAGE_CACHE_SIZE);\n" - "+\t\tLASSERT(last->oap_page_off + last->oap_count <= PAGE_SIZE);\n" - " \t\tlast->oap_async_flags |= ASYNC_COUNT_STABLE;\n" - " \t}\n" - " \n" - "@@ -1134,7 +1134,7 @@ static int osc_extent_make_ready(const struct lu_env *env,\n" - " \t */\n" - " \tlist_for_each_entry(oap, &ext->oe_pages, oap_pending_item) {\n" - " \t\tif (!(oap->oap_async_flags & ASYNC_COUNT_STABLE)) {\n" - "-\t\t\toap->oap_count = PAGE_CACHE_SIZE - oap->oap_page_off;\n" - "+\t\t\toap->oap_count = PAGE_SIZE - oap->oap_page_off;\n" - " \t\t\toap->oap_async_flags |= ASYNC_COUNT_STABLE;\n" - " \t\t}\n" - " \t}\n" - "@@ -1158,7 +1158,7 @@ static int osc_extent_expand(struct osc_extent *ext, pgoff_t index, int *grants)\n" - " \tstruct osc_object *obj = ext->oe_obj;\n" - " \tstruct client_obd *cli = osc_cli(obj);\n" - " \tstruct osc_extent *next;\n" - "-\tint ppc_bits = cli->cl_chunkbits - PAGE_CACHE_SHIFT;\n" - "+\tint ppc_bits = cli->cl_chunkbits - PAGE_SHIFT;\n" - " \tpgoff_t chunk = index >> ppc_bits;\n" - " \tpgoff_t end_chunk;\n" - " \tpgoff_t end_index;\n" - "@@ -1293,9 +1293,9 @@ static int osc_refresh_count(const struct lu_env *env,\n" - " \t\treturn 0;\n" - " \telse if (cl_offset(obj, page->cp_index + 1) > kms)\n" - " \t\t/* catch sub-page write at end of file */\n" - "-\t\treturn kms % PAGE_CACHE_SIZE;\n" - "+\t\treturn kms % PAGE_SIZE;\n" - " \telse\n" - "-\t\treturn PAGE_CACHE_SIZE;\n" - "+\t\treturn PAGE_SIZE;\n" - " }\n" - " \n" - " static int osc_completion(const struct lu_env *env, struct osc_async_page *oap,\n" - "@@ -1376,10 +1376,10 @@ static void osc_consume_write_grant(struct client_obd *cli,\n" - " \tassert_spin_locked(&cli->cl_loi_list_lock.lock);\n" - " \tLASSERT(!(pga->flag & OBD_BRW_FROM_GRANT));\n" - " \tatomic_inc(&obd_dirty_pages);\n" - "-\tcli->cl_dirty += PAGE_CACHE_SIZE;\n" - "+\tcli->cl_dirty += PAGE_SIZE;\n" - " \tpga->flag |= OBD_BRW_FROM_GRANT;\n" - " \tCDEBUG(D_CACHE, \"using %lu grant credits for brw %p page %p\\n\",\n" - "-\t PAGE_CACHE_SIZE, pga, pga->pg);\n" - "+\t PAGE_SIZE, pga, pga->pg);\n" - " \tosc_update_next_shrink(cli);\n" - " }\n" - " \n" - "@@ -1396,11 +1396,11 @@ static void osc_release_write_grant(struct client_obd *cli,\n" - " \n" - " \tpga->flag &= ~OBD_BRW_FROM_GRANT;\n" - " \tatomic_dec(&obd_dirty_pages);\n" - "-\tcli->cl_dirty -= PAGE_CACHE_SIZE;\n" - "+\tcli->cl_dirty -= PAGE_SIZE;\n" - " \tif (pga->flag & OBD_BRW_NOCACHE) {\n" - " \t\tpga->flag &= ~OBD_BRW_NOCACHE;\n" - " \t\tatomic_dec(&obd_dirty_transit_pages);\n" - "-\t\tcli->cl_dirty_transit -= PAGE_CACHE_SIZE;\n" - "+\t\tcli->cl_dirty_transit -= PAGE_SIZE;\n" - " \t}\n" - " }\n" - " \n" - "@@ -1456,7 +1456,7 @@ static void osc_unreserve_grant(struct client_obd *cli,\n" - " * used, we should return these grants to OST. There're two cases where grants\n" - " * can be lost:\n" - " * 1. truncate;\n" - "- * 2. blocksize at OST is less than PAGE_CACHE_SIZE and a partial page was\n" - "+ * 2. blocksize at OST is less than PAGE_SIZE and a partial page was\n" - " * written. In this case OST may use less chunks to serve this partial\n" - " * write. OSTs don't actually know the page size on the client side. so\n" - " * clients have to calculate lost grant by the blocksize on the OST.\n" - "@@ -1469,7 +1469,7 @@ static void osc_free_grant(struct client_obd *cli, unsigned int nr_pages,\n" - " \n" - " \tclient_obd_list_lock(&cli->cl_loi_list_lock);\n" - " \tatomic_sub(nr_pages, &obd_dirty_pages);\n" - "-\tcli->cl_dirty -= nr_pages << PAGE_CACHE_SHIFT;\n" - "+\tcli->cl_dirty -= nr_pages << PAGE_SHIFT;\n" - " \tcli->cl_lost_grant += lost_grant;\n" - " \tif (cli->cl_avail_grant < grant && cli->cl_lost_grant >= grant) {\n" - " \t\t/* borrow some grant from truncate to avoid the case that\n" - "@@ -1512,11 +1512,11 @@ static int osc_enter_cache_try(struct client_obd *cli,\n" - " \tif (rc < 0)\n" - " \t\treturn 0;\n" - " \n" - "-\tif (cli->cl_dirty + PAGE_CACHE_SIZE <= cli->cl_dirty_max &&\n" - "+\tif (cli->cl_dirty + PAGE_SIZE <= cli->cl_dirty_max &&\n" - " \t atomic_read(&obd_dirty_pages) + 1 <= obd_max_dirty_pages) {\n" - " \t\tosc_consume_write_grant(cli, &oap->oap_brw_page);\n" - " \t\tif (transient) {\n" - "-\t\t\tcli->cl_dirty_transit += PAGE_CACHE_SIZE;\n" - "+\t\t\tcli->cl_dirty_transit += PAGE_SIZE;\n" - " \t\t\tatomic_inc(&obd_dirty_transit_pages);\n" - " \t\t\toap->oap_brw_flags |= OBD_BRW_NOCACHE;\n" - " \t\t}\n" - "@@ -1562,7 +1562,7 @@ static int osc_enter_cache(const struct lu_env *env, struct client_obd *cli,\n" - " \t * of queued writes and create a discontiguous rpc stream\n" - " \t */\n" - " \tif (OBD_FAIL_CHECK(OBD_FAIL_OSC_NO_GRANT) ||\n" - "-\t cli->cl_dirty_max < PAGE_CACHE_SIZE ||\n" - "+\t cli->cl_dirty_max < PAGE_SIZE ||\n" - " \t cli->cl_ar.ar_force_sync || loi->loi_ar.ar_force_sync) {\n" - " \t\trc = -EDQUOT;\n" - " \t\tgoto out;\n" - "@@ -1632,7 +1632,7 @@ void osc_wake_cache_waiters(struct client_obd *cli)\n" - " \n" - " \t\tocw->ocw_rc = -EDQUOT;\n" - " \t\t/* we can't dirty more */\n" - "-\t\tif ((cli->cl_dirty + PAGE_CACHE_SIZE > cli->cl_dirty_max) ||\n" - "+\t\tif ((cli->cl_dirty + PAGE_SIZE > cli->cl_dirty_max) ||\n" - " \t\t (atomic_read(&obd_dirty_pages) + 1 >\n" - " \t\t obd_max_dirty_pages)) {\n" - " \t\t\tCDEBUG(D_CACHE, \"no dirty room: dirty: %ld osc max %ld, sys max %d\\n\",\n" - "diff --git a/drivers/staging/lustre/lustre/osc/osc_page.c b/drivers/staging/lustre/lustre/osc/osc_page.c\n" - "index d720b1a1c18c..ce9ddd515f64 100644\n" - "--- a/drivers/staging/lustre/lustre/osc/osc_page.c\n" - "+++ b/drivers/staging/lustre/lustre/osc/osc_page.c\n" - "@@ -410,7 +410,7 @@ int osc_page_init(const struct lu_env *env, struct cl_object *obj,\n" - " \tint result;\n" - " \n" - " \topg->ops_from = 0;\n" - "-\topg->ops_to = PAGE_CACHE_SIZE;\n" - "+\topg->ops_to = PAGE_SIZE;\n" - " \n" - " \tresult = osc_prep_async_page(osc, opg, vmpage,\n" - " \t\t\t\t cl_offset(obj, page->cp_index));\n" - "@@ -487,9 +487,9 @@ static atomic_t osc_lru_waiters = ATOMIC_INIT(0);\n" - " /* LRU pages are freed in batch mode. OSC should at least free this\n" - " * number of pages to avoid running out of LRU budget, and..\n" - " */\n" - "-static const int lru_shrink_min = 2 << (20 - PAGE_CACHE_SHIFT); /* 2M */\n" - "+static const int lru_shrink_min = 2 << (20 - PAGE_SHIFT); /* 2M */\n" - " /* free this number at most otherwise it will take too long time to finish. */\n" - "-static const int lru_shrink_max = 32 << (20 - PAGE_CACHE_SHIFT); /* 32M */\n" - "+static const int lru_shrink_max = 32 << (20 - PAGE_SHIFT); /* 32M */\n" - " \n" - " /* Check if we can free LRU slots from this OSC. If there exists LRU waiters,\n" - " * we should free slots aggressively. In this way, slots are freed in a steady\n" - "diff --git a/drivers/staging/lustre/lustre/osc/osc_request.c b/drivers/staging/lustre/lustre/osc/osc_request.c\n" - "index 74805f1ae888..30526ebcad04 100644\n" - "--- a/drivers/staging/lustre/lustre/osc/osc_request.c\n" - "+++ b/drivers/staging/lustre/lustre/osc/osc_request.c\n" - "@@ -826,7 +826,7 @@ static void osc_announce_cached(struct client_obd *cli, struct obdo *oa,\n" - " \t\toa->o_undirty = 0;\n" - " \t} else {\n" - " \t\tlong max_in_flight = (cli->cl_max_pages_per_rpc <<\n" - "-\t\t\t\t PAGE_CACHE_SHIFT)*\n" - "+\t\t\t\t PAGE_SHIFT)*\n" - " \t\t\t\t (cli->cl_max_rpcs_in_flight + 1);\n" - " \t\toa->o_undirty = max(cli->cl_dirty_max, max_in_flight);\n" - " \t}\n" - "@@ -909,11 +909,11 @@ static void osc_shrink_grant_local(struct client_obd *cli, struct obdo *oa)\n" - " static int osc_shrink_grant(struct client_obd *cli)\n" - " {\n" - " \t__u64 target_bytes = (cli->cl_max_rpcs_in_flight + 1) *\n" - "-\t\t\t (cli->cl_max_pages_per_rpc << PAGE_CACHE_SHIFT);\n" - "+\t\t\t (cli->cl_max_pages_per_rpc << PAGE_SHIFT);\n" - " \n" - " \tclient_obd_list_lock(&cli->cl_loi_list_lock);\n" - " \tif (cli->cl_avail_grant <= target_bytes)\n" - "-\t\ttarget_bytes = cli->cl_max_pages_per_rpc << PAGE_CACHE_SHIFT;\n" - "+\t\ttarget_bytes = cli->cl_max_pages_per_rpc << PAGE_SHIFT;\n" - " \tclient_obd_list_unlock(&cli->cl_loi_list_lock);\n" - " \n" - " \treturn osc_shrink_grant_to_target(cli, target_bytes);\n" - "@@ -929,8 +929,8 @@ int osc_shrink_grant_to_target(struct client_obd *cli, __u64 target_bytes)\n" - " \t * We don't want to shrink below a single RPC, as that will negatively\n" - " \t * impact block allocation and long-term performance.\n" - " \t */\n" - "-\tif (target_bytes < cli->cl_max_pages_per_rpc << PAGE_CACHE_SHIFT)\n" - "-\t\ttarget_bytes = cli->cl_max_pages_per_rpc << PAGE_CACHE_SHIFT;\n" - "+\tif (target_bytes < cli->cl_max_pages_per_rpc << PAGE_SHIFT)\n" - "+\t\ttarget_bytes = cli->cl_max_pages_per_rpc << PAGE_SHIFT;\n" - " \n" - " \tif (target_bytes >= cli->cl_avail_grant) {\n" - " \t\tclient_obd_list_unlock(&cli->cl_loi_list_lock);\n" - "@@ -978,7 +978,7 @@ static int osc_should_shrink_grant(struct client_obd *client)\n" - " \t\t * cli_brw_size(obd->u.cli.cl_import->imp_obd->obd_self_export)\n" - " \t\t * Keep comment here so that it can be found by searching.\n" - " \t\t */\n" - "-\t\tint brw_size = client->cl_max_pages_per_rpc << PAGE_CACHE_SHIFT;\n" - "+\t\tint brw_size = client->cl_max_pages_per_rpc << PAGE_SHIFT;\n" - " \n" - " \t\tif (client->cl_import->imp_state == LUSTRE_IMP_FULL &&\n" - " \t\t client->cl_avail_grant > brw_size)\n" - "@@ -1052,7 +1052,7 @@ static void osc_init_grant(struct client_obd *cli, struct obd_connect_data *ocd)\n" - " \t}\n" - " \n" - " \t/* determine the appropriate chunk size used by osc_extent. */\n" - "-\tcli->cl_chunkbits = max_t(int, PAGE_CACHE_SHIFT, ocd->ocd_blocksize);\n" - "+\tcli->cl_chunkbits = max_t(int, PAGE_SHIFT, ocd->ocd_blocksize);\n" - " \tclient_obd_list_unlock(&cli->cl_loi_list_lock);\n" - " \n" - " \tCDEBUG(D_CACHE, \"%s, setting cl_avail_grant: %ld cl_lost_grant: %ld chunk bits: %d\\n\",\n" - "@@ -1317,9 +1317,9 @@ static int osc_brw_prep_request(int cmd, struct client_obd *cli,\n" - " \t\tLASSERT(pg->count > 0);\n" - " \t\t/* make sure there is no gap in the middle of page array */\n" - " \t\tLASSERTF(page_count == 1 ||\n" - "-\t\t\t (ergo(i == 0, poff + pg->count == PAGE_CACHE_SIZE) &&\n" - "+\t\t\t (ergo(i == 0, poff + pg->count == PAGE_SIZE) &&\n" - " \t\t\t ergo(i > 0 && i < page_count - 1,\n" - "-\t\t\t poff == 0 && pg->count == PAGE_CACHE_SIZE) &&\n" - "+\t\t\t poff == 0 && pg->count == PAGE_SIZE) &&\n" - " \t\t\t ergo(i == page_count - 1, poff == 0)),\n" - " \t\t\t \"i: %d/%d pg: %p off: %llu, count: %u\\n\",\n" - " \t\t\t i, page_count, pg, pg->off, pg->count);\n" - "@@ -1877,7 +1877,7 @@ int osc_build_rpc(const struct lu_env *env, struct client_obd *cli,\n" - " \t\t\t\t\t\toap->oap_count;\n" - " \t\t\telse\n" - " \t\t\t\tLASSERT(oap->oap_page_off + oap->oap_count ==\n" - "-\t\t\t\t\tPAGE_CACHE_SIZE);\n" - "+\t\t\t\t\tPAGE_SIZE);\n" - " \t\t}\n" - " \t}\n" - " \n" - "@@ -1993,7 +1993,7 @@ int osc_build_rpc(const struct lu_env *env, struct client_obd *cli,\n" - " \t\ttmp->oap_request = ptlrpc_request_addref(req);\n" - " \n" - " \tclient_obd_list_lock(&cli->cl_loi_list_lock);\n" - "-\tstarting_offset >>= PAGE_CACHE_SHIFT;\n" - "+\tstarting_offset >>= PAGE_SHIFT;\n" - " \tif (cmd == OBD_BRW_READ) {\n" - " \t\tcli->cl_r_in_flight++;\n" - " \t\tlprocfs_oh_tally_log2(&cli->cl_read_page_hist, page_count);\n" - "@@ -2790,12 +2790,12 @@ out:\n" - " \t\t\t\t\t\tCFS_PAGE_MASK;\n" - " \n" - " \t\tif (OBD_OBJECT_EOF - fm_key->fiemap.fm_length <=\n" - "-\t\t fm_key->fiemap.fm_start + PAGE_CACHE_SIZE - 1)\n" - "+\t\t fm_key->fiemap.fm_start + PAGE_SIZE - 1)\n" - " \t\t\tpolicy.l_extent.end = OBD_OBJECT_EOF;\n" - " \t\telse\n" - " \t\t\tpolicy.l_extent.end = (fm_key->fiemap.fm_start +\n" - " \t\t\t\tfm_key->fiemap.fm_length +\n" - "-\t\t\t\tPAGE_CACHE_SIZE - 1) & CFS_PAGE_MASK;\n" - "+\t\t\t\tPAGE_SIZE - 1) & CFS_PAGE_MASK;\n" - " \n" - " \t\tostid_build_res_name(&fm_key->oa.o_oi, &res_id);\n" - " \t\tmode = ldlm_lock_match(exp->exp_obd->obd_namespace,\n" - "diff --git a/drivers/staging/lustre/lustre/ptlrpc/client.c b/drivers/staging/lustre/lustre/ptlrpc/client.c\n" - "index 1b7673eec4d7..cf3ac8eee9ee 100644\n" - "--- a/drivers/staging/lustre/lustre/ptlrpc/client.c\n" - "+++ b/drivers/staging/lustre/lustre/ptlrpc/client.c\n" - "@@ -174,12 +174,12 @@ void __ptlrpc_prep_bulk_page(struct ptlrpc_bulk_desc *desc,\n" - " \tLASSERT(page);\n" - " \tLASSERT(pageoffset >= 0);\n" - " \tLASSERT(len > 0);\n" - "-\tLASSERT(pageoffset + len <= PAGE_CACHE_SIZE);\n" - "+\tLASSERT(pageoffset + len <= PAGE_SIZE);\n" - " \n" - " \tdesc->bd_nob += len;\n" - " \n" - " \tif (pin)\n" - "-\t\tpage_cache_get(page);\n" - "+\t\tget_page(page);\n" - " \n" - " \tptlrpc_add_bulk_page(desc, page, pageoffset, len);\n" - " }\n" - "@@ -206,7 +206,7 @@ void __ptlrpc_free_bulk(struct ptlrpc_bulk_desc *desc, int unpin)\n" - " \n" - " \tif (unpin) {\n" - " \t\tfor (i = 0; i < desc->bd_iov_count; i++)\n" - "-\t\t\tpage_cache_release(desc->bd_iov[i].kiov_page);\n" - "+\t\t\tput_page(desc->bd_iov[i].kiov_page);\n" - " \t}\n" - " \n" - " \tkfree(desc);\n" - "diff --git a/drivers/staging/lustre/lustre/ptlrpc/import.c b/drivers/staging/lustre/lustre/ptlrpc/import.c\n" - "index b4eddf291269..cd94fed0ffdf 100644\n" - "--- a/drivers/staging/lustre/lustre/ptlrpc/import.c\n" - "+++ b/drivers/staging/lustre/lustre/ptlrpc/import.c\n" - "@@ -1092,7 +1092,7 @@ finish:\n" - " \n" - " \t\tif (ocd->ocd_connect_flags & OBD_CONNECT_BRW_SIZE)\n" - " \t\t\tcli->cl_max_pages_per_rpc =\n" - "-\t\t\t\tmin(ocd->ocd_brw_size >> PAGE_CACHE_SHIFT,\n" - "+\t\t\t\tmin(ocd->ocd_brw_size >> PAGE_SHIFT,\n" - " \t\t\t\t cli->cl_max_pages_per_rpc);\n" - " \t\telse if (imp->imp_connect_op == MDS_CONNECT ||\n" - " \t\t\t imp->imp_connect_op == MGS_CONNECT)\n" - "diff --git a/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c b/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c\n" - "index cee04efb6fb5..c95a91ce26c9 100644\n" - "--- a/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c\n" - "+++ b/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c\n" - "@@ -308,7 +308,7 @@ ptlrpc_lprocfs_req_history_max_seq_write(struct file *file,\n" - " \t * hose a kernel by allowing the request history to grow too\n" - " \t * far.\n" - " \t */\n" - "-\tbufpages = (svc->srv_buf_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tbufpages = (svc->srv_buf_size + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \tif (val > totalram_pages / (2 * bufpages))\n" - " \t\treturn -ERANGE;\n" - " \n" - "@@ -1226,7 +1226,7 @@ int lprocfs_wr_import(struct file *file, const char __user *buffer,\n" - " \tconst char prefix[] = \"connection=\";\n" - " \tconst int prefix_len = sizeof(prefix) - 1;\n" - " \n" - "-\tif (count > PAGE_CACHE_SIZE - 1 || count <= prefix_len)\n" - "+\tif (count > PAGE_SIZE - 1 || count <= prefix_len)\n" - " \t\treturn -EINVAL;\n" - " \n" - " \tkbuf = kzalloc(count + 1, GFP_NOFS);\n" - "diff --git a/drivers/staging/lustre/lustre/ptlrpc/recover.c b/drivers/staging/lustre/lustre/ptlrpc/recover.c\n" - "index 5f27d9c2e4ef..30d9a164e52d 100644\n" - "--- a/drivers/staging/lustre/lustre/ptlrpc/recover.c\n" - "+++ b/drivers/staging/lustre/lustre/ptlrpc/recover.c\n" - "@@ -195,7 +195,7 @@ int ptlrpc_resend(struct obd_import *imp)\n" - " \t}\n" - " \n" - " \tlist_for_each_entry_safe(req, next, &imp->imp_sending_list, rq_list) {\n" - "-\t\tLASSERTF((long)req > PAGE_CACHE_SIZE && req != LP_POISON,\n" - "+\t\tLASSERTF((long)req > PAGE_SIZE && req != LP_POISON,\n" - " \t\t\t \"req %p bad\\n\", req);\n" - " \t\tLASSERTF(req->rq_type != LI_POISON, \"req %p freed\\n\", req);\n" - " \t\tif (!ptlrpc_no_resend(req))\n" - "diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c\n" - "index 72d5b9bf5b29..d3872b8c9a6e 100644\n" - "--- a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c\n" - "+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c\n" - "@@ -58,7 +58,7 @@\n" - " * bulk encryption page pools\t *\n" - " ****************************************/\n" - " \n" - "-#define POINTERS_PER_PAGE\t(PAGE_CACHE_SIZE / sizeof(void *))\n" - "+#define POINTERS_PER_PAGE\t(PAGE_SIZE / sizeof(void *))\n" - " #define PAGES_PER_POOL\t\t(POINTERS_PER_PAGE)\n" - " \n" - " #define IDLE_IDX_MAX\t (100)\n" - "diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c\n" - "index 8cfce105c7ee..e21ca2bd6839 100644\n" - "--- a/drivers/usb/gadget/function/f_fs.c\n" - "+++ b/drivers/usb/gadget/function/f_fs.c\n" - "@@ -1147,8 +1147,8 @@ static int ffs_sb_fill(struct super_block *sb, void *_data, int silent)\n" - " \tffs->sb = sb;\n" - " \tdata->ffs_data = NULL;\n" - " \tsb->s_fs_info = ffs;\n" - "-\tsb->s_blocksize = PAGE_CACHE_SIZE;\n" - "-\tsb->s_blocksize_bits = PAGE_CACHE_SHIFT;\n" - "+\tsb->s_blocksize = PAGE_SIZE;\n" - "+\tsb->s_blocksize_bits = PAGE_SHIFT;\n" - " \tsb->s_magic = FUNCTIONFS_MAGIC;\n" - " \tsb->s_op = &ffs_sb_operations;\n" - " \tsb->s_time_gran = 1;\n" - "diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c\n" - "index 5cdaf0150a4e..e64479f882a5 100644\n" - "--- a/drivers/usb/gadget/legacy/inode.c\n" - "+++ b/drivers/usb/gadget/legacy/inode.c\n" - "@@ -1954,8 +1954,8 @@ gadgetfs_fill_super (struct super_block *sb, void *opts, int silent)\n" - " \t\treturn -ENODEV;\n" - " \n" - " \t/* superblock */\n" - "-\tsb->s_blocksize = PAGE_CACHE_SIZE;\n" - "-\tsb->s_blocksize_bits = PAGE_CACHE_SHIFT;\n" - "+\tsb->s_blocksize = PAGE_SIZE;\n" - "+\tsb->s_blocksize_bits = PAGE_SHIFT;\n" - " \tsb->s_magic = GADGETFS_MAGIC;\n" - " \tsb->s_op = &gadget_fs_operations;\n" - " \tsb->s_time_gran = 1;\n" - "diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c\n" - "index dba51362d2e2..90901861bfc0 100644\n" - "--- a/drivers/usb/storage/scsiglue.c\n" - "+++ b/drivers/usb/storage/scsiglue.c\n" - "@@ -123,7 +123,7 @@ static int slave_configure(struct scsi_device *sdev)\n" - " \t\tunsigned int max_sectors = 64;\n" - " \n" - " \t\tif (us->fflags & US_FL_MAX_SECTORS_MIN)\n" - "-\t\t\tmax_sectors = PAGE_CACHE_SIZE >> 9;\n" - "+\t\t\tmax_sectors = PAGE_SIZE >> 9;\n" - " \t\tif (queue_max_hw_sectors(sdev->request_queue) > max_sectors)\n" - " \t\t\tblk_queue_max_hw_sectors(sdev->request_queue,\n" - " \t\t\t\t\t max_sectors);\n" - "diff --git a/drivers/video/fbdev/pvr2fb.c b/drivers/video/fbdev/pvr2fb.c\n" - "index 0e24eb9c219c..580311e6bb03 100644\n" - "--- a/drivers/video/fbdev/pvr2fb.c\n" - "+++ b/drivers/video/fbdev/pvr2fb.c\n" - "@@ -735,7 +735,7 @@ out:\n" - " \n" - " out_unmap:\n" - " \tfor (i = 0; i < nr_pages; i++)\n" - "-\t\tpage_cache_release(pages[i]);\n" - "+\t\tput_page(pages[i]);\n" - " \n" - " \tkfree(pages);\n" - " \n" - "diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c\n" - "index e9e04376c52c..ac9225e86bf3 100644\n" - "--- a/fs/9p/vfs_addr.c\n" - "+++ b/fs/9p/vfs_addr.c\n" - "@@ -153,7 +153,7 @@ static void v9fs_invalidate_page(struct page *page, unsigned int offset,\n" - " \t * If called with zero offset, we should release\n" - " \t * the private state assocated with the page\n" - " \t */\n" - "-\tif (offset == 0 && length == PAGE_CACHE_SIZE)\n" - "+\tif (offset == 0 && length == PAGE_SIZE)\n" - " \t\tv9fs_fscache_invalidate_page(page);\n" - " }\n" - " \n" - "@@ -166,10 +166,10 @@ static int v9fs_vfs_writepage_locked(struct page *page)\n" - " \tstruct bio_vec bvec;\n" - " \tint err, len;\n" - " \n" - "-\tif (page->index == size >> PAGE_CACHE_SHIFT)\n" - "-\t\tlen = size & ~PAGE_CACHE_MASK;\n" - "+\tif (page->index == size >> PAGE_SHIFT)\n" - "+\t\tlen = size & ~PAGE_MASK;\n" - " \telse\n" - "-\t\tlen = PAGE_CACHE_SIZE;\n" - "+\t\tlen = PAGE_SIZE;\n" - " \n" - " \tbvec.bv_page = page;\n" - " \tbvec.bv_offset = 0;\n" - "@@ -271,7 +271,7 @@ static int v9fs_write_begin(struct file *filp, struct address_space *mapping,\n" - " \tint retval = 0;\n" - " \tstruct page *page;\n" - " \tstruct v9fs_inode *v9inode;\n" - "-\tpgoff_t index = pos >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = pos >> PAGE_SHIFT;\n" - " \tstruct inode *inode = mapping->host;\n" - " \n" - " \n" - "@@ -288,11 +288,11 @@ start:\n" - " \tif (PageUptodate(page))\n" - " \t\tgoto out;\n" - " \n" - "-\tif (len == PAGE_CACHE_SIZE)\n" - "+\tif (len == PAGE_SIZE)\n" - " \t\tgoto out;\n" - " \n" - " \tretval = v9fs_fid_readpage(v9inode->writeback_fid, page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \tif (!retval)\n" - " \t\tgoto start;\n" - " out:\n" - "@@ -313,7 +313,7 @@ static int v9fs_write_end(struct file *filp, struct address_space *mapping,\n" - " \t\t/*\n" - " \t\t * zero out the rest of the area\n" - " \t\t */\n" - "-\t\tunsigned from = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\t\tunsigned from = pos & (PAGE_SIZE - 1);\n" - " \n" - " \t\tzero_user(page, from + copied, len - copied);\n" - " \t\tflush_dcache_page(page);\n" - "@@ -331,7 +331,7 @@ static int v9fs_write_end(struct file *filp, struct address_space *mapping,\n" - " \t}\n" - " \tset_page_dirty(page);\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \treturn copied;\n" - " }\n" - "diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c\n" - "index eadc894faea2..b84c291ba1eb 100644\n" - "--- a/fs/9p/vfs_file.c\n" - "+++ b/fs/9p/vfs_file.c\n" - "@@ -421,8 +421,8 @@ v9fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)\n" - " \t\tstruct inode *inode = file_inode(file);\n" - " \t\tloff_t i_size;\n" - " \t\tunsigned long pg_start, pg_end;\n" - "-\t\tpg_start = origin >> PAGE_CACHE_SHIFT;\n" - "-\t\tpg_end = (origin + retval - 1) >> PAGE_CACHE_SHIFT;\n" - "+\t\tpg_start = origin >> PAGE_SHIFT;\n" - "+\t\tpg_end = (origin + retval - 1) >> PAGE_SHIFT;\n" - " \t\tif (inode->i_mapping && inode->i_mapping->nrpages)\n" - " \t\t\tinvalidate_inode_pages2_range(inode->i_mapping,\n" - " \t\t\t\t\t\t pg_start, pg_end);\n" - "diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c\n" - "index bf495cedec26..de3ed8629196 100644\n" - "--- a/fs/9p/vfs_super.c\n" - "+++ b/fs/9p/vfs_super.c\n" - "@@ -87,7 +87,7 @@ v9fs_fill_super(struct super_block *sb, struct v9fs_session_info *v9ses,\n" - " \t\tsb->s_op = &v9fs_super_ops;\n" - " \tsb->s_bdi = &v9ses->bdi;\n" - " \tif (v9ses->cache)\n" - "-\t\tsb->s_bdi->ra_pages = (VM_MAX_READAHEAD * 1024)/PAGE_CACHE_SIZE;\n" - "+\t\tsb->s_bdi->ra_pages = (VM_MAX_READAHEAD * 1024)/PAGE_SIZE;\n" - " \n" - " \tsb->s_flags |= MS_ACTIVE | MS_DIRSYNC | MS_NOATIME;\n" - " \tif (!v9ses->cache)\n" - "diff --git a/fs/affs/file.c b/fs/affs/file.c\n" - "index 22fc7c802d69..0cde550050e8 100644\n" - "--- a/fs/affs/file.c\n" - "+++ b/fs/affs/file.c\n" - "@@ -510,9 +510,9 @@ affs_do_readpage_ofs(struct page *page, unsigned to)\n" - " \n" - " \tpr_debug(\"%s(%lu, %ld, 0, %d)\\n\", __func__, inode->i_ino,\n" - " \t\t page->index, to);\n" - "-\tBUG_ON(to > PAGE_CACHE_SIZE);\n" - "+\tBUG_ON(to > PAGE_SIZE);\n" - " \tbsize = AFFS_SB(sb)->s_data_blksize;\n" - "-\ttmp = page->index << PAGE_CACHE_SHIFT;\n" - "+\ttmp = page->index << PAGE_SHIFT;\n" - " \tbidx = tmp / bsize;\n" - " \tboff = tmp % bsize;\n" - " \n" - "@@ -613,10 +613,10 @@ affs_readpage_ofs(struct file *file, struct page *page)\n" - " \tint err;\n" - " \n" - " \tpr_debug(\"%s(%lu, %ld)\\n\", __func__, inode->i_ino, page->index);\n" - "-\tto = PAGE_CACHE_SIZE;\n" - "-\tif (((page->index + 1) << PAGE_CACHE_SHIFT) > inode->i_size) {\n" - "-\t\tto = inode->i_size & ~PAGE_CACHE_MASK;\n" - "-\t\tmemset(page_address(page) + to, 0, PAGE_CACHE_SIZE - to);\n" - "+\tto = PAGE_SIZE;\n" - "+\tif (((page->index + 1) << PAGE_SHIFT) > inode->i_size) {\n" - "+\t\tto = inode->i_size & ~PAGE_MASK;\n" - "+\t\tmemset(page_address(page) + to, 0, PAGE_SIZE - to);\n" - " \t}\n" - " \n" - " \terr = affs_do_readpage_ofs(page, to);\n" - "@@ -646,7 +646,7 @@ static int affs_write_begin_ofs(struct file *file, struct address_space *mapping\n" - " \t\t\treturn err;\n" - " \t}\n" - " \n" - "-\tindex = pos >> PAGE_CACHE_SHIFT;\n" - "+\tindex = pos >> PAGE_SHIFT;\n" - " \tpage = grab_cache_page_write_begin(mapping, index, flags);\n" - " \tif (!page)\n" - " \t\treturn -ENOMEM;\n" - "@@ -656,10 +656,10 @@ static int affs_write_begin_ofs(struct file *file, struct address_space *mapping\n" - " \t\treturn 0;\n" - " \n" - " \t/* XXX: inefficient but safe in the face of short writes */\n" - "-\terr = affs_do_readpage_ofs(page, PAGE_CACHE_SIZE);\n" - "+\terr = affs_do_readpage_ofs(page, PAGE_SIZE);\n" - " \tif (err) {\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \treturn err;\n" - " }\n" - "@@ -677,7 +677,7 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping,\n" - " \tu32 tmp;\n" - " \tint written;\n" - " \n" - "-\tfrom = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tfrom = pos & (PAGE_SIZE - 1);\n" - " \tto = pos + len;\n" - " \t/*\n" - " \t * XXX: not sure if this can handle short copies (len < copied), but\n" - "@@ -692,7 +692,7 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping,\n" - " \n" - " \tbh = NULL;\n" - " \twritten = 0;\n" - "-\ttmp = (page->index << PAGE_CACHE_SHIFT) + from;\n" - "+\ttmp = (page->index << PAGE_SHIFT) + from;\n" - " \tbidx = tmp / bsize;\n" - " \tboff = tmp % bsize;\n" - " \tif (boff) {\n" - "@@ -788,13 +788,13 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping,\n" - " \n" - " done:\n" - " \taffs_brelse(bh);\n" - "-\ttmp = (page->index << PAGE_CACHE_SHIFT) + from;\n" - "+\ttmp = (page->index << PAGE_SHIFT) + from;\n" - " \tif (tmp > inode->i_size)\n" - " \t\tinode->i_size = AFFS_I(inode)->mmu_private = tmp;\n" - " \n" - " err_first_bh:\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \treturn written;\n" - " \n" - "diff --git a/fs/afs/dir.c b/fs/afs/dir.c\n" - "index e10e17788f06..5fda2bc53cd7 100644\n" - "--- a/fs/afs/dir.c\n" - "+++ b/fs/afs/dir.c\n" - "@@ -181,7 +181,7 @@ error:\n" - " static inline void afs_dir_put_page(struct page *page)\n" - " {\n" - " \tkunmap(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " /*\n" - "diff --git a/fs/afs/file.c b/fs/afs/file.c\n" - "index 999bc3caec92..6344aee4ac4b 100644\n" - "--- a/fs/afs/file.c\n" - "+++ b/fs/afs/file.c\n" - "@@ -164,7 +164,7 @@ int afs_page_filler(void *data, struct page *page)\n" - " \t\t_debug(\"cache said ENOBUFS\");\n" - " \tdefault:\n" - " \tgo_on:\n" - "-\t\toffset = page->index << PAGE_CACHE_SHIFT;\n" - "+\t\toffset = page->index << PAGE_SHIFT;\n" - " \t\tlen = min_t(size_t, i_size_read(inode) - offset, PAGE_SIZE);\n" - " \n" - " \t\t/* read the contents of the file from the server into the\n" - "@@ -319,7 +319,7 @@ static void afs_invalidatepage(struct page *page, unsigned int offset,\n" - " \tBUG_ON(!PageLocked(page));\n" - " \n" - " \t/* we clean up only if the entire page is being invalidated */\n" - "-\tif (offset == 0 && length == PAGE_CACHE_SIZE) {\n" - "+\tif (offset == 0 && length == PAGE_SIZE) {\n" - " #ifdef CONFIG_AFS_FSCACHE\n" - " \t\tif (PageFsCache(page)) {\n" - " \t\t\tstruct afs_vnode *vnode = AFS_FS_I(page->mapping->host);\n" - "diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c\n" - "index ccd0b212e82a..81dd075356b9 100644\n" - "--- a/fs/afs/mntpt.c\n" - "+++ b/fs/afs/mntpt.c\n" - "@@ -93,7 +93,7 @@ int afs_mntpt_check_symlink(struct afs_vnode *vnode, struct key *key)\n" - " \n" - " \tkunmap(page);\n" - " out_free:\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " out:\n" - " \t_leave(\" = %d\", ret);\n" - " \treturn ret;\n" - "@@ -189,7 +189,7 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt)\n" - " \t\tbuf = kmap_atomic(page);\n" - " \t\tmemcpy(devname, buf, size);\n" - " \t\tkunmap_atomic(buf);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tpage = NULL;\n" - " \t}\n" - " \n" - "@@ -211,7 +211,7 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt)\n" - " \treturn mnt;\n" - " \n" - " error:\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " error_no_page:\n" - " \tfree_page((unsigned long) options);\n" - " error_no_options:\n" - "diff --git a/fs/afs/super.c b/fs/afs/super.c\n" - "index 81afefe7d8a6..fbdb022b75a2 100644\n" - "--- a/fs/afs/super.c\n" - "+++ b/fs/afs/super.c\n" - "@@ -315,8 +315,8 @@ static int afs_fill_super(struct super_block *sb,\n" - " \t_enter(\"\");\n" - " \n" - " \t/* fill in the superblock */\n" - "-\tsb->s_blocksize\t\t= PAGE_CACHE_SIZE;\n" - "-\tsb->s_blocksize_bits\t= PAGE_CACHE_SHIFT;\n" - "+\tsb->s_blocksize\t\t= PAGE_SIZE;\n" - "+\tsb->s_blocksize_bits\t= PAGE_SHIFT;\n" - " \tsb->s_magic\t\t= AFS_FS_MAGIC;\n" - " \tsb->s_op\t\t= &afs_super_ops;\n" - " \tsb->s_bdi\t\t= &as->volume->bdi;\n" - "diff --git a/fs/afs/write.c b/fs/afs/write.c\n" - "index dfef94f70667..65de439bdc4f 100644\n" - "--- a/fs/afs/write.c\n" - "+++ b/fs/afs/write.c\n" - "@@ -93,10 +93,10 @@ static int afs_fill_page(struct afs_vnode *vnode, struct key *key,\n" - " \t_enter(\",,%llu\", (unsigned long long)pos);\n" - " \n" - " \ti_size = i_size_read(&vnode->vfs_inode);\n" - "-\tif (pos + PAGE_CACHE_SIZE > i_size)\n" - "+\tif (pos + PAGE_SIZE > i_size)\n" - " \t\tlen = i_size - pos;\n" - " \telse\n" - "-\t\tlen = PAGE_CACHE_SIZE;\n" - "+\t\tlen = PAGE_SIZE;\n" - " \n" - " \tret = afs_vnode_fetch_data(vnode, key, pos, len, page);\n" - " \tif (ret < 0) {\n" - "@@ -123,9 +123,9 @@ int afs_write_begin(struct file *file, struct address_space *mapping,\n" - " \tstruct afs_vnode *vnode = AFS_FS_I(file_inode(file));\n" - " \tstruct page *page;\n" - " \tstruct key *key = file->private_data;\n" - "-\tunsigned from = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tunsigned from = pos & (PAGE_SIZE - 1);\n" - " \tunsigned to = from + len;\n" - "-\tpgoff_t index = pos >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = pos >> PAGE_SHIFT;\n" - " \tint ret;\n" - " \n" - " \t_enter(\"{%x:%u},{%lx},%u,%u\",\n" - "@@ -151,8 +151,8 @@ int afs_write_begin(struct file *file, struct address_space *mapping,\n" - " \t*pagep = page;\n" - " \t/* page won't leak in error case: it eventually gets cleaned off LRU */\n" - " \n" - "-\tif (!PageUptodate(page) && len != PAGE_CACHE_SIZE) {\n" - "-\t\tret = afs_fill_page(vnode, key, index << PAGE_CACHE_SHIFT, page);\n" - "+\tif (!PageUptodate(page) && len != PAGE_SIZE) {\n" - "+\t\tret = afs_fill_page(vnode, key, index << PAGE_SHIFT, page);\n" - " \t\tif (ret < 0) {\n" - " \t\t\tkfree(candidate);\n" - " \t\t\t_leave(\" = %d [prep]\", ret);\n" - "@@ -266,7 +266,7 @@ int afs_write_end(struct file *file, struct address_space *mapping,\n" - " \tif (PageDirty(page))\n" - " \t\t_debug(\"dirtied\");\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \treturn copied;\n" - " }\n" - "@@ -480,7 +480,7 @@ static int afs_writepages_region(struct address_space *mapping,\n" - " \n" - " \t\tif (page->index > end) {\n" - " \t\t\t*_next = index;\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\t_leave(\" = 0 [%lx]\", *_next);\n" - " \t\t\treturn 0;\n" - " \t\t}\n" - "@@ -494,7 +494,7 @@ static int afs_writepages_region(struct address_space *mapping,\n" - " \n" - " \t\tif (page->mapping != mapping) {\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tcontinue;\n" - " \t\t}\n" - " \n" - "@@ -515,7 +515,7 @@ static int afs_writepages_region(struct address_space *mapping,\n" - " \n" - " \t\tret = afs_write_back_from_locked_page(wb, page);\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tif (ret < 0) {\n" - " \t\t\t_leave(\" = %d\", ret);\n" - " \t\t\treturn ret;\n" - "@@ -551,13 +551,13 @@ int afs_writepages(struct address_space *mapping,\n" - " \t\t\t\t\t\t &next);\n" - " \t\tmapping->writeback_index = next;\n" - " \t} else if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {\n" - "-\t\tend = (pgoff_t)(LLONG_MAX >> PAGE_CACHE_SHIFT);\n" - "+\t\tend = (pgoff_t)(LLONG_MAX >> PAGE_SHIFT);\n" - " \t\tret = afs_writepages_region(mapping, wbc, 0, end, &next);\n" - " \t\tif (wbc->nr_to_write > 0)\n" - " \t\t\tmapping->writeback_index = next;\n" - " \t} else {\n" - "-\t\tstart = wbc->range_start >> PAGE_CACHE_SHIFT;\n" - "-\t\tend = wbc->range_end >> PAGE_CACHE_SHIFT;\n" - "+\t\tstart = wbc->range_start >> PAGE_SHIFT;\n" - "+\t\tend = wbc->range_end >> PAGE_SHIFT;\n" - " \t\tret = afs_writepages_region(mapping, wbc, start, end, &next);\n" - " \t}\n" - " \n" - "diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c\n" - "index 7d914c67a9d0..81381cc0dd17 100644\n" - "--- a/fs/binfmt_elf.c\n" - "+++ b/fs/binfmt_elf.c\n" - "@@ -2292,7 +2292,7 @@ static int elf_core_dump(struct coredump_params *cprm)\n" - " \t\t\t\tvoid *kaddr = kmap(page);\n" - " \t\t\t\tstop = !dump_emit(cprm, kaddr, PAGE_SIZE);\n" - " \t\t\t\tkunmap(page);\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t} else\n" - " \t\t\t\tstop = !dump_skip(cprm, PAGE_SIZE);\n" - " \t\t\tif (stop)\n" - "diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c\n" - "index b1adb92e69de..083ea2bc60ab 100644\n" - "--- a/fs/binfmt_elf_fdpic.c\n" - "+++ b/fs/binfmt_elf_fdpic.c\n" - "@@ -1533,7 +1533,7 @@ static bool elf_fdpic_dump_segments(struct coredump_params *cprm)\n" - " \t\t\t\tvoid *kaddr = kmap(page);\n" - " \t\t\t\tres = dump_emit(cprm, kaddr, PAGE_SIZE);\n" - " \t\t\t\tkunmap(page);\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t} else {\n" - " \t\t\t\tres = dump_skip(cprm, PAGE_SIZE);\n" - " \t\t\t}\n" - "diff --git a/fs/block_dev.c b/fs/block_dev.c\n" - "index 3172c4e2f502..20a2c02b77c4 100644\n" - "--- a/fs/block_dev.c\n" - "+++ b/fs/block_dev.c\n" - "@@ -331,7 +331,7 @@ static int blkdev_write_end(struct file *file, struct address_space *mapping,\n" - " \tret = block_write_end(file, mapping, pos, len, copied, page, fsdata);\n" - " \n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \treturn ret;\n" - " }\n" - "@@ -1149,7 +1149,7 @@ void bd_set_size(struct block_device *bdev, loff_t size)\n" - " \tinode_lock(bdev->bd_inode);\n" - " \ti_size_write(bdev->bd_inode, size);\n" - " \tinode_unlock(bdev->bd_inode);\n" - "-\twhile (bsize < PAGE_CACHE_SIZE) {\n" - "+\twhile (bsize < PAGE_SIZE) {\n" - " \t\tif (size & bsize)\n" - " \t\t\tbreak;\n" - " \t\tbsize <<= 1;\n" - "diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c\n" - "index 861d472564c1..e17b46805aa1 100644\n" - "--- a/fs/btrfs/check-integrity.c\n" - "+++ b/fs/btrfs/check-integrity.c\n" - "@@ -755,7 +755,7 @@ static int btrfsic_process_superblock(struct btrfsic_state *state,\n" - " \t\t\tBUG_ON(NULL == l);\n" - " \n" - " \t\t\tret = btrfsic_read_block(state, &tmp_next_block_ctx);\n" - "-\t\t\tif (ret < (int)PAGE_CACHE_SIZE) {\n" - "+\t\t\tif (ret < (int)PAGE_SIZE) {\n" - " \t\t\t\tprintk(KERN_INFO\n" - " \t\t\t\t \"btrfsic: read @logical %llu failed!\\n\",\n" - " \t\t\t\t tmp_next_block_ctx.start);\n" - "@@ -1229,15 +1229,15 @@ static void btrfsic_read_from_block_data(\n" - " \tsize_t offset_in_page;\n" - " \tchar *kaddr;\n" - " \tchar *dst = (char *)dstv;\n" - "-\tsize_t start_offset = block_ctx->start & ((u64)PAGE_CACHE_SIZE - 1);\n" - "-\tunsigned long i = (start_offset + offset) >> PAGE_CACHE_SHIFT;\n" - "+\tsize_t start_offset = block_ctx->start & ((u64)PAGE_SIZE - 1);\n" - "+\tunsigned long i = (start_offset + offset) >> PAGE_SHIFT;\n" - " \n" - " \tWARN_ON(offset + len > block_ctx->len);\n" - "-\toffset_in_page = (start_offset + offset) & (PAGE_CACHE_SIZE - 1);\n" - "+\toffset_in_page = (start_offset + offset) & (PAGE_SIZE - 1);\n" - " \n" - " \twhile (len > 0) {\n" - "-\t\tcur = min(len, ((size_t)PAGE_CACHE_SIZE - offset_in_page));\n" - "-\t\tBUG_ON(i >= DIV_ROUND_UP(block_ctx->len, PAGE_CACHE_SIZE));\n" - "+\t\tcur = min(len, ((size_t)PAGE_SIZE - offset_in_page));\n" - "+\t\tBUG_ON(i >= DIV_ROUND_UP(block_ctx->len, PAGE_SIZE));\n" - " \t\tkaddr = block_ctx->datav[i];\n" - " \t\tmemcpy(dst, kaddr + offset_in_page, cur);\n" - " \n" - "@@ -1603,8 +1603,8 @@ static void btrfsic_release_block_ctx(struct btrfsic_block_data_ctx *block_ctx)\n" - " \n" - " \t\tBUG_ON(!block_ctx->datav);\n" - " \t\tBUG_ON(!block_ctx->pagev);\n" - "-\t\tnum_pages = (block_ctx->len + (u64)PAGE_CACHE_SIZE - 1) >>\n" - "-\t\t\t PAGE_CACHE_SHIFT;\n" - "+\t\tnum_pages = (block_ctx->len + (u64)PAGE_SIZE - 1) >>\n" - "+\t\t\t PAGE_SHIFT;\n" - " \t\twhile (num_pages > 0) {\n" - " \t\t\tnum_pages--;\n" - " \t\t\tif (block_ctx->datav[num_pages]) {\n" - "@@ -1635,15 +1635,15 @@ static int btrfsic_read_block(struct btrfsic_state *state,\n" - " \tBUG_ON(block_ctx->datav);\n" - " \tBUG_ON(block_ctx->pagev);\n" - " \tBUG_ON(block_ctx->mem_to_free);\n" - "-\tif (block_ctx->dev_bytenr & ((u64)PAGE_CACHE_SIZE - 1)) {\n" - "+\tif (block_ctx->dev_bytenr & ((u64)PAGE_SIZE - 1)) {\n" - " \t\tprintk(KERN_INFO\n" - " \t\t \"btrfsic: read_block() with unaligned bytenr %llu\\n\",\n" - " \t\t block_ctx->dev_bytenr);\n" - " \t\treturn -1;\n" - " \t}\n" - " \n" - "-\tnum_pages = (block_ctx->len + (u64)PAGE_CACHE_SIZE - 1) >>\n" - "-\t\t PAGE_CACHE_SHIFT;\n" - "+\tnum_pages = (block_ctx->len + (u64)PAGE_SIZE - 1) >>\n" - "+\t\t PAGE_SHIFT;\n" - " \tblock_ctx->mem_to_free = kzalloc((sizeof(*block_ctx->datav) +\n" - " \t\t\t\t\t sizeof(*block_ctx->pagev)) *\n" - " \t\t\t\t\t num_pages, GFP_NOFS);\n" - "@@ -1674,8 +1674,8 @@ static int btrfsic_read_block(struct btrfsic_state *state,\n" - " \n" - " \t\tfor (j = i; j < num_pages; j++) {\n" - " \t\t\tret = bio_add_page(bio, block_ctx->pagev[j],\n" - "-\t\t\t\t\t PAGE_CACHE_SIZE, 0);\n" - "-\t\t\tif (PAGE_CACHE_SIZE != ret)\n" - "+\t\t\t\t\t PAGE_SIZE, 0);\n" - "+\t\t\tif (PAGE_SIZE != ret)\n" - " \t\t\t\tbreak;\n" - " \t\t}\n" - " \t\tif (j == i) {\n" - "@@ -1691,7 +1691,7 @@ static int btrfsic_read_block(struct btrfsic_state *state,\n" - " \t\t\treturn -1;\n" - " \t\t}\n" - " \t\tbio_put(bio);\n" - "-\t\tdev_bytenr += (j - i) * PAGE_CACHE_SIZE;\n" - "+\t\tdev_bytenr += (j - i) * PAGE_SIZE;\n" - " \t\ti = j;\n" - " \t}\n" - " \tfor (i = 0; i < num_pages; i++) {\n" - "@@ -1767,9 +1767,9 @@ static int btrfsic_test_for_metadata(struct btrfsic_state *state,\n" - " \tu32 crc = ~(u32)0;\n" - " \tunsigned int i;\n" - " \n" - "-\tif (num_pages * PAGE_CACHE_SIZE < state->metablock_size)\n" - "+\tif (num_pages * PAGE_SIZE < state->metablock_size)\n" - " \t\treturn 1; /* not metadata */\n" - "-\tnum_pages = state->metablock_size >> PAGE_CACHE_SHIFT;\n" - "+\tnum_pages = state->metablock_size >> PAGE_SHIFT;\n" - " \th = (struct btrfs_header *)datav[0];\n" - " \n" - " \tif (memcmp(h->fsid, state->root->fs_info->fsid, BTRFS_UUID_SIZE))\n" - "@@ -1777,8 +1777,8 @@ static int btrfsic_test_for_metadata(struct btrfsic_state *state,\n" - " \n" - " \tfor (i = 0; i < num_pages; i++) {\n" - " \t\tu8 *data = i ? datav[i] : (datav[i] + BTRFS_CSUM_SIZE);\n" - "-\t\tsize_t sublen = i ? PAGE_CACHE_SIZE :\n" - "-\t\t\t\t (PAGE_CACHE_SIZE - BTRFS_CSUM_SIZE);\n" - "+\t\tsize_t sublen = i ? PAGE_SIZE :\n" - "+\t\t\t\t (PAGE_SIZE - BTRFS_CSUM_SIZE);\n" - " \n" - " \t\tcrc = btrfs_crc32c(crc, data, sublen);\n" - " \t}\n" - "@@ -1824,14 +1824,14 @@ again:\n" - " \t\tif (block->is_superblock) {\n" - " \t\t\tbytenr = btrfs_super_bytenr((struct btrfs_super_block *)\n" - " \t\t\t\t\t\t mapped_datav[0]);\n" - "-\t\t\tif (num_pages * PAGE_CACHE_SIZE <\n" - "+\t\t\tif (num_pages * PAGE_SIZE <\n" - " \t\t\t BTRFS_SUPER_INFO_SIZE) {\n" - " \t\t\t\tprintk(KERN_INFO\n" - " \t\t\t\t \"btrfsic: cannot work with too short bios!\\n\");\n" - " \t\t\t\treturn;\n" - " \t\t\t}\n" - " \t\t\tis_metadata = 1;\n" - "-\t\t\tBUG_ON(BTRFS_SUPER_INFO_SIZE & (PAGE_CACHE_SIZE - 1));\n" - "+\t\t\tBUG_ON(BTRFS_SUPER_INFO_SIZE & (PAGE_SIZE - 1));\n" - " \t\t\tprocessed_len = BTRFS_SUPER_INFO_SIZE;\n" - " \t\t\tif (state->print_mask &\n" - " \t\t\t BTRFSIC_PRINT_MASK_TREE_BEFORE_SB_WRITE) {\n" - "@@ -1842,7 +1842,7 @@ again:\n" - " \t\t}\n" - " \t\tif (is_metadata) {\n" - " \t\t\tif (!block->is_superblock) {\n" - "-\t\t\t\tif (num_pages * PAGE_CACHE_SIZE <\n" - "+\t\t\t\tif (num_pages * PAGE_SIZE <\n" - " \t\t\t\t state->metablock_size) {\n" - " \t\t\t\t\tprintk(KERN_INFO\n" - " \t\t\t\t\t \"btrfsic: cannot work with too short bios!\\n\");\n" - "@@ -1878,7 +1878,7 @@ again:\n" - " \t\t\t}\n" - " \t\t\tblock->logical_bytenr = bytenr;\n" - " \t\t} else {\n" - "-\t\t\tif (num_pages * PAGE_CACHE_SIZE <\n" - "+\t\t\tif (num_pages * PAGE_SIZE <\n" - " \t\t\t state->datablock_size) {\n" - " \t\t\t\tprintk(KERN_INFO\n" - " \t\t\t\t \"btrfsic: cannot work with too short bios!\\n\");\n" - "@@ -2011,7 +2011,7 @@ again:\n" - " \t\t\tblock->logical_bytenr = bytenr;\n" - " \t\t\tblock->is_metadata = 1;\n" - " \t\t\tif (block->is_superblock) {\n" - "-\t\t\t\tBUG_ON(PAGE_CACHE_SIZE !=\n" - "+\t\t\t\tBUG_ON(PAGE_SIZE !=\n" - " \t\t\t\t BTRFS_SUPER_INFO_SIZE);\n" - " \t\t\t\tret = btrfsic_process_written_superblock(\n" - " \t\t\t\t\t\tstate,\n" - "@@ -2170,8 +2170,8 @@ again:\n" - " continue_loop:\n" - " \tBUG_ON(!processed_len);\n" - " \tdev_bytenr += processed_len;\n" - "-\tmapped_datav += processed_len >> PAGE_CACHE_SHIFT;\n" - "-\tnum_pages -= processed_len >> PAGE_CACHE_SHIFT;\n" - "+\tmapped_datav += processed_len >> PAGE_SHIFT;\n" - "+\tnum_pages -= processed_len >> PAGE_SHIFT;\n" - " \tgoto again;\n" - " }\n" - " \n" - "@@ -2952,7 +2952,7 @@ static void __btrfsic_submit_bio(int rw, struct bio *bio)\n" - " \t\t\tgoto leave;\n" - " \t\tcur_bytenr = dev_bytenr;\n" - " \t\tfor (i = 0; i < bio->bi_vcnt; i++) {\n" - "-\t\t\tBUG_ON(bio->bi_io_vec[i].bv_len != PAGE_CACHE_SIZE);\n" - "+\t\t\tBUG_ON(bio->bi_io_vec[i].bv_len != PAGE_SIZE);\n" - " \t\t\tmapped_datav[i] = kmap(bio->bi_io_vec[i].bv_page);\n" - " \t\t\tif (!mapped_datav[i]) {\n" - " \t\t\t\twhile (i > 0) {\n" - "@@ -3035,16 +3035,16 @@ int btrfsic_mount(struct btrfs_root *root,\n" - " \tstruct list_head *dev_head = &fs_devices->devices;\n" - " \tstruct btrfs_device *device;\n" - " \n" - "-\tif (root->nodesize & ((u64)PAGE_CACHE_SIZE - 1)) {\n" - "+\tif (root->nodesize & ((u64)PAGE_SIZE - 1)) {\n" - " \t\tprintk(KERN_INFO\n" - "-\t\t \"btrfsic: cannot handle nodesize %d not being a multiple of PAGE_CACHE_SIZE %ld!\\n\",\n" - "-\t\t root->nodesize, PAGE_CACHE_SIZE);\n" - "+\t\t \"btrfsic: cannot handle nodesize %d not being a multiple of PAGE_SIZE %ld!\\n\",\n" - "+\t\t root->nodesize, PAGE_SIZE);\n" - " \t\treturn -1;\n" - " \t}\n" - "-\tif (root->sectorsize & ((u64)PAGE_CACHE_SIZE - 1)) {\n" - "+\tif (root->sectorsize & ((u64)PAGE_SIZE - 1)) {\n" - " \t\tprintk(KERN_INFO\n" - "-\t\t \"btrfsic: cannot handle sectorsize %d not being a multiple of PAGE_CACHE_SIZE %ld!\\n\",\n" - "-\t\t root->sectorsize, PAGE_CACHE_SIZE);\n" - "+\t\t \"btrfsic: cannot handle sectorsize %d not being a multiple of PAGE_SIZE %ld!\\n\",\n" - "+\t\t root->sectorsize, PAGE_SIZE);\n" - " \t\treturn -1;\n" - " \t}\n" - " \tstate = kzalloc(sizeof(*state), GFP_KERNEL | __GFP_NOWARN | __GFP_REPEAT);\n" - "diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c\n" - "index 3346cd8f9910..ff61a41ac90b 100644\n" - "--- a/fs/btrfs/compression.c\n" - "+++ b/fs/btrfs/compression.c\n" - "@@ -119,7 +119,7 @@ static int check_compressed_csum(struct inode *inode,\n" - " \t\tcsum = ~(u32)0;\n" - " \n" - " \t\tkaddr = kmap_atomic(page);\n" - "-\t\tcsum = btrfs_csum_data(kaddr, csum, PAGE_CACHE_SIZE);\n" - "+\t\tcsum = btrfs_csum_data(kaddr, csum, PAGE_SIZE);\n" - " \t\tbtrfs_csum_final(csum, (char *)&csum);\n" - " \t\tkunmap_atomic(kaddr);\n" - " \n" - "@@ -190,7 +190,7 @@ csum_failed:\n" - " \tfor (index = 0; index < cb->nr_pages; index++) {\n" - " \t\tpage = cb->compressed_pages[index];\n" - " \t\tpage->mapping = NULL;\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \n" - " \t/* do io completion on the original bio */\n" - "@@ -224,8 +224,8 @@ out:\n" - " static noinline void end_compressed_writeback(struct inode *inode,\n" - " \t\t\t\t\t const struct compressed_bio *cb)\n" - " {\n" - "-\tunsigned long index = cb->start >> PAGE_CACHE_SHIFT;\n" - "-\tunsigned long end_index = (cb->start + cb->len - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long index = cb->start >> PAGE_SHIFT;\n" - "+\tunsigned long end_index = (cb->start + cb->len - 1) >> PAGE_SHIFT;\n" - " \tstruct page *pages[16];\n" - " \tunsigned long nr_pages = end_index - index + 1;\n" - " \tint i;\n" - "@@ -247,7 +247,7 @@ static noinline void end_compressed_writeback(struct inode *inode,\n" - " \t\t\tif (cb->errors)\n" - " \t\t\t\tSetPageError(pages[i]);\n" - " \t\t\tend_page_writeback(pages[i]);\n" - "-\t\t\tpage_cache_release(pages[i]);\n" - "+\t\t\tput_page(pages[i]);\n" - " \t\t}\n" - " \t\tnr_pages -= ret;\n" - " \t\tindex += ret;\n" - "@@ -304,7 +304,7 @@ static void end_compressed_bio_write(struct bio *bio)\n" - " \tfor (index = 0; index < cb->nr_pages; index++) {\n" - " \t\tpage = cb->compressed_pages[index];\n" - " \t\tpage->mapping = NULL;\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \n" - " \t/* finally free the cb struct */\n" - "@@ -341,7 +341,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,\n" - " \tint ret;\n" - " \tint skip_sum = BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM;\n" - " \n" - "-\tWARN_ON(start & ((u64)PAGE_CACHE_SIZE - 1));\n" - "+\tWARN_ON(start & ((u64)PAGE_SIZE - 1));\n" - " \tcb = kmalloc(compressed_bio_size(root, compressed_len), GFP_NOFS);\n" - " \tif (!cb)\n" - " \t\treturn -ENOMEM;\n" - "@@ -374,14 +374,14 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,\n" - " \t\tpage->mapping = inode->i_mapping;\n" - " \t\tif (bio->bi_iter.bi_size)\n" - " \t\t\tret = io_tree->ops->merge_bio_hook(WRITE, page, 0,\n" - "-\t\t\t\t\t\t\t PAGE_CACHE_SIZE,\n" - "+\t\t\t\t\t\t\t PAGE_SIZE,\n" - " \t\t\t\t\t\t\t bio, 0);\n" - " \t\telse\n" - " \t\t\tret = 0;\n" - " \n" - " \t\tpage->mapping = NULL;\n" - "-\t\tif (ret || bio_add_page(bio, page, PAGE_CACHE_SIZE, 0) <\n" - "-\t\t PAGE_CACHE_SIZE) {\n" - "+\t\tif (ret || bio_add_page(bio, page, PAGE_SIZE, 0) <\n" - "+\t\t PAGE_SIZE) {\n" - " \t\t\tbio_get(bio);\n" - " \n" - " \t\t\t/*\n" - "@@ -410,15 +410,15 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,\n" - " \t\t\tBUG_ON(!bio);\n" - " \t\t\tbio->bi_private = cb;\n" - " \t\t\tbio->bi_end_io = end_compressed_bio_write;\n" - "-\t\t\tbio_add_page(bio, page, PAGE_CACHE_SIZE, 0);\n" - "+\t\t\tbio_add_page(bio, page, PAGE_SIZE, 0);\n" - " \t\t}\n" - "-\t\tif (bytes_left < PAGE_CACHE_SIZE) {\n" - "+\t\tif (bytes_left < PAGE_SIZE) {\n" - " \t\t\tbtrfs_info(BTRFS_I(inode)->root->fs_info,\n" - " \t\t\t\t\t\"bytes left %lu compress len %lu nr %lu\",\n" - " \t\t\t bytes_left, cb->compressed_len, cb->nr_pages);\n" - " \t\t}\n" - "-\t\tbytes_left -= PAGE_CACHE_SIZE;\n" - "-\t\tfirst_byte += PAGE_CACHE_SIZE;\n" - "+\t\tbytes_left -= PAGE_SIZE;\n" - "+\t\tfirst_byte += PAGE_SIZE;\n" - " \t\tcond_resched();\n" - " \t}\n" - " \tbio_get(bio);\n" - "@@ -457,17 +457,17 @@ static noinline int add_ra_bio_pages(struct inode *inode,\n" - " \tint misses = 0;\n" - " \n" - " \tpage = cb->orig_bio->bi_io_vec[cb->orig_bio->bi_vcnt - 1].bv_page;\n" - "-\tlast_offset = (page_offset(page) + PAGE_CACHE_SIZE);\n" - "+\tlast_offset = (page_offset(page) + PAGE_SIZE);\n" - " \tem_tree = &BTRFS_I(inode)->extent_tree;\n" - " \ttree = &BTRFS_I(inode)->io_tree;\n" - " \n" - " \tif (isize == 0)\n" - " \t\treturn 0;\n" - " \n" - "-\tend_index = (i_size_read(inode) - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tend_index = (i_size_read(inode) - 1) >> PAGE_SHIFT;\n" - " \n" - " \twhile (last_offset < compressed_end) {\n" - "-\t\tpg_index = last_offset >> PAGE_CACHE_SHIFT;\n" - "+\t\tpg_index = last_offset >> PAGE_SHIFT;\n" - " \n" - " \t\tif (pg_index > end_index)\n" - " \t\t\tbreak;\n" - "@@ -488,11 +488,11 @@ static noinline int add_ra_bio_pages(struct inode *inode,\n" - " \t\t\tbreak;\n" - " \n" - " \t\tif (add_to_page_cache_lru(page, mapping, pg_index, GFP_NOFS)) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tgoto next;\n" - " \t\t}\n" - " \n" - "-\t\tend = last_offset + PAGE_CACHE_SIZE - 1;\n" - "+\t\tend = last_offset + PAGE_SIZE - 1;\n" - " \t\t/*\n" - " \t\t * at this point, we have a locked page in the page cache\n" - " \t\t * for these bytes in the file. But, we have to make\n" - "@@ -502,27 +502,27 @@ static noinline int add_ra_bio_pages(struct inode *inode,\n" - " \t\tlock_extent(tree, last_offset, end);\n" - " \t\tread_lock(&em_tree->lock);\n" - " \t\tem = lookup_extent_mapping(em_tree, last_offset,\n" - "-\t\t\t\t\t PAGE_CACHE_SIZE);\n" - "+\t\t\t\t\t PAGE_SIZE);\n" - " \t\tread_unlock(&em_tree->lock);\n" - " \n" - " \t\tif (!em || last_offset < em->start ||\n" - "-\t\t (last_offset + PAGE_CACHE_SIZE > extent_map_end(em)) ||\n" - "+\t\t (last_offset + PAGE_SIZE > extent_map_end(em)) ||\n" - " \t\t (em->block_start >> 9) != cb->orig_bio->bi_iter.bi_sector) {\n" - " \t\t\tfree_extent_map(em);\n" - " \t\t\tunlock_extent(tree, last_offset, end);\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tbreak;\n" - " \t\t}\n" - " \t\tfree_extent_map(em);\n" - " \n" - " \t\tif (page->index == end_index) {\n" - " \t\t\tchar *userpage;\n" - "-\t\t\tsize_t zero_offset = isize & (PAGE_CACHE_SIZE - 1);\n" - "+\t\t\tsize_t zero_offset = isize & (PAGE_SIZE - 1);\n" - " \n" - " \t\t\tif (zero_offset) {\n" - " \t\t\t\tint zeros;\n" - "-\t\t\t\tzeros = PAGE_CACHE_SIZE - zero_offset;\n" - "+\t\t\t\tzeros = PAGE_SIZE - zero_offset;\n" - " \t\t\t\tuserpage = kmap_atomic(page);\n" - " \t\t\t\tmemset(userpage + zero_offset, 0, zeros);\n" - " \t\t\t\tflush_dcache_page(page);\n" - "@@ -531,19 +531,19 @@ static noinline int add_ra_bio_pages(struct inode *inode,\n" - " \t\t}\n" - " \n" - " \t\tret = bio_add_page(cb->orig_bio, page,\n" - "-\t\t\t\t PAGE_CACHE_SIZE, 0);\n" - "+\t\t\t\t PAGE_SIZE, 0);\n" - " \n" - "-\t\tif (ret == PAGE_CACHE_SIZE) {\n" - "+\t\tif (ret == PAGE_SIZE) {\n" - " \t\t\tnr_pages++;\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t} else {\n" - " \t\t\tunlock_extent(tree, last_offset, end);\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tbreak;\n" - " \t\t}\n" - " next:\n" - "-\t\tlast_offset += PAGE_CACHE_SIZE;\n" - "+\t\tlast_offset += PAGE_SIZE;\n" - " \t}\n" - " \treturn 0;\n" - " }\n" - "@@ -567,7 +567,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,\n" - " \tstruct extent_map_tree *em_tree;\n" - " \tstruct compressed_bio *cb;\n" - " \tstruct btrfs_root *root = BTRFS_I(inode)->root;\n" - "-\tunsigned long uncompressed_len = bio->bi_vcnt * PAGE_CACHE_SIZE;\n" - "+\tunsigned long uncompressed_len = bio->bi_vcnt * PAGE_SIZE;\n" - " \tunsigned long compressed_len;\n" - " \tunsigned long nr_pages;\n" - " \tunsigned long pg_index;\n" - "@@ -589,7 +589,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,\n" - " \tread_lock(&em_tree->lock);\n" - " \tem = lookup_extent_mapping(em_tree,\n" - " \t\t\t\t page_offset(bio->bi_io_vec->bv_page),\n" - "-\t\t\t\t PAGE_CACHE_SIZE);\n" - "+\t\t\t\t PAGE_SIZE);\n" - " \tread_unlock(&em_tree->lock);\n" - " \tif (!em)\n" - " \t\treturn -EIO;\n" - "@@ -617,7 +617,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,\n" - " \tcb->compress_type = extent_compress_type(bio_flags);\n" - " \tcb->orig_bio = bio;\n" - " \n" - "-\tnr_pages = DIV_ROUND_UP(compressed_len, PAGE_CACHE_SIZE);\n" - "+\tnr_pages = DIV_ROUND_UP(compressed_len, PAGE_SIZE);\n" - " \tcb->compressed_pages = kcalloc(nr_pages, sizeof(struct page *),\n" - " \t\t\t\t GFP_NOFS);\n" - " \tif (!cb->compressed_pages)\n" - "@@ -640,7 +640,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,\n" - " \tadd_ra_bio_pages(inode, em_start + em_len, cb);\n" - " \n" - " \t/* include any pages we added in add_ra-bio_pages */\n" - "-\tuncompressed_len = bio->bi_vcnt * PAGE_CACHE_SIZE;\n" - "+\tuncompressed_len = bio->bi_vcnt * PAGE_SIZE;\n" - " \tcb->len = uncompressed_len;\n" - " \n" - " \tcomp_bio = compressed_bio_alloc(bdev, cur_disk_byte, GFP_NOFS);\n" - "@@ -653,18 +653,18 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,\n" - " \tfor (pg_index = 0; pg_index < nr_pages; pg_index++) {\n" - " \t\tpage = cb->compressed_pages[pg_index];\n" - " \t\tpage->mapping = inode->i_mapping;\n" - "-\t\tpage->index = em_start >> PAGE_CACHE_SHIFT;\n" - "+\t\tpage->index = em_start >> PAGE_SHIFT;\n" - " \n" - " \t\tif (comp_bio->bi_iter.bi_size)\n" - " \t\t\tret = tree->ops->merge_bio_hook(READ, page, 0,\n" - "-\t\t\t\t\t\t\tPAGE_CACHE_SIZE,\n" - "+\t\t\t\t\t\t\tPAGE_SIZE,\n" - " \t\t\t\t\t\t\tcomp_bio, 0);\n" - " \t\telse\n" - " \t\t\tret = 0;\n" - " \n" - " \t\tpage->mapping = NULL;\n" - "-\t\tif (ret || bio_add_page(comp_bio, page, PAGE_CACHE_SIZE, 0) <\n" - "-\t\t PAGE_CACHE_SIZE) {\n" - "+\t\tif (ret || bio_add_page(comp_bio, page, PAGE_SIZE, 0) <\n" - "+\t\t PAGE_SIZE) {\n" - " \t\t\tbio_get(comp_bio);\n" - " \n" - " \t\t\tret = btrfs_bio_wq_end_io(root->fs_info, comp_bio,\n" - "@@ -702,9 +702,9 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,\n" - " \t\t\tcomp_bio->bi_private = cb;\n" - " \t\t\tcomp_bio->bi_end_io = end_compressed_bio_read;\n" - " \n" - "-\t\t\tbio_add_page(comp_bio, page, PAGE_CACHE_SIZE, 0);\n" - "+\t\t\tbio_add_page(comp_bio, page, PAGE_SIZE, 0);\n" - " \t\t}\n" - "-\t\tcur_disk_byte += PAGE_CACHE_SIZE;\n" - "+\t\tcur_disk_byte += PAGE_SIZE;\n" - " \t}\n" - " \tbio_get(comp_bio);\n" - " \n" - "@@ -1013,8 +1013,8 @@ int btrfs_decompress_buf2page(char *buf, unsigned long buf_start,\n" - " \n" - " \t/* copy bytes from the working buffer into the pages */\n" - " \twhile (working_bytes > 0) {\n" - "-\t\tbytes = min(PAGE_CACHE_SIZE - *pg_offset,\n" - "-\t\t\t PAGE_CACHE_SIZE - buf_offset);\n" - "+\t\tbytes = min(PAGE_SIZE - *pg_offset,\n" - "+\t\t\t PAGE_SIZE - buf_offset);\n" - " \t\tbytes = min(bytes, working_bytes);\n" - " \t\tkaddr = kmap_atomic(page_out);\n" - " \t\tmemcpy(kaddr + *pg_offset, buf + buf_offset, bytes);\n" - "@@ -1027,7 +1027,7 @@ int btrfs_decompress_buf2page(char *buf, unsigned long buf_start,\n" - " \t\tcurrent_buf_start += bytes;\n" - " \n" - " \t\t/* check if we need to pick another page */\n" - "-\t\tif (*pg_offset == PAGE_CACHE_SIZE) {\n" - "+\t\tif (*pg_offset == PAGE_SIZE) {\n" - " \t\t\t(*pg_index)++;\n" - " \t\t\tif (*pg_index >= vcnt)\n" - " \t\t\t\treturn 0;\n" - "diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c\n" - "index 769e0ff1b4ce..1ef1c40d70f4 100644\n" - "--- a/fs/btrfs/ctree.c\n" - "+++ b/fs/btrfs/ctree.c\n" - "@@ -523,7 +523,7 @@ alloc_tree_mod_elem(struct extent_buffer *eb, int slot,\n" - " \tif (!tm)\n" - " \t\treturn NULL;\n" - " \n" - "-\ttm->index = eb->start >> PAGE_CACHE_SHIFT;\n" - "+\ttm->index = eb->start >> PAGE_SHIFT;\n" - " \tif (op != MOD_LOG_KEY_ADD) {\n" - " \t\tbtrfs_node_key(eb, &tm->key, slot);\n" - " \t\ttm->blockptr = btrfs_node_blockptr(eb, slot);\n" - "@@ -588,7 +588,7 @@ tree_mod_log_insert_move(struct btrfs_fs_info *fs_info,\n" - " \t\tgoto free_tms;\n" - " \t}\n" - " \n" - "-\ttm->index = eb->start >> PAGE_CACHE_SHIFT;\n" - "+\ttm->index = eb->start >> PAGE_SHIFT;\n" - " \ttm->slot = src_slot;\n" - " \ttm->move.dst_slot = dst_slot;\n" - " \ttm->move.nr_items = nr_items;\n" - "@@ -699,7 +699,7 @@ tree_mod_log_insert_root(struct btrfs_fs_info *fs_info,\n" - " \t\tgoto free_tms;\n" - " \t}\n" - " \n" - "-\ttm->index = new_root->start >> PAGE_CACHE_SHIFT;\n" - "+\ttm->index = new_root->start >> PAGE_SHIFT;\n" - " \ttm->old_root.logical = old_root->start;\n" - " \ttm->old_root.level = btrfs_header_level(old_root);\n" - " \ttm->generation = btrfs_header_generation(old_root);\n" - "@@ -739,7 +739,7 @@ __tree_mod_log_search(struct btrfs_fs_info *fs_info, u64 start, u64 min_seq,\n" - " \tstruct rb_node *node;\n" - " \tstruct tree_mod_elem *cur = NULL;\n" - " \tstruct tree_mod_elem *found = NULL;\n" - "-\tu64 index = start >> PAGE_CACHE_SHIFT;\n" - "+\tu64 index = start >> PAGE_SHIFT;\n" - " \n" - " \ttree_mod_log_read_lock(fs_info);\n" - " \ttm_root = &fs_info->tree_mod_log;\n" - "diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c\n" - "index 5699bbc23feb..20ce055700f5 100644\n" - "--- a/fs/btrfs/disk-io.c\n" - "+++ b/fs/btrfs/disk-io.c\n" - "@@ -1055,7 +1055,7 @@ static void btree_invalidatepage(struct page *page, unsigned int offset,\n" - " \t\t\t (unsigned long long)page_offset(page));\n" - " \t\tClearPagePrivate(page);\n" - " \t\tset_page_private(page, 0);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " }\n" - " \n" - "@@ -1756,7 +1756,7 @@ static int setup_bdi(struct btrfs_fs_info *info, struct backing_dev_info *bdi)\n" - " \tif (err)\n" - " \t\treturn err;\n" - " \n" - "-\tbdi->ra_pages = VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;\n" - "+\tbdi->ra_pages = VM_MAX_READAHEAD * 1024 / PAGE_SIZE;\n" - " \tbdi->congested_fn\t= btrfs_congested_fn;\n" - " \tbdi->congested_data\t= info;\n" - " \tbdi->capabilities |= BDI_CAP_CGROUP_WRITEBACK;\n" - "@@ -2534,7 +2534,7 @@ int open_ctree(struct super_block *sb,\n" - " \t\terr = ret;\n" - " \t\tgoto fail_bdi;\n" - " \t}\n" - "-\tfs_info->dirty_metadata_batch = PAGE_CACHE_SIZE *\n" - "+\tfs_info->dirty_metadata_batch = PAGE_SIZE *\n" - " \t\t\t\t\t(1 + ilog2(nr_cpu_ids));\n" - " \n" - " \tret = percpu_counter_init(&fs_info->delalloc_bytes, 0, GFP_KERNEL);\n" - "@@ -2778,7 +2778,7 @@ int open_ctree(struct super_block *sb,\n" - " \t * flag our filesystem as having big metadata blocks if\n" - " \t * they are bigger than the page size\n" - " \t */\n" - "-\tif (btrfs_super_nodesize(disk_super) > PAGE_CACHE_SIZE) {\n" - "+\tif (btrfs_super_nodesize(disk_super) > PAGE_SIZE) {\n" - " \t\tif (!(features & BTRFS_FEATURE_INCOMPAT_BIG_METADATA))\n" - " \t\t\tprintk(KERN_INFO \"BTRFS: flagging fs with big metadata feature\\n\");\n" - " \t\tfeatures |= BTRFS_FEATURE_INCOMPAT_BIG_METADATA;\n" - "@@ -2828,7 +2828,7 @@ int open_ctree(struct super_block *sb,\n" - " \n" - " \tfs_info->bdi.ra_pages *= btrfs_super_num_devices(disk_super);\n" - " \tfs_info->bdi.ra_pages = max(fs_info->bdi.ra_pages,\n" - "-\t\t\t\t SZ_4M / PAGE_CACHE_SIZE);\n" - "+\t\t\t\t SZ_4M / PAGE_SIZE);\n" - " \n" - " \ttree_root->nodesize = nodesize;\n" - " \ttree_root->sectorsize = sectorsize;\n" - "@@ -4060,9 +4060,9 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info,\n" - " \t\tret = -EINVAL;\n" - " \t}\n" - " \t/* Only PAGE SIZE is supported yet */\n" - "-\tif (sectorsize != PAGE_CACHE_SIZE) {\n" - "+\tif (sectorsize != PAGE_SIZE) {\n" - " \t\tprintk(KERN_ERR \"BTRFS: sectorsize %llu not supported yet, only support %lu\\n\",\n" - "-\t\t\t\tsectorsize, PAGE_CACHE_SIZE);\n" - "+\t\t\t\tsectorsize, PAGE_SIZE);\n" - " \t\tret = -EINVAL;\n" - " \t}\n" - " \tif (!is_power_of_2(nodesize) || nodesize < sectorsize ||\n" - "diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c\n" - "index e2287c7c10be..e50a13ea4dd8 100644\n" - "--- a/fs/btrfs/extent-tree.c\n" - "+++ b/fs/btrfs/extent-tree.c\n" - "@@ -3452,7 +3452,7 @@ again:\n" - " \t\tnum_pages = 1;\n" - " \n" - " \tnum_pages *= 16;\n" - "-\tnum_pages *= PAGE_CACHE_SIZE;\n" - "+\tnum_pages *= PAGE_SIZE;\n" - " \n" - " \tret = btrfs_check_data_free_space(inode, 0, num_pages);\n" - " \tif (ret)\n" - "@@ -4639,7 +4639,7 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig,\n" - " \tloops = 0;\n" - " \twhile (delalloc_bytes && loops < 3) {\n" - " \t\tmax_reclaim = min(delalloc_bytes, to_reclaim);\n" - "-\t\tnr_pages = max_reclaim >> PAGE_CACHE_SHIFT;\n" - "+\t\tnr_pages = max_reclaim >> PAGE_SHIFT;\n" - " \t\tbtrfs_writeback_inodes_sb_nr(root, nr_pages, items);\n" - " \t\t/*\n" - " \t\t * We need to wait for the async pages to actually start before\n" - "diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c\n" - "index 392592dc7010..b7608fa4ddc4 100644\n" - "--- a/fs/btrfs/extent_io.c\n" - "+++ b/fs/btrfs/extent_io.c\n" - "@@ -1365,23 +1365,23 @@ int try_lock_extent(struct extent_io_tree *tree, u64 start, u64 end)\n" - " \n" - " void extent_range_clear_dirty_for_io(struct inode *inode, u64 start, u64 end)\n" - " {\n" - "-\tunsigned long index = start >> PAGE_CACHE_SHIFT;\n" - "-\tunsigned long end_index = end >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long index = start >> PAGE_SHIFT;\n" - "+\tunsigned long end_index = end >> PAGE_SHIFT;\n" - " \tstruct page *page;\n" - " \n" - " \twhile (index <= end_index) {\n" - " \t\tpage = find_get_page(inode->i_mapping, index);\n" - " \t\tBUG_ON(!page); /* Pages should be in the extent_io_tree */\n" - " \t\tclear_page_dirty_for_io(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tindex++;\n" - " \t}\n" - " }\n" - " \n" - " void extent_range_redirty_for_io(struct inode *inode, u64 start, u64 end)\n" - " {\n" - "-\tunsigned long index = start >> PAGE_CACHE_SHIFT;\n" - "-\tunsigned long end_index = end >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long index = start >> PAGE_SHIFT;\n" - "+\tunsigned long end_index = end >> PAGE_SHIFT;\n" - " \tstruct page *page;\n" - " \n" - " \twhile (index <= end_index) {\n" - "@@ -1389,7 +1389,7 @@ void extent_range_redirty_for_io(struct inode *inode, u64 start, u64 end)\n" - " \t\tBUG_ON(!page); /* Pages should be in the extent_io_tree */\n" - " \t\t__set_page_dirty_nobuffers(page);\n" - " \t\taccount_page_redirty(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tindex++;\n" - " \t}\n" - " }\n" - "@@ -1399,15 +1399,15 @@ void extent_range_redirty_for_io(struct inode *inode, u64 start, u64 end)\n" - " */\n" - " static void set_range_writeback(struct extent_io_tree *tree, u64 start, u64 end)\n" - " {\n" - "-\tunsigned long index = start >> PAGE_CACHE_SHIFT;\n" - "-\tunsigned long end_index = end >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long index = start >> PAGE_SHIFT;\n" - "+\tunsigned long end_index = end >> PAGE_SHIFT;\n" - " \tstruct page *page;\n" - " \n" - " \twhile (index <= end_index) {\n" - " \t\tpage = find_get_page(tree->mapping, index);\n" - " \t\tBUG_ON(!page); /* Pages should be in the extent_io_tree */\n" - " \t\tset_page_writeback(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tindex++;\n" - " \t}\n" - " }\n" - "@@ -1558,8 +1558,8 @@ static noinline void __unlock_for_delalloc(struct inode *inode,\n" - " {\n" - " \tint ret;\n" - " \tstruct page *pages[16];\n" - "-\tunsigned long index = start >> PAGE_CACHE_SHIFT;\n" - "-\tunsigned long end_index = end >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long index = start >> PAGE_SHIFT;\n" - "+\tunsigned long end_index = end >> PAGE_SHIFT;\n" - " \tunsigned long nr_pages = end_index - index + 1;\n" - " \tint i;\n" - " \n" - "@@ -1573,7 +1573,7 @@ static noinline void __unlock_for_delalloc(struct inode *inode,\n" - " \t\tfor (i = 0; i < ret; i++) {\n" - " \t\t\tif (pages[i] != locked_page)\n" - " \t\t\t\tunlock_page(pages[i]);\n" - "-\t\t\tpage_cache_release(pages[i]);\n" - "+\t\t\tput_page(pages[i]);\n" - " \t\t}\n" - " \t\tnr_pages -= ret;\n" - " \t\tindex += ret;\n" - "@@ -1586,9 +1586,9 @@ static noinline int lock_delalloc_pages(struct inode *inode,\n" - " \t\t\t\t\tu64 delalloc_start,\n" - " \t\t\t\t\tu64 delalloc_end)\n" - " {\n" - "-\tunsigned long index = delalloc_start >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long index = delalloc_start >> PAGE_SHIFT;\n" - " \tunsigned long start_index = index;\n" - "-\tunsigned long end_index = delalloc_end >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long end_index = delalloc_end >> PAGE_SHIFT;\n" - " \tunsigned long pages_locked = 0;\n" - " \tstruct page *pages[16];\n" - " \tunsigned long nrpages;\n" - "@@ -1621,11 +1621,11 @@ static noinline int lock_delalloc_pages(struct inode *inode,\n" - " \t\t\t\t pages[i]->mapping != inode->i_mapping) {\n" - " \t\t\t\t\tret = -EAGAIN;\n" - " \t\t\t\t\tunlock_page(pages[i]);\n" - "-\t\t\t\t\tpage_cache_release(pages[i]);\n" - "+\t\t\t\t\tput_page(pages[i]);\n" - " \t\t\t\t\tgoto done;\n" - " \t\t\t\t}\n" - " \t\t\t}\n" - "-\t\t\tpage_cache_release(pages[i]);\n" - "+\t\t\tput_page(pages[i]);\n" - " \t\t\tpages_locked++;\n" - " \t\t}\n" - " \t\tnrpages -= ret;\n" - "@@ -1638,7 +1638,7 @@ done:\n" - " \t\t__unlock_for_delalloc(inode, locked_page,\n" - " \t\t\t delalloc_start,\n" - " \t\t\t ((u64)(start_index + pages_locked - 1)) <<\n" - "-\t\t\t PAGE_CACHE_SHIFT);\n" - "+\t\t\t PAGE_SHIFT);\n" - " \t}\n" - " \treturn ret;\n" - " }\n" - "@@ -1698,7 +1698,7 @@ again:\n" - " \t\tfree_extent_state(cached_state);\n" - " \t\tcached_state = NULL;\n" - " \t\tif (!loops) {\n" - "-\t\t\tmax_bytes = PAGE_CACHE_SIZE;\n" - "+\t\t\tmax_bytes = PAGE_SIZE;\n" - " \t\t\tloops = 1;\n" - " \t\t\tgoto again;\n" - " \t\t} else {\n" - "@@ -1737,8 +1737,8 @@ void extent_clear_unlock_delalloc(struct inode *inode, u64 start, u64 end,\n" - " \tstruct extent_io_tree *tree = &BTRFS_I(inode)->io_tree;\n" - " \tint ret;\n" - " \tstruct page *pages[16];\n" - "-\tunsigned long index = start >> PAGE_CACHE_SHIFT;\n" - "-\tunsigned long end_index = end >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long index = start >> PAGE_SHIFT;\n" - "+\tunsigned long end_index = end >> PAGE_SHIFT;\n" - " \tunsigned long nr_pages = end_index - index + 1;\n" - " \tint i;\n" - " \n" - "@@ -1759,7 +1759,7 @@ void extent_clear_unlock_delalloc(struct inode *inode, u64 start, u64 end,\n" - " \t\t\t\tSetPagePrivate2(pages[i]);\n" - " \n" - " \t\t\tif (pages[i] == locked_page) {\n" - "-\t\t\t\tpage_cache_release(pages[i]);\n" - "+\t\t\t\tput_page(pages[i]);\n" - " \t\t\t\tcontinue;\n" - " \t\t\t}\n" - " \t\t\tif (page_ops & PAGE_CLEAR_DIRTY)\n" - "@@ -1772,7 +1772,7 @@ void extent_clear_unlock_delalloc(struct inode *inode, u64 start, u64 end,\n" - " \t\t\t\tend_page_writeback(pages[i]);\n" - " \t\t\tif (page_ops & PAGE_UNLOCK)\n" - " \t\t\t\tunlock_page(pages[i]);\n" - "-\t\t\tpage_cache_release(pages[i]);\n" - "+\t\t\tput_page(pages[i]);\n" - " \t\t}\n" - " \t\tnr_pages -= ret;\n" - " \t\tindex += ret;\n" - "@@ -1961,7 +1961,7 @@ int test_range_bit(struct extent_io_tree *tree, u64 start, u64 end,\n" - " static void check_page_uptodate(struct extent_io_tree *tree, struct page *page)\n" - " {\n" - " \tu64 start = page_offset(page);\n" - "-\tu64 end = start + PAGE_CACHE_SIZE - 1;\n" - "+\tu64 end = start + PAGE_SIZE - 1;\n" - " \tif (test_range_bit(tree, start, end, EXTENT_UPTODATE, 1, NULL))\n" - " \t\tSetPageUptodate(page);\n" - " }\n" - "@@ -2071,11 +2071,11 @@ int repair_eb_io_failure(struct btrfs_root *root, struct extent_buffer *eb,\n" - " \t\tstruct page *p = eb->pages[i];\n" - " \n" - " \t\tret = repair_io_failure(root->fs_info->btree_inode, start,\n" - "-\t\t\t\t\tPAGE_CACHE_SIZE, start, p,\n" - "+\t\t\t\t\tPAGE_SIZE, start, p,\n" - " \t\t\t\t\tstart - page_offset(p), mirror_num);\n" - " \t\tif (ret)\n" - " \t\t\tbreak;\n" - "-\t\tstart += PAGE_CACHE_SIZE;\n" - "+\t\tstart += PAGE_SIZE;\n" - " \t}\n" - " \n" - " \treturn ret;\n" - "@@ -2471,8 +2471,8 @@ static void end_bio_extent_writepage(struct bio *bio)\n" - " \t\t * advance bv_offset and adjust bv_len to compensate.\n" - " \t\t * Print a warning for nonzero offsets, and an error\n" - " \t\t * if they don't add up to a full page. */\n" - "-\t\tif (bvec->bv_offset || bvec->bv_len != PAGE_CACHE_SIZE) {\n" - "-\t\t\tif (bvec->bv_offset + bvec->bv_len != PAGE_CACHE_SIZE)\n" - "+\t\tif (bvec->bv_offset || bvec->bv_len != PAGE_SIZE) {\n" - "+\t\t\tif (bvec->bv_offset + bvec->bv_len != PAGE_SIZE)\n" - " \t\t\t\tbtrfs_err(BTRFS_I(page->mapping->host)->root->fs_info,\n" - " \t\t\t\t \"partial page write in btrfs with offset %u and length %u\",\n" - " \t\t\t\t\tbvec->bv_offset, bvec->bv_len);\n" - "@@ -2546,8 +2546,8 @@ static void end_bio_extent_readpage(struct bio *bio)\n" - " \t\t * advance bv_offset and adjust bv_len to compensate.\n" - " \t\t * Print a warning for nonzero offsets, and an error\n" - " \t\t * if they don't add up to a full page. */\n" - "-\t\tif (bvec->bv_offset || bvec->bv_len != PAGE_CACHE_SIZE) {\n" - "-\t\t\tif (bvec->bv_offset + bvec->bv_len != PAGE_CACHE_SIZE)\n" - "+\t\tif (bvec->bv_offset || bvec->bv_len != PAGE_SIZE) {\n" - "+\t\t\tif (bvec->bv_offset + bvec->bv_len != PAGE_SIZE)\n" - " \t\t\t\tbtrfs_err(BTRFS_I(page->mapping->host)->root->fs_info,\n" - " \t\t\t\t \"partial page read in btrfs with offset %u and length %u\",\n" - " \t\t\t\t\tbvec->bv_offset, bvec->bv_len);\n" - "@@ -2603,13 +2603,13 @@ static void end_bio_extent_readpage(struct bio *bio)\n" - " readpage_ok:\n" - " \t\tif (likely(uptodate)) {\n" - " \t\t\tloff_t i_size = i_size_read(inode);\n" - "-\t\t\tpgoff_t end_index = i_size >> PAGE_CACHE_SHIFT;\n" - "+\t\t\tpgoff_t end_index = i_size >> PAGE_SHIFT;\n" - " \t\t\tunsigned off;\n" - " \n" - " \t\t\t/* Zero out the end if this page straddles i_size */\n" - "-\t\t\toff = i_size & (PAGE_CACHE_SIZE-1);\n" - "+\t\t\toff = i_size & (PAGE_SIZE-1);\n" - " \t\t\tif (page->index == end_index && off)\n" - "-\t\t\t\tzero_user_segment(page, off, PAGE_CACHE_SIZE);\n" - "+\t\t\t\tzero_user_segment(page, off, PAGE_SIZE);\n" - " \t\t\tSetPageUptodate(page);\n" - " \t\t} else {\n" - " \t\t\tClearPageUptodate(page);\n" - "@@ -2773,7 +2773,7 @@ static int submit_extent_page(int rw, struct extent_io_tree *tree,\n" - " \tstruct bio *bio;\n" - " \tint contig = 0;\n" - " \tint old_compressed = prev_bio_flags & EXTENT_BIO_COMPRESSED;\n" - "-\tsize_t page_size = min_t(size_t, size, PAGE_CACHE_SIZE);\n" - "+\tsize_t page_size = min_t(size_t, size, PAGE_SIZE);\n" - " \n" - " \tif (bio_ret && *bio_ret) {\n" - " \t\tbio = *bio_ret;\n" - "@@ -2826,7 +2826,7 @@ static void attach_extent_buffer_page(struct extent_buffer *eb,\n" - " {\n" - " \tif (!PagePrivate(page)) {\n" - " \t\tSetPagePrivate(page);\n" - "-\t\tpage_cache_get(page);\n" - "+\t\tget_page(page);\n" - " \t\tset_page_private(page, (unsigned long)eb);\n" - " \t} else {\n" - " \t\tWARN_ON(page->private != (unsigned long)eb);\n" - "@@ -2837,7 +2837,7 @@ void set_page_extent_mapped(struct page *page)\n" - " {\n" - " \tif (!PagePrivate(page)) {\n" - " \t\tSetPagePrivate(page);\n" - "-\t\tpage_cache_get(page);\n" - "+\t\tget_page(page);\n" - " \t\tset_page_private(page, EXTENT_PAGE_PRIVATE);\n" - " \t}\n" - " }\n" - "@@ -2885,7 +2885,7 @@ static int __do_readpage(struct extent_io_tree *tree,\n" - " {\n" - " \tstruct inode *inode = page->mapping->host;\n" - " \tu64 start = page_offset(page);\n" - "-\tu64 page_end = start + PAGE_CACHE_SIZE - 1;\n" - "+\tu64 page_end = start + PAGE_SIZE - 1;\n" - " \tu64 end;\n" - " \tu64 cur = start;\n" - " \tu64 extent_offset;\n" - "@@ -2914,12 +2914,12 @@ static int __do_readpage(struct extent_io_tree *tree,\n" - " \t\t}\n" - " \t}\n" - " \n" - "-\tif (page->index == last_byte >> PAGE_CACHE_SHIFT) {\n" - "+\tif (page->index == last_byte >> PAGE_SHIFT) {\n" - " \t\tchar *userpage;\n" - "-\t\tsize_t zero_offset = last_byte & (PAGE_CACHE_SIZE - 1);\n" - "+\t\tsize_t zero_offset = last_byte & (PAGE_SIZE - 1);\n" - " \n" - " \t\tif (zero_offset) {\n" - "-\t\t\tiosize = PAGE_CACHE_SIZE - zero_offset;\n" - "+\t\t\tiosize = PAGE_SIZE - zero_offset;\n" - " \t\t\tuserpage = kmap_atomic(page);\n" - " \t\t\tmemset(userpage + zero_offset, 0, iosize);\n" - " \t\t\tflush_dcache_page(page);\n" - "@@ -2927,14 +2927,14 @@ static int __do_readpage(struct extent_io_tree *tree,\n" - " \t\t}\n" - " \t}\n" - " \twhile (cur <= end) {\n" - "-\t\tunsigned long pnr = (last_byte >> PAGE_CACHE_SHIFT) + 1;\n" - "+\t\tunsigned long pnr = (last_byte >> PAGE_SHIFT) + 1;\n" - " \t\tbool force_bio_submit = false;\n" - " \n" - " \t\tif (cur >= last_byte) {\n" - " \t\t\tchar *userpage;\n" - " \t\t\tstruct extent_state *cached = NULL;\n" - " \n" - "-\t\t\tiosize = PAGE_CACHE_SIZE - pg_offset;\n" - "+\t\t\tiosize = PAGE_SIZE - pg_offset;\n" - " \t\t\tuserpage = kmap_atomic(page);\n" - " \t\t\tmemset(userpage + pg_offset, 0, iosize);\n" - " \t\t\tflush_dcache_page(page);\n" - "@@ -3117,7 +3117,7 @@ static inline void __do_contiguous_readpages(struct extent_io_tree *tree,\n" - " \tfor (index = 0; index < nr_pages; index++) {\n" - " \t\t__do_readpage(tree, pages[index], get_extent, em_cached, bio,\n" - " \t\t\t mirror_num, bio_flags, rw, prev_em_start);\n" - "-\t\tpage_cache_release(pages[index]);\n" - "+\t\tput_page(pages[index]);\n" - " \t}\n" - " }\n" - " \n" - "@@ -3139,10 +3139,10 @@ static void __extent_readpages(struct extent_io_tree *tree,\n" - " \t\tpage_start = page_offset(pages[index]);\n" - " \t\tif (!end) {\n" - " \t\t\tstart = page_start;\n" - "-\t\t\tend = start + PAGE_CACHE_SIZE - 1;\n" - "+\t\t\tend = start + PAGE_SIZE - 1;\n" - " \t\t\tfirst_index = index;\n" - " \t\t} else if (end + 1 == page_start) {\n" - "-\t\t\tend += PAGE_CACHE_SIZE;\n" - "+\t\t\tend += PAGE_SIZE;\n" - " \t\t} else {\n" - " \t\t\t__do_contiguous_readpages(tree, &pages[first_index],\n" - " \t\t\t\t\t\t index - first_index, start,\n" - "@@ -3150,7 +3150,7 @@ static void __extent_readpages(struct extent_io_tree *tree,\n" - " \t\t\t\t\t\t bio, mirror_num, bio_flags,\n" - " \t\t\t\t\t\t rw, prev_em_start);\n" - " \t\t\tstart = page_start;\n" - "-\t\t\tend = start + PAGE_CACHE_SIZE - 1;\n" - "+\t\t\tend = start + PAGE_SIZE - 1;\n" - " \t\t\tfirst_index = index;\n" - " \t\t}\n" - " \t}\n" - "@@ -3172,7 +3172,7 @@ static int __extent_read_full_page(struct extent_io_tree *tree,\n" - " \tstruct inode *inode = page->mapping->host;\n" - " \tstruct btrfs_ordered_extent *ordered;\n" - " \tu64 start = page_offset(page);\n" - "-\tu64 end = start + PAGE_CACHE_SIZE - 1;\n" - "+\tu64 end = start + PAGE_SIZE - 1;\n" - " \tint ret;\n" - " \n" - " \twhile (1) {\n" - "@@ -3231,7 +3231,7 @@ static noinline_for_stack int writepage_delalloc(struct inode *inode,\n" - " \t\t\t unsigned long *nr_written)\n" - " {\n" - " \tstruct extent_io_tree *tree = epd->tree;\n" - "-\tu64 page_end = delalloc_start + PAGE_CACHE_SIZE - 1;\n" - "+\tu64 page_end = delalloc_start + PAGE_SIZE - 1;\n" - " \tu64 nr_delalloc;\n" - " \tu64 delalloc_to_write = 0;\n" - " \tu64 delalloc_end = 0;\n" - "@@ -3270,11 +3270,11 @@ static noinline_for_stack int writepage_delalloc(struct inode *inode,\n" - " \t\t/*\n" - " \t\t * delalloc_end is already one less than the total\n" - " \t\t * length, so we don't subtract one from\n" - "-\t\t * PAGE_CACHE_SIZE\n" - "+\t\t * PAGE_SIZE\n" - " \t\t */\n" - " \t\tdelalloc_to_write += (delalloc_end - delalloc_start +\n" - "-\t\t\t\t PAGE_CACHE_SIZE) >>\n" - "-\t\t\t\t PAGE_CACHE_SHIFT;\n" - "+\t\t\t\t PAGE_SIZE) >>\n" - "+\t\t\t\t PAGE_SHIFT;\n" - " \t\tdelalloc_start = delalloc_end + 1;\n" - " \t}\n" - " \tif (wbc->nr_to_write < delalloc_to_write) {\n" - "@@ -3323,7 +3323,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode,\n" - " {\n" - " \tstruct extent_io_tree *tree = epd->tree;\n" - " \tu64 start = page_offset(page);\n" - "-\tu64 page_end = start + PAGE_CACHE_SIZE - 1;\n" - "+\tu64 page_end = start + PAGE_SIZE - 1;\n" - " \tu64 end;\n" - " \tu64 cur = start;\n" - " \tu64 extent_offset;\n" - "@@ -3438,7 +3438,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode,\n" - " \t\tif (ret) {\n" - " \t\t\tSetPageError(page);\n" - " \t\t} else {\n" - "-\t\t\tunsigned long max_nr = (i_size >> PAGE_CACHE_SHIFT) + 1;\n" - "+\t\t\tunsigned long max_nr = (i_size >> PAGE_SHIFT) + 1;\n" - " \n" - " \t\t\tset_range_writeback(tree, cur, cur + iosize - 1);\n" - " \t\t\tif (!PageWriteback(page)) {\n" - "@@ -3481,12 +3481,12 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,\n" - " \tstruct inode *inode = page->mapping->host;\n" - " \tstruct extent_page_data *epd = data;\n" - " \tu64 start = page_offset(page);\n" - "-\tu64 page_end = start + PAGE_CACHE_SIZE - 1;\n" - "+\tu64 page_end = start + PAGE_SIZE - 1;\n" - " \tint ret;\n" - " \tint nr = 0;\n" - " \tsize_t pg_offset = 0;\n" - " \tloff_t i_size = i_size_read(inode);\n" - "-\tunsigned long end_index = i_size >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long end_index = i_size >> PAGE_SHIFT;\n" - " \tint write_flags;\n" - " \tunsigned long nr_written = 0;\n" - " \n" - "@@ -3501,10 +3501,10 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,\n" - " \n" - " \tClearPageError(page);\n" - " \n" - "-\tpg_offset = i_size & (PAGE_CACHE_SIZE - 1);\n" - "+\tpg_offset = i_size & (PAGE_SIZE - 1);\n" - " \tif (page->index > end_index ||\n" - " \t (page->index == end_index && !pg_offset)) {\n" - "-\t\tpage->mapping->a_ops->invalidatepage(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\tpage->mapping->a_ops->invalidatepage(page, 0, PAGE_SIZE);\n" - " \t\tunlock_page(page);\n" - " \t\treturn 0;\n" - " \t}\n" - "@@ -3514,7 +3514,7 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,\n" - " \n" - " \t\tuserpage = kmap_atomic(page);\n" - " \t\tmemset(userpage + pg_offset, 0,\n" - "-\t\t PAGE_CACHE_SIZE - pg_offset);\n" - "+\t\t PAGE_SIZE - pg_offset);\n" - " \t\tkunmap_atomic(userpage);\n" - " \t\tflush_dcache_page(page);\n" - " \t}\n" - "@@ -3752,7 +3752,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb,\n" - " \t\tclear_page_dirty_for_io(p);\n" - " \t\tset_page_writeback(p);\n" - " \t\tret = submit_extent_page(rw, tree, wbc, p, offset >> 9,\n" - "-\t\t\t\t\t PAGE_CACHE_SIZE, 0, bdev, &epd->bio,\n" - "+\t\t\t\t\t PAGE_SIZE, 0, bdev, &epd->bio,\n" - " \t\t\t\t\t -1, end_bio_extent_buffer_writepage,\n" - " \t\t\t\t\t 0, epd->bio_flags, bio_flags, false);\n" - " \t\tepd->bio_flags = bio_flags;\n" - "@@ -3764,7 +3764,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb,\n" - " \t\t\tret = -EIO;\n" - " \t\t\tbreak;\n" - " \t\t}\n" - "-\t\toffset += PAGE_CACHE_SIZE;\n" - "+\t\toffset += PAGE_SIZE;\n" - " \t\tupdate_nr_written(p, wbc, 1);\n" - " \t\tunlock_page(p);\n" - " \t}\n" - "@@ -3808,8 +3808,8 @@ int btree_write_cache_pages(struct address_space *mapping,\n" - " \t\tindex = mapping->writeback_index; /* Start from prev offset */\n" - " \t\tend = -1;\n" - " \t} else {\n" - "-\t\tindex = wbc->range_start >> PAGE_CACHE_SHIFT;\n" - "-\t\tend = wbc->range_end >> PAGE_CACHE_SHIFT;\n" - "+\t\tindex = wbc->range_start >> PAGE_SHIFT;\n" - "+\t\tend = wbc->range_end >> PAGE_SHIFT;\n" - " \t\tscanned = 1;\n" - " \t}\n" - " \tif (wbc->sync_mode == WB_SYNC_ALL)\n" - "@@ -3952,8 +3952,8 @@ static int extent_write_cache_pages(struct extent_io_tree *tree,\n" - " \t\tindex = mapping->writeback_index; /* Start from prev offset */\n" - " \t\tend = -1;\n" - " \t} else {\n" - "-\t\tindex = wbc->range_start >> PAGE_CACHE_SHIFT;\n" - "-\t\tend = wbc->range_end >> PAGE_CACHE_SHIFT;\n" - "+\t\tindex = wbc->range_start >> PAGE_SHIFT;\n" - "+\t\tend = wbc->range_end >> PAGE_SHIFT;\n" - " \t\tscanned = 1;\n" - " \t}\n" - " \tif (wbc->sync_mode == WB_SYNC_ALL)\n" - "@@ -4087,8 +4087,8 @@ int extent_write_locked_range(struct extent_io_tree *tree, struct inode *inode,\n" - " \tint ret = 0;\n" - " \tstruct address_space *mapping = inode->i_mapping;\n" - " \tstruct page *page;\n" - "-\tunsigned long nr_pages = (end - start + PAGE_CACHE_SIZE) >>\n" - "-\t\tPAGE_CACHE_SHIFT;\n" - "+\tunsigned long nr_pages = (end - start + PAGE_SIZE) >>\n" - "+\t\tPAGE_SHIFT;\n" - " \n" - " \tstruct extent_page_data epd = {\n" - " \t\t.bio = NULL,\n" - "@@ -4106,18 +4106,18 @@ int extent_write_locked_range(struct extent_io_tree *tree, struct inode *inode,\n" - " \t};\n" - " \n" - " \twhile (start <= end) {\n" - "-\t\tpage = find_get_page(mapping, start >> PAGE_CACHE_SHIFT);\n" - "+\t\tpage = find_get_page(mapping, start >> PAGE_SHIFT);\n" - " \t\tif (clear_page_dirty_for_io(page))\n" - " \t\t\tret = __extent_writepage(page, &wbc_writepages, &epd);\n" - " \t\telse {\n" - " \t\t\tif (tree->ops && tree->ops->writepage_end_io_hook)\n" - " \t\t\t\ttree->ops->writepage_end_io_hook(page, start,\n" - "-\t\t\t\t\t\t start + PAGE_CACHE_SIZE - 1,\n" - "+\t\t\t\t\t\t start + PAGE_SIZE - 1,\n" - " \t\t\t\t\t\t NULL, 1);\n" - " \t\t\tunlock_page(page);\n" - " \t\t}\n" - "-\t\tpage_cache_release(page);\n" - "-\t\tstart += PAGE_CACHE_SIZE;\n" - "+\t\tput_page(page);\n" - "+\t\tstart += PAGE_SIZE;\n" - " \t}\n" - " \n" - " \tflush_epd_write_bio(&epd);\n" - "@@ -4167,7 +4167,7 @@ int extent_readpages(struct extent_io_tree *tree,\n" - " \t\tlist_del(&page->lru);\n" - " \t\tif (add_to_page_cache_lru(page, mapping,\n" - " \t\t\t\t\tpage->index, GFP_NOFS)) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tcontinue;\n" - " \t\t}\n" - " \n" - "@@ -4201,7 +4201,7 @@ int extent_invalidatepage(struct extent_io_tree *tree,\n" - " {\n" - " \tstruct extent_state *cached_state = NULL;\n" - " \tu64 start = page_offset(page);\n" - "-\tu64 end = start + PAGE_CACHE_SIZE - 1;\n" - "+\tu64 end = start + PAGE_SIZE - 1;\n" - " \tsize_t blocksize = page->mapping->host->i_sb->s_blocksize;\n" - " \n" - " \tstart += ALIGN(offset, blocksize);\n" - "@@ -4227,7 +4227,7 @@ static int try_release_extent_state(struct extent_map_tree *map,\n" - " \t\t\t\t struct page *page, gfp_t mask)\n" - " {\n" - " \tu64 start = page_offset(page);\n" - "-\tu64 end = start + PAGE_CACHE_SIZE - 1;\n" - "+\tu64 end = start + PAGE_SIZE - 1;\n" - " \tint ret = 1;\n" - " \n" - " \tif (test_range_bit(tree, start, end,\n" - "@@ -4266,7 +4266,7 @@ int try_release_extent_mapping(struct extent_map_tree *map,\n" - " {\n" - " \tstruct extent_map *em;\n" - " \tu64 start = page_offset(page);\n" - "-\tu64 end = start + PAGE_CACHE_SIZE - 1;\n" - "+\tu64 end = start + PAGE_SIZE - 1;\n" - " \n" - " \tif (gfpflags_allow_blocking(mask) &&\n" - " \t page->mapping->host->i_size > SZ_16M) {\n" - "@@ -4591,14 +4591,14 @@ static void btrfs_release_extent_buffer_page(struct extent_buffer *eb)\n" - " \t\t\tClearPagePrivate(page);\n" - " \t\t\tset_page_private(page, 0);\n" - " \t\t\t/* One for the page private */\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t}\n" - " \n" - " \t\tif (mapped)\n" - " \t\t\tspin_unlock(&page->mapping->private_lock);\n" - " \n" - " \t\t/* One for when we alloced the page */\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t} while (index != 0);\n" - " }\n" - " \n" - "@@ -4783,7 +4783,7 @@ struct extent_buffer *find_extent_buffer(struct btrfs_fs_info *fs_info,\n" - " \n" - " \trcu_read_lock();\n" - " \teb = radix_tree_lookup(&fs_info->buffer_radix,\n" - "-\t\t\t start >> PAGE_CACHE_SHIFT);\n" - "+\t\t\t start >> PAGE_SHIFT);\n" - " \tif (eb && atomic_inc_not_zero(&eb->refs)) {\n" - " \t\trcu_read_unlock();\n" - " \t\t/*\n" - "@@ -4833,7 +4833,7 @@ again:\n" - " \t\tgoto free_eb;\n" - " \tspin_lock(&fs_info->buffer_lock);\n" - " \tret = radix_tree_insert(&fs_info->buffer_radix,\n" - "-\t\t\t\tstart >> PAGE_CACHE_SHIFT, eb);\n" - "+\t\t\t\tstart >> PAGE_SHIFT, eb);\n" - " \tspin_unlock(&fs_info->buffer_lock);\n" - " \tradix_tree_preload_end();\n" - " \tif (ret == -EEXIST) {\n" - "@@ -4866,7 +4866,7 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,\n" - " \tunsigned long len = fs_info->tree_root->nodesize;\n" - " \tunsigned long num_pages = num_extent_pages(start, len);\n" - " \tunsigned long i;\n" - "-\tunsigned long index = start >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long index = start >> PAGE_SHIFT;\n" - " \tstruct extent_buffer *eb;\n" - " \tstruct extent_buffer *exists = NULL;\n" - " \tstruct page *p;\n" - "@@ -4900,7 +4900,7 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,\n" - " \t\t\tif (atomic_inc_not_zero(&exists->refs)) {\n" - " \t\t\t\tspin_unlock(&mapping->private_lock);\n" - " \t\t\t\tunlock_page(p);\n" - "-\t\t\t\tpage_cache_release(p);\n" - "+\t\t\t\tput_page(p);\n" - " \t\t\t\tmark_extent_buffer_accessed(exists, p);\n" - " \t\t\t\tgoto free_eb;\n" - " \t\t\t}\n" - "@@ -4912,7 +4912,7 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,\n" - " \t\t\t */\n" - " \t\t\tClearPagePrivate(p);\n" - " \t\t\tWARN_ON(PageDirty(p));\n" - "-\t\t\tpage_cache_release(p);\n" - "+\t\t\tput_page(p);\n" - " \t\t}\n" - " \t\tattach_extent_buffer_page(eb, p);\n" - " \t\tspin_unlock(&mapping->private_lock);\n" - "@@ -4935,7 +4935,7 @@ again:\n" - " \n" - " \tspin_lock(&fs_info->buffer_lock);\n" - " \tret = radix_tree_insert(&fs_info->buffer_radix,\n" - "-\t\t\t\tstart >> PAGE_CACHE_SHIFT, eb);\n" - "+\t\t\t\tstart >> PAGE_SHIFT, eb);\n" - " \tspin_unlock(&fs_info->buffer_lock);\n" - " \tradix_tree_preload_end();\n" - " \tif (ret == -EEXIST) {\n" - "@@ -4998,7 +4998,7 @@ static int release_extent_buffer(struct extent_buffer *eb)\n" - " \n" - " \t\t\tspin_lock(&fs_info->buffer_lock);\n" - " \t\t\tradix_tree_delete(&fs_info->buffer_radix,\n" - "-\t\t\t\t\t eb->start >> PAGE_CACHE_SHIFT);\n" - "+\t\t\t\t\t eb->start >> PAGE_SHIFT);\n" - " \t\t\tspin_unlock(&fs_info->buffer_lock);\n" - " \t\t} else {\n" - " \t\t\tspin_unlock(&eb->refs_lock);\n" - "@@ -5172,8 +5172,8 @@ int read_extent_buffer_pages(struct extent_io_tree *tree,\n" - " \n" - " \tif (start) {\n" - " \t\tWARN_ON(start < eb->start);\n" - "-\t\tstart_i = (start >> PAGE_CACHE_SHIFT) -\n" - "-\t\t\t(eb->start >> PAGE_CACHE_SHIFT);\n" - "+\t\tstart_i = (start >> PAGE_SHIFT) -\n" - "+\t\t\t(eb->start >> PAGE_SHIFT);\n" - " \t} else {\n" - " \t\tstart_i = 0;\n" - " \t}\n" - "@@ -5256,18 +5256,18 @@ void read_extent_buffer(struct extent_buffer *eb, void *dstv,\n" - " \tstruct page *page;\n" - " \tchar *kaddr;\n" - " \tchar *dst = (char *)dstv;\n" - "-\tsize_t start_offset = eb->start & ((u64)PAGE_CACHE_SIZE - 1);\n" - "-\tunsigned long i = (start_offset + start) >> PAGE_CACHE_SHIFT;\n" - "+\tsize_t start_offset = eb->start & ((u64)PAGE_SIZE - 1);\n" - "+\tunsigned long i = (start_offset + start) >> PAGE_SHIFT;\n" - " \n" - " \tWARN_ON(start > eb->len);\n" - " \tWARN_ON(start + len > eb->start + eb->len);\n" - " \n" - "-\toffset = (start_offset + start) & (PAGE_CACHE_SIZE - 1);\n" - "+\toffset = (start_offset + start) & (PAGE_SIZE - 1);\n" - " \n" - " \twhile (len > 0) {\n" - " \t\tpage = eb->pages[i];\n" - " \n" - "-\t\tcur = min(len, (PAGE_CACHE_SIZE - offset));\n" - "+\t\tcur = min(len, (PAGE_SIZE - offset));\n" - " \t\tkaddr = page_address(page);\n" - " \t\tmemcpy(dst, kaddr + offset, cur);\n" - " \n" - "@@ -5287,19 +5287,19 @@ int read_extent_buffer_to_user(struct extent_buffer *eb, void __user *dstv,\n" - " \tstruct page *page;\n" - " \tchar *kaddr;\n" - " \tchar __user *dst = (char __user *)dstv;\n" - "-\tsize_t start_offset = eb->start & ((u64)PAGE_CACHE_SIZE - 1);\n" - "-\tunsigned long i = (start_offset + start) >> PAGE_CACHE_SHIFT;\n" - "+\tsize_t start_offset = eb->start & ((u64)PAGE_SIZE - 1);\n" - "+\tunsigned long i = (start_offset + start) >> PAGE_SHIFT;\n" - " \tint ret = 0;\n" - " \n" - " \tWARN_ON(start > eb->len);\n" - " \tWARN_ON(start + len > eb->start + eb->len);\n" - " \n" - "-\toffset = (start_offset + start) & (PAGE_CACHE_SIZE - 1);\n" - "+\toffset = (start_offset + start) & (PAGE_SIZE - 1);\n" - " \n" - " \twhile (len > 0) {\n" - " \t\tpage = eb->pages[i];\n" - " \n" - "-\t\tcur = min(len, (PAGE_CACHE_SIZE - offset));\n" - "+\t\tcur = min(len, (PAGE_SIZE - offset));\n" - " \t\tkaddr = page_address(page);\n" - " \t\tif (copy_to_user(dst, kaddr + offset, cur)) {\n" - " \t\t\tret = -EFAULT;\n" - "@@ -5320,13 +5320,13 @@ int map_private_extent_buffer(struct extent_buffer *eb, unsigned long start,\n" - " \t\t\t unsigned long *map_start,\n" - " \t\t\t unsigned long *map_len)\n" - " {\n" - "-\tsize_t offset = start & (PAGE_CACHE_SIZE - 1);\n" - "+\tsize_t offset = start & (PAGE_SIZE - 1);\n" - " \tchar *kaddr;\n" - " \tstruct page *p;\n" - "-\tsize_t start_offset = eb->start & ((u64)PAGE_CACHE_SIZE - 1);\n" - "-\tunsigned long i = (start_offset + start) >> PAGE_CACHE_SHIFT;\n" - "+\tsize_t start_offset = eb->start & ((u64)PAGE_SIZE - 1);\n" - "+\tunsigned long i = (start_offset + start) >> PAGE_SHIFT;\n" - " \tunsigned long end_i = (start_offset + start + min_len - 1) >>\n" - "-\t\tPAGE_CACHE_SHIFT;\n" - "+\t\tPAGE_SHIFT;\n" - " \n" - " \tif (i != end_i)\n" - " \t\treturn -EINVAL;\n" - "@@ -5336,7 +5336,7 @@ int map_private_extent_buffer(struct extent_buffer *eb, unsigned long start,\n" - " \t\t*map_start = 0;\n" - " \t} else {\n" - " \t\toffset = 0;\n" - "-\t\t*map_start = ((u64)i << PAGE_CACHE_SHIFT) - start_offset;\n" - "+\t\t*map_start = ((u64)i << PAGE_SHIFT) - start_offset;\n" - " \t}\n" - " \n" - " \tif (start + min_len > eb->len) {\n" - "@@ -5349,7 +5349,7 @@ int map_private_extent_buffer(struct extent_buffer *eb, unsigned long start,\n" - " \tp = eb->pages[i];\n" - " \tkaddr = page_address(p);\n" - " \t*map = kaddr + offset;\n" - "-\t*map_len = PAGE_CACHE_SIZE - offset;\n" - "+\t*map_len = PAGE_SIZE - offset;\n" - " \treturn 0;\n" - " }\n" - " \n" - "@@ -5362,19 +5362,19 @@ int memcmp_extent_buffer(struct extent_buffer *eb, const void *ptrv,\n" - " \tstruct page *page;\n" - " \tchar *kaddr;\n" - " \tchar *ptr = (char *)ptrv;\n" - "-\tsize_t start_offset = eb->start & ((u64)PAGE_CACHE_SIZE - 1);\n" - "-\tunsigned long i = (start_offset + start) >> PAGE_CACHE_SHIFT;\n" - "+\tsize_t start_offset = eb->start & ((u64)PAGE_SIZE - 1);\n" - "+\tunsigned long i = (start_offset + start) >> PAGE_SHIFT;\n" - " \tint ret = 0;\n" - " \n" - " \tWARN_ON(start > eb->len);\n" - " \tWARN_ON(start + len > eb->start + eb->len);\n" - " \n" - "-\toffset = (start_offset + start) & (PAGE_CACHE_SIZE - 1);\n" - "+\toffset = (start_offset + start) & (PAGE_SIZE - 1);\n" - " \n" - " \twhile (len > 0) {\n" - " \t\tpage = eb->pages[i];\n" - " \n" - "-\t\tcur = min(len, (PAGE_CACHE_SIZE - offset));\n" - "+\t\tcur = min(len, (PAGE_SIZE - offset));\n" - " \n" - " \t\tkaddr = page_address(page);\n" - " \t\tret = memcmp(ptr, kaddr + offset, cur);\n" - "@@ -5397,19 +5397,19 @@ void write_extent_buffer(struct extent_buffer *eb, const void *srcv,\n" - " \tstruct page *page;\n" - " \tchar *kaddr;\n" - " \tchar *src = (char *)srcv;\n" - "-\tsize_t start_offset = eb->start & ((u64)PAGE_CACHE_SIZE - 1);\n" - "-\tunsigned long i = (start_offset + start) >> PAGE_CACHE_SHIFT;\n" - "+\tsize_t start_offset = eb->start & ((u64)PAGE_SIZE - 1);\n" - "+\tunsigned long i = (start_offset + start) >> PAGE_SHIFT;\n" - " \n" - " \tWARN_ON(start > eb->len);\n" - " \tWARN_ON(start + len > eb->start + eb->len);\n" - " \n" - "-\toffset = (start_offset + start) & (PAGE_CACHE_SIZE - 1);\n" - "+\toffset = (start_offset + start) & (PAGE_SIZE - 1);\n" - " \n" - " \twhile (len > 0) {\n" - " \t\tpage = eb->pages[i];\n" - " \t\tWARN_ON(!PageUptodate(page));\n" - " \n" - "-\t\tcur = min(len, PAGE_CACHE_SIZE - offset);\n" - "+\t\tcur = min(len, PAGE_SIZE - offset);\n" - " \t\tkaddr = page_address(page);\n" - " \t\tmemcpy(kaddr + offset, src, cur);\n" - " \n" - "@@ -5427,19 +5427,19 @@ void memset_extent_buffer(struct extent_buffer *eb, char c,\n" - " \tsize_t offset;\n" - " \tstruct page *page;\n" - " \tchar *kaddr;\n" - "-\tsize_t start_offset = eb->start & ((u64)PAGE_CACHE_SIZE - 1);\n" - "-\tunsigned long i = (start_offset + start) >> PAGE_CACHE_SHIFT;\n" - "+\tsize_t start_offset = eb->start & ((u64)PAGE_SIZE - 1);\n" - "+\tunsigned long i = (start_offset + start) >> PAGE_SHIFT;\n" - " \n" - " \tWARN_ON(start > eb->len);\n" - " \tWARN_ON(start + len > eb->start + eb->len);\n" - " \n" - "-\toffset = (start_offset + start) & (PAGE_CACHE_SIZE - 1);\n" - "+\toffset = (start_offset + start) & (PAGE_SIZE - 1);\n" - " \n" - " \twhile (len > 0) {\n" - " \t\tpage = eb->pages[i];\n" - " \t\tWARN_ON(!PageUptodate(page));\n" - " \n" - "-\t\tcur = min(len, PAGE_CACHE_SIZE - offset);\n" - "+\t\tcur = min(len, PAGE_SIZE - offset);\n" - " \t\tkaddr = page_address(page);\n" - " \t\tmemset(kaddr + offset, c, cur);\n" - " \n" - "@@ -5458,19 +5458,19 @@ void copy_extent_buffer(struct extent_buffer *dst, struct extent_buffer *src,\n" - " \tsize_t offset;\n" - " \tstruct page *page;\n" - " \tchar *kaddr;\n" - "-\tsize_t start_offset = dst->start & ((u64)PAGE_CACHE_SIZE - 1);\n" - "-\tunsigned long i = (start_offset + dst_offset) >> PAGE_CACHE_SHIFT;\n" - "+\tsize_t start_offset = dst->start & ((u64)PAGE_SIZE - 1);\n" - "+\tunsigned long i = (start_offset + dst_offset) >> PAGE_SHIFT;\n" - " \n" - " \tWARN_ON(src->len != dst_len);\n" - " \n" - " \toffset = (start_offset + dst_offset) &\n" - "-\t\t(PAGE_CACHE_SIZE - 1);\n" - "+\t\t(PAGE_SIZE - 1);\n" - " \n" - " \twhile (len > 0) {\n" - " \t\tpage = dst->pages[i];\n" - " \t\tWARN_ON(!PageUptodate(page));\n" - " \n" - "-\t\tcur = min(len, (unsigned long)(PAGE_CACHE_SIZE - offset));\n" - "+\t\tcur = min(len, (unsigned long)(PAGE_SIZE - offset));\n" - " \n" - " \t\tkaddr = page_address(page);\n" - " \t\tread_extent_buffer(src, kaddr + offset, src_offset, cur);\n" - "@@ -5512,7 +5512,7 @@ static inline void eb_bitmap_offset(struct extent_buffer *eb,\n" - " \t\t\t\t unsigned long *page_index,\n" - " \t\t\t\t size_t *page_offset)\n" - " {\n" - "-\tsize_t start_offset = eb->start & ((u64)PAGE_CACHE_SIZE - 1);\n" - "+\tsize_t start_offset = eb->start & ((u64)PAGE_SIZE - 1);\n" - " \tsize_t byte_offset = BIT_BYTE(nr);\n" - " \tsize_t offset;\n" - " \n" - "@@ -5523,8 +5523,8 @@ static inline void eb_bitmap_offset(struct extent_buffer *eb,\n" - " \t */\n" - " \toffset = start_offset + start + byte_offset;\n" - " \n" - "-\t*page_index = offset >> PAGE_CACHE_SHIFT;\n" - "-\t*page_offset = offset & (PAGE_CACHE_SIZE - 1);\n" - "+\t*page_index = offset >> PAGE_SHIFT;\n" - "+\t*page_offset = offset & (PAGE_SIZE - 1);\n" - " }\n" - " \n" - " /**\n" - "@@ -5576,7 +5576,7 @@ void extent_buffer_bitmap_set(struct extent_buffer *eb, unsigned long start,\n" - " \t\tlen -= bits_to_set;\n" - " \t\tbits_to_set = BITS_PER_BYTE;\n" - " \t\tmask_to_set = ~0U;\n" - "-\t\tif (++offset >= PAGE_CACHE_SIZE && len > 0) {\n" - "+\t\tif (++offset >= PAGE_SIZE && len > 0) {\n" - " \t\t\toffset = 0;\n" - " \t\t\tpage = eb->pages[++i];\n" - " \t\t\tWARN_ON(!PageUptodate(page));\n" - "@@ -5618,7 +5618,7 @@ void extent_buffer_bitmap_clear(struct extent_buffer *eb, unsigned long start,\n" - " \t\tlen -= bits_to_clear;\n" - " \t\tbits_to_clear = BITS_PER_BYTE;\n" - " \t\tmask_to_clear = ~0U;\n" - "-\t\tif (++offset >= PAGE_CACHE_SIZE && len > 0) {\n" - "+\t\tif (++offset >= PAGE_SIZE && len > 0) {\n" - " \t\t\toffset = 0;\n" - " \t\t\tpage = eb->pages[++i];\n" - " \t\t\tWARN_ON(!PageUptodate(page));\n" - "@@ -5665,7 +5665,7 @@ void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,\n" - " \tsize_t cur;\n" - " \tsize_t dst_off_in_page;\n" - " \tsize_t src_off_in_page;\n" - "-\tsize_t start_offset = dst->start & ((u64)PAGE_CACHE_SIZE - 1);\n" - "+\tsize_t start_offset = dst->start & ((u64)PAGE_SIZE - 1);\n" - " \tunsigned long dst_i;\n" - " \tunsigned long src_i;\n" - " \n" - "@@ -5684,17 +5684,17 @@ void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,\n" - " \n" - " \twhile (len > 0) {\n" - " \t\tdst_off_in_page = (start_offset + dst_offset) &\n" - "-\t\t\t(PAGE_CACHE_SIZE - 1);\n" - "+\t\t\t(PAGE_SIZE - 1);\n" - " \t\tsrc_off_in_page = (start_offset + src_offset) &\n" - "-\t\t\t(PAGE_CACHE_SIZE - 1);\n" - "+\t\t\t(PAGE_SIZE - 1);\n" - " \n" - "-\t\tdst_i = (start_offset + dst_offset) >> PAGE_CACHE_SHIFT;\n" - "-\t\tsrc_i = (start_offset + src_offset) >> PAGE_CACHE_SHIFT;\n" - "+\t\tdst_i = (start_offset + dst_offset) >> PAGE_SHIFT;\n" - "+\t\tsrc_i = (start_offset + src_offset) >> PAGE_SHIFT;\n" - " \n" - "-\t\tcur = min(len, (unsigned long)(PAGE_CACHE_SIZE -\n" - "+\t\tcur = min(len, (unsigned long)(PAGE_SIZE -\n" - " \t\t\t\t\t src_off_in_page));\n" - " \t\tcur = min_t(unsigned long, cur,\n" - "-\t\t\t(unsigned long)(PAGE_CACHE_SIZE - dst_off_in_page));\n" - "+\t\t\t(unsigned long)(PAGE_SIZE - dst_off_in_page));\n" - " \n" - " \t\tcopy_pages(dst->pages[dst_i], dst->pages[src_i],\n" - " \t\t\t dst_off_in_page, src_off_in_page, cur);\n" - "@@ -5713,7 +5713,7 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,\n" - " \tsize_t src_off_in_page;\n" - " \tunsigned long dst_end = dst_offset + len - 1;\n" - " \tunsigned long src_end = src_offset + len - 1;\n" - "-\tsize_t start_offset = dst->start & ((u64)PAGE_CACHE_SIZE - 1);\n" - "+\tsize_t start_offset = dst->start & ((u64)PAGE_SIZE - 1);\n" - " \tunsigned long dst_i;\n" - " \tunsigned long src_i;\n" - " \n" - "@@ -5732,13 +5732,13 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,\n" - " \t\treturn;\n" - " \t}\n" - " \twhile (len > 0) {\n" - "-\t\tdst_i = (start_offset + dst_end) >> PAGE_CACHE_SHIFT;\n" - "-\t\tsrc_i = (start_offset + src_end) >> PAGE_CACHE_SHIFT;\n" - "+\t\tdst_i = (start_offset + dst_end) >> PAGE_SHIFT;\n" - "+\t\tsrc_i = (start_offset + src_end) >> PAGE_SHIFT;\n" - " \n" - " \t\tdst_off_in_page = (start_offset + dst_end) &\n" - "-\t\t\t(PAGE_CACHE_SIZE - 1);\n" - "+\t\t\t(PAGE_SIZE - 1);\n" - " \t\tsrc_off_in_page = (start_offset + src_end) &\n" - "-\t\t\t(PAGE_CACHE_SIZE - 1);\n" - "+\t\t\t(PAGE_SIZE - 1);\n" - " \n" - " \t\tcur = min_t(unsigned long, len, src_off_in_page + 1);\n" - " \t\tcur = min(cur, dst_off_in_page + 1);\n" - "diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h\n" - "index 880d5292e972..9c5abfac3338 100644\n" - "--- a/fs/btrfs/extent_io.h\n" - "+++ b/fs/btrfs/extent_io.h\n" - "@@ -120,7 +120,7 @@ struct extent_state {\n" - " };\n" - " \n" - " #define INLINE_EXTENT_BUFFER_PAGES 16\n" - "-#define MAX_INLINE_EXTENT_BUFFER_SIZE (INLINE_EXTENT_BUFFER_PAGES * PAGE_CACHE_SIZE)\n" - "+#define MAX_INLINE_EXTENT_BUFFER_SIZE (INLINE_EXTENT_BUFFER_PAGES * PAGE_SIZE)\n" - " struct extent_buffer {\n" - " \tu64 start;\n" - " \tunsigned long len;\n" - "@@ -366,8 +366,8 @@ void wait_on_extent_buffer_writeback(struct extent_buffer *eb);\n" - " \n" - " static inline unsigned long num_extent_pages(u64 start, u64 len)\n" - " {\n" - "-\treturn ((start + len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT) -\n" - "-\t\t(start >> PAGE_CACHE_SHIFT);\n" - "+\treturn ((start + len + PAGE_SIZE - 1) >> PAGE_SHIFT) -\n" - "+\t\t(start >> PAGE_SHIFT);\n" - " }\n" - " \n" - " static inline void extent_buffer_get(struct extent_buffer *eb)\n" - "diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c\n" - "index a67e1c828d0f..9311b524b1c1 100644\n" - "--- a/fs/btrfs/file-item.c\n" - "+++ b/fs/btrfs/file-item.c\n" - "@@ -31,7 +31,7 @@\n" - " \t\t\t\t size) - 1))\n" - " \n" - " #define MAX_CSUM_ITEMS(r, size) (min_t(u32, __MAX_CSUM_ITEMS(r, size), \\\n" - "-\t\t\t\t PAGE_CACHE_SIZE))\n" - "+\t\t\t\t PAGE_SIZE))\n" - " \n" - " #define MAX_ORDERED_SUM_BYTES(r) ((PAGE_SIZE - \\\n" - " \t\t\t\t sizeof(struct btrfs_ordered_sum)) / \\\n" - "@@ -201,7 +201,7 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,\n" - " \t\tcsum = (u8 *)dst;\n" - " \t}\n" - " \n" - "-\tif (bio->bi_iter.bi_size > PAGE_CACHE_SIZE * 8)\n" - "+\tif (bio->bi_iter.bi_size > PAGE_SIZE * 8)\n" - " \t\tpath->reada = READA_FORWARD;\n" - " \n" - " \tWARN_ON(bio->bi_vcnt <= 0);\n" - "diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c\n" - "index 098bb8f690c9..bbb4b4a618a6 100644\n" - "--- a/fs/btrfs/file.c\n" - "+++ b/fs/btrfs/file.c\n" - "@@ -413,11 +413,11 @@ static noinline int btrfs_copy_from_user(loff_t pos, size_t write_bytes,\n" - " \tsize_t copied = 0;\n" - " \tsize_t total_copied = 0;\n" - " \tint pg = 0;\n" - "-\tint offset = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tint offset = pos & (PAGE_SIZE - 1);\n" - " \n" - " \twhile (write_bytes > 0) {\n" - " \t\tsize_t count = min_t(size_t,\n" - "-\t\t\t\t PAGE_CACHE_SIZE - offset, write_bytes);\n" - "+\t\t\t\t PAGE_SIZE - offset, write_bytes);\n" - " \t\tstruct page *page = prepared_pages[pg];\n" - " \t\t/*\n" - " \t\t * Copy data from userspace to the current page\n" - "@@ -447,7 +447,7 @@ static noinline int btrfs_copy_from_user(loff_t pos, size_t write_bytes,\n" - " \t\tif (unlikely(copied == 0))\n" - " \t\t\tbreak;\n" - " \n" - "-\t\tif (copied < PAGE_CACHE_SIZE - offset) {\n" - "+\t\tif (copied < PAGE_SIZE - offset) {\n" - " \t\t\toffset += copied;\n" - " \t\t} else {\n" - " \t\t\tpg++;\n" - "@@ -472,7 +472,7 @@ static void btrfs_drop_pages(struct page **pages, size_t num_pages)\n" - " \t\t */\n" - " \t\tClearPageChecked(pages[i]);\n" - " \t\tunlock_page(pages[i]);\n" - "-\t\tpage_cache_release(pages[i]);\n" - "+\t\tput_page(pages[i]);\n" - " \t}\n" - " }\n" - " \n" - "@@ -1296,7 +1296,7 @@ static int prepare_uptodate_page(struct inode *inode,\n" - " {\n" - " \tint ret = 0;\n" - " \n" - "-\tif (((pos & (PAGE_CACHE_SIZE - 1)) || force_uptodate) &&\n" - "+\tif (((pos & (PAGE_SIZE - 1)) || force_uptodate) &&\n" - " \t !PageUptodate(page)) {\n" - " \t\tret = btrfs_readpage(NULL, page);\n" - " \t\tif (ret)\n" - "@@ -1322,7 +1322,7 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages,\n" - " \t\t\t\t size_t write_bytes, bool force_uptodate)\n" - " {\n" - " \tint i;\n" - "-\tunsigned long index = pos >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long index = pos >> PAGE_SHIFT;\n" - " \tgfp_t mask = btrfs_alloc_write_mask(inode->i_mapping);\n" - " \tint err = 0;\n" - " \tint faili;\n" - "@@ -1344,7 +1344,7 @@ again:\n" - " \t\t\terr = prepare_uptodate_page(inode, pages[i],\n" - " \t\t\t\t\t\t pos + write_bytes, false);\n" - " \t\tif (err) {\n" - "-\t\t\tpage_cache_release(pages[i]);\n" - "+\t\t\tput_page(pages[i]);\n" - " \t\t\tif (err == -EAGAIN) {\n" - " \t\t\t\terr = 0;\n" - " \t\t\t\tgoto again;\n" - "@@ -1359,7 +1359,7 @@ again:\n" - " fail:\n" - " \twhile (faili >= 0) {\n" - " \t\tunlock_page(pages[faili]);\n" - "-\t\tpage_cache_release(pages[faili]);\n" - "+\t\tput_page(pages[faili]);\n" - " \t\tfaili--;\n" - " \t}\n" - " \treturn err;\n" - "@@ -1387,8 +1387,8 @@ lock_and_cleanup_extent_if_need(struct inode *inode, struct page **pages,\n" - " \tint i;\n" - " \tint ret = 0;\n" - " \n" - "-\tstart_pos = pos & ~((u64)PAGE_CACHE_SIZE - 1);\n" - "-\tlast_pos = start_pos + ((u64)num_pages << PAGE_CACHE_SHIFT) - 1;\n" - "+\tstart_pos = pos & ~((u64)PAGE_SIZE - 1);\n" - "+\tlast_pos = start_pos + ((u64)num_pages << PAGE_SHIFT) - 1;\n" - " \n" - " \tif (start_pos < inode->i_size) {\n" - " \t\tstruct btrfs_ordered_extent *ordered;\n" - "@@ -1404,7 +1404,7 @@ lock_and_cleanup_extent_if_need(struct inode *inode, struct page **pages,\n" - " \t\t\t\t\t cached_state, GFP_NOFS);\n" - " \t\t\tfor (i = 0; i < num_pages; i++) {\n" - " \t\t\t\tunlock_page(pages[i]);\n" - "-\t\t\t\tpage_cache_release(pages[i]);\n" - "+\t\t\t\tput_page(pages[i]);\n" - " \t\t\t}\n" - " \t\t\tbtrfs_start_ordered_extent(inode, ordered, 1);\n" - " \t\t\tbtrfs_put_ordered_extent(ordered);\n" - "@@ -1493,8 +1493,8 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,\n" - " \tbool force_page_uptodate = false;\n" - " \tbool need_unlock;\n" - " \n" - "-\tnrptrs = min(DIV_ROUND_UP(iov_iter_count(i), PAGE_CACHE_SIZE),\n" - "-\t\t\tPAGE_CACHE_SIZE / (sizeof(struct page *)));\n" - "+\tnrptrs = min(DIV_ROUND_UP(iov_iter_count(i), PAGE_SIZE),\n" - "+\t\t\tPAGE_SIZE / (sizeof(struct page *)));\n" - " \tnrptrs = min(nrptrs, current->nr_dirtied_pause - current->nr_dirtied);\n" - " \tnrptrs = max(nrptrs, 8);\n" - " \tpages = kmalloc_array(nrptrs, sizeof(struct page *), GFP_KERNEL);\n" - "@@ -1502,12 +1502,12 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,\n" - " \t\treturn -ENOMEM;\n" - " \n" - " \twhile (iov_iter_count(i) > 0) {\n" - "-\t\tsize_t offset = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\t\tsize_t offset = pos & (PAGE_SIZE - 1);\n" - " \t\tsize_t write_bytes = min(iov_iter_count(i),\n" - "-\t\t\t\t\t nrptrs * (size_t)PAGE_CACHE_SIZE -\n" - "+\t\t\t\t\t nrptrs * (size_t)PAGE_SIZE -\n" - " \t\t\t\t\t offset);\n" - " \t\tsize_t num_pages = DIV_ROUND_UP(write_bytes + offset,\n" - "-\t\t\t\t\t\tPAGE_CACHE_SIZE);\n" - "+\t\t\t\t\t\tPAGE_SIZE);\n" - " \t\tsize_t reserve_bytes;\n" - " \t\tsize_t dirty_pages;\n" - " \t\tsize_t copied;\n" - "@@ -1523,7 +1523,7 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,\n" - " \t\t\tbreak;\n" - " \t\t}\n" - " \n" - "-\t\treserve_bytes = num_pages << PAGE_CACHE_SHIFT;\n" - "+\t\treserve_bytes = num_pages << PAGE_SHIFT;\n" - " \n" - " \t\tif (BTRFS_I(inode)->flags & (BTRFS_INODE_NODATACOW |\n" - " \t\t\t\t\t BTRFS_INODE_PREALLOC)) {\n" - "@@ -1541,8 +1541,8 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,\n" - " \t\t\t\t * write_bytes, so scale down.\n" - " \t\t\t\t */\n" - " \t\t\t\tnum_pages = DIV_ROUND_UP(write_bytes + offset,\n" - "-\t\t\t\t\t\t\t PAGE_CACHE_SIZE);\n" - "-\t\t\t\treserve_bytes = num_pages << PAGE_CACHE_SHIFT;\n" - "+\t\t\t\t\t\t\t PAGE_SIZE);\n" - "+\t\t\t\treserve_bytes = num_pages << PAGE_SHIFT;\n" - " \t\t\t\tgoto reserve_metadata;\n" - " \t\t\t}\n" - " \t\t}\n" - "@@ -1602,7 +1602,7 @@ again:\n" - " \t\t} else {\n" - " \t\t\tforce_page_uptodate = false;\n" - " \t\t\tdirty_pages = DIV_ROUND_UP(copied + offset,\n" - "-\t\t\t\t\t\t PAGE_CACHE_SIZE);\n" - "+\t\t\t\t\t\t PAGE_SIZE);\n" - " \t\t}\n" - " \n" - " \t\t/*\n" - "@@ -1614,7 +1614,7 @@ again:\n" - " \t\t */\n" - " \t\tif (num_pages > dirty_pages) {\n" - " \t\t\trelease_bytes = (num_pages - dirty_pages) <<\n" - "-\t\t\t\tPAGE_CACHE_SHIFT;\n" - "+\t\t\t\tPAGE_SHIFT;\n" - " \t\t\tif (copied > 0) {\n" - " \t\t\t\tspin_lock(&BTRFS_I(inode)->lock);\n" - " \t\t\t\tBTRFS_I(inode)->outstanding_extents++;\n" - "@@ -1627,13 +1627,13 @@ again:\n" - " \t\t\t\tu64 __pos;\n" - " \n" - " \t\t\t\t__pos = round_down(pos, root->sectorsize) +\n" - "-\t\t\t\t\t(dirty_pages << PAGE_CACHE_SHIFT);\n" - "+\t\t\t\t\t(dirty_pages << PAGE_SHIFT);\n" - " \t\t\t\tbtrfs_delalloc_release_space(inode, __pos,\n" - " \t\t\t\t\t\t\t release_bytes);\n" - " \t\t\t}\n" - " \t\t}\n" - " \n" - "-\t\trelease_bytes = dirty_pages << PAGE_CACHE_SHIFT;\n" - "+\t\trelease_bytes = dirty_pages << PAGE_SHIFT;\n" - " \n" - " \t\tif (copied > 0)\n" - " \t\t\tret = btrfs_dirty_pages(root, inode, pages,\n" - "@@ -1655,7 +1655,7 @@ again:\n" - " \t\tif (only_release_metadata && copied > 0) {\n" - " \t\t\tlockstart = round_down(pos, root->sectorsize);\n" - " \t\t\tlockend = lockstart +\n" - "-\t\t\t\t(dirty_pages << PAGE_CACHE_SHIFT) - 1;\n" - "+\t\t\t\t(dirty_pages << PAGE_SHIFT) - 1;\n" - " \n" - " \t\t\tset_extent_bit(&BTRFS_I(inode)->io_tree, lockstart,\n" - " \t\t\t\t lockend, EXTENT_NORESERVE, NULL,\n" - "@@ -1668,7 +1668,7 @@ again:\n" - " \t\tcond_resched();\n" - " \n" - " \t\tbalance_dirty_pages_ratelimited(inode->i_mapping);\n" - "-\t\tif (dirty_pages < (root->nodesize >> PAGE_CACHE_SHIFT) + 1)\n" - "+\t\tif (dirty_pages < (root->nodesize >> PAGE_SHIFT) + 1)\n" - " \t\t\tbtrfs_btree_balance_dirty(root);\n" - " \n" - " \t\tpos += copied;\n" - "@@ -1724,8 +1724,8 @@ static ssize_t __btrfs_direct_write(struct kiocb *iocb,\n" - " \t\tgoto out;\n" - " \twritten += written_buffered;\n" - " \tiocb->ki_pos = pos + written_buffered;\n" - "-\tinvalidate_mapping_pages(file->f_mapping, pos >> PAGE_CACHE_SHIFT,\n" - "-\t\t\t\t endbyte >> PAGE_CACHE_SHIFT);\n" - "+\tinvalidate_mapping_pages(file->f_mapping, pos >> PAGE_SHIFT,\n" - "+\t\t\t\t endbyte >> PAGE_SHIFT);\n" - " out:\n" - " \treturn written ? written : err;\n" - " }\n" - "@@ -2304,7 +2304,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)\n" - " \t\treturn ret;\n" - " \n" - " \tinode_lock(inode);\n" - "-\tino_size = round_up(inode->i_size, PAGE_CACHE_SIZE);\n" - "+\tino_size = round_up(inode->i_size, PAGE_SIZE);\n" - " \tret = find_first_non_hole(inode, &offset, &len);\n" - " \tif (ret < 0)\n" - " \t\tgoto out_only_mutex;\n" - "@@ -2317,8 +2317,8 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)\n" - " \tlockstart = round_up(offset, BTRFS_I(inode)->root->sectorsize);\n" - " \tlockend = round_down(offset + len,\n" - " \t\t\t BTRFS_I(inode)->root->sectorsize) - 1;\n" - "-\tsame_page = ((offset >> PAGE_CACHE_SHIFT) ==\n" - "-\t\t ((offset + len - 1) >> PAGE_CACHE_SHIFT));\n" - "+\tsame_page = ((offset >> PAGE_SHIFT) ==\n" - "+\t\t ((offset + len - 1) >> PAGE_SHIFT));\n" - " \n" - " \t/*\n" - " \t * We needn't truncate any page which is beyond the end of the file\n" - "@@ -2328,7 +2328,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)\n" - " \t * Only do this if we are in the same page and we aren't doing the\n" - " \t * entire page.\n" - " \t */\n" - "-\tif (same_page && len < PAGE_CACHE_SIZE) {\n" - "+\tif (same_page && len < PAGE_SIZE) {\n" - " \t\tif (offset < ino_size) {\n" - " \t\t\ttruncated_page = true;\n" - " \t\t\tret = btrfs_truncate_page(inode, offset, len, 0);\n" - "diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c\n" - "index 8f835bfa1bdd..5e6062c26129 100644\n" - "--- a/fs/btrfs/free-space-cache.c\n" - "+++ b/fs/btrfs/free-space-cache.c\n" - "@@ -29,7 +29,7 @@\n" - " #include \"inode-map.h\"\n" - " #include \"volumes.h\"\n" - " \n" - "-#define BITS_PER_BITMAP\t\t(PAGE_CACHE_SIZE * 8)\n" - "+#define BITS_PER_BITMAP\t\t(PAGE_SIZE * 8)\n" - " #define MAX_CACHE_BYTES_PER_GIG\tSZ_32K\n" - " \n" - " struct btrfs_trim_range {\n" - "@@ -295,7 +295,7 @@ static int readahead_cache(struct inode *inode)\n" - " \t\treturn -ENOMEM;\n" - " \n" - " \tfile_ra_state_init(ra, inode->i_mapping);\n" - "-\tlast_index = (i_size_read(inode) - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tlast_index = (i_size_read(inode) - 1) >> PAGE_SHIFT;\n" - " \n" - " \tpage_cache_sync_readahead(inode->i_mapping, ra, NULL, 0, last_index);\n" - " \n" - "@@ -310,14 +310,14 @@ static int io_ctl_init(struct btrfs_io_ctl *io_ctl, struct inode *inode,\n" - " \tint num_pages;\n" - " \tint check_crcs = 0;\n" - " \n" - "-\tnum_pages = DIV_ROUND_UP(i_size_read(inode), PAGE_CACHE_SIZE);\n" - "+\tnum_pages = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE);\n" - " \n" - " \tif (btrfs_ino(inode) != BTRFS_FREE_INO_OBJECTID)\n" - " \t\tcheck_crcs = 1;\n" - " \n" - " \t/* Make sure we can fit our crcs into the first page */\n" - " \tif (write && check_crcs &&\n" - "-\t (num_pages * sizeof(u32)) >= PAGE_CACHE_SIZE)\n" - "+\t (num_pages * sizeof(u32)) >= PAGE_SIZE)\n" - " \t\treturn -ENOSPC;\n" - " \n" - " \tmemset(io_ctl, 0, sizeof(struct btrfs_io_ctl));\n" - "@@ -354,9 +354,9 @@ static void io_ctl_map_page(struct btrfs_io_ctl *io_ctl, int clear)\n" - " \tio_ctl->page = io_ctl->pages[io_ctl->index++];\n" - " \tio_ctl->cur = page_address(io_ctl->page);\n" - " \tio_ctl->orig = io_ctl->cur;\n" - "-\tio_ctl->size = PAGE_CACHE_SIZE;\n" - "+\tio_ctl->size = PAGE_SIZE;\n" - " \tif (clear)\n" - "-\t\tmemset(io_ctl->cur, 0, PAGE_CACHE_SIZE);\n" - "+\t\tmemset(io_ctl->cur, 0, PAGE_SIZE);\n" - " }\n" - " \n" - " static void io_ctl_drop_pages(struct btrfs_io_ctl *io_ctl)\n" - "@@ -369,7 +369,7 @@ static void io_ctl_drop_pages(struct btrfs_io_ctl *io_ctl)\n" - " \t\tif (io_ctl->pages[i]) {\n" - " \t\t\tClearPageChecked(io_ctl->pages[i]);\n" - " \t\t\tunlock_page(io_ctl->pages[i]);\n" - "-\t\t\tpage_cache_release(io_ctl->pages[i]);\n" - "+\t\t\tput_page(io_ctl->pages[i]);\n" - " \t\t}\n" - " \t}\n" - " }\n" - "@@ -475,7 +475,7 @@ static void io_ctl_set_crc(struct btrfs_io_ctl *io_ctl, int index)\n" - " \t\toffset = sizeof(u32) * io_ctl->num_pages;\n" - " \n" - " \tcrc = btrfs_csum_data(io_ctl->orig + offset, crc,\n" - "-\t\t\t PAGE_CACHE_SIZE - offset);\n" - "+\t\t\t PAGE_SIZE - offset);\n" - " \tbtrfs_csum_final(crc, (char *)&crc);\n" - " \tio_ctl_unmap_page(io_ctl);\n" - " \ttmp = page_address(io_ctl->pages[0]);\n" - "@@ -503,7 +503,7 @@ static int io_ctl_check_crc(struct btrfs_io_ctl *io_ctl, int index)\n" - " \n" - " \tio_ctl_map_page(io_ctl, 0);\n" - " \tcrc = btrfs_csum_data(io_ctl->orig + offset, crc,\n" - "-\t\t\t PAGE_CACHE_SIZE - offset);\n" - "+\t\t\t PAGE_SIZE - offset);\n" - " \tbtrfs_csum_final(crc, (char *)&crc);\n" - " \tif (val != crc) {\n" - " \t\tbtrfs_err_rl(io_ctl->root->fs_info,\n" - "@@ -561,7 +561,7 @@ static int io_ctl_add_bitmap(struct btrfs_io_ctl *io_ctl, void *bitmap)\n" - " \t\tio_ctl_map_page(io_ctl, 0);\n" - " \t}\n" - " \n" - "-\tmemcpy(io_ctl->cur, bitmap, PAGE_CACHE_SIZE);\n" - "+\tmemcpy(io_ctl->cur, bitmap, PAGE_SIZE);\n" - " \tio_ctl_set_crc(io_ctl, io_ctl->index - 1);\n" - " \tif (io_ctl->index < io_ctl->num_pages)\n" - " \t\tio_ctl_map_page(io_ctl, 0);\n" - "@@ -621,7 +621,7 @@ static int io_ctl_read_bitmap(struct btrfs_io_ctl *io_ctl,\n" - " \tif (ret)\n" - " \t\treturn ret;\n" - " \n" - "-\tmemcpy(entry->bitmap, io_ctl->cur, PAGE_CACHE_SIZE);\n" - "+\tmemcpy(entry->bitmap, io_ctl->cur, PAGE_SIZE);\n" - " \tio_ctl_unmap_page(io_ctl);\n" - " \n" - " \treturn 0;\n" - "@@ -775,7 +775,7 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,\n" - " \t\t} else {\n" - " \t\t\tASSERT(num_bitmaps);\n" - " \t\t\tnum_bitmaps--;\n" - "-\t\t\te->bitmap = kzalloc(PAGE_CACHE_SIZE, GFP_NOFS);\n" - "+\t\t\te->bitmap = kzalloc(PAGE_SIZE, GFP_NOFS);\n" - " \t\t\tif (!e->bitmap) {\n" - " \t\t\t\tkmem_cache_free(\n" - " \t\t\t\t\tbtrfs_free_space_cachep, e);\n" - "@@ -1660,7 +1660,7 @@ static void recalculate_thresholds(struct btrfs_free_space_ctl *ctl)\n" - " \t * sure we don't go over our overall goal of MAX_CACHE_BYTES_PER_GIG as\n" - " \t * we add more bitmaps.\n" - " \t */\n" - "-\tbitmap_bytes = (ctl->total_bitmaps + 1) * PAGE_CACHE_SIZE;\n" - "+\tbitmap_bytes = (ctl->total_bitmaps + 1) * PAGE_SIZE;\n" - " \n" - " \tif (bitmap_bytes >= max_bytes) {\n" - " \t\tctl->extents_thresh = 0;\n" - "@@ -2111,7 +2111,7 @@ new_bitmap:\n" - " \t\t}\n" - " \n" - " \t\t/* allocate the bitmap */\n" - "-\t\tinfo->bitmap = kzalloc(PAGE_CACHE_SIZE, GFP_NOFS);\n" - "+\t\tinfo->bitmap = kzalloc(PAGE_SIZE, GFP_NOFS);\n" - " \t\tspin_lock(&ctl->tree_lock);\n" - " \t\tif (!info->bitmap) {\n" - " \t\t\tret = -ENOMEM;\n" - "@@ -3580,7 +3580,7 @@ again:\n" - " \t}\n" - " \n" - " \tif (!map) {\n" - "-\t\tmap = kzalloc(PAGE_CACHE_SIZE, GFP_NOFS);\n" - "+\t\tmap = kzalloc(PAGE_SIZE, GFP_NOFS);\n" - " \t\tif (!map) {\n" - " \t\t\tkmem_cache_free(btrfs_free_space_cachep, info);\n" - " \t\t\treturn -ENOMEM;\n" - "diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c\n" - "index e50316c4af15..72e34e25dd8e 100644\n" - "--- a/fs/btrfs/inode-map.c\n" - "+++ b/fs/btrfs/inode-map.c\n" - "@@ -283,7 +283,7 @@ void btrfs_unpin_free_ino(struct btrfs_root *root)\n" - " }\n" - " \n" - " #define INIT_THRESHOLD\t((SZ_32K / 2) / sizeof(struct btrfs_free_space))\n" - "-#define INODES_PER_BITMAP (PAGE_CACHE_SIZE * 8)\n" - "+#define INODES_PER_BITMAP (PAGE_SIZE * 8)\n" - " \n" - " /*\n" - " * The goal is to keep the memory used by the free_ino tree won't\n" - "@@ -317,7 +317,7 @@ static void recalculate_thresholds(struct btrfs_free_space_ctl *ctl)\n" - " \t}\n" - " \n" - " \tctl->extents_thresh = (max_bitmaps - ctl->total_bitmaps) *\n" - "-\t\t\t\tPAGE_CACHE_SIZE / sizeof(*info);\n" - "+\t\t\t\tPAGE_SIZE / sizeof(*info);\n" - " }\n" - " \n" - " /*\n" - "@@ -481,12 +481,12 @@ again:\n" - " \n" - " \tspin_lock(&ctl->tree_lock);\n" - " \tprealloc = sizeof(struct btrfs_free_space) * ctl->free_extents;\n" - "-\tprealloc = ALIGN(prealloc, PAGE_CACHE_SIZE);\n" - "-\tprealloc += ctl->total_bitmaps * PAGE_CACHE_SIZE;\n" - "+\tprealloc = ALIGN(prealloc, PAGE_SIZE);\n" - "+\tprealloc += ctl->total_bitmaps * PAGE_SIZE;\n" - " \tspin_unlock(&ctl->tree_lock);\n" - " \n" - " \t/* Just to make sure we have enough space */\n" - "-\tprealloc += 8 * PAGE_CACHE_SIZE;\n" - "+\tprealloc += 8 * PAGE_SIZE;\n" - " \n" - " \tret = btrfs_delalloc_reserve_space(inode, 0, prealloc);\n" - " \tif (ret)\n" - "diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c\n" - "index d96f5cf38a2d..ad15bbfc5003 100644\n" - "--- a/fs/btrfs/inode.c\n" - "+++ b/fs/btrfs/inode.c\n" - "@@ -194,7 +194,7 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans,\n" - " \t\twhile (compressed_size > 0) {\n" - " \t\t\tcpage = compressed_pages[i];\n" - " \t\t\tcur_size = min_t(unsigned long, compressed_size,\n" - "-\t\t\t\t PAGE_CACHE_SIZE);\n" - "+\t\t\t\t PAGE_SIZE);\n" - " \n" - " \t\t\tkaddr = kmap_atomic(cpage);\n" - " \t\t\twrite_extent_buffer(leaf, kaddr, ptr, cur_size);\n" - "@@ -208,13 +208,13 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans,\n" - " \t\t\t\t\t\t compress_type);\n" - " \t} else {\n" - " \t\tpage = find_get_page(inode->i_mapping,\n" - "-\t\t\t\t start >> PAGE_CACHE_SHIFT);\n" - "+\t\t\t\t start >> PAGE_SHIFT);\n" - " \t\tbtrfs_set_file_extent_compression(leaf, ei, 0);\n" - " \t\tkaddr = kmap_atomic(page);\n" - "-\t\toffset = start & (PAGE_CACHE_SIZE - 1);\n" - "+\t\toffset = start & (PAGE_SIZE - 1);\n" - " \t\twrite_extent_buffer(leaf, kaddr + offset, ptr, size);\n" - " \t\tkunmap_atomic(kaddr);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \tbtrfs_mark_buffer_dirty(leaf);\n" - " \tbtrfs_release_path(path);\n" - "@@ -263,7 +263,7 @@ static noinline int cow_file_range_inline(struct btrfs_root *root,\n" - " \t\tdata_len = compressed_size;\n" - " \n" - " \tif (start > 0 ||\n" - "-\t actual_end > PAGE_CACHE_SIZE ||\n" - "+\t actual_end > PAGE_SIZE ||\n" - " \t data_len > BTRFS_MAX_INLINE_DATA_SIZE(root) ||\n" - " \t (!compressed_size &&\n" - " \t (actual_end & (root->sectorsize - 1)) == 0) ||\n" - "@@ -322,7 +322,7 @@ out:\n" - " \t * And at reserve time, it's always aligned to page size, so\n" - " \t * just free one page here.\n" - " \t */\n" - "-\tbtrfs_qgroup_free_data(inode, 0, PAGE_CACHE_SIZE);\n" - "+\tbtrfs_qgroup_free_data(inode, 0, PAGE_SIZE);\n" - " \tbtrfs_free_path(path);\n" - " \tbtrfs_end_transaction(trans, root);\n" - " \treturn ret;\n" - "@@ -435,8 +435,8 @@ static noinline void compress_file_range(struct inode *inode,\n" - " \tactual_end = min_t(u64, isize, end + 1);\n" - " again:\n" - " \twill_compress = 0;\n" - "-\tnr_pages = (end >> PAGE_CACHE_SHIFT) - (start >> PAGE_CACHE_SHIFT) + 1;\n" - "-\tnr_pages = min_t(unsigned long, nr_pages, SZ_128K / PAGE_CACHE_SIZE);\n" - "+\tnr_pages = (end >> PAGE_SHIFT) - (start >> PAGE_SHIFT) + 1;\n" - "+\tnr_pages = min_t(unsigned long, nr_pages, SZ_128K / PAGE_SIZE);\n" - " \n" - " \t/*\n" - " \t * we don't want to send crud past the end of i_size through\n" - "@@ -514,7 +514,7 @@ again:\n" - " \n" - " \t\tif (!ret) {\n" - " \t\t\tunsigned long offset = total_compressed &\n" - "-\t\t\t\t(PAGE_CACHE_SIZE - 1);\n" - "+\t\t\t\t(PAGE_SIZE - 1);\n" - " \t\t\tstruct page *page = pages[nr_pages_ret - 1];\n" - " \t\t\tchar *kaddr;\n" - " \n" - "@@ -524,7 +524,7 @@ again:\n" - " \t\t\tif (offset) {\n" - " \t\t\t\tkaddr = kmap_atomic(page);\n" - " \t\t\t\tmemset(kaddr + offset, 0,\n" - "-\t\t\t\t PAGE_CACHE_SIZE - offset);\n" - "+\t\t\t\t PAGE_SIZE - offset);\n" - " \t\t\t\tkunmap_atomic(kaddr);\n" - " \t\t\t}\n" - " \t\t\twill_compress = 1;\n" - "@@ -580,7 +580,7 @@ cont:\n" - " \t\t * one last check to make sure the compression is really a\n" - " \t\t * win, compare the page count read with the blocks on disk\n" - " \t\t */\n" - "-\t\ttotal_in = ALIGN(total_in, PAGE_CACHE_SIZE);\n" - "+\t\ttotal_in = ALIGN(total_in, PAGE_SIZE);\n" - " \t\tif (total_compressed >= total_in) {\n" - " \t\t\twill_compress = 0;\n" - " \t\t} else {\n" - "@@ -594,7 +594,7 @@ cont:\n" - " \t\t */\n" - " \t\tfor (i = 0; i < nr_pages_ret; i++) {\n" - " \t\t\tWARN_ON(pages[i]->mapping);\n" - "-\t\t\tpage_cache_release(pages[i]);\n" - "+\t\t\tput_page(pages[i]);\n" - " \t\t}\n" - " \t\tkfree(pages);\n" - " \t\tpages = NULL;\n" - "@@ -650,7 +650,7 @@ cleanup_and_bail_uncompressed:\n" - " free_pages_out:\n" - " \tfor (i = 0; i < nr_pages_ret; i++) {\n" - " \t\tWARN_ON(pages[i]->mapping);\n" - "-\t\tpage_cache_release(pages[i]);\n" - "+\t\tput_page(pages[i]);\n" - " \t}\n" - " \tkfree(pages);\n" - " }\n" - "@@ -664,7 +664,7 @@ static void free_async_extent_pages(struct async_extent *async_extent)\n" - " \n" - " \tfor (i = 0; i < async_extent->nr_pages; i++) {\n" - " \t\tWARN_ON(async_extent->pages[i]->mapping);\n" - "-\t\tpage_cache_release(async_extent->pages[i]);\n" - "+\t\tput_page(async_extent->pages[i]);\n" - " \t}\n" - " \tkfree(async_extent->pages);\n" - " \tasync_extent->nr_pages = 0;\n" - "@@ -966,7 +966,7 @@ static noinline int cow_file_range(struct inode *inode,\n" - " \t\t\t\t PAGE_END_WRITEBACK);\n" - " \n" - " \t\t\t*nr_written = *nr_written +\n" - "-\t\t\t (end - start + PAGE_CACHE_SIZE) / PAGE_CACHE_SIZE;\n" - "+\t\t\t (end - start + PAGE_SIZE) / PAGE_SIZE;\n" - " \t\t\t*page_started = 1;\n" - " \t\t\tgoto out;\n" - " \t\t} else if (ret < 0) {\n" - "@@ -1106,8 +1106,8 @@ static noinline void async_cow_submit(struct btrfs_work *work)\n" - " \tasync_cow = container_of(work, struct async_cow, work);\n" - " \n" - " \troot = async_cow->root;\n" - "-\tnr_pages = (async_cow->end - async_cow->start + PAGE_CACHE_SIZE) >>\n" - "-\t\tPAGE_CACHE_SHIFT;\n" - "+\tnr_pages = (async_cow->end - async_cow->start + PAGE_SIZE) >>\n" - "+\t\tPAGE_SHIFT;\n" - " \n" - " \t/*\n" - " \t * atomic_sub_return implies a barrier for waitqueue_active\n" - "@@ -1164,8 +1164,8 @@ static int cow_file_range_async(struct inode *inode, struct page *locked_page,\n" - " \t\t\t\tasync_cow_start, async_cow_submit,\n" - " \t\t\t\tasync_cow_free);\n" - " \n" - "-\t\tnr_pages = (cur_end - start + PAGE_CACHE_SIZE) >>\n" - "-\t\t\tPAGE_CACHE_SHIFT;\n" - "+\t\tnr_pages = (cur_end - start + PAGE_SIZE) >>\n" - "+\t\t\tPAGE_SHIFT;\n" - " \t\tatomic_add(nr_pages, &root->fs_info->async_delalloc_pages);\n" - " \n" - " \t\tbtrfs_queue_work(root->fs_info->delalloc_workers,\n" - "@@ -1960,7 +1960,7 @@ static noinline int add_pending_csums(struct btrfs_trans_handle *trans,\n" - " int btrfs_set_extent_delalloc(struct inode *inode, u64 start, u64 end,\n" - " \t\t\t struct extent_state **cached_state)\n" - " {\n" - "-\tWARN_ON((end & (PAGE_CACHE_SIZE - 1)) == 0);\n" - "+\tWARN_ON((end & (PAGE_SIZE - 1)) == 0);\n" - " \treturn set_extent_delalloc(&BTRFS_I(inode)->io_tree, start, end,\n" - " \t\t\t\t cached_state, GFP_NOFS);\n" - " }\n" - "@@ -1993,7 +1993,7 @@ again:\n" - " \n" - " \tinode = page->mapping->host;\n" - " \tpage_start = page_offset(page);\n" - "-\tpage_end = page_offset(page) + PAGE_CACHE_SIZE - 1;\n" - "+\tpage_end = page_offset(page) + PAGE_SIZE - 1;\n" - " \n" - " \tlock_extent_bits(&BTRFS_I(inode)->io_tree, page_start, page_end,\n" - " \t\t\t &cached_state);\n" - "@@ -2013,7 +2013,7 @@ again:\n" - " \t}\n" - " \n" - " \tret = btrfs_delalloc_reserve_space(inode, page_start,\n" - "-\t\t\t\t\t PAGE_CACHE_SIZE);\n" - "+\t\t\t\t\t PAGE_SIZE);\n" - " \tif (ret) {\n" - " \t\tmapping_set_error(page->mapping, ret);\n" - " \t\tend_extent_writepage(page, ret, page_start, page_end);\n" - "@@ -2029,7 +2029,7 @@ out:\n" - " \t\t\t &cached_state, GFP_NOFS);\n" - " out_page:\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \tkfree(fixup);\n" - " }\n" - " \n" - "@@ -2062,7 +2062,7 @@ static int btrfs_writepage_start_hook(struct page *page, u64 start, u64 end)\n" - " \t\treturn -EAGAIN;\n" - " \n" - " \tSetPageChecked(page);\n" - "-\tpage_cache_get(page);\n" - "+\tget_page(page);\n" - " \tbtrfs_init_work(&fixup->work, btrfs_fixup_helper,\n" - " \t\t\tbtrfs_writepage_fixup_worker, NULL, NULL);\n" - " \tfixup->page = page;\n" - "@@ -4236,7 +4236,7 @@ static int truncate_inline_extent(struct inode *inode,\n" - " \n" - " \tif (btrfs_file_extent_compression(leaf, fi) != BTRFS_COMPRESS_NONE) {\n" - " \t\tloff_t offset = new_size;\n" - "-\t\tloff_t page_end = ALIGN(offset, PAGE_CACHE_SIZE);\n" - "+\t\tloff_t page_end = ALIGN(offset, PAGE_SIZE);\n" - " \n" - " \t\t/*\n" - " \t\t * Zero out the remaining of the last page of our inline extent,\n" - "@@ -4621,8 +4621,8 @@ int btrfs_truncate_page(struct inode *inode, loff_t from, loff_t len,\n" - " \tstruct extent_state *cached_state = NULL;\n" - " \tchar *kaddr;\n" - " \tu32 blocksize = root->sectorsize;\n" - "-\tpgoff_t index = from >> PAGE_CACHE_SHIFT;\n" - "-\tunsigned offset = from & (PAGE_CACHE_SIZE-1);\n" - "+\tpgoff_t index = from >> PAGE_SHIFT;\n" - "+\tunsigned offset = from & (PAGE_SIZE-1);\n" - " \tstruct page *page;\n" - " \tgfp_t mask = btrfs_alloc_write_mask(mapping);\n" - " \tint ret = 0;\n" - "@@ -4633,7 +4633,7 @@ int btrfs_truncate_page(struct inode *inode, loff_t from, loff_t len,\n" - " \t (!len || ((len & (blocksize - 1)) == 0)))\n" - " \t\tgoto out;\n" - " \tret = btrfs_delalloc_reserve_space(inode,\n" - "-\t\t\tround_down(from, PAGE_CACHE_SIZE), PAGE_CACHE_SIZE);\n" - "+\t\t\tround_down(from, PAGE_SIZE), PAGE_SIZE);\n" - " \tif (ret)\n" - " \t\tgoto out;\n" - " \n" - "@@ -4641,21 +4641,21 @@ again:\n" - " \tpage = find_or_create_page(mapping, index, mask);\n" - " \tif (!page) {\n" - " \t\tbtrfs_delalloc_release_space(inode,\n" - "-\t\t\t\tround_down(from, PAGE_CACHE_SIZE),\n" - "-\t\t\t\tPAGE_CACHE_SIZE);\n" - "+\t\t\t\tround_down(from, PAGE_SIZE),\n" - "+\t\t\t\tPAGE_SIZE);\n" - " \t\tret = -ENOMEM;\n" - " \t\tgoto out;\n" - " \t}\n" - " \n" - " \tpage_start = page_offset(page);\n" - "-\tpage_end = page_start + PAGE_CACHE_SIZE - 1;\n" - "+\tpage_end = page_start + PAGE_SIZE - 1;\n" - " \n" - " \tif (!PageUptodate(page)) {\n" - " \t\tret = btrfs_readpage(NULL, page);\n" - " \t\tlock_page(page);\n" - " \t\tif (page->mapping != mapping) {\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tgoto again;\n" - " \t\t}\n" - " \t\tif (!PageUptodate(page)) {\n" - "@@ -4673,7 +4673,7 @@ again:\n" - " \t\tunlock_extent_cached(io_tree, page_start, page_end,\n" - " \t\t\t\t &cached_state, GFP_NOFS);\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tbtrfs_start_ordered_extent(inode, ordered, 1);\n" - " \t\tbtrfs_put_ordered_extent(ordered);\n" - " \t\tgoto again;\n" - "@@ -4692,9 +4692,9 @@ again:\n" - " \t\tgoto out_unlock;\n" - " \t}\n" - " \n" - "-\tif (offset != PAGE_CACHE_SIZE) {\n" - "+\tif (offset != PAGE_SIZE) {\n" - " \t\tif (!len)\n" - "-\t\t\tlen = PAGE_CACHE_SIZE - offset;\n" - "+\t\t\tlen = PAGE_SIZE - offset;\n" - " \t\tkaddr = kmap(page);\n" - " \t\tif (front)\n" - " \t\t\tmemset(kaddr, 0, offset);\n" - "@@ -4711,9 +4711,9 @@ again:\n" - " out_unlock:\n" - " \tif (ret)\n" - " \t\tbtrfs_delalloc_release_space(inode, page_start,\n" - "-\t\t\t\t\t PAGE_CACHE_SIZE);\n" - "+\t\t\t\t\t PAGE_SIZE);\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " out:\n" - " \treturn ret;\n" - " }\n" - "@@ -6701,7 +6701,7 @@ static noinline int uncompress_inline(struct btrfs_path *path,\n" - " \n" - " \tread_extent_buffer(leaf, tmp, ptr, inline_size);\n" - " \n" - "-\tmax_size = min_t(unsigned long, PAGE_CACHE_SIZE, max_size);\n" - "+\tmax_size = min_t(unsigned long, PAGE_SIZE, max_size);\n" - " \tret = btrfs_decompress(compress_type, tmp, page,\n" - " \t\t\t extent_offset, inline_size, max_size);\n" - " \tkfree(tmp);\n" - "@@ -6863,8 +6863,8 @@ next:\n" - " \n" - " \t\tsize = btrfs_file_extent_inline_len(leaf, path->slots[0], item);\n" - " \t\textent_offset = page_offset(page) + pg_offset - extent_start;\n" - "-\t\tcopy_size = min_t(u64, PAGE_CACHE_SIZE - pg_offset,\n" - "-\t\t\t\tsize - extent_offset);\n" - "+\t\tcopy_size = min_t(u64, PAGE_SIZE - pg_offset,\n" - "+\t\t\t\t size - extent_offset);\n" - " \t\tem->start = extent_start + extent_offset;\n" - " \t\tem->len = ALIGN(copy_size, root->sectorsize);\n" - " \t\tem->orig_block_len = em->len;\n" - "@@ -6883,9 +6883,9 @@ next:\n" - " \t\t\t\tmap = kmap(page);\n" - " \t\t\t\tread_extent_buffer(leaf, map + pg_offset, ptr,\n" - " \t\t\t\t\t\t copy_size);\n" - "-\t\t\t\tif (pg_offset + copy_size < PAGE_CACHE_SIZE) {\n" - "+\t\t\t\tif (pg_offset + copy_size < PAGE_SIZE) {\n" - " \t\t\t\t\tmemset(map + pg_offset + copy_size, 0,\n" - "-\t\t\t\t\t PAGE_CACHE_SIZE - pg_offset -\n" - "+\t\t\t\t\t PAGE_SIZE - pg_offset -\n" - " \t\t\t\t\t copy_size);\n" - " \t\t\t\t}\n" - " \t\t\t\tkunmap(page);\n" - "@@ -7320,12 +7320,12 @@ bool btrfs_page_exists_in_range(struct inode *inode, loff_t start, loff_t end)\n" - " \tint start_idx;\n" - " \tint end_idx;\n" - " \n" - "-\tstart_idx = start >> PAGE_CACHE_SHIFT;\n" - "+\tstart_idx = start >> PAGE_SHIFT;\n" - " \n" - " \t/*\n" - " \t * end is the last byte in the last page. end == start is legal\n" - " \t */\n" - "-\tend_idx = end >> PAGE_CACHE_SHIFT;\n" - "+\tend_idx = end >> PAGE_SHIFT;\n" - " \n" - " \trcu_read_lock();\n" - " \n" - "@@ -7366,7 +7366,7 @@ bool btrfs_page_exists_in_range(struct inode *inode, loff_t start, loff_t end)\n" - " \t\t * include/linux/pagemap.h for details.\n" - " \t\t */\n" - " \t\tif (unlikely(page != *pagep)) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tpage = NULL;\n" - " \t\t}\n" - " \t}\n" - "@@ -7374,7 +7374,7 @@ bool btrfs_page_exists_in_range(struct inode *inode, loff_t start, loff_t end)\n" - " \tif (page) {\n" - " \t\tif (page->index <= end_idx)\n" - " \t\t\tfound = true;\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \n" - " \trcu_read_unlock();\n" - "@@ -8621,7 +8621,7 @@ static int __btrfs_releasepage(struct page *page, gfp_t gfp_flags)\n" - " \tif (ret == 1) {\n" - " \t\tClearPagePrivate(page);\n" - " \t\tset_page_private(page, 0);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \treturn ret;\n" - " }\n" - "@@ -8641,7 +8641,7 @@ static void btrfs_invalidatepage(struct page *page, unsigned int offset,\n" - " \tstruct btrfs_ordered_extent *ordered;\n" - " \tstruct extent_state *cached_state = NULL;\n" - " \tu64 page_start = page_offset(page);\n" - "-\tu64 page_end = page_start + PAGE_CACHE_SIZE - 1;\n" - "+\tu64 page_end = page_start + PAGE_SIZE - 1;\n" - " \tint inode_evicting = inode->i_state & I_FREEING;\n" - " \n" - " \t/*\n" - "@@ -8692,7 +8692,7 @@ static void btrfs_invalidatepage(struct page *page, unsigned int offset,\n" - " \n" - " \t\t\tif (btrfs_dec_test_ordered_pending(inode, &ordered,\n" - " \t\t\t\t\t\t\t page_start,\n" - "-\t\t\t\t\t\t\t PAGE_CACHE_SIZE, 1))\n" - "+\t\t\t\t\t\t\t PAGE_SIZE, 1))\n" - " \t\t\t\tbtrfs_finish_ordered_io(ordered);\n" - " \t\t}\n" - " \t\tbtrfs_put_ordered_extent(ordered);\n" - "@@ -8714,7 +8714,7 @@ static void btrfs_invalidatepage(struct page *page, unsigned int offset,\n" - " \t * 2) Not written to disk\n" - " \t * This means the reserved space should be freed here.\n" - " \t */\n" - "-\tbtrfs_qgroup_free_data(inode, page_start, PAGE_CACHE_SIZE);\n" - "+\tbtrfs_qgroup_free_data(inode, page_start, PAGE_SIZE);\n" - " \tif (!inode_evicting) {\n" - " \t\tclear_extent_bit(tree, page_start, page_end,\n" - " \t\t\t\t EXTENT_LOCKED | EXTENT_DIRTY |\n" - "@@ -8729,7 +8729,7 @@ static void btrfs_invalidatepage(struct page *page, unsigned int offset,\n" - " \tif (PagePrivate(page)) {\n" - " \t\tClearPagePrivate(page);\n" - " \t\tset_page_private(page, 0);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " }\n" - " \n" - "@@ -8766,10 +8766,10 @@ int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)\n" - " \n" - " \tsb_start_pagefault(inode->i_sb);\n" - " \tpage_start = page_offset(page);\n" - "-\tpage_end = page_start + PAGE_CACHE_SIZE - 1;\n" - "+\tpage_end = page_start + PAGE_SIZE - 1;\n" - " \n" - " \tret = btrfs_delalloc_reserve_space(inode, page_start,\n" - "-\t\t\t\t\t PAGE_CACHE_SIZE);\n" - "+\t\t\t\t\t PAGE_SIZE);\n" - " \tif (!ret) {\n" - " \t\tret = file_update_time(vma->vm_file);\n" - " \t\treserved = 1;\n" - "@@ -8836,14 +8836,14 @@ again:\n" - " \tret = 0;\n" - " \n" - " \t/* page is wholly or partially inside EOF */\n" - "-\tif (page_start + PAGE_CACHE_SIZE > size)\n" - "-\t\tzero_start = size & ~PAGE_CACHE_MASK;\n" - "+\tif (page_start + PAGE_SIZE > size)\n" - "+\t\tzero_start = size & ~PAGE_MASK;\n" - " \telse\n" - "-\t\tzero_start = PAGE_CACHE_SIZE;\n" - "+\t\tzero_start = PAGE_SIZE;\n" - " \n" - "-\tif (zero_start != PAGE_CACHE_SIZE) {\n" - "+\tif (zero_start != PAGE_SIZE) {\n" - " \t\tkaddr = kmap(page);\n" - "-\t\tmemset(kaddr + zero_start, 0, PAGE_CACHE_SIZE - zero_start);\n" - "+\t\tmemset(kaddr + zero_start, 0, PAGE_SIZE - zero_start);\n" - " \t\tflush_dcache_page(page);\n" - " \t\tkunmap(page);\n" - " \t}\n" - "@@ -8864,7 +8864,7 @@ out_unlock:\n" - " \t}\n" - " \tunlock_page(page);\n" - " out:\n" - "-\tbtrfs_delalloc_release_space(inode, page_start, PAGE_CACHE_SIZE);\n" - "+\tbtrfs_delalloc_release_space(inode, page_start, PAGE_SIZE);\n" - " out_noreserve:\n" - " \tsb_end_pagefault(inode->i_sb);\n" - " \treturn ret;\n" - "@@ -9250,7 +9250,7 @@ static int btrfs_getattr(struct vfsmount *mnt,\n" - " \n" - " \tgeneric_fillattr(inode, stat);\n" - " \tstat->dev = BTRFS_I(inode)->root->anon_dev;\n" - "-\tstat->blksize = PAGE_CACHE_SIZE;\n" - "+\tstat->blksize = PAGE_SIZE;\n" - " \n" - " \tspin_lock(&BTRFS_I(inode)->lock);\n" - " \tdelalloc_bytes = BTRFS_I(inode)->delalloc_bytes;\n" - "diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c\n" - "index 48aee9846329..095a135ef6a2 100644\n" - "--- a/fs/btrfs/ioctl.c\n" - "+++ b/fs/btrfs/ioctl.c\n" - "@@ -900,7 +900,7 @@ static int check_defrag_in_cache(struct inode *inode, u64 offset, u32 thresh)\n" - " \tu64 end;\n" - " \n" - " \tread_lock(&em_tree->lock);\n" - "-\tem = lookup_extent_mapping(em_tree, offset, PAGE_CACHE_SIZE);\n" - "+\tem = lookup_extent_mapping(em_tree, offset, PAGE_SIZE);\n" - " \tread_unlock(&em_tree->lock);\n" - " \n" - " \tif (em) {\n" - "@@ -990,7 +990,7 @@ static struct extent_map *defrag_lookup_extent(struct inode *inode, u64 start)\n" - " \tstruct extent_map_tree *em_tree = &BTRFS_I(inode)->extent_tree;\n" - " \tstruct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;\n" - " \tstruct extent_map *em;\n" - "-\tu64 len = PAGE_CACHE_SIZE;\n" - "+\tu64 len = PAGE_SIZE;\n" - " \n" - " \t/*\n" - " \t * hopefully we have this extent in the tree already, try without\n" - "@@ -1126,15 +1126,15 @@ static int cluster_pages_for_defrag(struct inode *inode,\n" - " \tstruct extent_io_tree *tree;\n" - " \tgfp_t mask = btrfs_alloc_write_mask(inode->i_mapping);\n" - " \n" - "-\tfile_end = (isize - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tfile_end = (isize - 1) >> PAGE_SHIFT;\n" - " \tif (!isize || start_index > file_end)\n" - " \t\treturn 0;\n" - " \n" - " \tpage_cnt = min_t(u64, (u64)num_pages, (u64)file_end - start_index + 1);\n" - " \n" - " \tret = btrfs_delalloc_reserve_space(inode,\n" - "-\t\t\tstart_index << PAGE_CACHE_SHIFT,\n" - "-\t\t\tpage_cnt << PAGE_CACHE_SHIFT);\n" - "+\t\t\tstart_index << PAGE_SHIFT,\n" - "+\t\t\tpage_cnt << PAGE_SHIFT);\n" - " \tif (ret)\n" - " \t\treturn ret;\n" - " \ti_done = 0;\n" - "@@ -1150,7 +1150,7 @@ again:\n" - " \t\t\tbreak;\n" - " \n" - " \t\tpage_start = page_offset(page);\n" - "-\t\tpage_end = page_start + PAGE_CACHE_SIZE - 1;\n" - "+\t\tpage_end = page_start + PAGE_SIZE - 1;\n" - " \t\twhile (1) {\n" - " \t\t\tlock_extent_bits(tree, page_start, page_end,\n" - " \t\t\t\t\t &cached_state);\n" - "@@ -1171,7 +1171,7 @@ again:\n" - " \t\t\t */\n" - " \t\t\tif (page->mapping != inode->i_mapping) {\n" - " \t\t\t\tunlock_page(page);\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t\tgoto again;\n" - " \t\t\t}\n" - " \t\t}\n" - "@@ -1181,7 +1181,7 @@ again:\n" - " \t\t\tlock_page(page);\n" - " \t\t\tif (!PageUptodate(page)) {\n" - " \t\t\t\tunlock_page(page);\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t\tret = -EIO;\n" - " \t\t\t\tbreak;\n" - " \t\t\t}\n" - "@@ -1189,7 +1189,7 @@ again:\n" - " \n" - " \t\tif (page->mapping != inode->i_mapping) {\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tgoto again;\n" - " \t\t}\n" - " \n" - "@@ -1210,7 +1210,7 @@ again:\n" - " \t\twait_on_page_writeback(pages[i]);\n" - " \n" - " \tpage_start = page_offset(pages[0]);\n" - "-\tpage_end = page_offset(pages[i_done - 1]) + PAGE_CACHE_SIZE;\n" - "+\tpage_end = page_offset(pages[i_done - 1]) + PAGE_SIZE;\n" - " \n" - " \tlock_extent_bits(&BTRFS_I(inode)->io_tree,\n" - " \t\t\t page_start, page_end - 1, &cached_state);\n" - "@@ -1224,8 +1224,8 @@ again:\n" - " \t\tBTRFS_I(inode)->outstanding_extents++;\n" - " \t\tspin_unlock(&BTRFS_I(inode)->lock);\n" - " \t\tbtrfs_delalloc_release_space(inode,\n" - "-\t\t\t\tstart_index << PAGE_CACHE_SHIFT,\n" - "-\t\t\t\t(page_cnt - i_done) << PAGE_CACHE_SHIFT);\n" - "+\t\t\t\tstart_index << PAGE_SHIFT,\n" - "+\t\t\t\t(page_cnt - i_done) << PAGE_SHIFT);\n" - " \t}\n" - " \n" - " \n" - "@@ -1242,17 +1242,17 @@ again:\n" - " \t\tset_page_extent_mapped(pages[i]);\n" - " \t\tset_page_dirty(pages[i]);\n" - " \t\tunlock_page(pages[i]);\n" - "-\t\tpage_cache_release(pages[i]);\n" - "+\t\tput_page(pages[i]);\n" - " \t}\n" - " \treturn i_done;\n" - " out:\n" - " \tfor (i = 0; i < i_done; i++) {\n" - " \t\tunlock_page(pages[i]);\n" - "-\t\tpage_cache_release(pages[i]);\n" - "+\t\tput_page(pages[i]);\n" - " \t}\n" - " \tbtrfs_delalloc_release_space(inode,\n" - "-\t\t\tstart_index << PAGE_CACHE_SHIFT,\n" - "-\t\t\tpage_cnt << PAGE_CACHE_SHIFT);\n" - "+\t\t\tstart_index << PAGE_SHIFT,\n" - "+\t\t\tpage_cnt << PAGE_SHIFT);\n" - " \treturn ret;\n" - " \n" - " }\n" - "@@ -1275,7 +1275,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,\n" - " \tint defrag_count = 0;\n" - " \tint compress_type = BTRFS_COMPRESS_ZLIB;\n" - " \tu32 extent_thresh = range->extent_thresh;\n" - "-\tunsigned long max_cluster = SZ_256K >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long max_cluster = SZ_256K >> PAGE_SHIFT;\n" - " \tunsigned long cluster = max_cluster;\n" - " \tu64 new_align = ~((u64)SZ_128K - 1);\n" - " \tstruct page **pages = NULL;\n" - "@@ -1319,9 +1319,9 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,\n" - " \t/* find the last page to defrag */\n" - " \tif (range->start + range->len > range->start) {\n" - " \t\tlast_index = min_t(u64, isize - 1,\n" - "-\t\t\t range->start + range->len - 1) >> PAGE_CACHE_SHIFT;\n" - "+\t\t\t range->start + range->len - 1) >> PAGE_SHIFT;\n" - " \t} else {\n" - "-\t\tlast_index = (isize - 1) >> PAGE_CACHE_SHIFT;\n" - "+\t\tlast_index = (isize - 1) >> PAGE_SHIFT;\n" - " \t}\n" - " \n" - " \tif (newer_than) {\n" - "@@ -1333,11 +1333,11 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,\n" - " \t\t\t * we always align our defrag to help keep\n" - " \t\t\t * the extents in the file evenly spaced\n" - " \t\t\t */\n" - "-\t\t\ti = (newer_off & new_align) >> PAGE_CACHE_SHIFT;\n" - "+\t\t\ti = (newer_off & new_align) >> PAGE_SHIFT;\n" - " \t\t} else\n" - " \t\t\tgoto out_ra;\n" - " \t} else {\n" - "-\t\ti = range->start >> PAGE_CACHE_SHIFT;\n" - "+\t\ti = range->start >> PAGE_SHIFT;\n" - " \t}\n" - " \tif (!max_to_defrag)\n" - " \t\tmax_to_defrag = last_index - i + 1;\n" - "@@ -1350,7 +1350,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,\n" - " \t\tinode->i_mapping->writeback_index = i;\n" - " \n" - " \twhile (i <= last_index && defrag_count < max_to_defrag &&\n" - "-\t (i < DIV_ROUND_UP(i_size_read(inode), PAGE_CACHE_SIZE))) {\n" - "+\t (i < DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE))) {\n" - " \t\t/*\n" - " \t\t * make sure we stop running if someone unmounts\n" - " \t\t * the FS\n" - "@@ -1364,7 +1364,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,\n" - " \t\t\tbreak;\n" - " \t\t}\n" - " \n" - "-\t\tif (!should_defrag_range(inode, (u64)i << PAGE_CACHE_SHIFT,\n" - "+\t\tif (!should_defrag_range(inode, (u64)i << PAGE_SHIFT,\n" - " \t\t\t\t\t extent_thresh, &last_len, &skip,\n" - " \t\t\t\t\t &defrag_end, range->flags &\n" - " \t\t\t\t\t BTRFS_DEFRAG_RANGE_COMPRESS)) {\n" - "@@ -1373,14 +1373,14 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,\n" - " \t\t\t * the should_defrag function tells us how much to skip\n" - " \t\t\t * bump our counter by the suggested amount\n" - " \t\t\t */\n" - "-\t\t\tnext = DIV_ROUND_UP(skip, PAGE_CACHE_SIZE);\n" - "+\t\t\tnext = DIV_ROUND_UP(skip, PAGE_SIZE);\n" - " \t\t\ti = max(i + 1, next);\n" - " \t\t\tcontinue;\n" - " \t\t}\n" - " \n" - " \t\tif (!newer_than) {\n" - "-\t\t\tcluster = (PAGE_CACHE_ALIGN(defrag_end) >>\n" - "-\t\t\t\t PAGE_CACHE_SHIFT) - i;\n" - "+\t\t\tcluster = (PAGE_ALIGN(defrag_end) >>\n" - "+\t\t\t\t PAGE_SHIFT) - i;\n" - " \t\t\tcluster = min(cluster, max_cluster);\n" - " \t\t} else {\n" - " \t\t\tcluster = max_cluster;\n" - "@@ -1414,20 +1414,20 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,\n" - " \t\t\t\ti += ret;\n" - " \n" - " \t\t\tnewer_off = max(newer_off + 1,\n" - "-\t\t\t\t\t(u64)i << PAGE_CACHE_SHIFT);\n" - "+\t\t\t\t\t(u64)i << PAGE_SHIFT);\n" - " \n" - " \t\t\tret = find_new_extents(root, inode, newer_than,\n" - " \t\t\t\t\t &newer_off, SZ_64K);\n" - " \t\t\tif (!ret) {\n" - " \t\t\t\trange->start = newer_off;\n" - "-\t\t\t\ti = (newer_off & new_align) >> PAGE_CACHE_SHIFT;\n" - "+\t\t\t\ti = (newer_off & new_align) >> PAGE_SHIFT;\n" - " \t\t\t} else {\n" - " \t\t\t\tbreak;\n" - " \t\t\t}\n" - " \t\t} else {\n" - " \t\t\tif (ret > 0) {\n" - " \t\t\t\ti += ret;\n" - "-\t\t\t\tlast_len += ret << PAGE_CACHE_SHIFT;\n" - "+\t\t\t\tlast_len += ret << PAGE_SHIFT;\n" - " \t\t\t} else {\n" - " \t\t\t\ti++;\n" - " \t\t\t\tlast_len = 0;\n" - "@@ -1724,7 +1724,7 @@ static noinline int btrfs_ioctl_snap_create_v2(struct file *file,\n" - " \tif (vol_args->flags & BTRFS_SUBVOL_RDONLY)\n" - " \t\treadonly = true;\n" - " \tif (vol_args->flags & BTRFS_SUBVOL_QGROUP_INHERIT) {\n" - "-\t\tif (vol_args->size > PAGE_CACHE_SIZE) {\n" - "+\t\tif (vol_args->size > PAGE_SIZE) {\n" - " \t\t\tret = -EINVAL;\n" - " \t\t\tgoto free_args;\n" - " \t\t}\n" - "@@ -2808,12 +2808,12 @@ static struct page *extent_same_get_page(struct inode *inode, pgoff_t index)\n" - " \t\tlock_page(page);\n" - " \t\tif (!PageUptodate(page)) {\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\treturn ERR_PTR(-EIO);\n" - " \t\t}\n" - " \t\tif (page->mapping != inode->i_mapping) {\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\treturn ERR_PTR(-EAGAIN);\n" - " \t\t}\n" - " \t}\n" - "@@ -2825,7 +2825,7 @@ static int gather_extent_pages(struct inode *inode, struct page **pages,\n" - " \t\t\t int num_pages, u64 off)\n" - " {\n" - " \tint i;\n" - "-\tpgoff_t index = off >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = off >> PAGE_SHIFT;\n" - " \n" - " \tfor (i = 0; i < num_pages; i++) {\n" - " again:\n" - "@@ -2934,12 +2934,12 @@ static void btrfs_cmp_data_free(struct cmp_pages *cmp)\n" - " \t\tpg = cmp->src_pages[i];\n" - " \t\tif (pg) {\n" - " \t\t\tunlock_page(pg);\n" - "-\t\t\tpage_cache_release(pg);\n" - "+\t\t\tput_page(pg);\n" - " \t\t}\n" - " \t\tpg = cmp->dst_pages[i];\n" - " \t\tif (pg) {\n" - " \t\t\tunlock_page(pg);\n" - "-\t\t\tpage_cache_release(pg);\n" - "+\t\t\tput_page(pg);\n" - " \t\t}\n" - " \t}\n" - " \tkfree(cmp->src_pages);\n" - "@@ -2951,7 +2951,7 @@ static int btrfs_cmp_data_prepare(struct inode *src, u64 loff,\n" - " \t\t\t\t u64 len, struct cmp_pages *cmp)\n" - " {\n" - " \tint ret;\n" - "-\tint num_pages = PAGE_CACHE_ALIGN(len) >> PAGE_CACHE_SHIFT;\n" - "+\tint num_pages = PAGE_ALIGN(len) >> PAGE_SHIFT;\n" - " \tstruct page **src_pgarr, **dst_pgarr;\n" - " \n" - " \t/*\n" - "@@ -2989,12 +2989,12 @@ static int btrfs_cmp_data(struct inode *src, u64 loff, struct inode *dst,\n" - " \tint ret = 0;\n" - " \tint i;\n" - " \tstruct page *src_page, *dst_page;\n" - "-\tunsigned int cmp_len = PAGE_CACHE_SIZE;\n" - "+\tunsigned int cmp_len = PAGE_SIZE;\n" - " \tvoid *addr, *dst_addr;\n" - " \n" - " \ti = 0;\n" - " \twhile (len) {\n" - "-\t\tif (len < PAGE_CACHE_SIZE)\n" - "+\t\tif (len < PAGE_SIZE)\n" - " \t\t\tcmp_len = len;\n" - " \n" - " \t\tBUG_ON(i >= cmp->num_pages);\n" - "@@ -3190,7 +3190,7 @@ ssize_t btrfs_dedupe_file_range(struct file *src_file, u64 loff, u64 olen,\n" - " \tif (olen > BTRFS_MAX_DEDUPE_LEN)\n" - " \t\tolen = BTRFS_MAX_DEDUPE_LEN;\n" - " \n" - "-\tif (WARN_ON_ONCE(bs < PAGE_CACHE_SIZE)) {\n" - "+\tif (WARN_ON_ONCE(bs < PAGE_SIZE)) {\n" - " \t\t/*\n" - " \t\t * Btrfs does not support blocksize < page_size. As a\n" - " \t\t * result, btrfs_cmp_data() won't correctly handle\n" - "@@ -3890,7 +3890,7 @@ static noinline int btrfs_clone_files(struct file *file, struct file *file_src,\n" - " \t * data immediately and not the previous data.\n" - " \t */\n" - " \ttruncate_inode_pages_range(&inode->i_data, destoff,\n" - "-\t\t\t\t PAGE_CACHE_ALIGN(destoff + len) - 1);\n" - "+\t\t\t\t PAGE_ALIGN(destoff + len) - 1);\n" - " out_unlock:\n" - " \tif (!same_inode)\n" - " \t\tbtrfs_double_inode_unlock(src, inode);\n" - "@@ -4122,7 +4122,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)\n" - " \t/* we generally have at most 6 or so space infos, one for each raid\n" - " \t * level. So, a whole page should be more than enough for everyone\n" - " \t */\n" - "-\tif (alloc_size > PAGE_CACHE_SIZE)\n" - "+\tif (alloc_size > PAGE_SIZE)\n" - " \t\treturn -ENOMEM;\n" - " \n" - " \tspace_args.total_spaces = 0;\n" - "diff --git a/fs/btrfs/lzo.c b/fs/btrfs/lzo.c\n" - "index a2f051347731..1adfbe7be6b8 100644\n" - "--- a/fs/btrfs/lzo.c\n" - "+++ b/fs/btrfs/lzo.c\n" - "@@ -55,8 +55,8 @@ static struct list_head *lzo_alloc_workspace(void)\n" - " \t\treturn ERR_PTR(-ENOMEM);\n" - " \n" - " \tworkspace->mem = vmalloc(LZO1X_MEM_COMPRESS);\n" - "-\tworkspace->buf = vmalloc(lzo1x_worst_compress(PAGE_CACHE_SIZE));\n" - "-\tworkspace->cbuf = vmalloc(lzo1x_worst_compress(PAGE_CACHE_SIZE));\n" - "+\tworkspace->buf = vmalloc(lzo1x_worst_compress(PAGE_SIZE));\n" - "+\tworkspace->cbuf = vmalloc(lzo1x_worst_compress(PAGE_SIZE));\n" - " \tif (!workspace->mem || !workspace->buf || !workspace->cbuf)\n" - " \t\tgoto fail;\n" - " \n" - "@@ -116,7 +116,7 @@ static int lzo_compress_pages(struct list_head *ws,\n" - " \t*total_out = 0;\n" - " \t*total_in = 0;\n" - " \n" - "-\tin_page = find_get_page(mapping, start >> PAGE_CACHE_SHIFT);\n" - "+\tin_page = find_get_page(mapping, start >> PAGE_SHIFT);\n" - " \tdata_in = kmap(in_page);\n" - " \n" - " \t/*\n" - "@@ -133,10 +133,10 @@ static int lzo_compress_pages(struct list_head *ws,\n" - " \ttot_out = LZO_LEN;\n" - " \tpages[0] = out_page;\n" - " \tnr_pages = 1;\n" - "-\tpg_bytes_left = PAGE_CACHE_SIZE - LZO_LEN;\n" - "+\tpg_bytes_left = PAGE_SIZE - LZO_LEN;\n" - " \n" - " \t/* compress at most one page of data each time */\n" - "-\tin_len = min(len, PAGE_CACHE_SIZE);\n" - "+\tin_len = min(len, PAGE_SIZE);\n" - " \twhile (tot_in < len) {\n" - " \t\tret = lzo1x_1_compress(data_in, in_len, workspace->cbuf,\n" - " \t\t\t\t &out_len, workspace->mem);\n" - "@@ -201,7 +201,7 @@ static int lzo_compress_pages(struct list_head *ws,\n" - " \t\t\t\tcpage_out = kmap(out_page);\n" - " \t\t\t\tpages[nr_pages++] = out_page;\n" - " \n" - "-\t\t\t\tpg_bytes_left = PAGE_CACHE_SIZE;\n" - "+\t\t\t\tpg_bytes_left = PAGE_SIZE;\n" - " \t\t\t\tout_offset = 0;\n" - " \t\t\t}\n" - " \t\t}\n" - "@@ -221,12 +221,12 @@ static int lzo_compress_pages(struct list_head *ws,\n" - " \n" - " \t\tbytes_left = len - tot_in;\n" - " \t\tkunmap(in_page);\n" - "-\t\tpage_cache_release(in_page);\n" - "+\t\tput_page(in_page);\n" - " \n" - "-\t\tstart += PAGE_CACHE_SIZE;\n" - "-\t\tin_page = find_get_page(mapping, start >> PAGE_CACHE_SHIFT);\n" - "+\t\tstart += PAGE_SIZE;\n" - "+\t\tin_page = find_get_page(mapping, start >> PAGE_SHIFT);\n" - " \t\tdata_in = kmap(in_page);\n" - "-\t\tin_len = min(bytes_left, PAGE_CACHE_SIZE);\n" - "+\t\tin_len = min(bytes_left, PAGE_SIZE);\n" - " \t}\n" - " \n" - " \tif (tot_out > tot_in)\n" - "@@ -248,7 +248,7 @@ out:\n" - " \n" - " \tif (in_page) {\n" - " \t\tkunmap(in_page);\n" - "-\t\tpage_cache_release(in_page);\n" - "+\t\tput_page(in_page);\n" - " \t}\n" - " \n" - " \treturn ret;\n" - "@@ -266,7 +266,7 @@ static int lzo_decompress_biovec(struct list_head *ws,\n" - " \tchar *data_in;\n" - " \tunsigned long page_in_index = 0;\n" - " \tunsigned long page_out_index = 0;\n" - "-\tunsigned long total_pages_in = DIV_ROUND_UP(srclen, PAGE_CACHE_SIZE);\n" - "+\tunsigned long total_pages_in = DIV_ROUND_UP(srclen, PAGE_SIZE);\n" - " \tunsigned long buf_start;\n" - " \tunsigned long buf_offset = 0;\n" - " \tunsigned long bytes;\n" - "@@ -289,7 +289,7 @@ static int lzo_decompress_biovec(struct list_head *ws,\n" - " \ttot_in = LZO_LEN;\n" - " \tin_offset = LZO_LEN;\n" - " \ttot_len = min_t(size_t, srclen, tot_len);\n" - "-\tin_page_bytes_left = PAGE_CACHE_SIZE - LZO_LEN;\n" - "+\tin_page_bytes_left = PAGE_SIZE - LZO_LEN;\n" - " \n" - " \ttot_out = 0;\n" - " \tpg_offset = 0;\n" - "@@ -345,12 +345,12 @@ cont:\n" - " \n" - " \t\t\t\tdata_in = kmap(pages_in[++page_in_index]);\n" - " \n" - "-\t\t\t\tin_page_bytes_left = PAGE_CACHE_SIZE;\n" - "+\t\t\t\tin_page_bytes_left = PAGE_SIZE;\n" - " \t\t\t\tin_offset = 0;\n" - " \t\t\t}\n" - " \t\t}\n" - " \n" - "-\t\tout_len = lzo1x_worst_compress(PAGE_CACHE_SIZE);\n" - "+\t\tout_len = lzo1x_worst_compress(PAGE_SIZE);\n" - " \t\tret = lzo1x_decompress_safe(buf, in_len, workspace->buf,\n" - " \t\t\t\t\t &out_len);\n" - " \t\tif (need_unmap)\n" - "@@ -399,7 +399,7 @@ static int lzo_decompress(struct list_head *ws, unsigned char *data_in,\n" - " \tin_len = read_compress_length(data_in);\n" - " \tdata_in += LZO_LEN;\n" - " \n" - "-\tout_len = PAGE_CACHE_SIZE;\n" - "+\tout_len = PAGE_SIZE;\n" - " \tret = lzo1x_decompress_safe(data_in, in_len, workspace->buf, &out_len);\n" - " \tif (ret != LZO_E_OK) {\n" - " \t\tprintk(KERN_WARNING \"BTRFS: decompress failed!\\n\");\n" - "diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c\n" - "index 55161369fab1..0b7792e02dd5 100644\n" - "--- a/fs/btrfs/raid56.c\n" - "+++ b/fs/btrfs/raid56.c\n" - "@@ -270,7 +270,7 @@ static void cache_rbio_pages(struct btrfs_raid_bio *rbio)\n" - " \t\ts = kmap(rbio->bio_pages[i]);\n" - " \t\td = kmap(rbio->stripe_pages[i]);\n" - " \n" - "-\t\tmemcpy(d, s, PAGE_CACHE_SIZE);\n" - "+\t\tmemcpy(d, s, PAGE_SIZE);\n" - " \n" - " \t\tkunmap(rbio->bio_pages[i]);\n" - " \t\tkunmap(rbio->stripe_pages[i]);\n" - "@@ -962,7 +962,7 @@ static struct page *page_in_rbio(struct btrfs_raid_bio *rbio,\n" - " */\n" - " static unsigned long rbio_nr_pages(unsigned long stripe_len, int nr_stripes)\n" - " {\n" - "-\treturn DIV_ROUND_UP(stripe_len, PAGE_CACHE_SIZE) * nr_stripes;\n" - "+\treturn DIV_ROUND_UP(stripe_len, PAGE_SIZE) * nr_stripes;\n" - " }\n" - " \n" - " /*\n" - "@@ -1078,7 +1078,7 @@ static int rbio_add_io_page(struct btrfs_raid_bio *rbio,\n" - " \tu64 disk_start;\n" - " \n" - " \tstripe = &rbio->bbio->stripes[stripe_nr];\n" - "-\tdisk_start = stripe->physical + (page_index << PAGE_CACHE_SHIFT);\n" - "+\tdisk_start = stripe->physical + (page_index << PAGE_SHIFT);\n" - " \n" - " \t/* if the device is missing, just fail this stripe */\n" - " \tif (!stripe->dev->bdev)\n" - "@@ -1096,8 +1096,8 @@ static int rbio_add_io_page(struct btrfs_raid_bio *rbio,\n" - " \t\tif (last_end == disk_start && stripe->dev->bdev &&\n" - " \t\t !last->bi_error &&\n" - " \t\t last->bi_bdev == stripe->dev->bdev) {\n" - "-\t\t\tret = bio_add_page(last, page, PAGE_CACHE_SIZE, 0);\n" - "-\t\t\tif (ret == PAGE_CACHE_SIZE)\n" - "+\t\t\tret = bio_add_page(last, page, PAGE_SIZE, 0);\n" - "+\t\t\tif (ret == PAGE_SIZE)\n" - " \t\t\t\treturn 0;\n" - " \t\t}\n" - " \t}\n" - "@@ -1111,7 +1111,7 @@ static int rbio_add_io_page(struct btrfs_raid_bio *rbio,\n" - " \tbio->bi_bdev = stripe->dev->bdev;\n" - " \tbio->bi_iter.bi_sector = disk_start >> 9;\n" - " \n" - "-\tbio_add_page(bio, page, PAGE_CACHE_SIZE, 0);\n" - "+\tbio_add_page(bio, page, PAGE_SIZE, 0);\n" - " \tbio_list_add(bio_list, bio);\n" - " \treturn 0;\n" - " }\n" - "@@ -1154,7 +1154,7 @@ static void index_rbio_pages(struct btrfs_raid_bio *rbio)\n" - " \tbio_list_for_each(bio, &rbio->bio_list) {\n" - " \t\tstart = (u64)bio->bi_iter.bi_sector << 9;\n" - " \t\tstripe_offset = start - rbio->bbio->raid_map[0];\n" - "-\t\tpage_index = stripe_offset >> PAGE_CACHE_SHIFT;\n" - "+\t\tpage_index = stripe_offset >> PAGE_SHIFT;\n" - " \n" - " \t\tfor (i = 0; i < bio->bi_vcnt; i++) {\n" - " \t\t\tp = bio->bi_io_vec[i].bv_page;\n" - "@@ -1253,7 +1253,7 @@ static noinline void finish_rmw(struct btrfs_raid_bio *rbio)\n" - " \t\t} else {\n" - " \t\t\t/* raid5 */\n" - " \t\t\tmemcpy(pointers[nr_data], pointers[0], PAGE_SIZE);\n" - "-\t\t\trun_xor(pointers + 1, nr_data - 1, PAGE_CACHE_SIZE);\n" - "+\t\t\trun_xor(pointers + 1, nr_data - 1, PAGE_SIZE);\n" - " \t\t}\n" - " \n" - " \n" - "@@ -1914,7 +1914,7 @@ pstripe:\n" - " \t\t\t/* Copy parity block into failed block to start with */\n" - " \t\t\tmemcpy(pointers[faila],\n" - " \t\t\t pointers[rbio->nr_data],\n" - "-\t\t\t PAGE_CACHE_SIZE);\n" - "+\t\t\t PAGE_SIZE);\n" - " \n" - " \t\t\t/* rearrange the pointer array */\n" - " \t\t\tp = pointers[faila];\n" - "@@ -1923,7 +1923,7 @@ pstripe:\n" - " \t\t\tpointers[rbio->nr_data - 1] = p;\n" - " \n" - " \t\t\t/* xor in the rest */\n" - "-\t\t\trun_xor(pointers, rbio->nr_data - 1, PAGE_CACHE_SIZE);\n" - "+\t\t\trun_xor(pointers, rbio->nr_data - 1, PAGE_SIZE);\n" - " \t\t}\n" - " \t\t/* if we're doing this rebuild as part of an rmw, go through\n" - " \t\t * and set all of our private rbio pages in the\n" - "@@ -2250,7 +2250,7 @@ void raid56_add_scrub_pages(struct btrfs_raid_bio *rbio, struct page *page,\n" - " \tASSERT(logical + PAGE_SIZE <= rbio->bbio->raid_map[0] +\n" - " \t\t\t\trbio->stripe_len * rbio->nr_data);\n" - " \tstripe_offset = (int)(logical - rbio->bbio->raid_map[0]);\n" - "-\tindex = stripe_offset >> PAGE_CACHE_SHIFT;\n" - "+\tindex = stripe_offset >> PAGE_SHIFT;\n" - " \trbio->bio_pages[index] = page;\n" - " }\n" - " \n" - "@@ -2365,14 +2365,14 @@ static noinline void finish_parity_scrub(struct btrfs_raid_bio *rbio,\n" - " \t\t} else {\n" - " \t\t\t/* raid5 */\n" - " \t\t\tmemcpy(pointers[nr_data], pointers[0], PAGE_SIZE);\n" - "-\t\t\trun_xor(pointers + 1, nr_data - 1, PAGE_CACHE_SIZE);\n" - "+\t\t\trun_xor(pointers + 1, nr_data - 1, PAGE_SIZE);\n" - " \t\t}\n" - " \n" - " \t\t/* Check scrubbing pairty and repair it */\n" - " \t\tp = rbio_stripe_page(rbio, rbio->scrubp, pagenr);\n" - " \t\tparity = kmap(p);\n" - "-\t\tif (memcmp(parity, pointers[rbio->scrubp], PAGE_CACHE_SIZE))\n" - "-\t\t\tmemcpy(parity, pointers[rbio->scrubp], PAGE_CACHE_SIZE);\n" - "+\t\tif (memcmp(parity, pointers[rbio->scrubp], PAGE_SIZE))\n" - "+\t\t\tmemcpy(parity, pointers[rbio->scrubp], PAGE_SIZE);\n" - " \t\telse\n" - " \t\t\t/* Parity is right, needn't writeback */\n" - " \t\t\tbitmap_clear(rbio->dbitmap, pagenr, 1);\n" - "diff --git a/fs/btrfs/reada.c b/fs/btrfs/reada.c\n" - "index 619f92963e27..bacc55e2655b 100644\n" - "--- a/fs/btrfs/reada.c\n" - "+++ b/fs/btrfs/reada.c\n" - "@@ -116,7 +116,7 @@ static int __readahead_hook(struct btrfs_root *root, struct extent_buffer *eb,\n" - " \tstruct reada_extent *re;\n" - " \tstruct btrfs_fs_info *fs_info = root->fs_info;\n" - " \tstruct list_head list;\n" - "-\tunsigned long index = start >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long index = start >> PAGE_SHIFT;\n" - " \tstruct btrfs_device *for_dev;\n" - " \n" - " \tif (eb)\n" - "@@ -259,7 +259,7 @@ static struct reada_zone *reada_find_zone(struct btrfs_fs_info *fs_info,\n" - " \tzone = NULL;\n" - " \tspin_lock(&fs_info->reada_lock);\n" - " \tret = radix_tree_gang_lookup(&dev->reada_zones, (void **)&zone,\n" - "-\t\t\t\t logical >> PAGE_CACHE_SHIFT, 1);\n" - "+\t\t\t\t logical >> PAGE_SHIFT, 1);\n" - " \tif (ret == 1)\n" - " \t\tkref_get(&zone->refcnt);\n" - " \tspin_unlock(&fs_info->reada_lock);\n" - "@@ -300,13 +300,13 @@ static struct reada_zone *reada_find_zone(struct btrfs_fs_info *fs_info,\n" - " \n" - " \tspin_lock(&fs_info->reada_lock);\n" - " \tret = radix_tree_insert(&dev->reada_zones,\n" - "-\t\t\t\t(unsigned long)(zone->end >> PAGE_CACHE_SHIFT),\n" - "+\t\t\t\t(unsigned long)(zone->end >> PAGE_SHIFT),\n" - " \t\t\t\tzone);\n" - " \n" - " \tif (ret == -EEXIST) {\n" - " \t\tkfree(zone);\n" - " \t\tret = radix_tree_gang_lookup(&dev->reada_zones, (void **)&zone,\n" - "-\t\t\t\t\t logical >> PAGE_CACHE_SHIFT, 1);\n" - "+\t\t\t\t\t logical >> PAGE_SHIFT, 1);\n" - " \t\tif (ret == 1)\n" - " \t\t\tkref_get(&zone->refcnt);\n" - " \t}\n" - "@@ -331,7 +331,7 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root,\n" - " \tint real_stripes;\n" - " \tint nzones = 0;\n" - " \tint i;\n" - "-\tunsigned long index = logical >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long index = logical >> PAGE_SHIFT;\n" - " \tint dev_replace_is_ongoing;\n" - " \n" - " \tspin_lock(&fs_info->reada_lock);\n" - "@@ -497,7 +497,7 @@ static void reada_extent_put(struct btrfs_fs_info *fs_info,\n" - " \t\t\t struct reada_extent *re)\n" - " {\n" - " \tint i;\n" - "-\tunsigned long index = re->logical >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long index = re->logical >> PAGE_SHIFT;\n" - " \n" - " \tspin_lock(&fs_info->reada_lock);\n" - " \tif (--re->refcnt) {\n" - "@@ -542,7 +542,7 @@ static void reada_zone_release(struct kref *kref)\n" - " \tstruct reada_zone *zone = container_of(kref, struct reada_zone, refcnt);\n" - " \n" - " \tradix_tree_delete(&zone->device->reada_zones,\n" - "-\t\t\t zone->end >> PAGE_CACHE_SHIFT);\n" - "+\t\t\t zone->end >> PAGE_SHIFT);\n" - " \n" - " \tkfree(zone);\n" - " }\n" - "@@ -591,7 +591,7 @@ static int reada_add_block(struct reada_control *rc, u64 logical,\n" - " static void reada_peer_zones_set_lock(struct reada_zone *zone, int lock)\n" - " {\n" - " \tint i;\n" - "-\tunsigned long index = zone->end >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long index = zone->end >> PAGE_SHIFT;\n" - " \n" - " \tfor (i = 0; i < zone->ndevs; ++i) {\n" - " \t\tstruct reada_zone *peer;\n" - "@@ -626,7 +626,7 @@ static int reada_pick_zone(struct btrfs_device *dev)\n" - " \t\t\t\t\t (void **)&zone, index, 1);\n" - " \t\tif (ret == 0)\n" - " \t\t\tbreak;\n" - "-\t\tindex = (zone->end >> PAGE_CACHE_SHIFT) + 1;\n" - "+\t\tindex = (zone->end >> PAGE_SHIFT) + 1;\n" - " \t\tif (zone->locked) {\n" - " \t\t\tif (zone->elems > top_locked_elems) {\n" - " \t\t\t\ttop_locked_elems = zone->elems;\n" - "@@ -678,7 +678,7 @@ static int reada_start_machine_dev(struct btrfs_fs_info *fs_info,\n" - " \t * plugging to speed things up\n" - " \t */\n" - " \tret = radix_tree_gang_lookup(&dev->reada_extents, (void **)&re,\n" - "-\t\t\t\t dev->reada_next >> PAGE_CACHE_SHIFT, 1);\n" - "+\t\t\t\t dev->reada_next >> PAGE_SHIFT, 1);\n" - " \tif (ret == 0 || re->logical >= dev->reada_curr_zone->end) {\n" - " \t\tret = reada_pick_zone(dev);\n" - " \t\tif (!ret) {\n" - "@@ -687,7 +687,7 @@ static int reada_start_machine_dev(struct btrfs_fs_info *fs_info,\n" - " \t\t}\n" - " \t\tre = NULL;\n" - " \t\tret = radix_tree_gang_lookup(&dev->reada_extents, (void **)&re,\n" - "-\t\t\t\t\tdev->reada_next >> PAGE_CACHE_SHIFT, 1);\n" - "+\t\t\t\t\tdev->reada_next >> PAGE_SHIFT, 1);\n" - " \t}\n" - " \tif (ret == 0) {\n" - " \t\tspin_unlock(&fs_info->reada_lock);\n" - "@@ -836,7 +836,7 @@ static void dump_devs(struct btrfs_fs_info *fs_info, int all)\n" - " \t\t\t\tprintk(KERN_CONT \" curr off %llu\",\n" - " \t\t\t\t\tdevice->reada_next - zone->start);\n" - " \t\t\tprintk(KERN_CONT \"\\n\");\n" - "-\t\t\tindex = (zone->end >> PAGE_CACHE_SHIFT) + 1;\n" - "+\t\t\tindex = (zone->end >> PAGE_SHIFT) + 1;\n" - " \t\t}\n" - " \t\tcnt = 0;\n" - " \t\tindex = 0;\n" - "@@ -863,7 +863,7 @@ static void dump_devs(struct btrfs_fs_info *fs_info, int all)\n" - " \t\t\t\t}\n" - " \t\t\t}\n" - " \t\t\tprintk(KERN_CONT \"\\n\");\n" - "-\t\t\tindex = (re->logical >> PAGE_CACHE_SHIFT) + 1;\n" - "+\t\t\tindex = (re->logical >> PAGE_SHIFT) + 1;\n" - " \t\t\tif (++cnt > 15)\n" - " \t\t\t\tbreak;\n" - " \t\t}\n" - "@@ -879,7 +879,7 @@ static void dump_devs(struct btrfs_fs_info *fs_info, int all)\n" - " \t\tif (ret == 0)\n" - " \t\t\tbreak;\n" - " \t\tif (!re->scheduled_for) {\n" - "-\t\t\tindex = (re->logical >> PAGE_CACHE_SHIFT) + 1;\n" - "+\t\t\tindex = (re->logical >> PAGE_SHIFT) + 1;\n" - " \t\t\tcontinue;\n" - " \t\t}\n" - " \t\tprintk(KERN_DEBUG\n" - "@@ -902,7 +902,7 @@ static void dump_devs(struct btrfs_fs_info *fs_info, int all)\n" - " \t\t\t}\n" - " \t\t}\n" - " \t\tprintk(KERN_CONT \"\\n\");\n" - "-\t\tindex = (re->logical >> PAGE_CACHE_SHIFT) + 1;\n" - "+\t\tindex = (re->logical >> PAGE_SHIFT) + 1;\n" - " \t}\n" - " \tspin_unlock(&fs_info->reada_lock);\n" - " }\n" - "diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c\n" - "index 2bd0011450df..3c93968b539d 100644\n" - "--- a/fs/btrfs/relocation.c\n" - "+++ b/fs/btrfs/relocation.c\n" - "@@ -3129,10 +3129,10 @@ static int relocate_file_extent_cluster(struct inode *inode,\n" - " \tif (ret)\n" - " \t\tgoto out;\n" - " \n" - "-\tindex = (cluster->start - offset) >> PAGE_CACHE_SHIFT;\n" - "-\tlast_index = (cluster->end - offset) >> PAGE_CACHE_SHIFT;\n" - "+\tindex = (cluster->start - offset) >> PAGE_SHIFT;\n" - "+\tlast_index = (cluster->end - offset) >> PAGE_SHIFT;\n" - " \twhile (index <= last_index) {\n" - "-\t\tret = btrfs_delalloc_reserve_metadata(inode, PAGE_CACHE_SIZE);\n" - "+\t\tret = btrfs_delalloc_reserve_metadata(inode, PAGE_SIZE);\n" - " \t\tif (ret)\n" - " \t\t\tgoto out;\n" - " \n" - "@@ -3145,7 +3145,7 @@ static int relocate_file_extent_cluster(struct inode *inode,\n" - " \t\t\t\t\t\t mask);\n" - " \t\t\tif (!page) {\n" - " \t\t\t\tbtrfs_delalloc_release_metadata(inode,\n" - "-\t\t\t\t\t\t\tPAGE_CACHE_SIZE);\n" - "+\t\t\t\t\t\t\tPAGE_SIZE);\n" - " \t\t\t\tret = -ENOMEM;\n" - " \t\t\t\tgoto out;\n" - " \t\t\t}\n" - "@@ -3162,16 +3162,16 @@ static int relocate_file_extent_cluster(struct inode *inode,\n" - " \t\t\tlock_page(page);\n" - " \t\t\tif (!PageUptodate(page)) {\n" - " \t\t\t\tunlock_page(page);\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t\tbtrfs_delalloc_release_metadata(inode,\n" - "-\t\t\t\t\t\t\tPAGE_CACHE_SIZE);\n" - "+\t\t\t\t\t\t\tPAGE_SIZE);\n" - " \t\t\t\tret = -EIO;\n" - " \t\t\t\tgoto out;\n" - " \t\t\t}\n" - " \t\t}\n" - " \n" - " \t\tpage_start = page_offset(page);\n" - "-\t\tpage_end = page_start + PAGE_CACHE_SIZE - 1;\n" - "+\t\tpage_end = page_start + PAGE_SIZE - 1;\n" - " \n" - " \t\tlock_extent(&BTRFS_I(inode)->io_tree, page_start, page_end);\n" - " \n" - "@@ -3191,7 +3191,7 @@ static int relocate_file_extent_cluster(struct inode *inode,\n" - " \t\tunlock_extent(&BTRFS_I(inode)->io_tree,\n" - " \t\t\t page_start, page_end);\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \n" - " \t\tindex++;\n" - " \t\tbalance_dirty_pages_ratelimited(inode->i_mapping);\n" - "diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c\n" - "index 92bf5ee732fb..1c6d3267029f 100644\n" - "--- a/fs/btrfs/scrub.c\n" - "+++ b/fs/btrfs/scrub.c\n" - "@@ -703,7 +703,7 @@ static int scrub_fixup_readpage(u64 inum, u64 offset, u64 root, void *fixup_ctx)\n" - " \tif (IS_ERR(inode))\n" - " \t\treturn PTR_ERR(inode);\n" - " \n" - "-\tindex = offset >> PAGE_CACHE_SHIFT;\n" - "+\tindex = offset >> PAGE_SHIFT;\n" - " \n" - " \tpage = find_or_create_page(inode->i_mapping, index, GFP_NOFS);\n" - " \tif (!page) {\n" - "@@ -1636,7 +1636,7 @@ static int scrub_write_page_to_dev_replace(struct scrub_block *sblock,\n" - " \tif (spage->io_error) {\n" - " \t\tvoid *mapped_buffer = kmap_atomic(spage->page);\n" - " \n" - "-\t\tmemset(mapped_buffer, 0, PAGE_CACHE_SIZE);\n" - "+\t\tmemset(mapped_buffer, 0, PAGE_SIZE);\n" - " \t\tflush_dcache_page(spage->page);\n" - " \t\tkunmap_atomic(mapped_buffer);\n" - " \t}\n" - "@@ -4292,8 +4292,8 @@ static int copy_nocow_pages_for_inode(u64 inum, u64 offset, u64 root,\n" - " \t\tgoto out;\n" - " \t}\n" - " \n" - "-\twhile (len >= PAGE_CACHE_SIZE) {\n" - "-\t\tindex = offset >> PAGE_CACHE_SHIFT;\n" - "+\twhile (len >= PAGE_SIZE) {\n" - "+\t\tindex = offset >> PAGE_SHIFT;\n" - " again:\n" - " \t\tpage = find_or_create_page(inode->i_mapping, index, GFP_NOFS);\n" - " \t\tif (!page) {\n" - "@@ -4324,7 +4324,7 @@ again:\n" - " \t\t\t */\n" - " \t\t\tif (page->mapping != inode->i_mapping) {\n" - " \t\t\t\tunlock_page(page);\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t\tgoto again;\n" - " \t\t\t}\n" - " \t\t\tif (!PageUptodate(page)) {\n" - "@@ -4346,15 +4346,15 @@ again:\n" - " \t\t\tret = err;\n" - " next_page:\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \n" - " \t\tif (ret)\n" - " \t\t\tbreak;\n" - " \n" - "-\t\toffset += PAGE_CACHE_SIZE;\n" - "-\t\tphysical_for_dev_replace += PAGE_CACHE_SIZE;\n" - "-\t\tnocow_ctx_logical += PAGE_CACHE_SIZE;\n" - "-\t\tlen -= PAGE_CACHE_SIZE;\n" - "+\t\toffset += PAGE_SIZE;\n" - "+\t\tphysical_for_dev_replace += PAGE_SIZE;\n" - "+\t\tnocow_ctx_logical += PAGE_SIZE;\n" - "+\t\tlen -= PAGE_SIZE;\n" - " \t}\n" - " \tret = COPY_COMPLETE;\n" - " out:\n" - "@@ -4388,8 +4388,8 @@ static int write_page_nocow(struct scrub_ctx *sctx,\n" - " \tbio->bi_iter.bi_size = 0;\n" - " \tbio->bi_iter.bi_sector = physical_for_dev_replace >> 9;\n" - " \tbio->bi_bdev = dev->bdev;\n" - "-\tret = bio_add_page(bio, page, PAGE_CACHE_SIZE, 0);\n" - "-\tif (ret != PAGE_CACHE_SIZE) {\n" - "+\tret = bio_add_page(bio, page, PAGE_SIZE, 0);\n" - "+\tif (ret != PAGE_SIZE) {\n" - " leave_with_eio:\n" - " \t\tbio_put(bio);\n" - " \t\tbtrfs_dev_stat_inc_and_print(dev, BTRFS_DEV_STAT_WRITE_ERRS);\n" - "diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c\n" - "index 63a6152be04b..f5b875c8c2d8 100644\n" - "--- a/fs/btrfs/send.c\n" - "+++ b/fs/btrfs/send.c\n" - "@@ -4448,9 +4448,9 @@ static ssize_t fill_read_buf(struct send_ctx *sctx, u64 offset, u32 len)\n" - " \tstruct page *page;\n" - " \tchar *addr;\n" - " \tstruct btrfs_key key;\n" - "-\tpgoff_t index = offset >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = offset >> PAGE_SHIFT;\n" - " \tpgoff_t last_index;\n" - "-\tunsigned pg_offset = offset & ~PAGE_CACHE_MASK;\n" - "+\tunsigned pg_offset = offset & ~PAGE_MASK;\n" - " \tssize_t ret = 0;\n" - " \n" - " \tkey.objectid = sctx->cur_ino;\n" - "@@ -4470,7 +4470,7 @@ static ssize_t fill_read_buf(struct send_ctx *sctx, u64 offset, u32 len)\n" - " \tif (len == 0)\n" - " \t\tgoto out;\n" - " \n" - "-\tlast_index = (offset + len - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tlast_index = (offset + len - 1) >> PAGE_SHIFT;\n" - " \n" - " \t/* initial readahead */\n" - " \tmemset(&sctx->ra, 0, sizeof(struct file_ra_state));\n" - "@@ -4480,7 +4480,7 @@ static ssize_t fill_read_buf(struct send_ctx *sctx, u64 offset, u32 len)\n" - " \n" - " \twhile (index <= last_index) {\n" - " \t\tunsigned cur_len = min_t(unsigned, len,\n" - "-\t\t\t\t\t PAGE_CACHE_SIZE - pg_offset);\n" - "+\t\t\t\t\t PAGE_SIZE - pg_offset);\n" - " \t\tpage = find_or_create_page(inode->i_mapping, index, GFP_NOFS);\n" - " \t\tif (!page) {\n" - " \t\t\tret = -ENOMEM;\n" - "@@ -4492,7 +4492,7 @@ static ssize_t fill_read_buf(struct send_ctx *sctx, u64 offset, u32 len)\n" - " \t\t\tlock_page(page);\n" - " \t\t\tif (!PageUptodate(page)) {\n" - " \t\t\t\tunlock_page(page);\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t\tret = -EIO;\n" - " \t\t\t\tbreak;\n" - " \t\t\t}\n" - "@@ -4502,7 +4502,7 @@ static ssize_t fill_read_buf(struct send_ctx *sctx, u64 offset, u32 len)\n" - " \t\tmemcpy(sctx->read_buf + ret, addr + pg_offset, cur_len);\n" - " \t\tkunmap(page);\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tindex++;\n" - " \t\tpg_offset = 0;\n" - " \t\tlen -= cur_len;\n" - "@@ -4803,7 +4803,7 @@ static int clone_range(struct send_ctx *sctx,\n" - " \t\ttype = btrfs_file_extent_type(leaf, ei);\n" - " \t\tif (type == BTRFS_FILE_EXTENT_INLINE) {\n" - " \t\t\text_len = btrfs_file_extent_inline_len(leaf, slot, ei);\n" - "-\t\t\text_len = PAGE_CACHE_ALIGN(ext_len);\n" - "+\t\t\text_len = PAGE_ALIGN(ext_len);\n" - " \t\t} else {\n" - " \t\t\text_len = btrfs_file_extent_num_bytes(leaf, ei);\n" - " \t\t}\n" - "@@ -4885,7 +4885,7 @@ static int send_write_or_clone(struct send_ctx *sctx,\n" - " \t\t * but there may be items after this page. Make\n" - " \t\t * sure to send the whole thing\n" - " \t\t */\n" - "-\t\tlen = PAGE_CACHE_ALIGN(len);\n" - "+\t\tlen = PAGE_ALIGN(len);\n" - " \t} else {\n" - " \t\tlen = btrfs_file_extent_num_bytes(path->nodes[0], ei);\n" - " \t}\n" - "diff --git a/fs/btrfs/struct-funcs.c b/fs/btrfs/struct-funcs.c\n" - "index b976597b0721..42752e5ead15 100644\n" - "--- a/fs/btrfs/struct-funcs.c\n" - "+++ b/fs/btrfs/struct-funcs.c\n" - "@@ -66,7 +66,7 @@ u##bits btrfs_get_token_##bits(struct extent_buffer *eb, void *ptr,\t\\\n" - " \t\t\t\t\t\t\t\t\t\\\n" - " \tif (token && token->kaddr && token->offset <= offset &&\t\t\\\n" - " \t token->eb == eb &&\t\t\t\t\t\t\\\n" - "-\t (token->offset + PAGE_CACHE_SIZE >= offset + size)) {\t\\\n" - "+\t (token->offset + PAGE_SIZE >= offset + size)) {\t\t\\\n" - " \t\tkaddr = token->kaddr;\t\t\t\t\t\\\n" - " \t\tp = kaddr + part_offset - token->offset;\t\t\\\n" - " \t\tres = get_unaligned_le##bits(p + off);\t\t\t\\\n" - "@@ -104,7 +104,7 @@ void btrfs_set_token_##bits(struct extent_buffer *eb,\t\t\t\\\n" - " \t\t\t\t\t\t\t\t\t\\\n" - " \tif (token && token->kaddr && token->offset <= offset &&\t\t\\\n" - " \t token->eb == eb &&\t\t\t\t\t\t\\\n" - "-\t (token->offset + PAGE_CACHE_SIZE >= offset + size)) {\t\\\n" - "+\t (token->offset + PAGE_SIZE >= offset + size)) {\t\t\\\n" - " \t\tkaddr = token->kaddr;\t\t\t\t\t\\\n" - " \t\tp = kaddr + part_offset - token->offset;\t\t\\\n" - " \t\tput_unaligned_le##bits(val, p + off);\t\t\t\\\n" - "diff --git a/fs/btrfs/tests/extent-io-tests.c b/fs/btrfs/tests/extent-io-tests.c\n" - "index 669b58201e36..70948b13bc81 100644\n" - "--- a/fs/btrfs/tests/extent-io-tests.c\n" - "+++ b/fs/btrfs/tests/extent-io-tests.c\n" - "@@ -32,8 +32,8 @@ static noinline int process_page_range(struct inode *inode, u64 start, u64 end,\n" - " {\n" - " \tint ret;\n" - " \tstruct page *pages[16];\n" - "-\tunsigned long index = start >> PAGE_CACHE_SHIFT;\n" - "-\tunsigned long end_index = end >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long index = start >> PAGE_SHIFT;\n" - "+\tunsigned long end_index = end >> PAGE_SHIFT;\n" - " \tunsigned long nr_pages = end_index - index + 1;\n" - " \tint i;\n" - " \tint count = 0;\n" - "@@ -49,9 +49,9 @@ static noinline int process_page_range(struct inode *inode, u64 start, u64 end,\n" - " \t\t\t\tcount++;\n" - " \t\t\tif (flags & PROCESS_UNLOCK && PageLocked(pages[i]))\n" - " \t\t\t\tunlock_page(pages[i]);\n" - "-\t\t\tpage_cache_release(pages[i]);\n" - "+\t\t\tput_page(pages[i]);\n" - " \t\t\tif (flags & PROCESS_RELEASE)\n" - "-\t\t\t\tpage_cache_release(pages[i]);\n" - "+\t\t\t\tput_page(pages[i]);\n" - " \t\t}\n" - " \t\tnr_pages -= ret;\n" - " \t\tindex += ret;\n" - "@@ -93,7 +93,7 @@ static int test_find_delalloc(void)\n" - " \t * everything to make sure our pages don't get evicted and screw up our\n" - " \t * test.\n" - " \t */\n" - "-\tfor (index = 0; index < (total_dirty >> PAGE_CACHE_SHIFT); index++) {\n" - "+\tfor (index = 0; index < (total_dirty >> PAGE_SHIFT); index++) {\n" - " \t\tpage = find_or_create_page(inode->i_mapping, index, GFP_KERNEL);\n" - " \t\tif (!page) {\n" - " \t\t\ttest_msg(\"Failed to allocate test page\\n\");\n" - "@@ -104,7 +104,7 @@ static int test_find_delalloc(void)\n" - " \t\tif (index) {\n" - " \t\t\tunlock_page(page);\n" - " \t\t} else {\n" - "-\t\t\tpage_cache_get(page);\n" - "+\t\t\tget_page(page);\n" - " \t\t\tlocked_page = page;\n" - " \t\t}\n" - " \t}\n" - "@@ -129,7 +129,7 @@ static int test_find_delalloc(void)\n" - " \t}\n" - " \tunlock_extent(&tmp, start, end);\n" - " \tunlock_page(locked_page);\n" - "-\tpage_cache_release(locked_page);\n" - "+\tput_page(locked_page);\n" - " \n" - " \t/*\n" - " \t * Test this scenario\n" - "@@ -139,7 +139,7 @@ static int test_find_delalloc(void)\n" - " \t */\n" - " \ttest_start = SZ_64M;\n" - " \tlocked_page = find_lock_page(inode->i_mapping,\n" - "-\t\t\t\t test_start >> PAGE_CACHE_SHIFT);\n" - "+\t\t\t\t test_start >> PAGE_SHIFT);\n" - " \tif (!locked_page) {\n" - " \t\ttest_msg(\"Couldn't find the locked page\\n\");\n" - " \t\tgoto out_bits;\n" - "@@ -165,7 +165,7 @@ static int test_find_delalloc(void)\n" - " \t}\n" - " \tunlock_extent(&tmp, start, end);\n" - " \t/* locked_page was unlocked above */\n" - "-\tpage_cache_release(locked_page);\n" - "+\tput_page(locked_page);\n" - " \n" - " \t/*\n" - " \t * Test this scenario\n" - "@@ -174,7 +174,7 @@ static int test_find_delalloc(void)\n" - " \t */\n" - " \ttest_start = max_bytes + 4096;\n" - " \tlocked_page = find_lock_page(inode->i_mapping, test_start >>\n" - "-\t\t\t\t PAGE_CACHE_SHIFT);\n" - "+\t\t\t\t PAGE_SHIFT);\n" - " \tif (!locked_page) {\n" - " \t\ttest_msg(\"Could'nt find the locked page\\n\");\n" - " \t\tgoto out_bits;\n" - "@@ -225,13 +225,13 @@ static int test_find_delalloc(void)\n" - " \t * range we want to find.\n" - " \t */\n" - " \tpage = find_get_page(inode->i_mapping,\n" - "-\t\t\t (max_bytes + SZ_1M) >> PAGE_CACHE_SHIFT);\n" - "+\t\t\t (max_bytes + SZ_1M) >> PAGE_SHIFT);\n" - " \tif (!page) {\n" - " \t\ttest_msg(\"Couldn't find our page\\n\");\n" - " \t\tgoto out_bits;\n" - " \t}\n" - " \tClearPageDirty(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \t/* We unlocked it in the previous test */\n" - " \tlock_page(locked_page);\n" - "@@ -239,7 +239,7 @@ static int test_find_delalloc(void)\n" - " \tend = 0;\n" - " \t/*\n" - " \t * Currently if we fail to find dirty pages in the delalloc range we\n" - "-\t * will adjust max_bytes down to PAGE_CACHE_SIZE and then re-search. If\n" - "+\t * will adjust max_bytes down to PAGE_SIZE and then re-search. If\n" - " \t * this changes at any point in the future we will need to fix this\n" - " \t * tests expected behavior.\n" - " \t */\n" - "@@ -249,9 +249,9 @@ static int test_find_delalloc(void)\n" - " \t\ttest_msg(\"Didn't find our range\\n\");\n" - " \t\tgoto out_bits;\n" - " \t}\n" - "-\tif (start != test_start && end != test_start + PAGE_CACHE_SIZE - 1) {\n" - "+\tif (start != test_start && end != test_start + PAGE_SIZE - 1) {\n" - " \t\ttest_msg(\"Expected start %Lu end %Lu, got start %Lu end %Lu\\n\",\n" - "-\t\t\t test_start, test_start + PAGE_CACHE_SIZE - 1, start,\n" - "+\t\t\t test_start, test_start + PAGE_SIZE - 1, start,\n" - " \t\t\t end);\n" - " \t\tgoto out_bits;\n" - " \t}\n" - "@@ -265,7 +265,7 @@ out_bits:\n" - " \tclear_extent_bits(&tmp, 0, total_dirty - 1, (unsigned)-1, GFP_KERNEL);\n" - " out:\n" - " \tif (locked_page)\n" - "-\t\tpage_cache_release(locked_page);\n" - "+\t\tput_page(locked_page);\n" - " \tprocess_page_range(inode, 0, total_dirty - 1,\n" - " \t\t\t PROCESS_UNLOCK | PROCESS_RELEASE);\n" - " \tiput(inode);\n" - "@@ -298,9 +298,9 @@ static int __test_eb_bitmaps(unsigned long *bitmap, struct extent_buffer *eb,\n" - " \t\treturn -EINVAL;\n" - " \t}\n" - " \n" - "-\tbitmap_set(bitmap, (PAGE_CACHE_SIZE - sizeof(long) / 2) * BITS_PER_BYTE,\n" - "+\tbitmap_set(bitmap, (PAGE_SIZE - sizeof(long) / 2) * BITS_PER_BYTE,\n" - " \t\t sizeof(long) * BITS_PER_BYTE);\n" - "-\textent_buffer_bitmap_set(eb, PAGE_CACHE_SIZE - sizeof(long) / 2, 0,\n" - "+\textent_buffer_bitmap_set(eb, PAGE_SIZE - sizeof(long) / 2, 0,\n" - " \t\t\t\t sizeof(long) * BITS_PER_BYTE);\n" - " \tif (memcmp_extent_buffer(eb, bitmap, 0, len) != 0) {\n" - " \t\ttest_msg(\"Setting straddling pages failed\\n\");\n" - "@@ -309,10 +309,10 @@ static int __test_eb_bitmaps(unsigned long *bitmap, struct extent_buffer *eb,\n" - " \n" - " \tbitmap_set(bitmap, 0, len * BITS_PER_BYTE);\n" - " \tbitmap_clear(bitmap,\n" - "-\t\t (PAGE_CACHE_SIZE - sizeof(long) / 2) * BITS_PER_BYTE,\n" - "+\t\t (PAGE_SIZE - sizeof(long) / 2) * BITS_PER_BYTE,\n" - " \t\t sizeof(long) * BITS_PER_BYTE);\n" - " \textent_buffer_bitmap_set(eb, 0, 0, len * BITS_PER_BYTE);\n" - "-\textent_buffer_bitmap_clear(eb, PAGE_CACHE_SIZE - sizeof(long) / 2, 0,\n" - "+\textent_buffer_bitmap_clear(eb, PAGE_SIZE - sizeof(long) / 2, 0,\n" - " \t\t\t\t sizeof(long) * BITS_PER_BYTE);\n" - " \tif (memcmp_extent_buffer(eb, bitmap, 0, len) != 0) {\n" - " \t\ttest_msg(\"Clearing straddling pages failed\\n\");\n" - "@@ -353,7 +353,7 @@ static int __test_eb_bitmaps(unsigned long *bitmap, struct extent_buffer *eb,\n" - " \n" - " static int test_eb_bitmaps(void)\n" - " {\n" - "-\tunsigned long len = PAGE_CACHE_SIZE * 4;\n" - "+\tunsigned long len = PAGE_SIZE * 4;\n" - " \tunsigned long *bitmap;\n" - " \tstruct extent_buffer *eb;\n" - " \tint ret;\n" - "@@ -379,7 +379,7 @@ static int test_eb_bitmaps(void)\n" - " \n" - " \t/* Do it over again with an extent buffer which isn't page-aligned. */\n" - " \tfree_extent_buffer(eb);\n" - "-\teb = __alloc_dummy_extent_buffer(NULL, PAGE_CACHE_SIZE / 2, len);\n" - "+\teb = __alloc_dummy_extent_buffer(NULL, PAGE_SIZE / 2, len);\n" - " \tif (!eb) {\n" - " \t\ttest_msg(\"Couldn't allocate test extent buffer\\n\");\n" - " \t\tkfree(bitmap);\n" - "diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c\n" - "index c9ad97b1e690..514247515312 100644\n" - "--- a/fs/btrfs/tests/free-space-tests.c\n" - "+++ b/fs/btrfs/tests/free-space-tests.c\n" - "@@ -22,7 +22,7 @@\n" - " #include \"../disk-io.h\"\n" - " #include \"../free-space-cache.h\"\n" - " \n" - "-#define BITS_PER_BITMAP\t\t(PAGE_CACHE_SIZE * 8)\n" - "+#define BITS_PER_BITMAP\t\t(PAGE_SIZE * 8)\n" - " \n" - " /*\n" - " * This test just does basic sanity checking, making sure we can add an exten\n" - "diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c\n" - "index 366b335946fa..eeb6da7976a5 100644\n" - "--- a/fs/btrfs/volumes.c\n" - "+++ b/fs/btrfs/volumes.c\n" - "@@ -1024,16 +1024,16 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,\n" - " \t}\n" - " \n" - " \t/* make sure our super fits in the device */\n" - "-\tif (bytenr + PAGE_CACHE_SIZE >= i_size_read(bdev->bd_inode))\n" - "+\tif (bytenr + PAGE_SIZE >= i_size_read(bdev->bd_inode))\n" - " \t\tgoto error_bdev_put;\n" - " \n" - " \t/* make sure our super fits in the page */\n" - "-\tif (sizeof(*disk_super) > PAGE_CACHE_SIZE)\n" - "+\tif (sizeof(*disk_super) > PAGE_SIZE)\n" - " \t\tgoto error_bdev_put;\n" - " \n" - " \t/* make sure our super doesn't straddle pages on disk */\n" - "-\tindex = bytenr >> PAGE_CACHE_SHIFT;\n" - "-\tif ((bytenr + sizeof(*disk_super) - 1) >> PAGE_CACHE_SHIFT != index)\n" - "+\tindex = bytenr >> PAGE_SHIFT;\n" - "+\tif ((bytenr + sizeof(*disk_super) - 1) >> PAGE_SHIFT != index)\n" - " \t\tgoto error_bdev_put;\n" - " \n" - " \t/* pull in the page with our super */\n" - "@@ -1046,7 +1046,7 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,\n" - " \tp = kmap(page);\n" - " \n" - " \t/* align our pointer to the offset of the super block */\n" - "-\tdisk_super = p + (bytenr & ~PAGE_CACHE_MASK);\n" - "+\tdisk_super = p + (bytenr & ~PAGE_MASK);\n" - " \n" - " \tif (btrfs_super_bytenr(disk_super) != bytenr ||\n" - " \t btrfs_super_magic(disk_super) != BTRFS_MAGIC)\n" - "@@ -1074,7 +1074,7 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,\n" - " \n" - " error_unmap:\n" - " \tkunmap(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " error_bdev_put:\n" - " \tblkdev_put(bdev, flags);\n" - "@@ -6522,7 +6522,7 @@ int btrfs_read_sys_array(struct btrfs_root *root)\n" - " \t * but sb spans only this function. Add an explicit SetPageUptodate call\n" - " \t * to silence the warning eg. on PowerPC 64.\n" - " \t */\n" - "-\tif (PAGE_CACHE_SIZE > BTRFS_SUPER_INFO_SIZE)\n" - "+\tif (PAGE_SIZE > BTRFS_SUPER_INFO_SIZE)\n" - " \t\tSetPageUptodate(sb->pages[0]);\n" - " \n" - " \twrite_extent_buffer(sb, super_copy, 0, BTRFS_SUPER_INFO_SIZE);\n" - "diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c\n" - "index 82990b8f872b..88d274e8ecf2 100644\n" - "--- a/fs/btrfs/zlib.c\n" - "+++ b/fs/btrfs/zlib.c\n" - "@@ -59,7 +59,7 @@ static struct list_head *zlib_alloc_workspace(void)\n" - " \tworkspacesize = max(zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL),\n" - " \t\t\tzlib_inflate_workspacesize());\n" - " \tworkspace->strm.workspace = vmalloc(workspacesize);\n" - "-\tworkspace->buf = kmalloc(PAGE_CACHE_SIZE, GFP_NOFS);\n" - "+\tworkspace->buf = kmalloc(PAGE_SIZE, GFP_NOFS);\n" - " \tif (!workspace->strm.workspace || !workspace->buf)\n" - " \t\tgoto fail;\n" - " \n" - "@@ -103,7 +103,7 @@ static int zlib_compress_pages(struct list_head *ws,\n" - " \tworkspace->strm.total_in = 0;\n" - " \tworkspace->strm.total_out = 0;\n" - " \n" - "-\tin_page = find_get_page(mapping, start >> PAGE_CACHE_SHIFT);\n" - "+\tin_page = find_get_page(mapping, start >> PAGE_SHIFT);\n" - " \tdata_in = kmap(in_page);\n" - " \n" - " \tout_page = alloc_page(GFP_NOFS | __GFP_HIGHMEM);\n" - "@@ -117,8 +117,8 @@ static int zlib_compress_pages(struct list_head *ws,\n" - " \n" - " \tworkspace->strm.next_in = data_in;\n" - " \tworkspace->strm.next_out = cpage_out;\n" - "-\tworkspace->strm.avail_out = PAGE_CACHE_SIZE;\n" - "-\tworkspace->strm.avail_in = min(len, PAGE_CACHE_SIZE);\n" - "+\tworkspace->strm.avail_out = PAGE_SIZE;\n" - "+\tworkspace->strm.avail_in = min(len, PAGE_SIZE);\n" - " \n" - " \twhile (workspace->strm.total_in < len) {\n" - " \t\tret = zlib_deflate(&workspace->strm, Z_SYNC_FLUSH);\n" - "@@ -156,7 +156,7 @@ static int zlib_compress_pages(struct list_head *ws,\n" - " \t\t\tcpage_out = kmap(out_page);\n" - " \t\t\tpages[nr_pages] = out_page;\n" - " \t\t\tnr_pages++;\n" - "-\t\t\tworkspace->strm.avail_out = PAGE_CACHE_SIZE;\n" - "+\t\t\tworkspace->strm.avail_out = PAGE_SIZE;\n" - " \t\t\tworkspace->strm.next_out = cpage_out;\n" - " \t\t}\n" - " \t\t/* we're all done */\n" - "@@ -170,14 +170,14 @@ static int zlib_compress_pages(struct list_head *ws,\n" - " \n" - " \t\t\tbytes_left = len - workspace->strm.total_in;\n" - " \t\t\tkunmap(in_page);\n" - "-\t\t\tpage_cache_release(in_page);\n" - "+\t\t\tput_page(in_page);\n" - " \n" - "-\t\t\tstart += PAGE_CACHE_SIZE;\n" - "+\t\t\tstart += PAGE_SIZE;\n" - " \t\t\tin_page = find_get_page(mapping,\n" - "-\t\t\t\t\t\tstart >> PAGE_CACHE_SHIFT);\n" - "+\t\t\t\t\t\tstart >> PAGE_SHIFT);\n" - " \t\t\tdata_in = kmap(in_page);\n" - " \t\t\tworkspace->strm.avail_in = min(bytes_left,\n" - "-\t\t\t\t\t\t\t PAGE_CACHE_SIZE);\n" - "+\t\t\t\t\t\t\t PAGE_SIZE);\n" - " \t\t\tworkspace->strm.next_in = data_in;\n" - " \t\t}\n" - " \t}\n" - "@@ -205,7 +205,7 @@ out:\n" - " \n" - " \tif (in_page) {\n" - " \t\tkunmap(in_page);\n" - "-\t\tpage_cache_release(in_page);\n" - "+\t\tput_page(in_page);\n" - " \t}\n" - " \treturn ret;\n" - " }\n" - "@@ -223,18 +223,18 @@ static int zlib_decompress_biovec(struct list_head *ws, struct page **pages_in,\n" - " \tsize_t total_out = 0;\n" - " \tunsigned long page_in_index = 0;\n" - " \tunsigned long page_out_index = 0;\n" - "-\tunsigned long total_pages_in = DIV_ROUND_UP(srclen, PAGE_CACHE_SIZE);\n" - "+\tunsigned long total_pages_in = DIV_ROUND_UP(srclen, PAGE_SIZE);\n" - " \tunsigned long buf_start;\n" - " \tunsigned long pg_offset;\n" - " \n" - " \tdata_in = kmap(pages_in[page_in_index]);\n" - " \tworkspace->strm.next_in = data_in;\n" - "-\tworkspace->strm.avail_in = min_t(size_t, srclen, PAGE_CACHE_SIZE);\n" - "+\tworkspace->strm.avail_in = min_t(size_t, srclen, PAGE_SIZE);\n" - " \tworkspace->strm.total_in = 0;\n" - " \n" - " \tworkspace->strm.total_out = 0;\n" - " \tworkspace->strm.next_out = workspace->buf;\n" - "-\tworkspace->strm.avail_out = PAGE_CACHE_SIZE;\n" - "+\tworkspace->strm.avail_out = PAGE_SIZE;\n" - " \tpg_offset = 0;\n" - " \n" - " \t/* If it's deflate, and it's got no preset dictionary, then\n" - "@@ -274,7 +274,7 @@ static int zlib_decompress_biovec(struct list_head *ws, struct page **pages_in,\n" - " \t\t}\n" - " \n" - " \t\tworkspace->strm.next_out = workspace->buf;\n" - "-\t\tworkspace->strm.avail_out = PAGE_CACHE_SIZE;\n" - "+\t\tworkspace->strm.avail_out = PAGE_SIZE;\n" - " \n" - " \t\tif (workspace->strm.avail_in == 0) {\n" - " \t\t\tunsigned long tmp;\n" - "@@ -288,7 +288,7 @@ static int zlib_decompress_biovec(struct list_head *ws, struct page **pages_in,\n" - " \t\t\tworkspace->strm.next_in = data_in;\n" - " \t\t\ttmp = srclen - workspace->strm.total_in;\n" - " \t\t\tworkspace->strm.avail_in = min(tmp,\n" - "-\t\t\t\t\t\t\t PAGE_CACHE_SIZE);\n" - "+\t\t\t\t\t\t\t PAGE_SIZE);\n" - " \t\t}\n" - " \t}\n" - " \tif (ret != Z_STREAM_END)\n" - "@@ -325,7 +325,7 @@ static int zlib_decompress(struct list_head *ws, unsigned char *data_in,\n" - " \tworkspace->strm.total_in = 0;\n" - " \n" - " \tworkspace->strm.next_out = workspace->buf;\n" - "-\tworkspace->strm.avail_out = PAGE_CACHE_SIZE;\n" - "+\tworkspace->strm.avail_out = PAGE_SIZE;\n" - " \tworkspace->strm.total_out = 0;\n" - " \t/* If it's deflate, and it's got no preset dictionary, then\n" - " \t we can tell zlib to skip the adler32 check. */\n" - "@@ -368,8 +368,8 @@ static int zlib_decompress(struct list_head *ws, unsigned char *data_in,\n" - " \t\telse\n" - " \t\t\tbuf_offset = 0;\n" - " \n" - "-\t\tbytes = min(PAGE_CACHE_SIZE - pg_offset,\n" - "-\t\t\t PAGE_CACHE_SIZE - buf_offset);\n" - "+\t\tbytes = min(PAGE_SIZE - pg_offset,\n" - "+\t\t\t PAGE_SIZE - buf_offset);\n" - " \t\tbytes = min(bytes, bytes_left);\n" - " \n" - " \t\tkaddr = kmap_atomic(dest_page);\n" - "@@ -380,7 +380,7 @@ static int zlib_decompress(struct list_head *ws, unsigned char *data_in,\n" - " \t\tbytes_left -= bytes;\n" - " next:\n" - " \t\tworkspace->strm.next_out = workspace->buf;\n" - "-\t\tworkspace->strm.avail_out = PAGE_CACHE_SIZE;\n" - "+\t\tworkspace->strm.avail_out = PAGE_SIZE;\n" - " \t}\n" - " \n" - " \tif (ret != Z_STREAM_END && bytes_left != 0)\n" - "diff --git a/fs/buffer.c b/fs/buffer.c\n" - "index 33be29675358..af0d9a82a8ed 100644\n" - "--- a/fs/buffer.c\n" - "+++ b/fs/buffer.c\n" - "@@ -129,7 +129,7 @@ __clear_page_buffers(struct page *page)\n" - " {\n" - " \tClearPagePrivate(page);\n" - " \tset_page_private(page, 0);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " static void buffer_io_error(struct buffer_head *bh, char *msg)\n" - "@@ -207,7 +207,7 @@ __find_get_block_slow(struct block_device *bdev, sector_t block)\n" - " \tstruct page *page;\n" - " \tint all_mapped = 1;\n" - " \n" - "-\tindex = block >> (PAGE_CACHE_SHIFT - bd_inode->i_blkbits);\n" - "+\tindex = block >> (PAGE_SHIFT - bd_inode->i_blkbits);\n" - " \tpage = find_get_page_flags(bd_mapping, index, FGP_ACCESSED);\n" - " \tif (!page)\n" - " \t\tgoto out;\n" - "@@ -245,7 +245,7 @@ __find_get_block_slow(struct block_device *bdev, sector_t block)\n" - " \t}\n" - " out_unlock:\n" - " \tspin_unlock(&bd_mapping->private_lock);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " out:\n" - " \treturn ret;\n" - " }\n" - "@@ -1040,7 +1040,7 @@ done:\n" - " \tret = (block < end_block) ? 1 : -ENXIO;\n" - " failed:\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn ret;\n" - " }\n" - " \n" - "@@ -1533,7 +1533,7 @@ void block_invalidatepage(struct page *page, unsigned int offset,\n" - " \t/*\n" - " \t * Check for overflow\n" - " \t */\n" - "-\tBUG_ON(stop > PAGE_CACHE_SIZE || stop < length);\n" - "+\tBUG_ON(stop > PAGE_SIZE || stop < length);\n" - " \n" - " \thead = page_buffers(page);\n" - " \tbh = head;\n" - "@@ -1716,7 +1716,7 @@ static int __block_write_full_page(struct inode *inode, struct page *page,\n" - " \tblocksize = bh->b_size;\n" - " \tbbits = block_size_bits(blocksize);\n" - " \n" - "-\tblock = (sector_t)page->index << (PAGE_CACHE_SHIFT - bbits);\n" - "+\tblock = (sector_t)page->index << (PAGE_SHIFT - bbits);\n" - " \tlast_block = (i_size_read(inode) - 1) >> bbits;\n" - " \n" - " \t/*\n" - "@@ -1894,7 +1894,7 @@ EXPORT_SYMBOL(page_zero_new_buffers);\n" - " int __block_write_begin(struct page *page, loff_t pos, unsigned len,\n" - " \t\tget_block_t *get_block)\n" - " {\n" - "-\tunsigned from = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tunsigned from = pos & (PAGE_SIZE - 1);\n" - " \tunsigned to = from + len;\n" - " \tstruct inode *inode = page->mapping->host;\n" - " \tunsigned block_start, block_end;\n" - "@@ -1904,15 +1904,15 @@ int __block_write_begin(struct page *page, loff_t pos, unsigned len,\n" - " \tstruct buffer_head *bh, *head, *wait[2], **wait_bh=wait;\n" - " \n" - " \tBUG_ON(!PageLocked(page));\n" - "-\tBUG_ON(from > PAGE_CACHE_SIZE);\n" - "-\tBUG_ON(to > PAGE_CACHE_SIZE);\n" - "+\tBUG_ON(from > PAGE_SIZE);\n" - "+\tBUG_ON(to > PAGE_SIZE);\n" - " \tBUG_ON(from > to);\n" - " \n" - " \thead = create_page_buffers(page, inode, 0);\n" - " \tblocksize = head->b_size;\n" - " \tbbits = block_size_bits(blocksize);\n" - " \n" - "-\tblock = (sector_t)page->index << (PAGE_CACHE_SHIFT - bbits);\n" - "+\tblock = (sector_t)page->index << (PAGE_SHIFT - bbits);\n" - " \n" - " \tfor(bh = head, block_start = 0; bh != head || !block_start;\n" - " \t block++, block_start=block_end, bh = bh->b_this_page) {\n" - "@@ -2020,7 +2020,7 @@ static int __block_commit_write(struct inode *inode, struct page *page,\n" - " int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len,\n" - " \t\tunsigned flags, struct page **pagep, get_block_t *get_block)\n" - " {\n" - "-\tpgoff_t index = pos >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = pos >> PAGE_SHIFT;\n" - " \tstruct page *page;\n" - " \tint status;\n" - " \n" - "@@ -2031,7 +2031,7 @@ int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len,\n" - " \tstatus = __block_write_begin(page, pos, len, get_block);\n" - " \tif (unlikely(status)) {\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tpage = NULL;\n" - " \t}\n" - " \n" - "@@ -2047,7 +2047,7 @@ int block_write_end(struct file *file, struct address_space *mapping,\n" - " \tstruct inode *inode = mapping->host;\n" - " \tunsigned start;\n" - " \n" - "-\tstart = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tstart = pos & (PAGE_SIZE - 1);\n" - " \n" - " \tif (unlikely(copied < len)) {\n" - " \t\t/*\n" - "@@ -2099,7 +2099,7 @@ int generic_write_end(struct file *file, struct address_space *mapping,\n" - " \t}\n" - " \n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \tif (old_size < pos)\n" - " \t\tpagecache_isize_extended(inode, old_size, pos);\n" - "@@ -2136,9 +2136,9 @@ int block_is_partially_uptodate(struct page *page, unsigned long from,\n" - " \n" - " \thead = page_buffers(page);\n" - " \tblocksize = head->b_size;\n" - "-\tto = min_t(unsigned, PAGE_CACHE_SIZE - from, count);\n" - "+\tto = min_t(unsigned, PAGE_SIZE - from, count);\n" - " \tto = from + to;\n" - "-\tif (from < blocksize && to > PAGE_CACHE_SIZE - blocksize)\n" - "+\tif (from < blocksize && to > PAGE_SIZE - blocksize)\n" - " \t\treturn 0;\n" - " \n" - " \tbh = head;\n" - "@@ -2181,7 +2181,7 @@ int block_read_full_page(struct page *page, get_block_t *get_block)\n" - " \tblocksize = head->b_size;\n" - " \tbbits = block_size_bits(blocksize);\n" - " \n" - "-\tiblock = (sector_t)page->index << (PAGE_CACHE_SHIFT - bbits);\n" - "+\tiblock = (sector_t)page->index << (PAGE_SHIFT - bbits);\n" - " \tlblock = (i_size_read(inode)+blocksize-1) >> bbits;\n" - " \tbh = head;\n" - " \tnr = 0;\n" - "@@ -2295,16 +2295,16 @@ static int cont_expand_zero(struct file *file, struct address_space *mapping,\n" - " \tunsigned zerofrom, offset, len;\n" - " \tint err = 0;\n" - " \n" - "-\tindex = pos >> PAGE_CACHE_SHIFT;\n" - "-\toffset = pos & ~PAGE_CACHE_MASK;\n" - "+\tindex = pos >> PAGE_SHIFT;\n" - "+\toffset = pos & ~PAGE_MASK;\n" - " \n" - "-\twhile (index > (curidx = (curpos = *bytes)>>PAGE_CACHE_SHIFT)) {\n" - "-\t\tzerofrom = curpos & ~PAGE_CACHE_MASK;\n" - "+\twhile (index > (curidx = (curpos = *bytes)>>PAGE_SHIFT)) {\n" - "+\t\tzerofrom = curpos & ~PAGE_MASK;\n" - " \t\tif (zerofrom & (blocksize-1)) {\n" - " \t\t\t*bytes |= (blocksize-1);\n" - " \t\t\t(*bytes)++;\n" - " \t\t}\n" - "-\t\tlen = PAGE_CACHE_SIZE - zerofrom;\n" - "+\t\tlen = PAGE_SIZE - zerofrom;\n" - " \n" - " \t\terr = pagecache_write_begin(file, mapping, curpos, len,\n" - " \t\t\t\t\t\tAOP_FLAG_UNINTERRUPTIBLE,\n" - "@@ -2329,7 +2329,7 @@ static int cont_expand_zero(struct file *file, struct address_space *mapping,\n" - " \n" - " \t/* page covers the boundary, find the boundary offset */\n" - " \tif (index == curidx) {\n" - "-\t\tzerofrom = curpos & ~PAGE_CACHE_MASK;\n" - "+\t\tzerofrom = curpos & ~PAGE_MASK;\n" - " \t\t/* if we will expand the thing last block will be filled */\n" - " \t\tif (offset <= zerofrom) {\n" - " \t\t\tgoto out;\n" - "@@ -2375,7 +2375,7 @@ int cont_write_begin(struct file *file, struct address_space *mapping,\n" - " \tif (err)\n" - " \t\treturn err;\n" - " \n" - "-\tzerofrom = *bytes & ~PAGE_CACHE_MASK;\n" - "+\tzerofrom = *bytes & ~PAGE_MASK;\n" - " \tif (pos+len > *bytes && zerofrom & (blocksize-1)) {\n" - " \t\t*bytes |= (blocksize-1);\n" - " \t\t(*bytes)++;\n" - "@@ -2430,10 +2430,10 @@ int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,\n" - " \t}\n" - " \n" - " \t/* page is wholly or partially inside EOF */\n" - "-\tif (((page->index + 1) << PAGE_CACHE_SHIFT) > size)\n" - "-\t\tend = size & ~PAGE_CACHE_MASK;\n" - "+\tif (((page->index + 1) << PAGE_SHIFT) > size)\n" - "+\t\tend = size & ~PAGE_MASK;\n" - " \telse\n" - "-\t\tend = PAGE_CACHE_SIZE;\n" - "+\t\tend = PAGE_SIZE;\n" - " \n" - " \tret = __block_write_begin(page, 0, end, get_block);\n" - " \tif (!ret)\n" - "@@ -2508,8 +2508,8 @@ int nobh_write_begin(struct address_space *mapping,\n" - " \tint ret = 0;\n" - " \tint is_mapped_to_disk = 1;\n" - " \n" - "-\tindex = pos >> PAGE_CACHE_SHIFT;\n" - "-\tfrom = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tindex = pos >> PAGE_SHIFT;\n" - "+\tfrom = pos & (PAGE_SIZE - 1);\n" - " \tto = from + len;\n" - " \n" - " \tpage = grab_cache_page_write_begin(mapping, index, flags);\n" - "@@ -2543,7 +2543,7 @@ int nobh_write_begin(struct address_space *mapping,\n" - " \t\tgoto out_release;\n" - " \t}\n" - " \n" - "-\tblock_in_file = (sector_t)page->index << (PAGE_CACHE_SHIFT - blkbits);\n" - "+\tblock_in_file = (sector_t)page->index << (PAGE_SHIFT - blkbits);\n" - " \n" - " \t/*\n" - " \t * We loop across all blocks in the page, whether or not they are\n" - "@@ -2551,7 +2551,7 @@ int nobh_write_begin(struct address_space *mapping,\n" - " \t * page is fully mapped-to-disk.\n" - " \t */\n" - " \tfor (block_start = 0, block_in_page = 0, bh = head;\n" - "-\t\t block_start < PAGE_CACHE_SIZE;\n" - "+\t\t block_start < PAGE_SIZE;\n" - " \t\t block_in_page++, block_start += blocksize, bh = bh->b_this_page) {\n" - " \t\tint create;\n" - " \n" - "@@ -2623,7 +2623,7 @@ failed:\n" - " \n" - " out_release:\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \t*pagep = NULL;\n" - " \n" - " \treturn ret;\n" - "@@ -2653,7 +2653,7 @@ int nobh_write_end(struct file *file, struct address_space *mapping,\n" - " \t}\n" - " \n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \twhile (head) {\n" - " \t\tbh = head;\n" - "@@ -2675,7 +2675,7 @@ int nobh_writepage(struct page *page, get_block_t *get_block,\n" - " {\n" - " \tstruct inode * const inode = page->mapping->host;\n" - " \tloff_t i_size = i_size_read(inode);\n" - "-\tconst pgoff_t end_index = i_size >> PAGE_CACHE_SHIFT;\n" - "+\tconst pgoff_t end_index = i_size >> PAGE_SHIFT;\n" - " \tunsigned offset;\n" - " \tint ret;\n" - " \n" - "@@ -2684,7 +2684,7 @@ int nobh_writepage(struct page *page, get_block_t *get_block,\n" - " \t\tgoto out;\n" - " \n" - " \t/* Is the page fully outside i_size? (truncate in progress) */\n" - "-\toffset = i_size & (PAGE_CACHE_SIZE-1);\n" - "+\toffset = i_size & (PAGE_SIZE-1);\n" - " \tif (page->index >= end_index+1 || !offset) {\n" - " \t\t/*\n" - " \t\t * The page may have dirty, unmapped buffers. For example,\n" - "@@ -2707,7 +2707,7 @@ int nobh_writepage(struct page *page, get_block_t *get_block,\n" - " \t * the page size, the remaining memory is zeroed when mapped, and\n" - " \t * writes to that region are not written out to the file.\"\n" - " \t */\n" - "-\tzero_user_segment(page, offset, PAGE_CACHE_SIZE);\n" - "+\tzero_user_segment(page, offset, PAGE_SIZE);\n" - " out:\n" - " \tret = mpage_writepage(page, get_block, wbc);\n" - " \tif (ret == -EAGAIN)\n" - "@@ -2720,8 +2720,8 @@ EXPORT_SYMBOL(nobh_writepage);\n" - " int nobh_truncate_page(struct address_space *mapping,\n" - " \t\t\tloff_t from, get_block_t *get_block)\n" - " {\n" - "-\tpgoff_t index = from >> PAGE_CACHE_SHIFT;\n" - "-\tunsigned offset = from & (PAGE_CACHE_SIZE-1);\n" - "+\tpgoff_t index = from >> PAGE_SHIFT;\n" - "+\tunsigned offset = from & (PAGE_SIZE-1);\n" - " \tunsigned blocksize;\n" - " \tsector_t iblock;\n" - " \tunsigned length, pos;\n" - "@@ -2738,7 +2738,7 @@ int nobh_truncate_page(struct address_space *mapping,\n" - " \t\treturn 0;\n" - " \n" - " \tlength = blocksize - length;\n" - "-\tiblock = (sector_t)index << (PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "+\tiblock = (sector_t)index << (PAGE_SHIFT - inode->i_blkbits);\n" - " \n" - " \tpage = grab_cache_page(mapping, index);\n" - " \terr = -ENOMEM;\n" - "@@ -2748,7 +2748,7 @@ int nobh_truncate_page(struct address_space *mapping,\n" - " \tif (page_has_buffers(page)) {\n" - " has_buffers:\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\treturn block_truncate_page(mapping, from, get_block);\n" - " \t}\n" - " \n" - "@@ -2772,7 +2772,7 @@ has_buffers:\n" - " \tif (!PageUptodate(page)) {\n" - " \t\terr = mapping->a_ops->readpage(NULL, page);\n" - " \t\tif (err) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tgoto out;\n" - " \t\t}\n" - " \t\tlock_page(page);\n" - "@@ -2789,7 +2789,7 @@ has_buffers:\n" - " \n" - " unlock:\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " out:\n" - " \treturn err;\n" - " }\n" - "@@ -2798,8 +2798,8 @@ EXPORT_SYMBOL(nobh_truncate_page);\n" - " int block_truncate_page(struct address_space *mapping,\n" - " \t\t\tloff_t from, get_block_t *get_block)\n" - " {\n" - "-\tpgoff_t index = from >> PAGE_CACHE_SHIFT;\n" - "-\tunsigned offset = from & (PAGE_CACHE_SIZE-1);\n" - "+\tpgoff_t index = from >> PAGE_SHIFT;\n" - "+\tunsigned offset = from & (PAGE_SIZE-1);\n" - " \tunsigned blocksize;\n" - " \tsector_t iblock;\n" - " \tunsigned length, pos;\n" - "@@ -2816,7 +2816,7 @@ int block_truncate_page(struct address_space *mapping,\n" - " \t\treturn 0;\n" - " \n" - " \tlength = blocksize - length;\n" - "-\tiblock = (sector_t)index << (PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "+\tiblock = (sector_t)index << (PAGE_SHIFT - inode->i_blkbits);\n" - " \t\n" - " \tpage = grab_cache_page(mapping, index);\n" - " \terr = -ENOMEM;\n" - "@@ -2865,7 +2865,7 @@ int block_truncate_page(struct address_space *mapping,\n" - " \n" - " unlock:\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " out:\n" - " \treturn err;\n" - " }\n" - "@@ -2879,7 +2879,7 @@ int block_write_full_page(struct page *page, get_block_t *get_block,\n" - " {\n" - " \tstruct inode * const inode = page->mapping->host;\n" - " \tloff_t i_size = i_size_read(inode);\n" - "-\tconst pgoff_t end_index = i_size >> PAGE_CACHE_SHIFT;\n" - "+\tconst pgoff_t end_index = i_size >> PAGE_SHIFT;\n" - " \tunsigned offset;\n" - " \n" - " \t/* Is the page fully inside i_size? */\n" - "@@ -2888,14 +2888,14 @@ int block_write_full_page(struct page *page, get_block_t *get_block,\n" - " \t\t\t\t\t end_buffer_async_write);\n" - " \n" - " \t/* Is the page fully outside i_size? (truncate in progress) */\n" - "-\toffset = i_size & (PAGE_CACHE_SIZE-1);\n" - "+\toffset = i_size & (PAGE_SIZE-1);\n" - " \tif (page->index >= end_index+1 || !offset) {\n" - " \t\t/*\n" - " \t\t * The page may have dirty, unmapped buffers. For example,\n" - " \t\t * they may have been added in ext3_writepage(). Make them\n" - " \t\t * freeable here, so the page does not leak.\n" - " \t\t */\n" - "-\t\tdo_invalidatepage(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\tdo_invalidatepage(page, 0, PAGE_SIZE);\n" - " \t\tunlock_page(page);\n" - " \t\treturn 0; /* don't care */\n" - " \t}\n" - "@@ -2907,7 +2907,7 @@ int block_write_full_page(struct page *page, get_block_t *get_block,\n" - " \t * the page size, the remaining memory is zeroed when mapped, and\n" - " \t * writes to that region are not written out to the file.\"\n" - " \t */\n" - "-\tzero_user_segment(page, offset, PAGE_CACHE_SIZE);\n" - "+\tzero_user_segment(page, offset, PAGE_SIZE);\n" - " \treturn __block_write_full_page(inode, page, get_block, wbc,\n" - " \t\t\t\t\t\t\tend_buffer_async_write);\n" - " }\n" - "diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c\n" - "index c0f3da3926a0..afbdc418966d 100644\n" - "--- a/fs/cachefiles/rdwr.c\n" - "+++ b/fs/cachefiles/rdwr.c\n" - "@@ -194,10 +194,10 @@ static void cachefiles_read_copier(struct fscache_operation *_op)\n" - " \t\t\terror = -EIO;\n" - " \t\t}\n" - " \n" - "-\t\tpage_cache_release(monitor->back_page);\n" - "+\t\tput_page(monitor->back_page);\n" - " \n" - " \t\tfscache_end_io(op, monitor->netfs_page, error);\n" - "-\t\tpage_cache_release(monitor->netfs_page);\n" - "+\t\tput_page(monitor->netfs_page);\n" - " \t\tfscache_retrieval_complete(op, 1);\n" - " \t\tfscache_put_retrieval(op);\n" - " \t\tkfree(monitor);\n" - "@@ -288,8 +288,8 @@ monitor_backing_page:\n" - " \t_debug(\"- monitor add\");\n" - " \n" - " \t/* install the monitor */\n" - "-\tpage_cache_get(monitor->netfs_page);\n" - "-\tpage_cache_get(backpage);\n" - "+\tget_page(monitor->netfs_page);\n" - "+\tget_page(backpage);\n" - " \tmonitor->back_page = backpage;\n" - " \tmonitor->monitor.private = backpage;\n" - " \tadd_page_wait_queue(backpage, &monitor->monitor);\n" - "@@ -310,7 +310,7 @@ backing_page_already_present:\n" - " \t_debug(\"- present\");\n" - " \n" - " \tif (newpage) {\n" - "-\t\tpage_cache_release(newpage);\n" - "+\t\tput_page(newpage);\n" - " \t\tnewpage = NULL;\n" - " \t}\n" - " \n" - "@@ -342,7 +342,7 @@ success:\n" - " \n" - " out:\n" - " \tif (backpage)\n" - "-\t\tpage_cache_release(backpage);\n" - "+\t\tput_page(backpage);\n" - " \tif (monitor) {\n" - " \t\tfscache_put_retrieval(monitor->op);\n" - " \t\tkfree(monitor);\n" - "@@ -363,7 +363,7 @@ io_error:\n" - " \tgoto out;\n" - " \n" - " nomem_page:\n" - "-\tpage_cache_release(newpage);\n" - "+\tput_page(newpage);\n" - " nomem_monitor:\n" - " \tfscache_put_retrieval(monitor->op);\n" - " \tkfree(monitor);\n" - "@@ -530,7 +530,7 @@ static int cachefiles_read_backing_file(struct cachefiles_object *object,\n" - " \t\t\t\t\t netpage->index, cachefiles_gfp);\n" - " \t\tif (ret < 0) {\n" - " \t\t\tif (ret == -EEXIST) {\n" - "-\t\t\t\tpage_cache_release(netpage);\n" - "+\t\t\t\tput_page(netpage);\n" - " \t\t\t\tfscache_retrieval_complete(op, 1);\n" - " \t\t\t\tcontinue;\n" - " \t\t\t}\n" - "@@ -538,10 +538,10 @@ static int cachefiles_read_backing_file(struct cachefiles_object *object,\n" - " \t\t}\n" - " \n" - " \t\t/* install a monitor */\n" - "-\t\tpage_cache_get(netpage);\n" - "+\t\tget_page(netpage);\n" - " \t\tmonitor->netfs_page = netpage;\n" - " \n" - "-\t\tpage_cache_get(backpage);\n" - "+\t\tget_page(backpage);\n" - " \t\tmonitor->back_page = backpage;\n" - " \t\tmonitor->monitor.private = backpage;\n" - " \t\tadd_page_wait_queue(backpage, &monitor->monitor);\n" - "@@ -555,10 +555,10 @@ static int cachefiles_read_backing_file(struct cachefiles_object *object,\n" - " \t\t\tunlock_page(backpage);\n" - " \t\t}\n" - " \n" - "-\t\tpage_cache_release(backpage);\n" - "+\t\tput_page(backpage);\n" - " \t\tbackpage = NULL;\n" - " \n" - "-\t\tpage_cache_release(netpage);\n" - "+\t\tput_page(netpage);\n" - " \t\tnetpage = NULL;\n" - " \t\tcontinue;\n" - " \n" - "@@ -603,7 +603,7 @@ static int cachefiles_read_backing_file(struct cachefiles_object *object,\n" - " \t\t\t\t\t netpage->index, cachefiles_gfp);\n" - " \t\tif (ret < 0) {\n" - " \t\t\tif (ret == -EEXIST) {\n" - "-\t\t\t\tpage_cache_release(netpage);\n" - "+\t\t\t\tput_page(netpage);\n" - " \t\t\t\tfscache_retrieval_complete(op, 1);\n" - " \t\t\t\tcontinue;\n" - " \t\t\t}\n" - "@@ -612,14 +612,14 @@ static int cachefiles_read_backing_file(struct cachefiles_object *object,\n" - " \n" - " \t\tcopy_highpage(netpage, backpage);\n" - " \n" - "-\t\tpage_cache_release(backpage);\n" - "+\t\tput_page(backpage);\n" - " \t\tbackpage = NULL;\n" - " \n" - " \t\tfscache_mark_page_cached(op, netpage);\n" - " \n" - " \t\t/* the netpage is unlocked and marked up to date here */\n" - " \t\tfscache_end_io(op, netpage, 0);\n" - "-\t\tpage_cache_release(netpage);\n" - "+\t\tput_page(netpage);\n" - " \t\tnetpage = NULL;\n" - " \t\tfscache_retrieval_complete(op, 1);\n" - " \t\tcontinue;\n" - "@@ -632,11 +632,11 @@ static int cachefiles_read_backing_file(struct cachefiles_object *object,\n" - " out:\n" - " \t/* tidy up */\n" - " \tif (newpage)\n" - "-\t\tpage_cache_release(newpage);\n" - "+\t\tput_page(newpage);\n" - " \tif (netpage)\n" - "-\t\tpage_cache_release(netpage);\n" - "+\t\tput_page(netpage);\n" - " \tif (backpage)\n" - "-\t\tpage_cache_release(backpage);\n" - "+\t\tput_page(backpage);\n" - " \tif (monitor) {\n" - " \t\tfscache_put_retrieval(op);\n" - " \t\tkfree(monitor);\n" - "@@ -644,7 +644,7 @@ out:\n" - " \n" - " \tlist_for_each_entry_safe(netpage, _n, list, lru) {\n" - " \t\tlist_del(&netpage->lru);\n" - "-\t\tpage_cache_release(netpage);\n" - "+\t\tput_page(netpage);\n" - " \t\tfscache_retrieval_complete(op, 1);\n" - " \t}\n" - " \n" - "diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c\n" - "index 19adeb0ef82a..355e2bc794cd 100644\n" - "--- a/fs/ceph/addr.c\n" - "+++ b/fs/ceph/addr.c\n" - "@@ -143,7 +143,7 @@ static void ceph_invalidatepage(struct page *page, unsigned int offset,\n" - " \tinode = page->mapping->host;\n" - " \tci = ceph_inode(inode);\n" - " \n" - "-\tif (offset != 0 || length != PAGE_CACHE_SIZE) {\n" - "+\tif (offset != 0 || length != PAGE_SIZE) {\n" - " \t\tdout(\"%p invalidatepage %p idx %lu partial dirty page %u~%u\\n\",\n" - " \t\t inode, page, page->index, offset, length);\n" - " \t\treturn;\n" - "@@ -197,10 +197,10 @@ static int readpage_nounlock(struct file *filp, struct page *page)\n" - " \t\t&ceph_inode_to_client(inode)->client->osdc;\n" - " \tint err = 0;\n" - " \tu64 off = page_offset(page);\n" - "-\tu64 len = PAGE_CACHE_SIZE;\n" - "+\tu64 len = PAGE_SIZE;\n" - " \n" - " \tif (off >= i_size_read(inode)) {\n" - "-\t\tzero_user_segment(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user_segment(page, 0, PAGE_SIZE);\n" - " \t\tSetPageUptodate(page);\n" - " \t\treturn 0;\n" - " \t}\n" - "@@ -212,7 +212,7 @@ static int readpage_nounlock(struct file *filp, struct page *page)\n" - " \t\t */\n" - " \t\tif (off == 0)\n" - " \t\t\treturn -EINVAL;\n" - "-\t\tzero_user_segment(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user_segment(page, 0, PAGE_SIZE);\n" - " \t\tSetPageUptodate(page);\n" - " \t\treturn 0;\n" - " \t}\n" - "@@ -234,9 +234,9 @@ static int readpage_nounlock(struct file *filp, struct page *page)\n" - " \t\tceph_fscache_readpage_cancel(inode, page);\n" - " \t\tgoto out;\n" - " \t}\n" - "-\tif (err < PAGE_CACHE_SIZE)\n" - "+\tif (err < PAGE_SIZE)\n" - " \t\t/* zero fill remainder of page */\n" - "-\t\tzero_user_segment(page, err, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user_segment(page, err, PAGE_SIZE);\n" - " \telse\n" - " \t\tflush_dcache_page(page);\n" - " \n" - "@@ -278,10 +278,10 @@ static void finish_read(struct ceph_osd_request *req, struct ceph_msg *msg)\n" - " \n" - " \t\tif (rc < 0 && rc != ENOENT)\n" - " \t\t\tgoto unlock;\n" - "-\t\tif (bytes < (int)PAGE_CACHE_SIZE) {\n" - "+\t\tif (bytes < (int)PAGE_SIZE) {\n" - " \t\t\t/* zero (remainder of) page */\n" - " \t\t\tint s = bytes < 0 ? 0 : bytes;\n" - "-\t\t\tzero_user_segment(page, s, PAGE_CACHE_SIZE);\n" - "+\t\t\tzero_user_segment(page, s, PAGE_SIZE);\n" - " \t\t}\n" - " \t\tdout(\"finish_read %p uptodate %p idx %lu\\n\", inode, page,\n" - " \t\t page->index);\n" - "@@ -290,8 +290,8 @@ static void finish_read(struct ceph_osd_request *req, struct ceph_msg *msg)\n" - " \t\tceph_readpage_to_fscache(inode, page);\n" - " unlock:\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "-\t\tbytes -= PAGE_CACHE_SIZE;\n" - "+\t\tput_page(page);\n" - "+\t\tbytes -= PAGE_SIZE;\n" - " \t}\n" - " \tkfree(osd_data->pages);\n" - " }\n" - "@@ -336,7 +336,7 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max)\n" - " \t\tif (max && nr_pages == max)\n" - " \t\t\tbreak;\n" - " \t}\n" - "-\tlen = nr_pages << PAGE_CACHE_SHIFT;\n" - "+\tlen = nr_pages << PAGE_SHIFT;\n" - " \tdout(\"start_read %p nr_pages %d is %lld~%lld\\n\", inode, nr_pages,\n" - " \t off, len);\n" - " \tvino = ceph_vino(inode);\n" - "@@ -364,7 +364,7 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max)\n" - " \t\tif (add_to_page_cache_lru(page, &inode->i_data, page->index,\n" - " \t\t\t\t\t GFP_KERNEL)) {\n" - " \t\t\tceph_fscache_uncache_page(inode, page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tdout(\"start_read %p add_to_page_cache failed %p\\n\",\n" - " \t\t\t inode, page);\n" - " \t\t\tnr_pages = i;\n" - "@@ -415,8 +415,8 @@ static int ceph_readpages(struct file *file, struct address_space *mapping,\n" - " \tif (rc == 0)\n" - " \t\tgoto out;\n" - " \n" - "-\tif (fsc->mount_options->rsize >= PAGE_CACHE_SIZE)\n" - "-\t\tmax = (fsc->mount_options->rsize + PAGE_CACHE_SIZE - 1)\n" - "+\tif (fsc->mount_options->rsize >= PAGE_SIZE)\n" - "+\t\tmax = (fsc->mount_options->rsize + PAGE_SIZE - 1)\n" - " \t\t\t>> PAGE_SHIFT;\n" - " \n" - " \tdout(\"readpages %p file %p nr_pages %d max %d\\n\", inode,\n" - "@@ -484,7 +484,7 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc)\n" - " \tlong writeback_stat;\n" - " \tu64 truncate_size;\n" - " \tu32 truncate_seq;\n" - "-\tint err = 0, len = PAGE_CACHE_SIZE;\n" - "+\tint err = 0, len = PAGE_SIZE;\n" - " \n" - " \tdout(\"writepage %p idx %lu\\n\", page, page->index);\n" - " \n" - "@@ -725,9 +725,9 @@ static int ceph_writepages_start(struct address_space *mapping,\n" - " \t}\n" - " \tif (fsc->mount_options->wsize && fsc->mount_options->wsize < wsize)\n" - " \t\twsize = fsc->mount_options->wsize;\n" - "-\tif (wsize < PAGE_CACHE_SIZE)\n" - "-\t\twsize = PAGE_CACHE_SIZE;\n" - "-\tmax_pages_ever = wsize >> PAGE_CACHE_SHIFT;\n" - "+\tif (wsize < PAGE_SIZE)\n" - "+\t\twsize = PAGE_SIZE;\n" - "+\tmax_pages_ever = wsize >> PAGE_SHIFT;\n" - " \n" - " \tpagevec_init(&pvec, 0);\n" - " \n" - "@@ -737,8 +737,8 @@ static int ceph_writepages_start(struct address_space *mapping,\n" - " \t\tend = -1;\n" - " \t\tdout(\" cyclic, start at %lu\\n\", start);\n" - " \t} else {\n" - "-\t\tstart = wbc->range_start >> PAGE_CACHE_SHIFT;\n" - "-\t\tend = wbc->range_end >> PAGE_CACHE_SHIFT;\n" - "+\t\tstart = wbc->range_start >> PAGE_SHIFT;\n" - "+\t\tend = wbc->range_end >> PAGE_SHIFT;\n" - " \t\tif (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)\n" - " \t\t\trange_whole = 1;\n" - " \t\tshould_loop = 0;\n" - "@@ -953,14 +953,14 @@ get_more_pages:\n" - " \n" - " \t\t/* Format the osd request message and submit the write */\n" - " \t\toffset = page_offset(pages[0]);\n" - "-\t\tlen = (u64)locked_pages << PAGE_CACHE_SHIFT;\n" - "+\t\tlen = (u64)locked_pages << PAGE_SHIFT;\n" - " \t\tif (snap_size == -1) {\n" - " \t\t\tlen = min(len, (u64)i_size_read(inode) - offset);\n" - " \t\t\t /* writepages_finish() clears writeback pages\n" - " \t\t\t * according to the data length, so make sure\n" - " \t\t\t * data length covers all locked pages */\n" - " \t\t\tlen = max(len, 1 +\n" - "-\t\t\t\t((u64)(locked_pages - 1) << PAGE_CACHE_SHIFT));\n" - "+\t\t\t\t((u64)(locked_pages - 1) << PAGE_SHIFT));\n" - " \t\t} else {\n" - " \t\t\tlen = min(len, snap_size - offset);\n" - " \t\t}\n" - "@@ -1048,8 +1048,8 @@ static int ceph_update_writeable_page(struct file *file,\n" - " {\n" - " \tstruct inode *inode = file_inode(file);\n" - " \tstruct ceph_inode_info *ci = ceph_inode(inode);\n" - "-\tloff_t page_off = pos & PAGE_CACHE_MASK;\n" - "-\tint pos_in_page = pos & ~PAGE_CACHE_MASK;\n" - "+\tloff_t page_off = pos & PAGE_MASK;\n" - "+\tint pos_in_page = pos & ~PAGE_MASK;\n" - " \tint end_in_page = pos_in_page + len;\n" - " \tloff_t i_size;\n" - " \tint r;\n" - "@@ -1104,7 +1104,7 @@ retry_locked:\n" - " \t}\n" - " \n" - " \t/* full page? */\n" - "-\tif (pos_in_page == 0 && len == PAGE_CACHE_SIZE)\n" - "+\tif (pos_in_page == 0 && len == PAGE_SIZE)\n" - " \t\treturn 0;\n" - " \n" - " \t/* past end of file? */\n" - "@@ -1112,12 +1112,12 @@ retry_locked:\n" - " \n" - " \tif (page_off >= i_size ||\n" - " \t (pos_in_page == 0 && (pos+len) >= i_size &&\n" - "-\t end_in_page - pos_in_page != PAGE_CACHE_SIZE)) {\n" - "+\t end_in_page - pos_in_page != PAGE_SIZE)) {\n" - " \t\tdout(\" zeroing %p 0 - %d and %d - %d\\n\",\n" - "-\t\t page, pos_in_page, end_in_page, (int)PAGE_CACHE_SIZE);\n" - "+\t\t page, pos_in_page, end_in_page, (int)PAGE_SIZE);\n" - " \t\tzero_user_segments(page,\n" - " \t\t\t\t 0, pos_in_page,\n" - "-\t\t\t\t end_in_page, PAGE_CACHE_SIZE);\n" - "+\t\t\t\t end_in_page, PAGE_SIZE);\n" - " \t\treturn 0;\n" - " \t}\n" - " \n" - "@@ -1141,7 +1141,7 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,\n" - " {\n" - " \tstruct inode *inode = file_inode(file);\n" - " \tstruct page *page;\n" - "-\tpgoff_t index = pos >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = pos >> PAGE_SHIFT;\n" - " \tint r;\n" - " \n" - " \tdo {\n" - "@@ -1155,7 +1155,7 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,\n" - " \n" - " \t\tr = ceph_update_writeable_page(file, pos, len, page);\n" - " \t\tif (r < 0)\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\telse\n" - " \t\t\t*pagep = page;\n" - " \t} while (r == -EAGAIN);\n" - "@@ -1172,7 +1172,7 @@ static int ceph_write_end(struct file *file, struct address_space *mapping,\n" - " \t\t\t struct page *page, void *fsdata)\n" - " {\n" - " \tstruct inode *inode = file_inode(file);\n" - "-\tunsigned from = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tunsigned from = pos & (PAGE_SIZE - 1);\n" - " \tint check_cap = 0;\n" - " \n" - " \tdout(\"write_end file %p inode %p page %p %d~%d (%d)\\n\", file,\n" - "@@ -1192,7 +1192,7 @@ static int ceph_write_end(struct file *file, struct address_space *mapping,\n" - " \tset_page_dirty(page);\n" - " \n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \tif (check_cap)\n" - " \t\tceph_check_caps(ceph_inode(inode), CHECK_CAPS_AUTHONLY, NULL);\n" - "@@ -1235,11 +1235,11 @@ static int ceph_filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)\n" - " \tstruct ceph_inode_info *ci = ceph_inode(inode);\n" - " \tstruct ceph_file_info *fi = vma->vm_file->private_data;\n" - " \tstruct page *pinned_page = NULL;\n" - "-\tloff_t off = vmf->pgoff << PAGE_CACHE_SHIFT;\n" - "+\tloff_t off = vmf->pgoff << PAGE_SHIFT;\n" - " \tint want, got, ret;\n" - " \n" - " \tdout(\"filemap_fault %p %llx.%llx %llu~%zd trying to get caps\\n\",\n" - "-\t inode, ceph_vinop(inode), off, (size_t)PAGE_CACHE_SIZE);\n" - "+\t inode, ceph_vinop(inode), off, (size_t)PAGE_SIZE);\n" - " \tif (fi->fmode & CEPH_FILE_MODE_LAZY)\n" - " \t\twant = CEPH_CAP_FILE_CACHE | CEPH_CAP_FILE_LAZYIO;\n" - " \telse\n" - "@@ -1256,7 +1256,7 @@ static int ceph_filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)\n" - " \t\t}\n" - " \t}\n" - " \tdout(\"filemap_fault %p %llu~%zd got cap refs on %s\\n\",\n" - "-\t inode, off, (size_t)PAGE_CACHE_SIZE, ceph_cap_string(got));\n" - "+\t inode, off, (size_t)PAGE_SIZE, ceph_cap_string(got));\n" - " \n" - " \tif ((got & (CEPH_CAP_FILE_CACHE | CEPH_CAP_FILE_LAZYIO)) ||\n" - " \t ci->i_inline_version == CEPH_INLINE_NONE)\n" - "@@ -1265,16 +1265,16 @@ static int ceph_filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)\n" - " \t\tret = -EAGAIN;\n" - " \n" - " \tdout(\"filemap_fault %p %llu~%zd dropping cap refs on %s ret %d\\n\",\n" - "-\t inode, off, (size_t)PAGE_CACHE_SIZE, ceph_cap_string(got), ret);\n" - "+\t inode, off, (size_t)PAGE_SIZE, ceph_cap_string(got), ret);\n" - " \tif (pinned_page)\n" - "-\t\tpage_cache_release(pinned_page);\n" - "+\t\tput_page(pinned_page);\n" - " \tceph_put_cap_refs(ci, got);\n" - " \n" - " \tif (ret != -EAGAIN)\n" - " \t\treturn ret;\n" - " \n" - " \t/* read inline data */\n" - "-\tif (off >= PAGE_CACHE_SIZE) {\n" - "+\tif (off >= PAGE_SIZE) {\n" - " \t\t/* does not support inline data > PAGE_SIZE */\n" - " \t\tret = VM_FAULT_SIGBUS;\n" - " \t} else {\n" - "@@ -1291,12 +1291,12 @@ static int ceph_filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)\n" - " \t\t\t\t\t CEPH_STAT_CAP_INLINE_DATA, true);\n" - " \t\tif (ret1 < 0 || off >= i_size_read(inode)) {\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tret = VM_FAULT_SIGBUS;\n" - " \t\t\tgoto out;\n" - " \t\t}\n" - "-\t\tif (ret1 < PAGE_CACHE_SIZE)\n" - "-\t\t\tzero_user_segment(page, ret1, PAGE_CACHE_SIZE);\n" - "+\t\tif (ret1 < PAGE_SIZE)\n" - "+\t\t\tzero_user_segment(page, ret1, PAGE_SIZE);\n" - " \t\telse\n" - " \t\t\tflush_dcache_page(page);\n" - " \t\tSetPageUptodate(page);\n" - "@@ -1305,7 +1305,7 @@ static int ceph_filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)\n" - " \t}\n" - " out:\n" - " \tdout(\"filemap_fault %p %llu~%zd read inline data ret %d\\n\",\n" - "-\t inode, off, (size_t)PAGE_CACHE_SIZE, ret);\n" - "+\t inode, off, (size_t)PAGE_SIZE, ret);\n" - " \treturn ret;\n" - " }\n" - " \n" - "@@ -1343,10 +1343,10 @@ static int ceph_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)\n" - " \t\t}\n" - " \t}\n" - " \n" - "-\tif (off + PAGE_CACHE_SIZE <= size)\n" - "-\t\tlen = PAGE_CACHE_SIZE;\n" - "+\tif (off + PAGE_SIZE <= size)\n" - "+\t\tlen = PAGE_SIZE;\n" - " \telse\n" - "-\t\tlen = size & ~PAGE_CACHE_MASK;\n" - "+\t\tlen = size & ~PAGE_MASK;\n" - " \n" - " \tdout(\"page_mkwrite %p %llx.%llx %llu~%zd getting caps i_size %llu\\n\",\n" - " \t inode, ceph_vinop(inode), off, len, size);\n" - "@@ -1432,7 +1432,7 @@ void ceph_fill_inline_data(struct inode *inode, struct page *locked_page,\n" - " \t\t\treturn;\n" - " \t\tif (PageUptodate(page)) {\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\treturn;\n" - " \t\t}\n" - " \t}\n" - "@@ -1447,14 +1447,14 @@ void ceph_fill_inline_data(struct inode *inode, struct page *locked_page,\n" - " \t}\n" - " \n" - " \tif (page != locked_page) {\n" - "-\t\tif (len < PAGE_CACHE_SIZE)\n" - "-\t\t\tzero_user_segment(page, len, PAGE_CACHE_SIZE);\n" - "+\t\tif (len < PAGE_SIZE)\n" - "+\t\t\tzero_user_segment(page, len, PAGE_SIZE);\n" - " \t\telse\n" - " \t\t\tflush_dcache_page(page);\n" - " \n" - " \t\tSetPageUptodate(page);\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " }\n" - " \n" - "@@ -1491,7 +1491,7 @@ int ceph_uninline_data(struct file *filp, struct page *locked_page)\n" - " \t\t\t\tfrom_pagecache = true;\n" - " \t\t\t\tlock_page(page);\n" - " \t\t\t} else {\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t\tpage = NULL;\n" - " \t\t\t}\n" - " \t\t}\n" - "@@ -1499,8 +1499,8 @@ int ceph_uninline_data(struct file *filp, struct page *locked_page)\n" - " \n" - " \tif (page) {\n" - " \t\tlen = i_size_read(inode);\n" - "-\t\tif (len > PAGE_CACHE_SIZE)\n" - "-\t\t\tlen = PAGE_CACHE_SIZE;\n" - "+\t\tif (len > PAGE_SIZE)\n" - "+\t\t\tlen = PAGE_SIZE;\n" - " \t} else {\n" - " \t\tpage = __page_cache_alloc(GFP_NOFS);\n" - " \t\tif (!page) {\n" - "@@ -1584,7 +1584,7 @@ out:\n" - " \tif (page && page != locked_page) {\n" - " \t\tif (from_pagecache) {\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t} else\n" - " \t\t\t__free_pages(page, 0);\n" - " \t}\n" - "diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c\n" - "index 6fe0ad26a7df..835b1d9a8873 100644\n" - "--- a/fs/ceph/caps.c\n" - "+++ b/fs/ceph/caps.c\n" - "@@ -2507,7 +2507,7 @@ int ceph_get_caps(struct ceph_inode_info *ci, int need, int want,\n" - " \t\t\t\t\t*pinned_page = page;\n" - " \t\t\t\t\tbreak;\n" - " \t\t\t\t}\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t}\n" - " \t\t\t/*\n" - " \t\t\t * drop cap refs first because getattr while\n" - "diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c\n" - "index fd11fb231a2e..b91369988eaa 100644\n" - "--- a/fs/ceph/dir.c\n" - "+++ b/fs/ceph/dir.c\n" - "@@ -146,7 +146,7 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,\n" - " \tstruct inode *dir = d_inode(parent);\n" - " \tstruct dentry *dentry, *last = NULL;\n" - " \tstruct ceph_dentry_info *di;\n" - "-\tunsigned nsize = PAGE_CACHE_SIZE / sizeof(struct dentry *);\n" - "+\tunsigned nsize = PAGE_SIZE / sizeof(struct dentry *);\n" - " \tint err = 0;\n" - " \tloff_t ptr_pos = 0;\n" - " \tstruct ceph_readdir_cache_control cache_ctl = {};\n" - "@@ -171,7 +171,7 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,\n" - " \t\t}\n" - " \n" - " \t\terr = -EAGAIN;\n" - "-\t\tpgoff = ptr_pos >> PAGE_CACHE_SHIFT;\n" - "+\t\tpgoff = ptr_pos >> PAGE_SHIFT;\n" - " \t\tif (!cache_ctl.page || pgoff != page_index(cache_ctl.page)) {\n" - " \t\t\tceph_readdir_cache_release(&cache_ctl);\n" - " \t\t\tcache_ctl.page = find_lock_page(&dir->i_data, pgoff);\n" - "diff --git a/fs/ceph/file.c b/fs/ceph/file.c\n" - "index eb9028e8cfc5..04040daaf5f1 100644\n" - "--- a/fs/ceph/file.c\n" - "+++ b/fs/ceph/file.c\n" - "@@ -459,7 +459,7 @@ more:\n" - " \t\t\tret += zlen;\n" - " \t\t}\n" - " \n" - "-\t\tdidpages = (page_align + ret) >> PAGE_CACHE_SHIFT;\n" - "+\t\tdidpages = (page_align + ret) >> PAGE_SHIFT;\n" - " \t\tpos += ret;\n" - " \t\tread = pos - off;\n" - " \t\tleft -= ret;\n" - "@@ -800,8 +800,8 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter,\n" - " \n" - " \tif (write) {\n" - " \t\tret = invalidate_inode_pages2_range(inode->i_mapping,\n" - "-\t\t\t\t\tpos >> PAGE_CACHE_SHIFT,\n" - "-\t\t\t\t\t(pos + count) >> PAGE_CACHE_SHIFT);\n" - "+\t\t\t\t\tpos >> PAGE_SHIFT,\n" - "+\t\t\t\t\t(pos + count) >> PAGE_SHIFT);\n" - " \t\tif (ret < 0)\n" - " \t\t\tdout(\"invalidate_inode_pages2_range returned %d\\n\", ret);\n" - " \n" - "@@ -866,7 +866,7 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter,\n" - " \t\t\t * may block.\n" - " \t\t\t */\n" - " \t\t\ttruncate_inode_pages_range(inode->i_mapping, pos,\n" - "-\t\t\t\t\t(pos+len) | (PAGE_CACHE_SIZE - 1));\n" - "+\t\t\t\t\t(pos+len) | (PAGE_SIZE - 1));\n" - " \n" - " \t\t\tosd_req_op_init(req, 1, CEPH_OSD_OP_STARTSYNC, 0);\n" - " \t\t}\n" - "@@ -1001,8 +1001,8 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos,\n" - " \t\treturn ret;\n" - " \n" - " \tret = invalidate_inode_pages2_range(inode->i_mapping,\n" - "-\t\t\t\t\t pos >> PAGE_CACHE_SHIFT,\n" - "-\t\t\t\t\t (pos + count) >> PAGE_CACHE_SHIFT);\n" - "+\t\t\t\t\t pos >> PAGE_SHIFT,\n" - "+\t\t\t\t\t (pos + count) >> PAGE_SHIFT);\n" - " \tif (ret < 0)\n" - " \t\tdout(\"invalidate_inode_pages2_range returned %d\\n\", ret);\n" - " \n" - "@@ -1031,7 +1031,7 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos,\n" - " \t\t * write from beginning of first page,\n" - " \t\t * regardless of io alignment\n" - " \t\t */\n" - "-\t\tnum_pages = (len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "+\t\tnum_pages = (len + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \n" - " \t\tpages = ceph_alloc_page_vector(num_pages, GFP_KERNEL);\n" - " \t\tif (IS_ERR(pages)) {\n" - "@@ -1154,7 +1154,7 @@ again:\n" - " \tdout(\"aio_read %p %llx.%llx dropping cap refs on %s = %d\\n\",\n" - " \t inode, ceph_vinop(inode), ceph_cap_string(got), (int)ret);\n" - " \tif (pinned_page) {\n" - "-\t\tpage_cache_release(pinned_page);\n" - "+\t\tput_page(pinned_page);\n" - " \t\tpinned_page = NULL;\n" - " \t}\n" - " \tceph_put_cap_refs(ci, got);\n" - "@@ -1183,10 +1183,10 @@ again:\n" - " \t\tif (retry_op == READ_INLINE) {\n" - " \t\t\tBUG_ON(ret > 0 || read > 0);\n" - " \t\t\tif (iocb->ki_pos < i_size &&\n" - "-\t\t\t iocb->ki_pos < PAGE_CACHE_SIZE) {\n" - "+\t\t\t iocb->ki_pos < PAGE_SIZE) {\n" - " \t\t\t\tloff_t end = min_t(loff_t, i_size,\n" - " \t\t\t\t\t\t iocb->ki_pos + len);\n" - "-\t\t\t\tend = min_t(loff_t, end, PAGE_CACHE_SIZE);\n" - "+\t\t\t\tend = min_t(loff_t, end, PAGE_SIZE);\n" - " \t\t\t\tif (statret < end)\n" - " \t\t\t\t\tzero_user_segment(page, statret, end);\n" - " \t\t\t\tret = copy_page_to_iter(page,\n" - "@@ -1458,21 +1458,21 @@ static inline void ceph_zero_partial_page(\n" - " \tstruct inode *inode, loff_t offset, unsigned size)\n" - " {\n" - " \tstruct page *page;\n" - "-\tpgoff_t index = offset >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = offset >> PAGE_SHIFT;\n" - " \n" - " \tpage = find_lock_page(inode->i_mapping, index);\n" - " \tif (page) {\n" - " \t\twait_on_page_writeback(page);\n" - "-\t\tzero_user(page, offset & (PAGE_CACHE_SIZE - 1), size);\n" - "+\t\tzero_user(page, offset & (PAGE_SIZE - 1), size);\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " }\n" - " \n" - " static void ceph_zero_pagecache_range(struct inode *inode, loff_t offset,\n" - " \t\t\t\t loff_t length)\n" - " {\n" - "-\tloff_t nearly = round_up(offset, PAGE_CACHE_SIZE);\n" - "+\tloff_t nearly = round_up(offset, PAGE_SIZE);\n" - " \tif (offset < nearly) {\n" - " \t\tloff_t size = nearly - offset;\n" - " \t\tif (length < size)\n" - "@@ -1481,8 +1481,8 @@ static void ceph_zero_pagecache_range(struct inode *inode, loff_t offset,\n" - " \t\toffset += size;\n" - " \t\tlength -= size;\n" - " \t}\n" - "-\tif (length >= PAGE_CACHE_SIZE) {\n" - "-\t\tloff_t size = round_down(length, PAGE_CACHE_SIZE);\n" - "+\tif (length >= PAGE_SIZE) {\n" - "+\t\tloff_t size = round_down(length, PAGE_SIZE);\n" - " \t\ttruncate_pagecache_range(inode, offset, offset + size - 1);\n" - " \t\toffset += size;\n" - " \t\tlength -= size;\n" - "diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c\n" - "index e48fd8b23257..d5572db245e5 100644\n" - "--- a/fs/ceph/inode.c\n" - "+++ b/fs/ceph/inode.c\n" - "@@ -1333,7 +1333,7 @@ void ceph_readdir_cache_release(struct ceph_readdir_cache_control *ctl)\n" - " {\n" - " \tif (ctl->page) {\n" - " \t\tkunmap(ctl->page);\n" - "-\t\tpage_cache_release(ctl->page);\n" - "+\t\tput_page(ctl->page);\n" - " \t\tctl->page = NULL;\n" - " \t}\n" - " }\n" - "@@ -1343,7 +1343,7 @@ static int fill_readdir_cache(struct inode *dir, struct dentry *dn,\n" - " \t\t\t struct ceph_mds_request *req)\n" - " {\n" - " \tstruct ceph_inode_info *ci = ceph_inode(dir);\n" - "-\tunsigned nsize = PAGE_CACHE_SIZE / sizeof(struct dentry*);\n" - "+\tunsigned nsize = PAGE_SIZE / sizeof(struct dentry*);\n" - " \tunsigned idx = ctl->index % nsize;\n" - " \tpgoff_t pgoff = ctl->index / nsize;\n" - " \n" - "diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c\n" - "index 911d64d865f1..859c0444d3b9 100644\n" - "--- a/fs/ceph/mds_client.c\n" - "+++ b/fs/ceph/mds_client.c\n" - "@@ -1610,7 +1610,7 @@ again:\n" - " \twhile (!list_empty(&tmp_list)) {\n" - " \t\tif (!msg) {\n" - " \t\t\tmsg = ceph_msg_new(CEPH_MSG_CLIENT_CAPRELEASE,\n" - "-\t\t\t\t\tPAGE_CACHE_SIZE, GFP_NOFS, false);\n" - "+\t\t\t\t\tPAGE_SIZE, GFP_NOFS, false);\n" - " \t\t\tif (!msg)\n" - " \t\t\t\tgoto out_err;\n" - " \t\t\thead = msg->front.iov_base;\n" - "diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h\n" - "index 37712ccffcc6..3a8408ccf337 100644\n" - "--- a/fs/ceph/mds_client.h\n" - "+++ b/fs/ceph/mds_client.h\n" - "@@ -97,7 +97,7 @@ struct ceph_mds_reply_info_parsed {\n" - " /*\n" - " * cap releases are batched and sent to the MDS en masse.\n" - " */\n" - "-#define CEPH_CAPS_PER_RELEASE ((PAGE_CACHE_SIZE -\t\t\t\\\n" - "+#define CEPH_CAPS_PER_RELEASE ((PAGE_SIZE -\t\t\t\t\\\n" - " \t\t\t\tsizeof(struct ceph_mds_cap_release)) /\t\\\n" - " \t\t\t sizeof(struct ceph_mds_cap_item))\n" - " \n" - "diff --git a/fs/ceph/super.c b/fs/ceph/super.c\n" - "index ca4d5e8457f1..98acbf7b3efc 100644\n" - "--- a/fs/ceph/super.c\n" - "+++ b/fs/ceph/super.c\n" - "@@ -560,7 +560,7 @@ static struct ceph_fs_client *create_fs_client(struct ceph_mount_options *fsopt,\n" - " \n" - " \t/* set up mempools */\n" - " \terr = -ENOMEM;\n" - "-\tpage_count = fsc->mount_options->wsize >> PAGE_CACHE_SHIFT;\n" - "+\tpage_count = fsc->mount_options->wsize >> PAGE_SHIFT;\n" - " \tsize = sizeof (struct page *) * (page_count ? page_count : 1);\n" - " \tfsc->wb_pagevec_pool = mempool_create_kmalloc_pool(10, size);\n" - " \tif (!fsc->wb_pagevec_pool)\n" - "@@ -915,13 +915,13 @@ static int ceph_register_bdi(struct super_block *sb,\n" - " \tint err;\n" - " \n" - " \t/* set ra_pages based on rasize mount option? */\n" - "-\tif (fsc->mount_options->rasize >= PAGE_CACHE_SIZE)\n" - "+\tif (fsc->mount_options->rasize >= PAGE_SIZE)\n" - " \t\tfsc->backing_dev_info.ra_pages =\n" - "-\t\t\t(fsc->mount_options->rasize + PAGE_CACHE_SIZE - 1)\n" - "+\t\t\t(fsc->mount_options->rasize + PAGE_SIZE - 1)\n" - " \t\t\t>> PAGE_SHIFT;\n" - " \telse\n" - " \t\tfsc->backing_dev_info.ra_pages =\n" - "-\t\t\tVM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;\n" - "+\t\t\tVM_MAX_READAHEAD * 1024 / PAGE_SIZE;\n" - " \n" - " \terr = bdi_register(&fsc->backing_dev_info, NULL, \"ceph-%ld\",\n" - " \t\t\t atomic_long_inc_return(&bdi_seq));\n" - "diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c\n" - "index 1d86fc620e5c..89201564c346 100644\n" - "--- a/fs/cifs/cifsfs.c\n" - "+++ b/fs/cifs/cifsfs.c\n" - "@@ -962,7 +962,7 @@ static int cifs_clone_file_range(struct file *src_file, loff_t off,\n" - " \tcifs_dbg(FYI, \"about to flush pages\\n\");\n" - " \t/* should we flush first and last page first */\n" - " \ttruncate_inode_pages_range(&target_inode->i_data, destoff,\n" - "-\t\t\t\t PAGE_CACHE_ALIGN(destoff + len)-1);\n" - "+\t\t\t\t PAGE_ALIGN(destoff + len)-1);\n" - " \n" - " \tif (target_tcon->ses->server->ops->duplicate_extents)\n" - " \t\trc = target_tcon->ses->server->ops->duplicate_extents(xid,\n" - "diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h\n" - "index d21da9f05bae..f2cc0b3d1af7 100644\n" - "--- a/fs/cifs/cifsglob.h\n" - "+++ b/fs/cifs/cifsglob.h\n" - "@@ -714,7 +714,7 @@ compare_mid(__u16 mid, const struct smb_hdr *smb)\n" - " *\n" - " * Note that this might make for \"interesting\" allocation problems during\n" - " * writeback however as we have to allocate an array of pointers for the\n" - "- * pages. A 16M write means ~32kb page array with PAGE_CACHE_SIZE == 4096.\n" - "+ * pages. A 16M write means ~32kb page array with PAGE_SIZE == 4096.\n" - " *\n" - " * For reads, there is a similar problem as we need to allocate an array\n" - " * of kvecs to handle the receive, though that should only need to be done\n" - "@@ -733,7 +733,7 @@ compare_mid(__u16 mid, const struct smb_hdr *smb)\n" - " \n" - " /*\n" - " * The default wsize is 1M. find_get_pages seems to return a maximum of 256\n" - "- * pages in a single call. With PAGE_CACHE_SIZE == 4k, this means we can fill\n" - "+ * pages in a single call. With PAGE_SIZE == 4k, this means we can fill\n" - " * a single wsize request with a single call.\n" - " */\n" - " #define CIFS_DEFAULT_IOSIZE (1024 * 1024)\n" - "diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c\n" - "index 76fcb50295a3..a894bf809ff7 100644\n" - "--- a/fs/cifs/cifssmb.c\n" - "+++ b/fs/cifs/cifssmb.c\n" - "@@ -1929,17 +1929,17 @@ cifs_writev_requeue(struct cifs_writedata *wdata)\n" - " \n" - " \t\twsize = server->ops->wp_retry_size(inode);\n" - " \t\tif (wsize < rest_len) {\n" - "-\t\t\tnr_pages = wsize / PAGE_CACHE_SIZE;\n" - "+\t\t\tnr_pages = wsize / PAGE_SIZE;\n" - " \t\t\tif (!nr_pages) {\n" - " \t\t\t\trc = -ENOTSUPP;\n" - " \t\t\t\tbreak;\n" - " \t\t\t}\n" - "-\t\t\tcur_len = nr_pages * PAGE_CACHE_SIZE;\n" - "-\t\t\ttailsz = PAGE_CACHE_SIZE;\n" - "+\t\t\tcur_len = nr_pages * PAGE_SIZE;\n" - "+\t\t\ttailsz = PAGE_SIZE;\n" - " \t\t} else {\n" - "-\t\t\tnr_pages = DIV_ROUND_UP(rest_len, PAGE_CACHE_SIZE);\n" - "+\t\t\tnr_pages = DIV_ROUND_UP(rest_len, PAGE_SIZE);\n" - " \t\t\tcur_len = rest_len;\n" - "-\t\t\ttailsz = rest_len - (nr_pages - 1) * PAGE_CACHE_SIZE;\n" - "+\t\t\ttailsz = rest_len - (nr_pages - 1) * PAGE_SIZE;\n" - " \t\t}\n" - " \n" - " \t\twdata2 = cifs_writedata_alloc(nr_pages, cifs_writev_complete);\n" - "@@ -1957,7 +1957,7 @@ cifs_writev_requeue(struct cifs_writedata *wdata)\n" - " \t\twdata2->sync_mode = wdata->sync_mode;\n" - " \t\twdata2->nr_pages = nr_pages;\n" - " \t\twdata2->offset = page_offset(wdata2->pages[0]);\n" - "-\t\twdata2->pagesz = PAGE_CACHE_SIZE;\n" - "+\t\twdata2->pagesz = PAGE_SIZE;\n" - " \t\twdata2->tailsz = tailsz;\n" - " \t\twdata2->bytes = cur_len;\n" - " \n" - "@@ -1975,7 +1975,7 @@ cifs_writev_requeue(struct cifs_writedata *wdata)\n" - " \t\t\tif (rc != 0 && rc != -EAGAIN) {\n" - " \t\t\t\tSetPageError(wdata2->pages[j]);\n" - " \t\t\t\tend_page_writeback(wdata2->pages[j]);\n" - "-\t\t\t\tpage_cache_release(wdata2->pages[j]);\n" - "+\t\t\t\tput_page(wdata2->pages[j]);\n" - " \t\t\t}\n" - " \t\t}\n" - " \n" - "@@ -2018,7 +2018,7 @@ cifs_writev_complete(struct work_struct *work)\n" - " \t\telse if (wdata->result < 0)\n" - " \t\t\tSetPageError(page);\n" - " \t\tend_page_writeback(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \tif (wdata->result != -EAGAIN)\n" - " \t\tmapping_set_error(inode->i_mapping, wdata->result);\n" - "diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c\n" - "index a763cd3d9e7c..6f62ac821a84 100644\n" - "--- a/fs/cifs/connect.c\n" - "+++ b/fs/cifs/connect.c\n" - "@@ -3630,7 +3630,7 @@ try_mount_again:\n" - " \tcifs_sb->rsize = server->ops->negotiate_rsize(tcon, volume_info);\n" - " \n" - " \t/* tune readahead according to rsize */\n" - "-\tcifs_sb->bdi.ra_pages = cifs_sb->rsize / PAGE_CACHE_SIZE;\n" - "+\tcifs_sb->bdi.ra_pages = cifs_sb->rsize / PAGE_SIZE;\n" - " \n" - " remote_path_check:\n" - " #ifdef CONFIG_CIFS_DFS_UPCALL\n" - "diff --git a/fs/cifs/file.c b/fs/cifs/file.c\n" - "index ff882aeaccc6..c03d0744648b 100644\n" - "--- a/fs/cifs/file.c\n" - "+++ b/fs/cifs/file.c\n" - "@@ -1833,7 +1833,7 @@ refind_writable:\n" - " static int cifs_partialpagewrite(struct page *page, unsigned from, unsigned to)\n" - " {\n" - " \tstruct address_space *mapping = page->mapping;\n" - "-\tloff_t offset = (loff_t)page->index << PAGE_CACHE_SHIFT;\n" - "+\tloff_t offset = (loff_t)page->index << PAGE_SHIFT;\n" - " \tchar *write_data;\n" - " \tint rc = -EFAULT;\n" - " \tint bytes_written = 0;\n" - "@@ -1849,7 +1849,7 @@ static int cifs_partialpagewrite(struct page *page, unsigned from, unsigned to)\n" - " \twrite_data = kmap(page);\n" - " \twrite_data += from;\n" - " \n" - "-\tif ((to > PAGE_CACHE_SIZE) || (from > to)) {\n" - "+\tif ((to > PAGE_SIZE) || (from > to)) {\n" - " \t\tkunmap(page);\n" - " \t\treturn -EIO;\n" - " \t}\n" - "@@ -1902,7 +1902,7 @@ wdata_alloc_and_fillpages(pgoff_t tofind, struct address_space *mapping,\n" - " \t * find_get_pages_tag seems to return a max of 256 on each\n" - " \t * iteration, so we must call it several times in order to\n" - " \t * fill the array or the wsize is effectively limited to\n" - "-\t * 256 * PAGE_CACHE_SIZE.\n" - "+\t * 256 * PAGE_SIZE.\n" - " \t */\n" - " \t*found_pages = 0;\n" - " \tpages = wdata->pages;\n" - "@@ -1991,7 +1991,7 @@ wdata_prepare_pages(struct cifs_writedata *wdata, unsigned int found_pages,\n" - " \n" - " \t/* put any pages we aren't going to use */\n" - " \tfor (i = nr_pages; i < found_pages; i++) {\n" - "-\t\tpage_cache_release(wdata->pages[i]);\n" - "+\t\tput_page(wdata->pages[i]);\n" - " \t\twdata->pages[i] = NULL;\n" - " \t}\n" - " \n" - "@@ -2009,11 +2009,11 @@ wdata_send_pages(struct cifs_writedata *wdata, unsigned int nr_pages,\n" - " \twdata->sync_mode = wbc->sync_mode;\n" - " \twdata->nr_pages = nr_pages;\n" - " \twdata->offset = page_offset(wdata->pages[0]);\n" - "-\twdata->pagesz = PAGE_CACHE_SIZE;\n" - "+\twdata->pagesz = PAGE_SIZE;\n" - " \twdata->tailsz = min(i_size_read(mapping->host) -\n" - " \t\t\tpage_offset(wdata->pages[nr_pages - 1]),\n" - "-\t\t\t(loff_t)PAGE_CACHE_SIZE);\n" - "-\twdata->bytes = ((nr_pages - 1) * PAGE_CACHE_SIZE) + wdata->tailsz;\n" - "+\t\t\t(loff_t)PAGE_SIZE);\n" - "+\twdata->bytes = ((nr_pages - 1) * PAGE_SIZE) + wdata->tailsz;\n" - " \n" - " \tif (wdata->cfile != NULL)\n" - " \t\tcifsFileInfo_put(wdata->cfile);\n" - "@@ -2047,15 +2047,15 @@ static int cifs_writepages(struct address_space *mapping,\n" - " \t * If wsize is smaller than the page cache size, default to writing\n" - " \t * one page at a time via cifs_writepage\n" - " \t */\n" - "-\tif (cifs_sb->wsize < PAGE_CACHE_SIZE)\n" - "+\tif (cifs_sb->wsize < PAGE_SIZE)\n" - " \t\treturn generic_writepages(mapping, wbc);\n" - " \n" - " \tif (wbc->range_cyclic) {\n" - " \t\tindex = mapping->writeback_index; /* Start from prev offset */\n" - " \t\tend = -1;\n" - " \t} else {\n" - "-\t\tindex = wbc->range_start >> PAGE_CACHE_SHIFT;\n" - "-\t\tend = wbc->range_end >> PAGE_CACHE_SHIFT;\n" - "+\t\tindex = wbc->range_start >> PAGE_SHIFT;\n" - "+\t\tend = wbc->range_end >> PAGE_SHIFT;\n" - " \t\tif (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)\n" - " \t\t\trange_whole = true;\n" - " \t\tscanned = true;\n" - "@@ -2071,7 +2071,7 @@ retry:\n" - " \t\tif (rc)\n" - " \t\t\tbreak;\n" - " \n" - "-\t\ttofind = min((wsize / PAGE_CACHE_SIZE) - 1, end - index) + 1;\n" - "+\t\ttofind = min((wsize / PAGE_SIZE) - 1, end - index) + 1;\n" - " \n" - " \t\twdata = wdata_alloc_and_fillpages(tofind, mapping, end, &index,\n" - " \t\t\t\t\t\t &found_pages);\n" - "@@ -2111,7 +2111,7 @@ retry:\n" - " \t\t\t\telse\n" - " \t\t\t\t\tSetPageError(wdata->pages[i]);\n" - " \t\t\t\tend_page_writeback(wdata->pages[i]);\n" - "-\t\t\t\tpage_cache_release(wdata->pages[i]);\n" - "+\t\t\t\tput_page(wdata->pages[i]);\n" - " \t\t\t}\n" - " \t\t\tif (rc != -EAGAIN)\n" - " \t\t\t\tmapping_set_error(mapping, rc);\n" - "@@ -2154,7 +2154,7 @@ cifs_writepage_locked(struct page *page, struct writeback_control *wbc)\n" - " \n" - " \txid = get_xid();\n" - " /* BB add check for wbc flags */\n" - "-\tpage_cache_get(page);\n" - "+\tget_page(page);\n" - " \tif (!PageUptodate(page))\n" - " \t\tcifs_dbg(FYI, \"ppw - page not up to date\\n\");\n" - " \n" - "@@ -2170,7 +2170,7 @@ cifs_writepage_locked(struct page *page, struct writeback_control *wbc)\n" - " \t */\n" - " \tset_page_writeback(page);\n" - " retry_write:\n" - "-\trc = cifs_partialpagewrite(page, 0, PAGE_CACHE_SIZE);\n" - "+\trc = cifs_partialpagewrite(page, 0, PAGE_SIZE);\n" - " \tif (rc == -EAGAIN && wbc->sync_mode == WB_SYNC_ALL)\n" - " \t\tgoto retry_write;\n" - " \telse if (rc == -EAGAIN)\n" - "@@ -2180,7 +2180,7 @@ retry_write:\n" - " \telse\n" - " \t\tSetPageUptodate(page);\n" - " \tend_page_writeback(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \tfree_xid(xid);\n" - " \treturn rc;\n" - " }\n" - "@@ -2214,12 +2214,12 @@ static int cifs_write_end(struct file *file, struct address_space *mapping,\n" - " \t\tif (copied == len)\n" - " \t\t\tSetPageUptodate(page);\n" - " \t\tClearPageChecked(page);\n" - "-\t} else if (!PageUptodate(page) && copied == PAGE_CACHE_SIZE)\n" - "+\t} else if (!PageUptodate(page) && copied == PAGE_SIZE)\n" - " \t\tSetPageUptodate(page);\n" - " \n" - " \tif (!PageUptodate(page)) {\n" - " \t\tchar *page_data;\n" - "-\t\tunsigned offset = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\t\tunsigned offset = pos & (PAGE_SIZE - 1);\n" - " \t\tunsigned int xid;\n" - " \n" - " \t\txid = get_xid();\n" - "@@ -2248,7 +2248,7 @@ static int cifs_write_end(struct file *file, struct address_space *mapping,\n" - " \t}\n" - " \n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \treturn rc;\n" - " }\n" - "@@ -3286,9 +3286,9 @@ cifs_readv_complete(struct work_struct *work)\n" - " \t\t (rdata->result == -EAGAIN && got_bytes))\n" - " \t\t\tcifs_readpage_to_fscache(rdata->mapping->host, page);\n" - " \n" - "-\t\tgot_bytes -= min_t(unsigned int, PAGE_CACHE_SIZE, got_bytes);\n" - "+\t\tgot_bytes -= min_t(unsigned int, PAGE_SIZE, got_bytes);\n" - " \n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\trdata->pages[i] = NULL;\n" - " \t}\n" - " \tkref_put(&rdata->refcount, cifs_readdata_release);\n" - "@@ -3307,21 +3307,21 @@ cifs_readpages_read_into_pages(struct TCP_Server_Info *server,\n" - " \n" - " \t/* determine the eof that the server (probably) has */\n" - " \teof = CIFS_I(rdata->mapping->host)->server_eof;\n" - "-\teof_index = eof ? (eof - 1) >> PAGE_CACHE_SHIFT : 0;\n" - "+\teof_index = eof ? (eof - 1) >> PAGE_SHIFT : 0;\n" - " \tcifs_dbg(FYI, \"eof=%llu eof_index=%lu\\n\", eof, eof_index);\n" - " \n" - " \trdata->got_bytes = 0;\n" - "-\trdata->tailsz = PAGE_CACHE_SIZE;\n" - "+\trdata->tailsz = PAGE_SIZE;\n" - " \tfor (i = 0; i < nr_pages; i++) {\n" - " \t\tstruct page *page = rdata->pages[i];\n" - " \n" - "-\t\tif (len >= PAGE_CACHE_SIZE) {\n" - "+\t\tif (len >= PAGE_SIZE) {\n" - " \t\t\t/* enough data to fill the page */\n" - " \t\t\tiov.iov_base = kmap(page);\n" - "-\t\t\tiov.iov_len = PAGE_CACHE_SIZE;\n" - "+\t\t\tiov.iov_len = PAGE_SIZE;\n" - " \t\t\tcifs_dbg(FYI, \"%u: idx=%lu iov_base=%p iov_len=%zu\\n\",\n" - " \t\t\t\t i, page->index, iov.iov_base, iov.iov_len);\n" - "-\t\t\tlen -= PAGE_CACHE_SIZE;\n" - "+\t\t\tlen -= PAGE_SIZE;\n" - " \t\t} else if (len > 0) {\n" - " \t\t\t/* enough for partial page, fill and zero the rest */\n" - " \t\t\tiov.iov_base = kmap(page);\n" - "@@ -3329,7 +3329,7 @@ cifs_readpages_read_into_pages(struct TCP_Server_Info *server,\n" - " \t\t\tcifs_dbg(FYI, \"%u: idx=%lu iov_base=%p iov_len=%zu\\n\",\n" - " \t\t\t\t i, page->index, iov.iov_base, iov.iov_len);\n" - " \t\t\tmemset(iov.iov_base + len,\n" - "-\t\t\t\t'\\0', PAGE_CACHE_SIZE - len);\n" - "+\t\t\t\t'\\0', PAGE_SIZE - len);\n" - " \t\t\trdata->tailsz = len;\n" - " \t\t\tlen = 0;\n" - " \t\t} else if (page->index > eof_index) {\n" - "@@ -3341,12 +3341,12 @@ cifs_readpages_read_into_pages(struct TCP_Server_Info *server,\n" - " \t\t\t * to prevent the VFS from repeatedly attempting to\n" - " \t\t\t * fill them until the writes are flushed.\n" - " \t\t\t */\n" - "-\t\t\tzero_user(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\t\tzero_user(page, 0, PAGE_SIZE);\n" - " \t\t\tlru_cache_add_file(page);\n" - " \t\t\tflush_dcache_page(page);\n" - " \t\t\tSetPageUptodate(page);\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\trdata->pages[i] = NULL;\n" - " \t\t\trdata->nr_pages--;\n" - " \t\t\tcontinue;\n" - "@@ -3354,7 +3354,7 @@ cifs_readpages_read_into_pages(struct TCP_Server_Info *server,\n" - " \t\t\t/* no need to hold page hostage */\n" - " \t\t\tlru_cache_add_file(page);\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\trdata->pages[i] = NULL;\n" - " \t\t\trdata->nr_pages--;\n" - " \t\t\tcontinue;\n" - "@@ -3402,8 +3402,8 @@ readpages_get_pages(struct address_space *mapping, struct list_head *page_list,\n" - " \t}\n" - " \n" - " \t/* move first page to the tmplist */\n" - "-\t*offset = (loff_t)page->index << PAGE_CACHE_SHIFT;\n" - "-\t*bytes = PAGE_CACHE_SIZE;\n" - "+\t*offset = (loff_t)page->index << PAGE_SHIFT;\n" - "+\t*bytes = PAGE_SIZE;\n" - " \t*nr_pages = 1;\n" - " \tlist_move_tail(&page->lru, tmplist);\n" - " \n" - "@@ -3415,7 +3415,7 @@ readpages_get_pages(struct address_space *mapping, struct list_head *page_list,\n" - " \t\t\tbreak;\n" - " \n" - " \t\t/* would this page push the read over the rsize? */\n" - "-\t\tif (*bytes + PAGE_CACHE_SIZE > rsize)\n" - "+\t\tif (*bytes + PAGE_SIZE > rsize)\n" - " \t\t\tbreak;\n" - " \n" - " \t\t__SetPageLocked(page);\n" - "@@ -3424,7 +3424,7 @@ readpages_get_pages(struct address_space *mapping, struct list_head *page_list,\n" - " \t\t\tbreak;\n" - " \t\t}\n" - " \t\tlist_move_tail(&page->lru, tmplist);\n" - "-\t\t(*bytes) += PAGE_CACHE_SIZE;\n" - "+\t\t(*bytes) += PAGE_SIZE;\n" - " \t\texpected_index++;\n" - " \t\t(*nr_pages)++;\n" - " \t}\n" - "@@ -3493,7 +3493,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,\n" - " \t\t * reach this point however since we set ra_pages to 0 when the\n" - " \t\t * rsize is smaller than a cache page.\n" - " \t\t */\n" - "-\t\tif (unlikely(rsize < PAGE_CACHE_SIZE)) {\n" - "+\t\tif (unlikely(rsize < PAGE_SIZE)) {\n" - " \t\t\tadd_credits_and_wake_if(server, credits, 0);\n" - " \t\t\treturn 0;\n" - " \t\t}\n" - "@@ -3512,7 +3512,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,\n" - " \t\t\t\tlist_del(&page->lru);\n" - " \t\t\t\tlru_cache_add_file(page);\n" - " \t\t\t\tunlock_page(page);\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t}\n" - " \t\t\trc = -ENOMEM;\n" - " \t\t\tadd_credits_and_wake_if(server, credits, 0);\n" - "@@ -3524,7 +3524,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,\n" - " \t\trdata->offset = offset;\n" - " \t\trdata->bytes = bytes;\n" - " \t\trdata->pid = pid;\n" - "-\t\trdata->pagesz = PAGE_CACHE_SIZE;\n" - "+\t\trdata->pagesz = PAGE_SIZE;\n" - " \t\trdata->read_into_pages = cifs_readpages_read_into_pages;\n" - " \t\trdata->credits = credits;\n" - " \n" - "@@ -3542,7 +3542,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,\n" - " \t\t\t\tpage = rdata->pages[i];\n" - " \t\t\t\tlru_cache_add_file(page);\n" - " \t\t\t\tunlock_page(page);\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t}\n" - " \t\t\t/* Fallback to the readpage in error/reconnect cases */\n" - " \t\t\tkref_put(&rdata->refcount, cifs_readdata_release);\n" - "@@ -3577,7 +3577,7 @@ static int cifs_readpage_worker(struct file *file, struct page *page,\n" - " \tread_data = kmap(page);\n" - " \t/* for reads over a certain size could initiate async read ahead */\n" - " \n" - "-\trc = cifs_read(file, read_data, PAGE_CACHE_SIZE, poffset);\n" - "+\trc = cifs_read(file, read_data, PAGE_SIZE, poffset);\n" - " \n" - " \tif (rc < 0)\n" - " \t\tgoto io_error;\n" - "@@ -3587,8 +3587,8 @@ static int cifs_readpage_worker(struct file *file, struct page *page,\n" - " \tfile_inode(file)->i_atime =\n" - " \t\tcurrent_fs_time(file_inode(file)->i_sb);\n" - " \n" - "-\tif (PAGE_CACHE_SIZE > rc)\n" - "-\t\tmemset(read_data + rc, 0, PAGE_CACHE_SIZE - rc);\n" - "+\tif (PAGE_SIZE > rc)\n" - "+\t\tmemset(read_data + rc, 0, PAGE_SIZE - rc);\n" - " \n" - " \tflush_dcache_page(page);\n" - " \tSetPageUptodate(page);\n" - "@@ -3608,7 +3608,7 @@ read_complete:\n" - " \n" - " static int cifs_readpage(struct file *file, struct page *page)\n" - " {\n" - "-\tloff_t offset = (loff_t)page->index << PAGE_CACHE_SHIFT;\n" - "+\tloff_t offset = (loff_t)page->index << PAGE_SHIFT;\n" - " \tint rc = -EACCES;\n" - " \tunsigned int xid;\n" - " \n" - "@@ -3679,8 +3679,8 @@ static int cifs_write_begin(struct file *file, struct address_space *mapping,\n" - " \t\t\tstruct page **pagep, void **fsdata)\n" - " {\n" - " \tint oncethru = 0;\n" - "-\tpgoff_t index = pos >> PAGE_CACHE_SHIFT;\n" - "-\tloff_t offset = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tpgoff_t index = pos >> PAGE_SHIFT;\n" - "+\tloff_t offset = pos & (PAGE_SIZE - 1);\n" - " \tloff_t page_start = pos & PAGE_MASK;\n" - " \tloff_t i_size;\n" - " \tstruct page *page;\n" - "@@ -3703,7 +3703,7 @@ start:\n" - " \t * the server. If the write is short, we'll end up doing a sync write\n" - " \t * instead.\n" - " \t */\n" - "-\tif (len == PAGE_CACHE_SIZE)\n" - "+\tif (len == PAGE_SIZE)\n" - " \t\tgoto out;\n" - " \n" - " \t/*\n" - "@@ -3718,7 +3718,7 @@ start:\n" - " \t\t (offset == 0 && (pos + len) >= i_size)) {\n" - " \t\t\tzero_user_segments(page, 0, offset,\n" - " \t\t\t\t\t offset + len,\n" - "-\t\t\t\t\t PAGE_CACHE_SIZE);\n" - "+\t\t\t\t\t PAGE_SIZE);\n" - " \t\t\t/*\n" - " \t\t\t * PageChecked means that the parts of the page\n" - " \t\t\t * to which we're not writing are considered up\n" - "@@ -3737,7 +3737,7 @@ start:\n" - " \t\t * do a sync write instead since PG_uptodate isn't set.\n" - " \t\t */\n" - " \t\tcifs_readpage_worker(file, page, &page_start);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\toncethru = 1;\n" - " \t\tgoto start;\n" - " \t} else {\n" - "@@ -3764,7 +3764,7 @@ static void cifs_invalidate_page(struct page *page, unsigned int offset,\n" - " {\n" - " \tstruct cifsInodeInfo *cifsi = CIFS_I(page->mapping->host);\n" - " \n" - "-\tif (offset == 0 && length == PAGE_CACHE_SIZE)\n" - "+\tif (offset == 0 && length == PAGE_SIZE)\n" - " \t\tcifs_fscache_invalidate_page(page, &cifsi->vfs_inode);\n" - " }\n" - " \n" - "@@ -3772,7 +3772,7 @@ static int cifs_launder_page(struct page *page)\n" - " {\n" - " \tint rc = 0;\n" - " \tloff_t range_start = page_offset(page);\n" - "-\tloff_t range_end = range_start + (loff_t)(PAGE_CACHE_SIZE - 1);\n" - "+\tloff_t range_end = range_start + (loff_t)(PAGE_SIZE - 1);\n" - " \tstruct writeback_control wbc = {\n" - " \t\t.sync_mode = WB_SYNC_ALL,\n" - " \t\t.nr_to_write = 0,\n" - "diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c\n" - "index aeb26dbfa1bf..5f9ad5c42180 100644\n" - "--- a/fs/cifs/inode.c\n" - "+++ b/fs/cifs/inode.c\n" - "@@ -59,7 +59,7 @@ static void cifs_set_ops(struct inode *inode)\n" - " \n" - " \t\t/* check if server can support readpages */\n" - " \t\tif (cifs_sb_master_tcon(cifs_sb)->ses->server->maxBuf <\n" - "-\t\t\t\tPAGE_CACHE_SIZE + MAX_CIFS_HDR_SIZE)\n" - "+\t\t\t\tPAGE_SIZE + MAX_CIFS_HDR_SIZE)\n" - " \t\t\tinode->i_data.a_ops = &cifs_addr_ops_smallbuf;\n" - " \t\telse\n" - " \t\t\tinode->i_data.a_ops = &cifs_addr_ops;\n" - "@@ -2019,8 +2019,8 @@ int cifs_getattr(struct vfsmount *mnt, struct dentry *dentry,\n" - " \n" - " static int cifs_truncate_page(struct address_space *mapping, loff_t from)\n" - " {\n" - "-\tpgoff_t index = from >> PAGE_CACHE_SHIFT;\n" - "-\tunsigned offset = from & (PAGE_CACHE_SIZE - 1);\n" - "+\tpgoff_t index = from >> PAGE_SHIFT;\n" - "+\tunsigned offset = from & (PAGE_SIZE - 1);\n" - " \tstruct page *page;\n" - " \tint rc = 0;\n" - " \n" - "@@ -2028,9 +2028,9 @@ static int cifs_truncate_page(struct address_space *mapping, loff_t from)\n" - " \tif (!page)\n" - " \t\treturn -ENOMEM;\n" - " \n" - "-\tzero_user_segment(page, offset, PAGE_CACHE_SIZE);\n" - "+\tzero_user_segment(page, offset, PAGE_SIZE);\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn rc;\n" - " }\n" - " \n" - "diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c\n" - "index a8f3b589a2df..cfd91320e869 100644\n" - "--- a/fs/configfs/mount.c\n" - "+++ b/fs/configfs/mount.c\n" - "@@ -71,8 +71,8 @@ static int configfs_fill_super(struct super_block *sb, void *data, int silent)\n" - " \tstruct inode *inode;\n" - " \tstruct dentry *root;\n" - " \n" - "-\tsb->s_blocksize = PAGE_CACHE_SIZE;\n" - "-\tsb->s_blocksize_bits = PAGE_CACHE_SHIFT;\n" - "+\tsb->s_blocksize = PAGE_SIZE;\n" - "+\tsb->s_blocksize_bits = PAGE_SHIFT;\n" - " \tsb->s_magic = CONFIGFS_MAGIC;\n" - " \tsb->s_op = &configfs_ops;\n" - " \tsb->s_time_gran = 1;\n" - "diff --git a/fs/cramfs/README b/fs/cramfs/README\n" - "index 445d1c2d7646..9d4e7ea311f4 100644\n" - "--- a/fs/cramfs/README\n" - "+++ b/fs/cramfs/README\n" - "@@ -86,26 +86,26 @@ Block Size\n" - " \n" - " (Block size in cramfs refers to the size of input data that is\n" - " compressed at a time. It's intended to be somewhere around\n" - "-PAGE_CACHE_SIZE for cramfs_readpage's convenience.)\n" - "+PAGE_SIZE for cramfs_readpage's convenience.)\n" - " \n" - " The superblock ought to indicate the block size that the fs was\n" - " written for, since comments in <linux/pagemap.h> indicate that\n" - "-PAGE_CACHE_SIZE may grow in future (if I interpret the comment\n" - "+PAGE_SIZE may grow in future (if I interpret the comment\n" - " correctly).\n" - " \n" - "-Currently, mkcramfs #define's PAGE_CACHE_SIZE as 4096 and uses that\n" - "-for blksize, whereas Linux-2.3.39 uses its PAGE_CACHE_SIZE, which in\n" - "+Currently, mkcramfs #define's PAGE_SIZE as 4096 and uses that\n" - "+for blksize, whereas Linux-2.3.39 uses its PAGE_SIZE, which in\n" - " turn is defined as PAGE_SIZE (which can be as large as 32KB on arm).\n" - " This discrepancy is a bug, though it's not clear which should be\n" - " changed.\n" - " \n" - "-One option is to change mkcramfs to take its PAGE_CACHE_SIZE from\n" - "+One option is to change mkcramfs to take its PAGE_SIZE from\n" - " <asm/page.h>. Personally I don't like this option, but it does\n" - " require the least amount of change: just change `#define\n" - "-PAGE_CACHE_SIZE (4096)' to `#include <asm/page.h>'. The disadvantage\n" - "+PAGE_SIZE (4096)' to `#include <asm/page.h>'. The disadvantage\n" - " is that the generated cramfs cannot always be shared between different\n" - " kernels, not even necessarily kernels of the same architecture if\n" - "-PAGE_CACHE_SIZE is subject to change between kernel versions\n" - "+PAGE_SIZE is subject to change between kernel versions\n" - " (currently possible with arm and ia64).\n" - " \n" - " The remaining options try to make cramfs more sharable.\n" - "@@ -126,22 +126,22 @@ size. The options are:\n" - " 1. Always 4096 bytes.\n" - " \n" - " 2. Writer chooses blocksize; kernel adapts but rejects blocksize >\n" - "- PAGE_CACHE_SIZE.\n" - "+ PAGE_SIZE.\n" - " \n" - " 3. Writer chooses blocksize; kernel adapts even to blocksize >\n" - "- PAGE_CACHE_SIZE.\n" - "+ PAGE_SIZE.\n" - " \n" - " It's easy enough to change the kernel to use a smaller value than\n" - "-PAGE_CACHE_SIZE: just make cramfs_readpage read multiple blocks.\n" - "+PAGE_SIZE: just make cramfs_readpage read multiple blocks.\n" - " \n" - "-The cost of option 1 is that kernels with a larger PAGE_CACHE_SIZE\n" - "+The cost of option 1 is that kernels with a larger PAGE_SIZE\n" - " value don't get as good compression as they can.\n" - " \n" - " The cost of option 2 relative to option 1 is that the code uses\n" - " variables instead of #define'd constants. The gain is that people\n" - "-with kernels having larger PAGE_CACHE_SIZE can make use of that if\n" - "+with kernels having larger PAGE_SIZE can make use of that if\n" - " they don't mind their cramfs being inaccessible to kernels with\n" - "-smaller PAGE_CACHE_SIZE values.\n" - "+smaller PAGE_SIZE values.\n" - " \n" - " Option 3 is easy to implement if we don't mind being CPU-inefficient:\n" - " e.g. get readpage to decompress to a buffer of size MAX_BLKSIZE (which\n" - "diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c\n" - "index b862bc219cd7..3a32ddf98095 100644\n" - "--- a/fs/cramfs/inode.c\n" - "+++ b/fs/cramfs/inode.c\n" - "@@ -137,7 +137,7 @@ static struct inode *get_cramfs_inode(struct super_block *sb,\n" - " * page cache and dentry tree anyway..\n" - " *\n" - " * This also acts as a way to guarantee contiguous areas of up to\n" - "- * BLKS_PER_BUF*PAGE_CACHE_SIZE, so that the caller doesn't need to\n" - "+ * BLKS_PER_BUF*PAGE_SIZE, so that the caller doesn't need to\n" - " * worry about end-of-buffer issues even when decompressing a full\n" - " * page cache.\n" - " */\n" - "@@ -152,7 +152,7 @@ static struct inode *get_cramfs_inode(struct super_block *sb,\n" - " */\n" - " #define BLKS_PER_BUF_SHIFT\t(2)\n" - " #define BLKS_PER_BUF\t\t(1 << BLKS_PER_BUF_SHIFT)\n" - "-#define BUFFER_SIZE\t\t(BLKS_PER_BUF*PAGE_CACHE_SIZE)\n" - "+#define BUFFER_SIZE\t\t(BLKS_PER_BUF*PAGE_SIZE)\n" - " \n" - " static unsigned char read_buffers[READ_BUFFERS][BUFFER_SIZE];\n" - " static unsigned buffer_blocknr[READ_BUFFERS];\n" - "@@ -173,8 +173,8 @@ static void *cramfs_read(struct super_block *sb, unsigned int offset, unsigned i\n" - " \n" - " \tif (!len)\n" - " \t\treturn NULL;\n" - "-\tblocknr = offset >> PAGE_CACHE_SHIFT;\n" - "-\toffset &= PAGE_CACHE_SIZE - 1;\n" - "+\tblocknr = offset >> PAGE_SHIFT;\n" - "+\toffset &= PAGE_SIZE - 1;\n" - " \n" - " \t/* Check if an existing buffer already has the data.. */\n" - " \tfor (i = 0; i < READ_BUFFERS; i++) {\n" - "@@ -184,14 +184,14 @@ static void *cramfs_read(struct super_block *sb, unsigned int offset, unsigned i\n" - " \t\t\tcontinue;\n" - " \t\tif (blocknr < buffer_blocknr[i])\n" - " \t\t\tcontinue;\n" - "-\t\tblk_offset = (blocknr - buffer_blocknr[i]) << PAGE_CACHE_SHIFT;\n" - "+\t\tblk_offset = (blocknr - buffer_blocknr[i]) << PAGE_SHIFT;\n" - " \t\tblk_offset += offset;\n" - " \t\tif (blk_offset + len > BUFFER_SIZE)\n" - " \t\t\tcontinue;\n" - " \t\treturn read_buffers[i] + blk_offset;\n" - " \t}\n" - " \n" - "-\tdevsize = mapping->host->i_size >> PAGE_CACHE_SHIFT;\n" - "+\tdevsize = mapping->host->i_size >> PAGE_SHIFT;\n" - " \n" - " \t/* Ok, read in BLKS_PER_BUF pages completely first. */\n" - " \tfor (i = 0; i < BLKS_PER_BUF; i++) {\n" - "@@ -213,7 +213,7 @@ static void *cramfs_read(struct super_block *sb, unsigned int offset, unsigned i\n" - " \t\t\twait_on_page_locked(page);\n" - " \t\t\tif (!PageUptodate(page)) {\n" - " \t\t\t\t/* asynchronous error */\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t\tpages[i] = NULL;\n" - " \t\t\t}\n" - " \t\t}\n" - "@@ -229,12 +229,12 @@ static void *cramfs_read(struct super_block *sb, unsigned int offset, unsigned i\n" - " \t\tstruct page *page = pages[i];\n" - " \n" - " \t\tif (page) {\n" - "-\t\t\tmemcpy(data, kmap(page), PAGE_CACHE_SIZE);\n" - "+\t\t\tmemcpy(data, kmap(page), PAGE_SIZE);\n" - " \t\t\tkunmap(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t} else\n" - "-\t\t\tmemset(data, 0, PAGE_CACHE_SIZE);\n" - "-\t\tdata += PAGE_CACHE_SIZE;\n" - "+\t\t\tmemset(data, 0, PAGE_SIZE);\n" - "+\t\tdata += PAGE_SIZE;\n" - " \t}\n" - " \treturn read_buffers[buffer] + offset;\n" - " }\n" - "@@ -353,7 +353,7 @@ static int cramfs_statfs(struct dentry *dentry, struct kstatfs *buf)\n" - " \tu64 id = huge_encode_dev(sb->s_bdev->bd_dev);\n" - " \n" - " \tbuf->f_type = CRAMFS_MAGIC;\n" - "-\tbuf->f_bsize = PAGE_CACHE_SIZE;\n" - "+\tbuf->f_bsize = PAGE_SIZE;\n" - " \tbuf->f_blocks = CRAMFS_SB(sb)->blocks;\n" - " \tbuf->f_bfree = 0;\n" - " \tbuf->f_bavail = 0;\n" - "@@ -496,7 +496,7 @@ static int cramfs_readpage(struct file *file, struct page *page)\n" - " \tint bytes_filled;\n" - " \tvoid *pgdata;\n" - " \n" - "-\tmaxblock = (inode->i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tmaxblock = (inode->i_size + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \tbytes_filled = 0;\n" - " \tpgdata = kmap(page);\n" - " \n" - "@@ -516,14 +516,14 @@ static int cramfs_readpage(struct file *file, struct page *page)\n" - " \n" - " \t\tif (compr_len == 0)\n" - " \t\t\t; /* hole */\n" - "-\t\telse if (unlikely(compr_len > (PAGE_CACHE_SIZE << 1))) {\n" - "+\t\telse if (unlikely(compr_len > (PAGE_SIZE << 1))) {\n" - " \t\t\tpr_err(\"bad compressed blocksize %u\\n\",\n" - " \t\t\t\tcompr_len);\n" - " \t\t\tgoto err;\n" - " \t\t} else {\n" - " \t\t\tmutex_lock(&read_mutex);\n" - " \t\t\tbytes_filled = cramfs_uncompress_block(pgdata,\n" - "-\t\t\t\t PAGE_CACHE_SIZE,\n" - "+\t\t\t\t PAGE_SIZE,\n" - " \t\t\t\t cramfs_read(sb, start_offset, compr_len),\n" - " \t\t\t\t compr_len);\n" - " \t\t\tmutex_unlock(&read_mutex);\n" - "@@ -532,7 +532,7 @@ static int cramfs_readpage(struct file *file, struct page *page)\n" - " \t\t}\n" - " \t}\n" - " \n" - "-\tmemset(pgdata + bytes_filled, 0, PAGE_CACHE_SIZE - bytes_filled);\n" - "+\tmemset(pgdata + bytes_filled, 0, PAGE_SIZE - bytes_filled);\n" - " \tflush_dcache_page(page);\n" - " \tkunmap(page);\n" - " \tSetPageUptodate(page);\n" - "diff --git a/fs/dax.c b/fs/dax.c\n" - "index bbb2ad783770..1144c55561f5 100644\n" - "--- a/fs/dax.c\n" - "+++ b/fs/dax.c\n" - "@@ -318,7 +318,7 @@ static int dax_load_hole(struct address_space *mapping, struct page *page,\n" - " \tsize = (i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \tif (vmf->pgoff >= size) {\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\treturn VM_FAULT_SIGBUS;\n" - " \t}\n" - " \n" - "@@ -346,7 +346,7 @@ static int copy_user_bh(struct page *to, struct inode *inode,\n" - " }\n" - " \n" - " #define NO_SECTOR -1\n" - "-#define DAX_PMD_INDEX(page_index) (page_index & (PMD_MASK >> PAGE_CACHE_SHIFT))\n" - "+#define DAX_PMD_INDEX(page_index) (page_index & (PMD_MASK >> PAGE_SHIFT))\n" - " \n" - " static int dax_radix_entry(struct address_space *mapping, pgoff_t index,\n" - " \t\tsector_t sector, bool pmd_entry, bool dirty)\n" - "@@ -501,8 +501,8 @@ int dax_writeback_mapping_range(struct address_space *mapping,\n" - " \tif (!mapping->nrexceptional || wbc->sync_mode != WB_SYNC_ALL)\n" - " \t\treturn 0;\n" - " \n" - "-\tstart_index = wbc->range_start >> PAGE_CACHE_SHIFT;\n" - "-\tend_index = wbc->range_end >> PAGE_CACHE_SHIFT;\n" - "+\tstart_index = wbc->range_start >> PAGE_SHIFT;\n" - "+\tend_index = wbc->range_end >> PAGE_SHIFT;\n" - " \tpmd_index = DAX_PMD_INDEX(start_index);\n" - " \n" - " \trcu_read_lock();\n" - "@@ -637,12 +637,12 @@ int __dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf,\n" - " \tpage = find_get_page(mapping, vmf->pgoff);\n" - " \tif (page) {\n" - " \t\tif (!lock_page_or_retry(page, vma->vm_mm, vmf->flags)) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\treturn VM_FAULT_RETRY;\n" - " \t\t}\n" - " \t\tif (unlikely(page->mapping != mapping)) {\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tgoto repeat;\n" - " \t\t}\n" - " \t\tsize = (i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - "@@ -706,10 +706,10 @@ int __dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf,\n" - " \n" - " \tif (page) {\n" - " \t\tunmap_mapping_range(mapping, vmf->pgoff << PAGE_SHIFT,\n" - "-\t\t\t\t\t\t\tPAGE_CACHE_SIZE, 0);\n" - "+\t\t\t\t\t\t\tPAGE_SIZE, 0);\n" - " \t\tdelete_from_page_cache(page);\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tpage = NULL;\n" - " \t}\n" - " \n" - "@@ -742,7 +742,7 @@ int __dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf,\n" - " unlock_page:\n" - " \tif (page) {\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \tgoto out;\n" - " }\n" - "@@ -1089,7 +1089,7 @@ EXPORT_SYMBOL_GPL(dax_pfn_mkwrite);\n" - " * you are truncating a file, the helper function dax_truncate_page() may be\n" - " * more convenient.\n" - " *\n" - "- * We work in terms of PAGE_CACHE_SIZE here for commonality with\n" - "+ * We work in terms of PAGE_SIZE here for commonality with\n" - " * block_truncate_page(), but we could go down to PAGE_SIZE if the filesystem\n" - " * took care of disposing of the unnecessary blocks. Even if the filesystem\n" - " * block size is smaller than PAGE_SIZE, we have to zero the rest of the page\n" - "@@ -1099,18 +1099,18 @@ int dax_zero_page_range(struct inode *inode, loff_t from, unsigned length,\n" - " \t\t\t\t\t\t\tget_block_t get_block)\n" - " {\n" - " \tstruct buffer_head bh;\n" - "-\tpgoff_t index = from >> PAGE_CACHE_SHIFT;\n" - "-\tunsigned offset = from & (PAGE_CACHE_SIZE-1);\n" - "+\tpgoff_t index = from >> PAGE_SHIFT;\n" - "+\tunsigned offset = from & (PAGE_SIZE-1);\n" - " \tint err;\n" - " \n" - " \t/* Block boundary? Nothing to do */\n" - " \tif (!length)\n" - " \t\treturn 0;\n" - "-\tBUG_ON((offset + length) > PAGE_CACHE_SIZE);\n" - "+\tBUG_ON((offset + length) > PAGE_SIZE);\n" - " \n" - " \tmemset(&bh, 0, sizeof(bh));\n" - " \tbh.b_bdev = inode->i_sb->s_bdev;\n" - "-\tbh.b_size = PAGE_CACHE_SIZE;\n" - "+\tbh.b_size = PAGE_SIZE;\n" - " \terr = get_block(inode, index, &bh, 0);\n" - " \tif (err < 0)\n" - " \t\treturn err;\n" - "@@ -1118,7 +1118,7 @@ int dax_zero_page_range(struct inode *inode, loff_t from, unsigned length,\n" - " \t\tstruct block_device *bdev = bh.b_bdev;\n" - " \t\tstruct blk_dax_ctl dax = {\n" - " \t\t\t.sector = to_sector(&bh, inode),\n" - "-\t\t\t.size = PAGE_CACHE_SIZE,\n" - "+\t\t\t.size = PAGE_SIZE,\n" - " \t\t};\n" - " \n" - " \t\tif (dax_map_atomic(bdev, &dax) < 0)\n" - "@@ -1141,7 +1141,7 @@ EXPORT_SYMBOL_GPL(dax_zero_page_range);\n" - " * Similar to block_truncate_page(), this function can be called by a\n" - " * filesystem when it is truncating a DAX file to handle the partial page.\n" - " *\n" - "- * We work in terms of PAGE_CACHE_SIZE here for commonality with\n" - "+ * We work in terms of PAGE_SIZE here for commonality with\n" - " * block_truncate_page(), but we could go down to PAGE_SIZE if the filesystem\n" - " * took care of disposing of the unnecessary blocks. Even if the filesystem\n" - " * block size is smaller than PAGE_SIZE, we have to zero the rest of the page\n" - "@@ -1149,7 +1149,7 @@ EXPORT_SYMBOL_GPL(dax_zero_page_range);\n" - " */\n" - " int dax_truncate_page(struct inode *inode, loff_t from, get_block_t get_block)\n" - " {\n" - "-\tunsigned length = PAGE_CACHE_ALIGN(from) - from;\n" - "+\tunsigned length = PAGE_ALIGN(from) - from;\n" - " \treturn dax_zero_page_range(inode, from, length, get_block);\n" - " }\n" - " EXPORT_SYMBOL_GPL(dax_truncate_page);\n" - "diff --git a/fs/direct-io.c b/fs/direct-io.c\n" - "index 0a8d937c6775..9a65345a57ad 100644\n" - "--- a/fs/direct-io.c\n" - "+++ b/fs/direct-io.c\n" - "@@ -172,7 +172,7 @@ static inline int dio_refill_pages(struct dio *dio, struct dio_submit *sdio)\n" - " \t\t */\n" - " \t\tif (dio->page_errors == 0)\n" - " \t\t\tdio->page_errors = ret;\n" - "-\t\tpage_cache_get(page);\n" - "+\t\tget_page(page);\n" - " \t\tdio->pages[0] = page;\n" - " \t\tsdio->head = 0;\n" - " \t\tsdio->tail = 1;\n" - "@@ -419,7 +419,7 @@ static inline void dio_bio_submit(struct dio *dio, struct dio_submit *sdio)\n" - " static inline void dio_cleanup(struct dio *dio, struct dio_submit *sdio)\n" - " {\n" - " \twhile (sdio->head < sdio->tail)\n" - "-\t\tpage_cache_release(dio->pages[sdio->head++]);\n" - "+\t\tput_page(dio->pages[sdio->head++]);\n" - " }\n" - " \n" - " /*\n" - "@@ -482,7 +482,7 @@ static int dio_bio_complete(struct dio *dio, struct bio *bio)\n" - " \t\t\tif (dio->rw == READ && !PageCompound(page) &&\n" - " \t\t\t\t\tdio->should_dirty)\n" - " \t\t\t\tset_page_dirty_lock(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t}\n" - " \t\terr = bio->bi_error;\n" - " \t\tbio_put(bio);\n" - "@@ -691,7 +691,7 @@ static inline int dio_bio_add_page(struct dio_submit *sdio)\n" - " \t\t */\n" - " \t\tif ((sdio->cur_page_len + sdio->cur_page_offset) == PAGE_SIZE)\n" - " \t\t\tsdio->pages_in_io--;\n" - "-\t\tpage_cache_get(sdio->cur_page);\n" - "+\t\tget_page(sdio->cur_page);\n" - " \t\tsdio->final_block_in_bio = sdio->cur_page_block +\n" - " \t\t\t(sdio->cur_page_len >> sdio->blkbits);\n" - " \t\tret = 0;\n" - "@@ -805,13 +805,13 @@ submit_page_section(struct dio *dio, struct dio_submit *sdio, struct page *page,\n" - " \t */\n" - " \tif (sdio->cur_page) {\n" - " \t\tret = dio_send_cur_page(dio, sdio, map_bh);\n" - "-\t\tpage_cache_release(sdio->cur_page);\n" - "+\t\tput_page(sdio->cur_page);\n" - " \t\tsdio->cur_page = NULL;\n" - " \t\tif (ret)\n" - " \t\t\treturn ret;\n" - " \t}\n" - " \n" - "-\tpage_cache_get(page);\t\t/* It is in dio */\n" - "+\tget_page(page);\t\t/* It is in dio */\n" - " \tsdio->cur_page = page;\n" - " \tsdio->cur_page_offset = offset;\n" - " \tsdio->cur_page_len = len;\n" - "@@ -825,7 +825,7 @@ out:\n" - " \tif (sdio->boundary) {\n" - " \t\tret = dio_send_cur_page(dio, sdio, map_bh);\n" - " \t\tdio_bio_submit(dio, sdio);\n" - "-\t\tpage_cache_release(sdio->cur_page);\n" - "+\t\tput_page(sdio->cur_page);\n" - " \t\tsdio->cur_page = NULL;\n" - " \t}\n" - " \treturn ret;\n" - "@@ -942,7 +942,7 @@ static int do_direct_IO(struct dio *dio, struct dio_submit *sdio,\n" - " \n" - " \t\t\t\tret = get_more_blocks(dio, sdio, map_bh);\n" - " \t\t\t\tif (ret) {\n" - "-\t\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\t\tput_page(page);\n" - " \t\t\t\t\tgoto out;\n" - " \t\t\t\t}\n" - " \t\t\t\tif (!buffer_mapped(map_bh))\n" - "@@ -983,7 +983,7 @@ do_holes:\n" - " \n" - " \t\t\t\t/* AKPM: eargh, -ENOTBLK is a hack */\n" - " \t\t\t\tif (dio->rw & WRITE) {\n" - "-\t\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\t\tput_page(page);\n" - " \t\t\t\t\treturn -ENOTBLK;\n" - " \t\t\t\t}\n" - " \n" - "@@ -996,7 +996,7 @@ do_holes:\n" - " \t\t\t\tif (sdio->block_in_file >=\n" - " \t\t\t\t\t\ti_size_aligned >> blkbits) {\n" - " \t\t\t\t\t/* We hit eof */\n" - "-\t\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\t\tput_page(page);\n" - " \t\t\t\t\tgoto out;\n" - " \t\t\t\t}\n" - " \t\t\t\tzero_user(page, from, 1 << blkbits);\n" - "@@ -1036,7 +1036,7 @@ do_holes:\n" - " \t\t\t\t\t\t sdio->next_block_for_io,\n" - " \t\t\t\t\t\t map_bh);\n" - " \t\t\tif (ret) {\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t\tgoto out;\n" - " \t\t\t}\n" - " \t\t\tsdio->next_block_for_io += this_chunk_blocks;\n" - "@@ -1052,7 +1052,7 @@ next_block:\n" - " \t\t}\n" - " \n" - " \t\t/* Drop the ref which was taken in get_user_pages() */\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " out:\n" - " \treturn ret;\n" - "@@ -1276,7 +1276,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,\n" - " \t\tret2 = dio_send_cur_page(dio, &sdio, &map_bh);\n" - " \t\tif (retval == 0)\n" - " \t\t\tretval = ret2;\n" - "-\t\tpage_cache_release(sdio.cur_page);\n" - "+\t\tput_page(sdio.cur_page);\n" - " \t\tsdio.cur_page = NULL;\n" - " \t}\n" - " \tif (sdio.bio)\n" - "diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c\n" - "index 00640e70ed7a..1ab012a27d9f 100644\n" - "--- a/fs/dlm/lowcomms.c\n" - "+++ b/fs/dlm/lowcomms.c\n" - "@@ -640,7 +640,7 @@ static int receive_from_sock(struct connection *con)\n" - " \t\tcon->rx_page = alloc_page(GFP_ATOMIC);\n" - " \t\tif (con->rx_page == NULL)\n" - " \t\t\tgoto out_resched;\n" - "-\t\tcbuf_init(&con->cb, PAGE_CACHE_SIZE);\n" - "+\t\tcbuf_init(&con->cb, PAGE_SIZE);\n" - " \t}\n" - " \n" - " \t/*\n" - "@@ -657,7 +657,7 @@ static int receive_from_sock(struct connection *con)\n" - " \t * buffer and the start of the currently used section (cb.base)\n" - " \t */\n" - " \tif (cbuf_data(&con->cb) >= con->cb.base) {\n" - "-\t\tiov[0].iov_len = PAGE_CACHE_SIZE - cbuf_data(&con->cb);\n" - "+\t\tiov[0].iov_len = PAGE_SIZE - cbuf_data(&con->cb);\n" - " \t\tiov[1].iov_len = con->cb.base;\n" - " \t\tiov[1].iov_base = page_address(con->rx_page);\n" - " \t\tnvec = 2;\n" - "@@ -675,7 +675,7 @@ static int receive_from_sock(struct connection *con)\n" - " \tret = dlm_process_incoming_buffer(con->nodeid,\n" - " \t\t\t\t\t page_address(con->rx_page),\n" - " \t\t\t\t\t con->cb.base, con->cb.len,\n" - "-\t\t\t\t\t PAGE_CACHE_SIZE);\n" - "+\t\t\t\t\t PAGE_SIZE);\n" - " \tif (ret == -EBADMSG) {\n" - " \t\tlog_print(\"lowcomms: addr=%p, base=%u, len=%u, read=%d\",\n" - " \t\t\t page_address(con->rx_page), con->cb.base,\n" - "@@ -1416,7 +1416,7 @@ void *dlm_lowcomms_get_buffer(int nodeid, int len, gfp_t allocation, char **ppc)\n" - " \tspin_lock(&con->writequeue_lock);\n" - " \te = list_entry(con->writequeue.prev, struct writequeue_entry, list);\n" - " \tif ((&e->list == &con->writequeue) ||\n" - "-\t (PAGE_CACHE_SIZE - e->end < len)) {\n" - "+\t (PAGE_SIZE - e->end < len)) {\n" - " \t\te = NULL;\n" - " \t} else {\n" - " \t\toffset = e->end;\n" - "diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c\n" - "index 64026e53722a..d09cb4cdd09f 100644\n" - "--- a/fs/ecryptfs/crypto.c\n" - "+++ b/fs/ecryptfs/crypto.c\n" - "@@ -286,7 +286,7 @@ int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg,\n" - " \t\tpg = virt_to_page(addr);\n" - " \t\toffset = offset_in_page(addr);\n" - " \t\tsg_set_page(&sg[i], pg, 0, offset);\n" - "-\t\tremainder_of_page = PAGE_CACHE_SIZE - offset;\n" - "+\t\tremainder_of_page = PAGE_SIZE - offset;\n" - " \t\tif (size >= remainder_of_page) {\n" - " \t\t\tsg[i].length = remainder_of_page;\n" - " \t\t\taddr += remainder_of_page;\n" - "@@ -400,7 +400,7 @@ static loff_t lower_offset_for_page(struct ecryptfs_crypt_stat *crypt_stat,\n" - " \t\t\t\t struct page *page)\n" - " {\n" - " \treturn ecryptfs_lower_header_size(crypt_stat) +\n" - "-\t ((loff_t)page->index << PAGE_CACHE_SHIFT);\n" - "+\t ((loff_t)page->index << PAGE_SHIFT);\n" - " }\n" - " \n" - " /**\n" - "@@ -428,7 +428,7 @@ static int crypt_extent(struct ecryptfs_crypt_stat *crypt_stat,\n" - " \tsize_t extent_size = crypt_stat->extent_size;\n" - " \tint rc;\n" - " \n" - "-\textent_base = (((loff_t)page_index) * (PAGE_CACHE_SIZE / extent_size));\n" - "+\textent_base = (((loff_t)page_index) * (PAGE_SIZE / extent_size));\n" - " \trc = ecryptfs_derive_iv(extent_iv, crypt_stat,\n" - " \t\t\t\t(extent_base + extent_offset));\n" - " \tif (rc) {\n" - "@@ -498,7 +498,7 @@ int ecryptfs_encrypt_page(struct page *page)\n" - " \t}\n" - " \n" - " \tfor (extent_offset = 0;\n" - "-\t extent_offset < (PAGE_CACHE_SIZE / crypt_stat->extent_size);\n" - "+\t extent_offset < (PAGE_SIZE / crypt_stat->extent_size);\n" - " \t extent_offset++) {\n" - " \t\trc = crypt_extent(crypt_stat, enc_extent_page, page,\n" - " \t\t\t\t extent_offset, ENCRYPT);\n" - "@@ -512,7 +512,7 @@ int ecryptfs_encrypt_page(struct page *page)\n" - " \tlower_offset = lower_offset_for_page(crypt_stat, page);\n" - " \tenc_extent_virt = kmap(enc_extent_page);\n" - " \trc = ecryptfs_write_lower(ecryptfs_inode, enc_extent_virt, lower_offset,\n" - "-\t\t\t\t PAGE_CACHE_SIZE);\n" - "+\t\t\t\t PAGE_SIZE);\n" - " \tkunmap(enc_extent_page);\n" - " \tif (rc < 0) {\n" - " \t\tecryptfs_printk(KERN_ERR,\n" - "@@ -560,7 +560,7 @@ int ecryptfs_decrypt_page(struct page *page)\n" - " \n" - " \tlower_offset = lower_offset_for_page(crypt_stat, page);\n" - " \tpage_virt = kmap(page);\n" - "-\trc = ecryptfs_read_lower(page_virt, lower_offset, PAGE_CACHE_SIZE,\n" - "+\trc = ecryptfs_read_lower(page_virt, lower_offset, PAGE_SIZE,\n" - " \t\t\t\t ecryptfs_inode);\n" - " \tkunmap(page);\n" - " \tif (rc < 0) {\n" - "@@ -571,7 +571,7 @@ int ecryptfs_decrypt_page(struct page *page)\n" - " \t}\n" - " \n" - " \tfor (extent_offset = 0;\n" - "-\t extent_offset < (PAGE_CACHE_SIZE / crypt_stat->extent_size);\n" - "+\t extent_offset < (PAGE_SIZE / crypt_stat->extent_size);\n" - " \t extent_offset++) {\n" - " \t\trc = crypt_extent(crypt_stat, page, page,\n" - " \t\t\t\t extent_offset, DECRYPT);\n" - "@@ -659,11 +659,11 @@ void ecryptfs_set_default_sizes(struct ecryptfs_crypt_stat *crypt_stat)\n" - " \tif (crypt_stat->flags & ECRYPTFS_METADATA_IN_XATTR)\n" - " \t\tcrypt_stat->metadata_size = ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE;\n" - " \telse {\n" - "-\t\tif (PAGE_CACHE_SIZE <= ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE)\n" - "+\t\tif (PAGE_SIZE <= ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE)\n" - " \t\t\tcrypt_stat->metadata_size =\n" - " \t\t\t\tECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE;\n" - " \t\telse\n" - "-\t\t\tcrypt_stat->metadata_size = PAGE_CACHE_SIZE;\n" - "+\t\t\tcrypt_stat->metadata_size = PAGE_SIZE;\n" - " \t}\n" - " }\n" - " \n" - "@@ -1442,7 +1442,7 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry)\n" - " \t\t\t\t\t\tECRYPTFS_VALIDATE_HEADER_SIZE);\n" - " \tif (rc) {\n" - " \t\t/* metadata is not in the file header, so try xattrs */\n" - "-\t\tmemset(page_virt, 0, PAGE_CACHE_SIZE);\n" - "+\t\tmemset(page_virt, 0, PAGE_SIZE);\n" - " \t\trc = ecryptfs_read_xattr_region(page_virt, ecryptfs_inode);\n" - " \t\tif (rc) {\n" - " \t\t\tprintk(KERN_DEBUG \"Valid eCryptfs headers not found in \"\n" - "@@ -1475,7 +1475,7 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry)\n" - " \t}\n" - " out:\n" - " \tif (page_virt) {\n" - "-\t\tmemset(page_virt, 0, PAGE_CACHE_SIZE);\n" - "+\t\tmemset(page_virt, 0, PAGE_SIZE);\n" - " \t\tkmem_cache_free(ecryptfs_header_cache, page_virt);\n" - " \t}\n" - " \treturn rc;\n" - "diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c\n" - "index 121114e9a464..224b49e71aa4 100644\n" - "--- a/fs/ecryptfs/inode.c\n" - "+++ b/fs/ecryptfs/inode.c\n" - "@@ -763,10 +763,10 @@ static int truncate_upper(struct dentry *dentry, struct iattr *ia,\n" - " \t} else { /* ia->ia_size < i_size_read(inode) */\n" - " \t\t/* We're chopping off all the pages down to the page\n" - " \t\t * in which ia->ia_size is located. Fill in the end of\n" - "-\t\t * that page from (ia->ia_size & ~PAGE_CACHE_MASK) to\n" - "-\t\t * PAGE_CACHE_SIZE with zeros. */\n" - "-\t\tsize_t num_zeros = (PAGE_CACHE_SIZE\n" - "-\t\t\t\t - (ia->ia_size & ~PAGE_CACHE_MASK));\n" - "+\t\t * that page from (ia->ia_size & ~PAGE_MASK) to\n" - "+\t\t * PAGE_SIZE with zeros. */\n" - "+\t\tsize_t num_zeros = (PAGE_SIZE\n" - "+\t\t\t\t - (ia->ia_size & ~PAGE_MASK));\n" - " \n" - " \t\tif (!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)) {\n" - " \t\t\ttruncate_setsize(inode, ia->ia_size);\n" - "diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c\n" - "index c5c84dfb5b3e..3274c469b42f 100644\n" - "--- a/fs/ecryptfs/keystore.c\n" - "+++ b/fs/ecryptfs/keystore.c\n" - "@@ -1800,7 +1800,7 @@ int ecryptfs_parse_packet_set(struct ecryptfs_crypt_stat *crypt_stat,\n" - " \t * added the our &auth_tok_list */\n" - " \tnext_packet_is_auth_tok_packet = 1;\n" - " \twhile (next_packet_is_auth_tok_packet) {\n" - "-\t\tsize_t max_packet_size = ((PAGE_CACHE_SIZE - 8) - i);\n" - "+\t\tsize_t max_packet_size = ((PAGE_SIZE - 8) - i);\n" - " \n" - " \t\tswitch (src[i]) {\n" - " \t\tcase ECRYPTFS_TAG_3_PACKET_TYPE:\n" - "diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c\n" - "index 8b0b4a73116d..1698132d0e57 100644\n" - "--- a/fs/ecryptfs/main.c\n" - "+++ b/fs/ecryptfs/main.c\n" - "@@ -695,12 +695,12 @@ static struct ecryptfs_cache_info {\n" - " \t{\n" - " \t\t.cache = &ecryptfs_header_cache,\n" - " \t\t.name = \"ecryptfs_headers\",\n" - "-\t\t.size = PAGE_CACHE_SIZE,\n" - "+\t\t.size = PAGE_SIZE,\n" - " \t},\n" - " \t{\n" - " \t\t.cache = &ecryptfs_xattr_cache,\n" - " \t\t.name = \"ecryptfs_xattr_cache\",\n" - "-\t\t.size = PAGE_CACHE_SIZE,\n" - "+\t\t.size = PAGE_SIZE,\n" - " \t},\n" - " \t{\n" - " \t\t.cache = &ecryptfs_key_record_cache,\n" - "@@ -818,7 +818,7 @@ static int __init ecryptfs_init(void)\n" - " {\n" - " \tint rc;\n" - " \n" - "-\tif (ECRYPTFS_DEFAULT_EXTENT_SIZE > PAGE_CACHE_SIZE) {\n" - "+\tif (ECRYPTFS_DEFAULT_EXTENT_SIZE > PAGE_SIZE) {\n" - " \t\trc = -EINVAL;\n" - " \t\tecryptfs_printk(KERN_ERR, \"The eCryptfs extent size is \"\n" - " \t\t\t\t\"larger than the host's page size, and so \"\n" - "@@ -826,7 +826,7 @@ static int __init ecryptfs_init(void)\n" - " \t\t\t\t\"default eCryptfs extent size is [%u] bytes; \"\n" - " \t\t\t\t\"the page size is [%lu] bytes.\\n\",\n" - " \t\t\t\tECRYPTFS_DEFAULT_EXTENT_SIZE,\n" - "-\t\t\t\t(unsigned long)PAGE_CACHE_SIZE);\n" - "+\t\t\t\t(unsigned long)PAGE_SIZE);\n" - " \t\tgoto out;\n" - " \t}\n" - " \trc = ecryptfs_init_kmem_caches();\n" - "diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c\n" - "index 1f5865263b3e..e6b1d80952b9 100644\n" - "--- a/fs/ecryptfs/mmap.c\n" - "+++ b/fs/ecryptfs/mmap.c\n" - "@@ -122,7 +122,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page,\n" - " \t\t\t\t struct ecryptfs_crypt_stat *crypt_stat)\n" - " {\n" - " \tloff_t extent_num_in_page = 0;\n" - "-\tloff_t num_extents_per_page = (PAGE_CACHE_SIZE\n" - "+\tloff_t num_extents_per_page = (PAGE_SIZE\n" - " \t\t\t\t / crypt_stat->extent_size);\n" - " \tint rc = 0;\n" - " \n" - "@@ -138,7 +138,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page,\n" - " \t\t\tchar *page_virt;\n" - " \n" - " \t\t\tpage_virt = kmap_atomic(page);\n" - "-\t\t\tmemset(page_virt, 0, PAGE_CACHE_SIZE);\n" - "+\t\t\tmemset(page_virt, 0, PAGE_SIZE);\n" - " \t\t\t/* TODO: Support more than one header extent */\n" - " \t\t\tif (view_extent_num == 0) {\n" - " \t\t\t\tsize_t written;\n" - "@@ -164,8 +164,8 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page,\n" - " \t\t\t\t - crypt_stat->metadata_size);\n" - " \n" - " \t\t\trc = ecryptfs_read_lower_page_segment(\n" - "-\t\t\t\tpage, (lower_offset >> PAGE_CACHE_SHIFT),\n" - "-\t\t\t\t(lower_offset & ~PAGE_CACHE_MASK),\n" - "+\t\t\t\tpage, (lower_offset >> PAGE_SHIFT),\n" - "+\t\t\t\t(lower_offset & ~PAGE_MASK),\n" - " \t\t\t\tcrypt_stat->extent_size, page->mapping->host);\n" - " \t\t\tif (rc) {\n" - " \t\t\t\tprintk(KERN_ERR \"%s: Error attempting to read \"\n" - "@@ -198,7 +198,7 @@ static int ecryptfs_readpage(struct file *file, struct page *page)\n" - " \n" - " \tif (!crypt_stat || !(crypt_stat->flags & ECRYPTFS_ENCRYPTED)) {\n" - " \t\trc = ecryptfs_read_lower_page_segment(page, page->index, 0,\n" - "-\t\t\t\t\t\t PAGE_CACHE_SIZE,\n" - "+\t\t\t\t\t\t PAGE_SIZE,\n" - " \t\t\t\t\t\t page->mapping->host);\n" - " \t} else if (crypt_stat->flags & ECRYPTFS_VIEW_AS_ENCRYPTED) {\n" - " \t\tif (crypt_stat->flags & ECRYPTFS_METADATA_IN_XATTR) {\n" - "@@ -215,7 +215,7 @@ static int ecryptfs_readpage(struct file *file, struct page *page)\n" - " \n" - " \t\t} else {\n" - " \t\t\trc = ecryptfs_read_lower_page_segment(\n" - "-\t\t\t\tpage, page->index, 0, PAGE_CACHE_SIZE,\n" - "+\t\t\t\tpage, page->index, 0, PAGE_SIZE,\n" - " \t\t\t\tpage->mapping->host);\n" - " \t\t\tif (rc) {\n" - " \t\t\t\tprintk(KERN_ERR \"Error reading page; rc = \"\n" - "@@ -250,12 +250,12 @@ static int fill_zeros_to_end_of_page(struct page *page, unsigned int to)\n" - " \tstruct inode *inode = page->mapping->host;\n" - " \tint end_byte_in_page;\n" - " \n" - "-\tif ((i_size_read(inode) / PAGE_CACHE_SIZE) != page->index)\n" - "+\tif ((i_size_read(inode) / PAGE_SIZE) != page->index)\n" - " \t\tgoto out;\n" - "-\tend_byte_in_page = i_size_read(inode) % PAGE_CACHE_SIZE;\n" - "+\tend_byte_in_page = i_size_read(inode) % PAGE_SIZE;\n" - " \tif (to > end_byte_in_page)\n" - " \t\tend_byte_in_page = to;\n" - "-\tzero_user_segment(page, end_byte_in_page, PAGE_CACHE_SIZE);\n" - "+\tzero_user_segment(page, end_byte_in_page, PAGE_SIZE);\n" - " out:\n" - " \treturn 0;\n" - " }\n" - "@@ -279,7 +279,7 @@ static int ecryptfs_write_begin(struct file *file,\n" - " \t\t\tloff_t pos, unsigned len, unsigned flags,\n" - " \t\t\tstruct page **pagep, void **fsdata)\n" - " {\n" - "-\tpgoff_t index = pos >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = pos >> PAGE_SHIFT;\n" - " \tstruct page *page;\n" - " \tloff_t prev_page_end_size;\n" - " \tint rc = 0;\n" - "@@ -289,14 +289,14 @@ static int ecryptfs_write_begin(struct file *file,\n" - " \t\treturn -ENOMEM;\n" - " \t*pagep = page;\n" - " \n" - "-\tprev_page_end_size = ((loff_t)index << PAGE_CACHE_SHIFT);\n" - "+\tprev_page_end_size = ((loff_t)index << PAGE_SHIFT);\n" - " \tif (!PageUptodate(page)) {\n" - " \t\tstruct ecryptfs_crypt_stat *crypt_stat =\n" - " \t\t\t&ecryptfs_inode_to_private(mapping->host)->crypt_stat;\n" - " \n" - " \t\tif (!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)) {\n" - " \t\t\trc = ecryptfs_read_lower_page_segment(\n" - "-\t\t\t\tpage, index, 0, PAGE_CACHE_SIZE, mapping->host);\n" - "+\t\t\t\tpage, index, 0, PAGE_SIZE, mapping->host);\n" - " \t\t\tif (rc) {\n" - " \t\t\t\tprintk(KERN_ERR \"%s: Error attempting to read \"\n" - " \t\t\t\t \"lower page segment; rc = [%d]\\n\",\n" - "@@ -322,7 +322,7 @@ static int ecryptfs_write_begin(struct file *file,\n" - " \t\t\t\tSetPageUptodate(page);\n" - " \t\t\t} else {\n" - " \t\t\t\trc = ecryptfs_read_lower_page_segment(\n" - "-\t\t\t\t\tpage, index, 0, PAGE_CACHE_SIZE,\n" - "+\t\t\t\t\tpage, index, 0, PAGE_SIZE,\n" - " \t\t\t\t\tmapping->host);\n" - " \t\t\t\tif (rc) {\n" - " \t\t\t\t\tprintk(KERN_ERR \"%s: Error reading \"\n" - "@@ -336,9 +336,9 @@ static int ecryptfs_write_begin(struct file *file,\n" - " \t\t} else {\n" - " \t\t\tif (prev_page_end_size\n" - " \t\t\t >= i_size_read(page->mapping->host)) {\n" - "-\t\t\t\tzero_user(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\t\t\tzero_user(page, 0, PAGE_SIZE);\n" - " \t\t\t\tSetPageUptodate(page);\n" - "-\t\t\t} else if (len < PAGE_CACHE_SIZE) {\n" - "+\t\t\t} else if (len < PAGE_SIZE) {\n" - " \t\t\t\trc = ecryptfs_decrypt_page(page);\n" - " \t\t\t\tif (rc) {\n" - " \t\t\t\t\tprintk(KERN_ERR \"%s: Error decrypting \"\n" - "@@ -371,11 +371,11 @@ static int ecryptfs_write_begin(struct file *file,\n" - " \t * of page? Zero it out. */\n" - " \tif ((i_size_read(mapping->host) == prev_page_end_size)\n" - " \t && (pos != 0))\n" - "-\t\tzero_user(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user(page, 0, PAGE_SIZE);\n" - " out:\n" - " \tif (unlikely(rc)) {\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\t*pagep = NULL;\n" - " \t}\n" - " \treturn rc;\n" - "@@ -437,7 +437,7 @@ static int ecryptfs_write_inode_size_to_xattr(struct inode *ecryptfs_inode)\n" - " \t}\n" - " \tinode_lock(lower_inode);\n" - " \tsize = lower_inode->i_op->getxattr(lower_dentry, ECRYPTFS_XATTR_NAME,\n" - "-\t\t\t\t\t xattr_virt, PAGE_CACHE_SIZE);\n" - "+\t\t\t\t\t xattr_virt, PAGE_SIZE);\n" - " \tif (size < 0)\n" - " \t\tsize = 8;\n" - " \tput_unaligned_be64(i_size_read(ecryptfs_inode), xattr_virt);\n" - "@@ -479,8 +479,8 @@ static int ecryptfs_write_end(struct file *file,\n" - " \t\t\tloff_t pos, unsigned len, unsigned copied,\n" - " \t\t\tstruct page *page, void *fsdata)\n" - " {\n" - "-\tpgoff_t index = pos >> PAGE_CACHE_SHIFT;\n" - "-\tunsigned from = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tpgoff_t index = pos >> PAGE_SHIFT;\n" - "+\tunsigned from = pos & (PAGE_SIZE - 1);\n" - " \tunsigned to = from + copied;\n" - " \tstruct inode *ecryptfs_inode = mapping->host;\n" - " \tstruct ecryptfs_crypt_stat *crypt_stat =\n" - "@@ -500,7 +500,7 @@ static int ecryptfs_write_end(struct file *file,\n" - " \t\tgoto out;\n" - " \t}\n" - " \tif (!PageUptodate(page)) {\n" - "-\t\tif (copied < PAGE_CACHE_SIZE) {\n" - "+\t\tif (copied < PAGE_SIZE) {\n" - " \t\t\trc = 0;\n" - " \t\t\tgoto out;\n" - " \t\t}\n" - "@@ -533,7 +533,7 @@ static int ecryptfs_write_end(struct file *file,\n" - " \t\trc = copied;\n" - " out:\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn rc;\n" - " }\n" - " \n" - "diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c\n" - "index 09fe622274e4..158a3a39f82d 100644\n" - "--- a/fs/ecryptfs/read_write.c\n" - "+++ b/fs/ecryptfs/read_write.c\n" - "@@ -74,7 +74,7 @@ int ecryptfs_write_lower_page_segment(struct inode *ecryptfs_inode,\n" - " \tloff_t offset;\n" - " \tint rc;\n" - " \n" - "-\toffset = ((((loff_t)page_for_lower->index) << PAGE_CACHE_SHIFT)\n" - "+\toffset = ((((loff_t)page_for_lower->index) << PAGE_SHIFT)\n" - " \t\t + offset_in_page);\n" - " \tvirt = kmap(page_for_lower);\n" - " \trc = ecryptfs_write_lower(ecryptfs_inode, virt, offset, size);\n" - "@@ -123,9 +123,9 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,\n" - " \telse\n" - " \t\tpos = offset;\n" - " \twhile (pos < (offset + size)) {\n" - "-\t\tpgoff_t ecryptfs_page_idx = (pos >> PAGE_CACHE_SHIFT);\n" - "-\t\tsize_t start_offset_in_page = (pos & ~PAGE_CACHE_MASK);\n" - "-\t\tsize_t num_bytes = (PAGE_CACHE_SIZE - start_offset_in_page);\n" - "+\t\tpgoff_t ecryptfs_page_idx = (pos >> PAGE_SHIFT);\n" - "+\t\tsize_t start_offset_in_page = (pos & ~PAGE_MASK);\n" - "+\t\tsize_t num_bytes = (PAGE_SIZE - start_offset_in_page);\n" - " \t\tloff_t total_remaining_bytes = ((offset + size) - pos);\n" - " \n" - " \t\tif (fatal_signal_pending(current)) {\n" - "@@ -165,7 +165,7 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,\n" - " \t\t\t * Fill in zero values to the end of the page */\n" - " \t\t\tmemset(((char *)ecryptfs_page_virt\n" - " \t\t\t\t+ start_offset_in_page), 0,\n" - "-\t\t\t\tPAGE_CACHE_SIZE - start_offset_in_page);\n" - "+\t\t\t\tPAGE_SIZE - start_offset_in_page);\n" - " \t\t}\n" - " \n" - " \t\t/* pos >= offset, we are now writing the data request */\n" - "@@ -186,7 +186,7 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,\n" - " \t\t\t\t\t\tecryptfs_page,\n" - " \t\t\t\t\t\tstart_offset_in_page,\n" - " \t\t\t\t\t\tdata_offset);\n" - "-\t\tpage_cache_release(ecryptfs_page);\n" - "+\t\tput_page(ecryptfs_page);\n" - " \t\tif (rc) {\n" - " \t\t\tprintk(KERN_ERR \"%s: Error encrypting \"\n" - " \t\t\t \"page; rc = [%d]\\n\", __func__, rc);\n" - "@@ -262,7 +262,7 @@ int ecryptfs_read_lower_page_segment(struct page *page_for_ecryptfs,\n" - " \tloff_t offset;\n" - " \tint rc;\n" - " \n" - "-\toffset = ((((loff_t)page_index) << PAGE_CACHE_SHIFT) + offset_in_page);\n" - "+\toffset = ((((loff_t)page_index) << PAGE_SHIFT) + offset_in_page);\n" - " \tvirt = kmap(page_for_ecryptfs);\n" - " \trc = ecryptfs_read_lower(virt, offset, size, ecryptfs_inode);\n" - " \tif (rc > 0)\n" - "diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c\n" - "index dd029d13ea61..553c5d2db4a4 100644\n" - "--- a/fs/efivarfs/super.c\n" - "+++ b/fs/efivarfs/super.c\n" - "@@ -197,8 +197,8 @@ static int efivarfs_fill_super(struct super_block *sb, void *data, int silent)\n" - " \tefivarfs_sb = sb;\n" - " \n" - " \tsb->s_maxbytes = MAX_LFS_FILESIZE;\n" - "-\tsb->s_blocksize = PAGE_CACHE_SIZE;\n" - "-\tsb->s_blocksize_bits = PAGE_CACHE_SHIFT;\n" - "+\tsb->s_blocksize = PAGE_SIZE;\n" - "+\tsb->s_blocksize_bits = PAGE_SHIFT;\n" - " \tsb->s_magic = EFIVARFS_MAGIC;\n" - " \tsb->s_op = &efivarfs_ops;\n" - " \tsb->s_d_op\t\t= &efivarfs_d_ops;\n" - "diff --git a/fs/exofs/dir.c b/fs/exofs/dir.c\n" - "index e5bb2abf77f9..547b93cbea63 100644\n" - "--- a/fs/exofs/dir.c\n" - "+++ b/fs/exofs/dir.c\n" - "@@ -41,16 +41,16 @@ static inline unsigned exofs_chunk_size(struct inode *inode)\n" - " static inline void exofs_put_page(struct page *page)\n" - " {\n" - " \tkunmap(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " static unsigned exofs_last_byte(struct inode *inode, unsigned long page_nr)\n" - " {\n" - " \tloff_t last_byte = inode->i_size;\n" - " \n" - "-\tlast_byte -= page_nr << PAGE_CACHE_SHIFT;\n" - "-\tif (last_byte > PAGE_CACHE_SIZE)\n" - "-\t\tlast_byte = PAGE_CACHE_SIZE;\n" - "+\tlast_byte -= page_nr << PAGE_SHIFT;\n" - "+\tif (last_byte > PAGE_SIZE)\n" - "+\t\tlast_byte = PAGE_SIZE;\n" - " \treturn last_byte;\n" - " }\n" - " \n" - "@@ -85,13 +85,13 @@ static void exofs_check_page(struct page *page)\n" - " \tunsigned chunk_size = exofs_chunk_size(dir);\n" - " \tchar *kaddr = page_address(page);\n" - " \tunsigned offs, rec_len;\n" - "-\tunsigned limit = PAGE_CACHE_SIZE;\n" - "+\tunsigned limit = PAGE_SIZE;\n" - " \tstruct exofs_dir_entry *p;\n" - " \tchar *error;\n" - " \n" - " \t/* if the page is the last one in the directory */\n" - "-\tif ((dir->i_size >> PAGE_CACHE_SHIFT) == page->index) {\n" - "-\t\tlimit = dir->i_size & ~PAGE_CACHE_MASK;\n" - "+\tif ((dir->i_size >> PAGE_SHIFT) == page->index) {\n" - "+\t\tlimit = dir->i_size & ~PAGE_MASK;\n" - " \t\tif (limit & (chunk_size - 1))\n" - " \t\t\tgoto Ebadsize;\n" - " \t\tif (!limit)\n" - "@@ -138,7 +138,7 @@ bad_entry:\n" - " \tEXOFS_ERR(\n" - " \t\t\"ERROR [exofs_check_page]: bad entry in directory(0x%lx): %s - \"\n" - " \t\t\"offset=%lu, inode=0x%llu, rec_len=%d, name_len=%d\\n\",\n" - "-\t\tdir->i_ino, error, (page->index<<PAGE_CACHE_SHIFT)+offs,\n" - "+\t\tdir->i_ino, error, (page->index<<PAGE_SHIFT)+offs,\n" - " \t\t_LLU(le64_to_cpu(p->inode_no)),\n" - " \t\trec_len, p->name_len);\n" - " \tgoto fail;\n" - "@@ -147,7 +147,7 @@ Eend:\n" - " \tEXOFS_ERR(\"ERROR [exofs_check_page]: \"\n" - " \t\t\"entry in directory(0x%lx) spans the page boundary\"\n" - " \t\t\"offset=%lu, inode=0x%llx\\n\",\n" - "-\t\tdir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs,\n" - "+\t\tdir->i_ino, (page->index<<PAGE_SHIFT)+offs,\n" - " \t\t_LLU(le64_to_cpu(p->inode_no)));\n" - " fail:\n" - " \tSetPageChecked(page);\n" - "@@ -237,8 +237,8 @@ exofs_readdir(struct file *file, struct dir_context *ctx)\n" - " {\n" - " \tloff_t pos = ctx->pos;\n" - " \tstruct inode *inode = file_inode(file);\n" - "-\tunsigned int offset = pos & ~PAGE_CACHE_MASK;\n" - "-\tunsigned long n = pos >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned int offset = pos & ~PAGE_MASK;\n" - "+\tunsigned long n = pos >> PAGE_SHIFT;\n" - " \tunsigned long npages = dir_pages(inode);\n" - " \tunsigned chunk_mask = ~(exofs_chunk_size(inode)-1);\n" - " \tint need_revalidate = (file->f_version != inode->i_version);\n" - "@@ -254,7 +254,7 @@ exofs_readdir(struct file *file, struct dir_context *ctx)\n" - " \t\tif (IS_ERR(page)) {\n" - " \t\t\tEXOFS_ERR(\"ERROR: bad page in directory(0x%lx)\\n\",\n" - " \t\t\t\t inode->i_ino);\n" - "-\t\t\tctx->pos += PAGE_CACHE_SIZE - offset;\n" - "+\t\t\tctx->pos += PAGE_SIZE - offset;\n" - " \t\t\treturn PTR_ERR(page);\n" - " \t\t}\n" - " \t\tkaddr = page_address(page);\n" - "@@ -262,7 +262,7 @@ exofs_readdir(struct file *file, struct dir_context *ctx)\n" - " \t\t\tif (offset) {\n" - " \t\t\t\toffset = exofs_validate_entry(kaddr, offset,\n" - " \t\t\t\t\t\t\t\tchunk_mask);\n" - "-\t\t\t\tctx->pos = (n<<PAGE_CACHE_SHIFT) + offset;\n" - "+\t\t\t\tctx->pos = (n<<PAGE_SHIFT) + offset;\n" - " \t\t\t}\n" - " \t\t\tfile->f_version = inode->i_version;\n" - " \t\t\tneed_revalidate = 0;\n" - "@@ -449,7 +449,7 @@ int exofs_add_link(struct dentry *dentry, struct inode *inode)\n" - " \t\tkaddr = page_address(page);\n" - " \t\tdir_end = kaddr + exofs_last_byte(dir, n);\n" - " \t\tde = (struct exofs_dir_entry *)kaddr;\n" - "-\t\tkaddr += PAGE_CACHE_SIZE - reclen;\n" - "+\t\tkaddr += PAGE_SIZE - reclen;\n" - " \t\twhile ((char *)de <= kaddr) {\n" - " \t\t\tif ((char *)de == dir_end) {\n" - " \t\t\t\tname_len = 0;\n" - "@@ -602,7 +602,7 @@ int exofs_make_empty(struct inode *inode, struct inode *parent)\n" - " \tkunmap_atomic(kaddr);\n" - " \terr = exofs_commit_chunk(page, 0, chunk_size);\n" - " fail:\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn err;\n" - " }\n" - " \n" - "diff --git a/fs/exofs/inode.c b/fs/exofs/inode.c\n" - "index 9eaf595aeaf8..49e1bd00b4ec 100644\n" - "--- a/fs/exofs/inode.c\n" - "+++ b/fs/exofs/inode.c\n" - "@@ -317,7 +317,7 @@ static int read_exec(struct page_collect *pcol)\n" - " \n" - " \tif (!pcol->ios) {\n" - " \t\tint ret = ore_get_rw_state(&pcol->sbi->layout, &oi->oc, true,\n" - "-\t\t\t\t\t pcol->pg_first << PAGE_CACHE_SHIFT,\n" - "+\t\t\t\t\t pcol->pg_first << PAGE_SHIFT,\n" - " \t\t\t\t\t pcol->length, &pcol->ios);\n" - " \n" - " \t\tif (ret)\n" - "@@ -383,7 +383,7 @@ static int readpage_strip(void *data, struct page *page)\n" - " \tstruct inode *inode = pcol->inode;\n" - " \tstruct exofs_i_info *oi = exofs_i(inode);\n" - " \tloff_t i_size = i_size_read(inode);\n" - "-\tpgoff_t end_index = i_size >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t end_index = i_size >> PAGE_SHIFT;\n" - " \tsize_t len;\n" - " \tint ret;\n" - " \n" - "@@ -397,9 +397,9 @@ static int readpage_strip(void *data, struct page *page)\n" - " \tpcol->that_locked_page = page;\n" - " \n" - " \tif (page->index < end_index)\n" - "-\t\tlen = PAGE_CACHE_SIZE;\n" - "+\t\tlen = PAGE_SIZE;\n" - " \telse if (page->index == end_index)\n" - "-\t\tlen = i_size & ~PAGE_CACHE_MASK;\n" - "+\t\tlen = i_size & ~PAGE_MASK;\n" - " \telse\n" - " \t\tlen = 0;\n" - " \n" - "@@ -442,8 +442,8 @@ try_again:\n" - " \t\t\tgoto fail;\n" - " \t}\n" - " \n" - "-\tif (len != PAGE_CACHE_SIZE)\n" - "-\t\tzero_user(page, len, PAGE_CACHE_SIZE - len);\n" - "+\tif (len != PAGE_SIZE)\n" - "+\t\tzero_user(page, len, PAGE_SIZE - len);\n" - " \n" - " \tEXOFS_DBGMSG2(\" readpage_strip(0x%lx, 0x%lx) len=0x%zx\\n\",\n" - " \t\t inode->i_ino, page->index, len);\n" - "@@ -609,7 +609,7 @@ static void __r4w_put_page(void *priv, struct page *page)\n" - " \n" - " \tif ((pcol->that_locked_page != page) && (ZERO_PAGE(0) != page)) {\n" - " \t\tEXOFS_DBGMSG2(\"index=0x%lx\\n\", page->index);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\treturn;\n" - " \t}\n" - " \tEXOFS_DBGMSG2(\"that_locked_page index=0x%lx\\n\",\n" - "@@ -633,7 +633,7 @@ static int write_exec(struct page_collect *pcol)\n" - " \n" - " \tBUG_ON(pcol->ios);\n" - " \tret = ore_get_rw_state(&pcol->sbi->layout, &oi->oc, false,\n" - "-\t\t\t\t pcol->pg_first << PAGE_CACHE_SHIFT,\n" - "+\t\t\t\t pcol->pg_first << PAGE_SHIFT,\n" - " \t\t\t\t pcol->length, &pcol->ios);\n" - " \tif (unlikely(ret))\n" - " \t\tgoto err;\n" - "@@ -696,7 +696,7 @@ static int writepage_strip(struct page *page,\n" - " \tstruct inode *inode = pcol->inode;\n" - " \tstruct exofs_i_info *oi = exofs_i(inode);\n" - " \tloff_t i_size = i_size_read(inode);\n" - "-\tpgoff_t end_index = i_size >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t end_index = i_size >> PAGE_SHIFT;\n" - " \tsize_t len;\n" - " \tint ret;\n" - " \n" - "@@ -708,9 +708,9 @@ static int writepage_strip(struct page *page,\n" - " \n" - " \tif (page->index < end_index)\n" - " \t\t/* in this case, the page is within the limits of the file */\n" - "-\t\tlen = PAGE_CACHE_SIZE;\n" - "+\t\tlen = PAGE_SIZE;\n" - " \telse {\n" - "-\t\tlen = i_size & ~PAGE_CACHE_MASK;\n" - "+\t\tlen = i_size & ~PAGE_MASK;\n" - " \n" - " \t\tif (page->index > end_index || !len) {\n" - " \t\t\t/* in this case, the page is outside the limits\n" - "@@ -790,10 +790,10 @@ static int exofs_writepages(struct address_space *mapping,\n" - " \tlong start, end, expected_pages;\n" - " \tint ret;\n" - " \n" - "-\tstart = wbc->range_start >> PAGE_CACHE_SHIFT;\n" - "+\tstart = wbc->range_start >> PAGE_SHIFT;\n" - " \tend = (wbc->range_end == LLONG_MAX) ?\n" - " \t\t\tstart + mapping->nrpages :\n" - "-\t\t\twbc->range_end >> PAGE_CACHE_SHIFT;\n" - "+\t\t\twbc->range_end >> PAGE_SHIFT;\n" - " \n" - " \tif (start || end)\n" - " \t\texpected_pages = end - start + 1;\n" - "@@ -881,15 +881,15 @@ int exofs_write_begin(struct file *file, struct address_space *mapping,\n" - " \t}\n" - " \n" - " \t /* read modify write */\n" - "-\tif (!PageUptodate(page) && (len != PAGE_CACHE_SIZE)) {\n" - "+\tif (!PageUptodate(page) && (len != PAGE_SIZE)) {\n" - " \t\tloff_t i_size = i_size_read(mapping->host);\n" - "-\t\tpgoff_t end_index = i_size >> PAGE_CACHE_SHIFT;\n" - "+\t\tpgoff_t end_index = i_size >> PAGE_SHIFT;\n" - " \t\tsize_t rlen;\n" - " \n" - " \t\tif (page->index < end_index)\n" - "-\t\t\trlen = PAGE_CACHE_SIZE;\n" - "+\t\t\trlen = PAGE_SIZE;\n" - " \t\telse if (page->index == end_index)\n" - "-\t\t\trlen = i_size & ~PAGE_CACHE_MASK;\n" - "+\t\t\trlen = i_size & ~PAGE_MASK;\n" - " \t\telse\n" - " \t\t\trlen = 0;\n" - " \n" - "diff --git a/fs/exofs/namei.c b/fs/exofs/namei.c\n" - "index c20d77df2679..622a686bb08b 100644\n" - "--- a/fs/exofs/namei.c\n" - "+++ b/fs/exofs/namei.c\n" - "@@ -292,11 +292,11 @@ static int exofs_rename(struct inode *old_dir, struct dentry *old_dentry,\n" - " out_dir:\n" - " \tif (dir_de) {\n" - " \t\tkunmap(dir_page);\n" - "-\t\tpage_cache_release(dir_page);\n" - "+\t\tput_page(dir_page);\n" - " \t}\n" - " out_old:\n" - " \tkunmap(old_page);\n" - "-\tpage_cache_release(old_page);\n" - "+\tput_page(old_page);\n" - " out:\n" - " \treturn err;\n" - " }\n" - "diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c\n" - "index 0c6638b40f21..7ff6fcfa685d 100644\n" - "--- a/fs/ext2/dir.c\n" - "+++ b/fs/ext2/dir.c\n" - "@@ -37,7 +37,7 @@ static inline unsigned ext2_rec_len_from_disk(__le16 dlen)\n" - " {\n" - " \tunsigned len = le16_to_cpu(dlen);\n" - " \n" - "-#if (PAGE_CACHE_SIZE >= 65536)\n" - "+#if (PAGE_SIZE >= 65536)\n" - " \tif (len == EXT2_MAX_REC_LEN)\n" - " \t\treturn 1 << 16;\n" - " #endif\n" - "@@ -46,7 +46,7 @@ static inline unsigned ext2_rec_len_from_disk(__le16 dlen)\n" - " \n" - " static inline __le16 ext2_rec_len_to_disk(unsigned len)\n" - " {\n" - "-#if (PAGE_CACHE_SIZE >= 65536)\n" - "+#if (PAGE_SIZE >= 65536)\n" - " \tif (len == (1 << 16))\n" - " \t\treturn cpu_to_le16(EXT2_MAX_REC_LEN);\n" - " \telse\n" - "@@ -67,7 +67,7 @@ static inline unsigned ext2_chunk_size(struct inode *inode)\n" - " static inline void ext2_put_page(struct page *page)\n" - " {\n" - " \tkunmap(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " /*\n" - "@@ -79,9 +79,9 @@ ext2_last_byte(struct inode *inode, unsigned long page_nr)\n" - " {\n" - " \tunsigned last_byte = inode->i_size;\n" - " \n" - "-\tlast_byte -= page_nr << PAGE_CACHE_SHIFT;\n" - "-\tif (last_byte > PAGE_CACHE_SIZE)\n" - "-\t\tlast_byte = PAGE_CACHE_SIZE;\n" - "+\tlast_byte -= page_nr << PAGE_SHIFT;\n" - "+\tif (last_byte > PAGE_SIZE)\n" - "+\t\tlast_byte = PAGE_SIZE;\n" - " \treturn last_byte;\n" - " }\n" - " \n" - "@@ -118,12 +118,12 @@ static void ext2_check_page(struct page *page, int quiet)\n" - " \tchar *kaddr = page_address(page);\n" - " \tu32 max_inumber = le32_to_cpu(EXT2_SB(sb)->s_es->s_inodes_count);\n" - " \tunsigned offs, rec_len;\n" - "-\tunsigned limit = PAGE_CACHE_SIZE;\n" - "+\tunsigned limit = PAGE_SIZE;\n" - " \text2_dirent *p;\n" - " \tchar *error;\n" - " \n" - "-\tif ((dir->i_size >> PAGE_CACHE_SHIFT) == page->index) {\n" - "-\t\tlimit = dir->i_size & ~PAGE_CACHE_MASK;\n" - "+\tif ((dir->i_size >> PAGE_SHIFT) == page->index) {\n" - "+\t\tlimit = dir->i_size & ~PAGE_MASK;\n" - " \t\tif (limit & (chunk_size - 1))\n" - " \t\t\tgoto Ebadsize;\n" - " \t\tif (!limit)\n" - "@@ -176,7 +176,7 @@ bad_entry:\n" - " \tif (!quiet)\n" - " \t\text2_error(sb, __func__, \"bad entry in directory #%lu: : %s - \"\n" - " \t\t\t\"offset=%lu, inode=%lu, rec_len=%d, name_len=%d\",\n" - "-\t\t\tdir->i_ino, error, (page->index<<PAGE_CACHE_SHIFT)+offs,\n" - "+\t\t\tdir->i_ino, error, (page->index<<PAGE_SHIFT)+offs,\n" - " \t\t\t(unsigned long) le32_to_cpu(p->inode),\n" - " \t\t\trec_len, p->name_len);\n" - " \tgoto fail;\n" - "@@ -186,7 +186,7 @@ Eend:\n" - " \t\text2_error(sb, \"ext2_check_page\",\n" - " \t\t\t\"entry in directory #%lu spans the page boundary\"\n" - " \t\t\t\"offset=%lu, inode=%lu\",\n" - "-\t\t\tdir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs,\n" - "+\t\t\tdir->i_ino, (page->index<<PAGE_SHIFT)+offs,\n" - " \t\t\t(unsigned long) le32_to_cpu(p->inode));\n" - " \t}\n" - " fail:\n" - "@@ -287,8 +287,8 @@ ext2_readdir(struct file *file, struct dir_context *ctx)\n" - " \tloff_t pos = ctx->pos;\n" - " \tstruct inode *inode = file_inode(file);\n" - " \tstruct super_block *sb = inode->i_sb;\n" - "-\tunsigned int offset = pos & ~PAGE_CACHE_MASK;\n" - "-\tunsigned long n = pos >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned int offset = pos & ~PAGE_MASK;\n" - "+\tunsigned long n = pos >> PAGE_SHIFT;\n" - " \tunsigned long npages = dir_pages(inode);\n" - " \tunsigned chunk_mask = ~(ext2_chunk_size(inode)-1);\n" - " \tunsigned char *types = NULL;\n" - "@@ -309,14 +309,14 @@ ext2_readdir(struct file *file, struct dir_context *ctx)\n" - " \t\t\text2_error(sb, __func__,\n" - " \t\t\t\t \"bad page in #%lu\",\n" - " \t\t\t\t inode->i_ino);\n" - "-\t\t\tctx->pos += PAGE_CACHE_SIZE - offset;\n" - "+\t\t\tctx->pos += PAGE_SIZE - offset;\n" - " \t\t\treturn PTR_ERR(page);\n" - " \t\t}\n" - " \t\tkaddr = page_address(page);\n" - " \t\tif (unlikely(need_revalidate)) {\n" - " \t\t\tif (offset) {\n" - " \t\t\t\toffset = ext2_validate_entry(kaddr, offset, chunk_mask);\n" - "-\t\t\t\tctx->pos = (n<<PAGE_CACHE_SHIFT) + offset;\n" - "+\t\t\t\tctx->pos = (n<<PAGE_SHIFT) + offset;\n" - " \t\t\t}\n" - " \t\t\tfile->f_version = inode->i_version;\n" - " \t\t\tneed_revalidate = 0;\n" - "@@ -406,7 +406,7 @@ struct ext2_dir_entry_2 *ext2_find_entry (struct inode * dir,\n" - " \t\tif (++n >= npages)\n" - " \t\t\tn = 0;\n" - " \t\t/* next page is past the blocks we've got */\n" - "-\t\tif (unlikely(n > (dir->i_blocks >> (PAGE_CACHE_SHIFT - 9)))) {\n" - "+\t\tif (unlikely(n > (dir->i_blocks >> (PAGE_SHIFT - 9)))) {\n" - " \t\t\text2_error(dir->i_sb, __func__,\n" - " \t\t\t\t\"dir %lu size %lld exceeds block count %llu\",\n" - " \t\t\t\tdir->i_ino, dir->i_size,\n" - "@@ -511,7 +511,7 @@ int ext2_add_link (struct dentry *dentry, struct inode *inode)\n" - " \t\tkaddr = page_address(page);\n" - " \t\tdir_end = kaddr + ext2_last_byte(dir, n);\n" - " \t\tde = (ext2_dirent *)kaddr;\n" - "-\t\tkaddr += PAGE_CACHE_SIZE - reclen;\n" - "+\t\tkaddr += PAGE_SIZE - reclen;\n" - " \t\twhile ((char *)de <= kaddr) {\n" - " \t\t\tif ((char *)de == dir_end) {\n" - " \t\t\t\t/* We hit i_size */\n" - "@@ -655,7 +655,7 @@ int ext2_make_empty(struct inode *inode, struct inode *parent)\n" - " \tkunmap_atomic(kaddr);\n" - " \terr = ext2_commit_chunk(page, 0, chunk_size);\n" - " fail:\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn err;\n" - " }\n" - " \n" - "diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c\n" - "index 7a2be8f7f3c3..d34843925b23 100644\n" - "--- a/fs/ext2/namei.c\n" - "+++ b/fs/ext2/namei.c\n" - "@@ -398,7 +398,7 @@ static int ext2_rename (struct inode * old_dir, struct dentry * old_dentry,\n" - " \t\t\text2_set_link(old_inode, dir_de, dir_page, new_dir, 0);\n" - " \t\telse {\n" - " \t\t\tkunmap(dir_page);\n" - "-\t\t\tpage_cache_release(dir_page);\n" - "+\t\t\tput_page(dir_page);\n" - " \t\t}\n" - " \t\tinode_dec_link_count(old_dir);\n" - " \t}\n" - "@@ -408,11 +408,11 @@ static int ext2_rename (struct inode * old_dir, struct dentry * old_dentry,\n" - " out_dir:\n" - " \tif (dir_de) {\n" - " \t\tkunmap(dir_page);\n" - "-\t\tpage_cache_release(dir_page);\n" - "+\t\tput_page(dir_page);\n" - " \t}\n" - " out_old:\n" - " \tkunmap(old_page);\n" - "-\tpage_cache_release(old_page);\n" - "+\tput_page(old_page);\n" - " out:\n" - " \treturn err;\n" - " }\n" - "diff --git a/fs/ext4/crypto.c b/fs/ext4/crypto.c\n" - "index edc053a81914..2580ef3346ca 100644\n" - "--- a/fs/ext4/crypto.c\n" - "+++ b/fs/ext4/crypto.c\n" - "@@ -283,10 +283,10 @@ static int ext4_page_crypto(struct inode *inode,\n" - " \t EXT4_XTS_TWEAK_SIZE - sizeof(index));\n" - " \n" - " \tsg_init_table(&dst, 1);\n" - "-\tsg_set_page(&dst, dest_page, PAGE_CACHE_SIZE, 0);\n" - "+\tsg_set_page(&dst, dest_page, PAGE_SIZE, 0);\n" - " \tsg_init_table(&src, 1);\n" - "-\tsg_set_page(&src, src_page, PAGE_CACHE_SIZE, 0);\n" - "-\tskcipher_request_set_crypt(req, &src, &dst, PAGE_CACHE_SIZE,\n" - "+\tsg_set_page(&src, src_page, PAGE_SIZE, 0);\n" - "+\tskcipher_request_set_crypt(req, &src, &dst, PAGE_SIZE,\n" - " \t\t\t\t xts_tweak);\n" - " \tif (rw == EXT4_DECRYPT)\n" - " \t\tres = crypto_skcipher_decrypt(req);\n" - "@@ -396,7 +396,7 @@ int ext4_encrypted_zeroout(struct inode *inode, ext4_lblk_t lblk,\n" - " \t\t (unsigned long) inode->i_ino, lblk, len);\n" - " #endif\n" - " \n" - "-\tBUG_ON(inode->i_sb->s_blocksize != PAGE_CACHE_SIZE);\n" - "+\tBUG_ON(inode->i_sb->s_blocksize != PAGE_SIZE);\n" - " \n" - " \tctx = ext4_get_crypto_ctx(inode);\n" - " \tif (IS_ERR(ctx))\n" - "diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c\n" - "index 33f5e2a50cf8..a887efeb7027 100644\n" - "--- a/fs/ext4/dir.c\n" - "+++ b/fs/ext4/dir.c\n" - "@@ -155,13 +155,13 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)\n" - " \t\terr = ext4_map_blocks(NULL, inode, &map, 0);\n" - " \t\tif (err > 0) {\n" - " \t\t\tpgoff_t index = map.m_pblk >>\n" - "-\t\t\t\t\t(PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "+\t\t\t\t\t(PAGE_SHIFT - inode->i_blkbits);\n" - " \t\t\tif (!ra_has_index(&file->f_ra, index))\n" - " \t\t\t\tpage_cache_sync_readahead(\n" - " \t\t\t\t\tsb->s_bdev->bd_inode->i_mapping,\n" - " \t\t\t\t\t&file->f_ra, file,\n" - " \t\t\t\t\tindex, 1);\n" - "-\t\t\tfile->f_ra.prev_pos = (loff_t)index << PAGE_CACHE_SHIFT;\n" - "+\t\t\tfile->f_ra.prev_pos = (loff_t)index << PAGE_SHIFT;\n" - " \t\t\tbh = ext4_bread(NULL, inode, map.m_lblk, 0);\n" - " \t\t\tif (IS_ERR(bh)) {\n" - " \t\t\t\terr = PTR_ERR(bh);\n" - "diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h\n" - "index 393689dfa1af..d96ec1dd22a9 100644\n" - "--- a/fs/ext4/ext4.h\n" - "+++ b/fs/ext4/ext4.h\n" - "@@ -1970,7 +1970,7 @@ ext4_rec_len_from_disk(__le16 dlen, unsigned blocksize)\n" - " {\n" - " \tunsigned len = le16_to_cpu(dlen);\n" - " \n" - "-#if (PAGE_CACHE_SIZE >= 65536)\n" - "+#if (PAGE_SIZE >= 65536)\n" - " \tif (len == EXT4_MAX_REC_LEN || len == 0)\n" - " \t\treturn blocksize;\n" - " \treturn (len & 65532) | ((len & 3) << 16);\n" - "@@ -1983,7 +1983,7 @@ static inline __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize)\n" - " {\n" - " \tif ((len > blocksize) || (blocksize > (1 << 18)) || (len & 3))\n" - " \t\tBUG();\n" - "-#if (PAGE_CACHE_SIZE >= 65536)\n" - "+#if (PAGE_SIZE >= 65536)\n" - " \tif (len < 65536)\n" - " \t\treturn cpu_to_le16(len);\n" - " \tif (len == blocksize) {\n" - "diff --git a/fs/ext4/file.c b/fs/ext4/file.c\n" - "index 6659e216385e..0caece398eb8 100644\n" - "--- a/fs/ext4/file.c\n" - "+++ b/fs/ext4/file.c\n" - "@@ -428,8 +428,8 @@ static int ext4_find_unwritten_pgoff(struct inode *inode,\n" - " \tlastoff = startoff;\n" - " \tendoff = (loff_t)end_blk << blkbits;\n" - " \n" - "-\tindex = startoff >> PAGE_CACHE_SHIFT;\n" - "-\tend = endoff >> PAGE_CACHE_SHIFT;\n" - "+\tindex = startoff >> PAGE_SHIFT;\n" - "+\tend = endoff >> PAGE_SHIFT;\n" - " \n" - " \tpagevec_init(&pvec, 0);\n" - " \tdo {\n" - "diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c\n" - "index 7cbdd3752ba5..7bc6c855cc18 100644\n" - "--- a/fs/ext4/inline.c\n" - "+++ b/fs/ext4/inline.c\n" - "@@ -482,7 +482,7 @@ static int ext4_read_inline_page(struct inode *inode, struct page *page)\n" - " \tret = ext4_read_inline_data(inode, kaddr, len, &iloc);\n" - " \tflush_dcache_page(page);\n" - " \tkunmap_atomic(kaddr);\n" - "-\tzero_user_segment(page, len, PAGE_CACHE_SIZE);\n" - "+\tzero_user_segment(page, len, PAGE_SIZE);\n" - " \tSetPageUptodate(page);\n" - " \tbrelse(iloc.bh);\n" - " \n" - "@@ -507,7 +507,7 @@ int ext4_readpage_inline(struct inode *inode, struct page *page)\n" - " \tif (!page->index)\n" - " \t\tret = ext4_read_inline_page(inode, page);\n" - " \telse if (!PageUptodate(page)) {\n" - "-\t\tzero_user_segment(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user_segment(page, 0, PAGE_SIZE);\n" - " \t\tSetPageUptodate(page);\n" - " \t}\n" - " \n" - "@@ -595,7 +595,7 @@ retry:\n" - " \n" - " \tif (ret) {\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tpage = NULL;\n" - " \t\text4_orphan_add(handle, inode);\n" - " \t\tup_write(&EXT4_I(inode)->xattr_sem);\n" - "@@ -621,7 +621,7 @@ retry:\n" - " out:\n" - " \tif (page) {\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \tif (sem_held)\n" - " \t\tup_write(&EXT4_I(inode)->xattr_sem);\n" - "@@ -690,7 +690,7 @@ int ext4_try_to_write_inline_data(struct address_space *mapping,\n" - " \tif (!ext4_has_inline_data(inode)) {\n" - " \t\tret = 0;\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tgoto out_up_read;\n" - " \t}\n" - " \n" - "@@ -815,7 +815,7 @@ static int ext4_da_convert_inline_data_to_extent(struct address_space *mapping,\n" - " \tif (ret) {\n" - " \t\tup_read(&EXT4_I(inode)->xattr_sem);\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\text4_truncate_failed_write(inode);\n" - " \t\treturn ret;\n" - " \t}\n" - "@@ -829,7 +829,7 @@ out:\n" - " \tup_read(&EXT4_I(inode)->xattr_sem);\n" - " \tif (page) {\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \treturn ret;\n" - " }\n" - "@@ -919,7 +919,7 @@ retry_journal:\n" - " out_release_page:\n" - " \tup_read(&EXT4_I(inode)->xattr_sem);\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " out_journal:\n" - " \text4_journal_stop(handle);\n" - " out:\n" - "@@ -947,7 +947,7 @@ int ext4_da_write_inline_data_end(struct inode *inode, loff_t pos,\n" - " \t\ti_size_changed = 1;\n" - " \t}\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \t/*\n" - " \t * Don't mark the inode dirty under page lock. First, it unnecessarily\n" - "diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c\n" - "index b2e9576450eb..58ec44be2f42 100644\n" - "--- a/fs/ext4/inode.c\n" - "+++ b/fs/ext4/inode.c\n" - "@@ -1057,7 +1057,7 @@ int do_journal_get_write_access(handle_t *handle,\n" - " static int ext4_block_write_begin(struct page *page, loff_t pos, unsigned len,\n" - " \t\t\t\t get_block_t *get_block)\n" - " {\n" - "-\tunsigned from = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tunsigned from = pos & (PAGE_SIZE - 1);\n" - " \tunsigned to = from + len;\n" - " \tstruct inode *inode = page->mapping->host;\n" - " \tunsigned block_start, block_end;\n" - "@@ -1069,15 +1069,15 @@ static int ext4_block_write_begin(struct page *page, loff_t pos, unsigned len,\n" - " \tbool decrypt = false;\n" - " \n" - " \tBUG_ON(!PageLocked(page));\n" - "-\tBUG_ON(from > PAGE_CACHE_SIZE);\n" - "-\tBUG_ON(to > PAGE_CACHE_SIZE);\n" - "+\tBUG_ON(from > PAGE_SIZE);\n" - "+\tBUG_ON(to > PAGE_SIZE);\n" - " \tBUG_ON(from > to);\n" - " \n" - " \tif (!page_has_buffers(page))\n" - " \t\tcreate_empty_buffers(page, blocksize, 0);\n" - " \thead = page_buffers(page);\n" - " \tbbits = ilog2(blocksize);\n" - "-\tblock = (sector_t)page->index << (PAGE_CACHE_SHIFT - bbits);\n" - "+\tblock = (sector_t)page->index << (PAGE_SHIFT - bbits);\n" - " \n" - " \tfor (bh = head, block_start = 0; bh != head || !block_start;\n" - " \t block++, block_start = block_end, bh = bh->b_this_page) {\n" - "@@ -1159,8 +1159,8 @@ static int ext4_write_begin(struct file *file, struct address_space *mapping,\n" - " \t * we allocate blocks but write fails for some reason\n" - " \t */\n" - " \tneeded_blocks = ext4_writepage_trans_blocks(inode) + 1;\n" - "-\tindex = pos >> PAGE_CACHE_SHIFT;\n" - "-\tfrom = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tindex = pos >> PAGE_SHIFT;\n" - "+\tfrom = pos & (PAGE_SIZE - 1);\n" - " \tto = from + len;\n" - " \n" - " \tif (ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) {\n" - "@@ -1188,7 +1188,7 @@ retry_grab:\n" - " retry_journal:\n" - " \thandle = ext4_journal_start(inode, EXT4_HT_WRITE_PAGE, needed_blocks);\n" - " \tif (IS_ERR(handle)) {\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\treturn PTR_ERR(handle);\n" - " \t}\n" - " \n" - "@@ -1196,7 +1196,7 @@ retry_journal:\n" - " \tif (page->mapping != mapping) {\n" - " \t\t/* The page got truncated from under us */\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\text4_journal_stop(handle);\n" - " \t\tgoto retry_grab;\n" - " \t}\n" - "@@ -1252,7 +1252,7 @@ retry_journal:\n" - " \t\tif (ret == -ENOSPC &&\n" - " \t\t ext4_should_retry_alloc(inode->i_sb, &retries))\n" - " \t\t\tgoto retry_journal;\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\treturn ret;\n" - " \t}\n" - " \t*pagep = page;\n" - "@@ -1295,7 +1295,7 @@ static int ext4_write_end(struct file *file,\n" - " \t\tret = ext4_jbd2_file_inode(handle, inode);\n" - " \t\tif (ret) {\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tgoto errout;\n" - " \t\t}\n" - " \t}\n" - "@@ -1315,7 +1315,7 @@ static int ext4_write_end(struct file *file,\n" - " \t */\n" - " \ti_size_changed = ext4_update_inode_size(inode, pos + copied);\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \tif (old_size < pos)\n" - " \t\tpagecache_isize_extended(inode, old_size, pos);\n" - "@@ -1399,7 +1399,7 @@ static int ext4_journalled_write_end(struct file *file,\n" - " \tint size_changed = 0;\n" - " \n" - " \ttrace_ext4_journalled_write_end(inode, pos, len, copied);\n" - "-\tfrom = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tfrom = pos & (PAGE_SIZE - 1);\n" - " \tto = from + len;\n" - " \n" - " \tBUG_ON(!ext4_handle_valid(handle));\n" - "@@ -1423,7 +1423,7 @@ static int ext4_journalled_write_end(struct file *file,\n" - " \text4_set_inode_state(inode, EXT4_STATE_JDATA);\n" - " \tEXT4_I(inode)->i_datasync_tid = handle->h_transaction->t_tid;\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \tif (old_size < pos)\n" - " \t\tpagecache_isize_extended(inode, old_size, pos);\n" - "@@ -1537,7 +1537,7 @@ static void ext4_da_page_release_reservation(struct page *page,\n" - " \tint num_clusters;\n" - " \text4_fsblk_t lblk;\n" - " \n" - "-\tBUG_ON(stop > PAGE_CACHE_SIZE || stop < length);\n" - "+\tBUG_ON(stop > PAGE_SIZE || stop < length);\n" - " \n" - " \thead = page_buffers(page);\n" - " \tbh = head;\n" - "@@ -1553,7 +1553,7 @@ static void ext4_da_page_release_reservation(struct page *page,\n" - " \t\t\tclear_buffer_delay(bh);\n" - " \t\t} else if (contiguous_blks) {\n" - " \t\t\tlblk = page->index <<\n" - "-\t\t\t (PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "+\t\t\t (PAGE_SHIFT - inode->i_blkbits);\n" - " \t\t\tlblk += (curr_off >> inode->i_blkbits) -\n" - " \t\t\t\tcontiguous_blks;\n" - " \t\t\text4_es_remove_extent(inode, lblk, contiguous_blks);\n" - "@@ -1563,7 +1563,7 @@ static void ext4_da_page_release_reservation(struct page *page,\n" - " \t} while ((bh = bh->b_this_page) != head);\n" - " \n" - " \tif (contiguous_blks) {\n" - "-\t\tlblk = page->index << (PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "+\t\tlblk = page->index << (PAGE_SHIFT - inode->i_blkbits);\n" - " \t\tlblk += (curr_off >> inode->i_blkbits) - contiguous_blks;\n" - " \t\text4_es_remove_extent(inode, lblk, contiguous_blks);\n" - " \t}\n" - "@@ -1572,7 +1572,7 @@ static void ext4_da_page_release_reservation(struct page *page,\n" - " \t * need to release the reserved space for that cluster. */\n" - " \tnum_clusters = EXT4_NUM_B2C(sbi, to_release);\n" - " \twhile (num_clusters > 0) {\n" - "-\t\tlblk = (page->index << (PAGE_CACHE_SHIFT - inode->i_blkbits)) +\n" - "+\t\tlblk = (page->index << (PAGE_SHIFT - inode->i_blkbits)) +\n" - " \t\t\t((num_clusters - 1) << sbi->s_cluster_bits);\n" - " \t\tif (sbi->s_cluster_ratio == 1 ||\n" - " \t\t !ext4_find_delalloc_cluster(inode, lblk))\n" - "@@ -1619,8 +1619,8 @@ static void mpage_release_unused_pages(struct mpage_da_data *mpd,\n" - " \tend = mpd->next_page - 1;\n" - " \tif (invalidate) {\n" - " \t\text4_lblk_t start, last;\n" - "-\t\tstart = index << (PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "-\t\tlast = end << (PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "+\t\tstart = index << (PAGE_SHIFT - inode->i_blkbits);\n" - "+\t\tlast = end << (PAGE_SHIFT - inode->i_blkbits);\n" - " \t\text4_es_remove_extent(inode, start, last - start + 1);\n" - " \t}\n" - " \n" - "@@ -1636,7 +1636,7 @@ static void mpage_release_unused_pages(struct mpage_da_data *mpd,\n" - " \t\t\tBUG_ON(!PageLocked(page));\n" - " \t\t\tBUG_ON(PageWriteback(page));\n" - " \t\t\tif (invalidate) {\n" - "-\t\t\t\tblock_invalidatepage(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\t\t\tblock_invalidatepage(page, 0, PAGE_SIZE);\n" - " \t\t\t\tClearPageUptodate(page);\n" - " \t\t\t}\n" - " \t\t\tunlock_page(page);\n" - "@@ -2007,10 +2007,10 @@ static int ext4_writepage(struct page *page,\n" - " \n" - " \ttrace_ext4_writepage(page);\n" - " \tsize = i_size_read(inode);\n" - "-\tif (page->index == size >> PAGE_CACHE_SHIFT)\n" - "-\t\tlen = size & ~PAGE_CACHE_MASK;\n" - "+\tif (page->index == size >> PAGE_SHIFT)\n" - "+\t\tlen = size & ~PAGE_MASK;\n" - " \telse\n" - "-\t\tlen = PAGE_CACHE_SIZE;\n" - "+\t\tlen = PAGE_SIZE;\n" - " \n" - " \tpage_bufs = page_buffers(page);\n" - " \t/*\n" - "@@ -2034,7 +2034,7 @@ static int ext4_writepage(struct page *page,\n" - " \t\t\t\t ext4_bh_delay_or_unwritten)) {\n" - " \t\tredirty_page_for_writepage(wbc, page);\n" - " \t\tif ((current->flags & PF_MEMALLOC) ||\n" - "-\t\t (inode->i_sb->s_blocksize == PAGE_CACHE_SIZE)) {\n" - "+\t\t (inode->i_sb->s_blocksize == PAGE_SIZE)) {\n" - " \t\t\t/*\n" - " \t\t\t * For memory cleaning there's no point in writing only\n" - " \t\t\t * some buffers. So just bail out. Warn if we came here\n" - "@@ -2076,10 +2076,10 @@ static int mpage_submit_page(struct mpage_da_data *mpd, struct page *page)\n" - " \tint err;\n" - " \n" - " \tBUG_ON(page->index != mpd->first_page);\n" - "-\tif (page->index == size >> PAGE_CACHE_SHIFT)\n" - "-\t\tlen = size & ~PAGE_CACHE_MASK;\n" - "+\tif (page->index == size >> PAGE_SHIFT)\n" - "+\t\tlen = size & ~PAGE_MASK;\n" - " \telse\n" - "-\t\tlen = PAGE_CACHE_SIZE;\n" - "+\t\tlen = PAGE_SIZE;\n" - " \tclear_page_dirty_for_io(page);\n" - " \terr = ext4_bio_write_page(&mpd->io_submit, page, len, mpd->wbc, false);\n" - " \tif (!err)\n" - "@@ -2213,7 +2213,7 @@ static int mpage_map_and_submit_buffers(struct mpage_da_data *mpd)\n" - " \tint nr_pages, i;\n" - " \tstruct inode *inode = mpd->inode;\n" - " \tstruct buffer_head *head, *bh;\n" - "-\tint bpp_bits = PAGE_CACHE_SHIFT - inode->i_blkbits;\n" - "+\tint bpp_bits = PAGE_SHIFT - inode->i_blkbits;\n" - " \tpgoff_t start, end;\n" - " \text4_lblk_t lblk;\n" - " \tsector_t pblock;\n" - "@@ -2274,7 +2274,7 @@ static int mpage_map_and_submit_buffers(struct mpage_da_data *mpd)\n" - " \t\t\t * supports blocksize < pagesize as we will try to\n" - " \t\t\t * convert potentially unmapped parts of inode.\n" - " \t\t\t */\n" - "-\t\t\tmpd->io_submit.io_end->size += PAGE_CACHE_SIZE;\n" - "+\t\t\tmpd->io_submit.io_end->size += PAGE_SIZE;\n" - " \t\t\t/* Page fully mapped - let IO run! */\n" - " \t\t\terr = mpage_submit_page(mpd, page);\n" - " \t\t\tif (err < 0) {\n" - "@@ -2426,7 +2426,7 @@ update_disksize:\n" - " \t * Update on-disk size after IO is submitted. Races with\n" - " \t * truncate are avoided by checking i_size under i_data_sem.\n" - " \t */\n" - "-\tdisksize = ((loff_t)mpd->first_page) << PAGE_CACHE_SHIFT;\n" - "+\tdisksize = ((loff_t)mpd->first_page) << PAGE_SHIFT;\n" - " \tif (disksize > EXT4_I(inode)->i_disksize) {\n" - " \t\tint err2;\n" - " \t\tloff_t i_size;\n" - "@@ -2562,7 +2562,7 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd)\n" - " \t\t\tmpd->next_page = page->index + 1;\n" - " \t\t\t/* Add all dirty buffers to mpd */\n" - " \t\t\tlblk = ((ext4_lblk_t)page->index) <<\n" - "-\t\t\t\t(PAGE_CACHE_SHIFT - blkbits);\n" - "+\t\t\t\t(PAGE_SHIFT - blkbits);\n" - " \t\t\thead = page_buffers(page);\n" - " \t\t\terr = mpage_process_page_bufs(mpd, head, head, lblk);\n" - " \t\t\tif (err <= 0)\n" - "@@ -2647,7 +2647,7 @@ static int ext4_writepages(struct address_space *mapping,\n" - " \t\t * We may need to convert up to one extent per block in\n" - " \t\t * the page and we may dirty the inode.\n" - " \t\t */\n" - "-\t\trsv_blocks = 1 + (PAGE_CACHE_SIZE >> inode->i_blkbits);\n" - "+\t\trsv_blocks = 1 + (PAGE_SIZE >> inode->i_blkbits);\n" - " \t}\n" - " \n" - " \t/*\n" - "@@ -2678,8 +2678,8 @@ static int ext4_writepages(struct address_space *mapping,\n" - " \t\tmpd.first_page = writeback_index;\n" - " \t\tmpd.last_page = -1;\n" - " \t} else {\n" - "-\t\tmpd.first_page = wbc->range_start >> PAGE_CACHE_SHIFT;\n" - "-\t\tmpd.last_page = wbc->range_end >> PAGE_CACHE_SHIFT;\n" - "+\t\tmpd.first_page = wbc->range_start >> PAGE_SHIFT;\n" - "+\t\tmpd.last_page = wbc->range_end >> PAGE_SHIFT;\n" - " \t}\n" - " \n" - " \tmpd.inode = inode;\n" - "@@ -2838,7 +2838,7 @@ static int ext4_da_write_begin(struct file *file, struct address_space *mapping,\n" - " \tstruct inode *inode = mapping->host;\n" - " \thandle_t *handle;\n" - " \n" - "-\tindex = pos >> PAGE_CACHE_SHIFT;\n" - "+\tindex = pos >> PAGE_SHIFT;\n" - " \n" - " \tif (ext4_nonda_switch(inode->i_sb)) {\n" - " \t\t*fsdata = (void *)FALL_BACK_TO_NONDELALLOC;\n" - "@@ -2881,7 +2881,7 @@ retry_journal:\n" - " \thandle = ext4_journal_start(inode, EXT4_HT_WRITE_PAGE,\n" - " \t\t\t\text4_da_write_credits(inode, pos, len));\n" - " \tif (IS_ERR(handle)) {\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\treturn PTR_ERR(handle);\n" - " \t}\n" - " \n" - "@@ -2889,7 +2889,7 @@ retry_journal:\n" - " \tif (page->mapping != mapping) {\n" - " \t\t/* The page got truncated from under us */\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\text4_journal_stop(handle);\n" - " \t\tgoto retry_grab;\n" - " \t}\n" - "@@ -2917,7 +2917,7 @@ retry_journal:\n" - " \t\t ext4_should_retry_alloc(inode->i_sb, &retries))\n" - " \t\t\tgoto retry_journal;\n" - " \n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\treturn ret;\n" - " \t}\n" - " \n" - "@@ -2965,7 +2965,7 @@ static int ext4_da_write_end(struct file *file,\n" - " \t\t\t\t len, copied, page, fsdata);\n" - " \n" - " \ttrace_ext4_da_write_end(inode, pos, len, copied);\n" - "-\tstart = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tstart = pos & (PAGE_SIZE - 1);\n" - " \tend = start + copied - 1;\n" - " \n" - " \t/*\n" - "@@ -3187,7 +3187,7 @@ static int __ext4_journalled_invalidatepage(struct page *page,\n" - " \t/*\n" - " \t * If it's a full truncate we just forget about the pending dirtying\n" - " \t */\n" - "-\tif (offset == 0 && length == PAGE_CACHE_SIZE)\n" - "+\tif (offset == 0 && length == PAGE_SIZE)\n" - " \t\tClearPageChecked(page);\n" - " \n" - " \treturn jbd2_journal_invalidatepage(journal, page, offset, length);\n" - "@@ -3546,8 +3546,8 @@ void ext4_set_aops(struct inode *inode)\n" - " static int __ext4_block_zero_page_range(handle_t *handle,\n" - " \t\tstruct address_space *mapping, loff_t from, loff_t length)\n" - " {\n" - "-\text4_fsblk_t index = from >> PAGE_CACHE_SHIFT;\n" - "-\tunsigned offset = from & (PAGE_CACHE_SIZE-1);\n" - "+\text4_fsblk_t index = from >> PAGE_SHIFT;\n" - "+\tunsigned offset = from & (PAGE_SIZE-1);\n" - " \tunsigned blocksize, pos;\n" - " \text4_lblk_t iblock;\n" - " \tstruct inode *inode = mapping->host;\n" - "@@ -3555,14 +3555,14 @@ static int __ext4_block_zero_page_range(handle_t *handle,\n" - " \tstruct page *page;\n" - " \tint err = 0;\n" - " \n" - "-\tpage = find_or_create_page(mapping, from >> PAGE_CACHE_SHIFT,\n" - "+\tpage = find_or_create_page(mapping, from >> PAGE_SHIFT,\n" - " \t\t\t\t mapping_gfp_constraint(mapping, ~__GFP_FS));\n" - " \tif (!page)\n" - " \t\treturn -ENOMEM;\n" - " \n" - " \tblocksize = inode->i_sb->s_blocksize;\n" - " \n" - "-\tiblock = index << (PAGE_CACHE_SHIFT - inode->i_sb->s_blocksize_bits);\n" - "+\tiblock = index << (PAGE_SHIFT - inode->i_sb->s_blocksize_bits);\n" - " \n" - " \tif (!page_has_buffers(page))\n" - " \t\tcreate_empty_buffers(page, blocksize, 0);\n" - "@@ -3604,7 +3604,7 @@ static int __ext4_block_zero_page_range(handle_t *handle,\n" - " \t\t ext4_encrypted_inode(inode)) {\n" - " \t\t\t/* We expect the key to be set. */\n" - " \t\t\tBUG_ON(!ext4_has_encryption_key(inode));\n" - "-\t\t\tBUG_ON(blocksize != PAGE_CACHE_SIZE);\n" - "+\t\t\tBUG_ON(blocksize != PAGE_SIZE);\n" - " \t\t\tWARN_ON_ONCE(ext4_decrypt(page));\n" - " \t\t}\n" - " \t}\n" - "@@ -3628,7 +3628,7 @@ static int __ext4_block_zero_page_range(handle_t *handle,\n" - " \n" - " unlock:\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn err;\n" - " }\n" - " \n" - "@@ -3643,7 +3643,7 @@ static int ext4_block_zero_page_range(handle_t *handle,\n" - " \t\tstruct address_space *mapping, loff_t from, loff_t length)\n" - " {\n" - " \tstruct inode *inode = mapping->host;\n" - "-\tunsigned offset = from & (PAGE_CACHE_SIZE-1);\n" - "+\tunsigned offset = from & (PAGE_SIZE-1);\n" - " \tunsigned blocksize = inode->i_sb->s_blocksize;\n" - " \tunsigned max = blocksize - (offset & (blocksize - 1));\n" - " \n" - "@@ -3668,7 +3668,7 @@ static int ext4_block_zero_page_range(handle_t *handle,\n" - " static int ext4_block_truncate_page(handle_t *handle,\n" - " \t\tstruct address_space *mapping, loff_t from)\n" - " {\n" - "-\tunsigned offset = from & (PAGE_CACHE_SIZE-1);\n" - "+\tunsigned offset = from & (PAGE_SIZE-1);\n" - " \tunsigned length;\n" - " \tunsigned blocksize;\n" - " \tstruct inode *inode = mapping->host;\n" - "@@ -3806,7 +3806,7 @@ int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length)\n" - " \t */\n" - " \tif (offset + length > inode->i_size) {\n" - " \t\tlength = inode->i_size +\n" - "-\t\t PAGE_CACHE_SIZE - (inode->i_size & (PAGE_CACHE_SIZE - 1)) -\n" - "+\t\t PAGE_SIZE - (inode->i_size & (PAGE_SIZE - 1)) -\n" - " \t\t offset;\n" - " \t}\n" - " \n" - "@@ -4881,23 +4881,23 @@ static void ext4_wait_for_tail_page_commit(struct inode *inode)\n" - " \ttid_t commit_tid = 0;\n" - " \tint ret;\n" - " \n" - "-\toffset = inode->i_size & (PAGE_CACHE_SIZE - 1);\n" - "+\toffset = inode->i_size & (PAGE_SIZE - 1);\n" - " \t/*\n" - " \t * All buffers in the last page remain valid? Then there's nothing to\n" - "-\t * do. We do the check mainly to optimize the common PAGE_CACHE_SIZE ==\n" - "+\t * do. We do the check mainly to optimize the common PAGE_SIZE ==\n" - " \t * blocksize case\n" - " \t */\n" - "-\tif (offset > PAGE_CACHE_SIZE - (1 << inode->i_blkbits))\n" - "+\tif (offset > PAGE_SIZE - (1 << inode->i_blkbits))\n" - " \t\treturn;\n" - " \twhile (1) {\n" - " \t\tpage = find_lock_page(inode->i_mapping,\n" - "-\t\t\t\t inode->i_size >> PAGE_CACHE_SHIFT);\n" - "+\t\t\t\t inode->i_size >> PAGE_SHIFT);\n" - " \t\tif (!page)\n" - " \t\t\treturn;\n" - " \t\tret = __ext4_journalled_invalidatepage(page, offset,\n" - "-\t\t\t\t\t\tPAGE_CACHE_SIZE - offset);\n" - "+\t\t\t\t\t\tPAGE_SIZE - offset);\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tif (ret != -EBUSY)\n" - " \t\t\treturn;\n" - " \t\tcommit_tid = 0;\n" - "@@ -5536,10 +5536,10 @@ int ext4_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)\n" - " \t\tgoto out;\n" - " \t}\n" - " \n" - "-\tif (page->index == size >> PAGE_CACHE_SHIFT)\n" - "-\t\tlen = size & ~PAGE_CACHE_MASK;\n" - "+\tif (page->index == size >> PAGE_SHIFT)\n" - "+\t\tlen = size & ~PAGE_MASK;\n" - " \telse\n" - "-\t\tlen = PAGE_CACHE_SIZE;\n" - "+\t\tlen = PAGE_SIZE;\n" - " \t/*\n" - " \t * Return if we have all the buffers mapped. This avoids the need to do\n" - " \t * journal_start/journal_stop which can block and take a long time\n" - "@@ -5570,7 +5570,7 @@ retry_alloc:\n" - " \tret = block_page_mkwrite(vma, vmf, get_block);\n" - " \tif (!ret && ext4_should_journal_data(inode)) {\n" - " \t\tif (ext4_walk_page_buffers(handle, page_buffers(page), 0,\n" - "-\t\t\t PAGE_CACHE_SIZE, NULL, do_journal_get_write_access)) {\n" - "+\t\t\t PAGE_SIZE, NULL, do_journal_get_write_access)) {\n" - " \t\t\tunlock_page(page);\n" - " \t\t\tret = VM_FAULT_SIGBUS;\n" - " \t\t\text4_journal_stop(handle);\n" - "diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c\n" - "index 50e05df28f66..eeeade76012e 100644\n" - "--- a/fs/ext4/mballoc.c\n" - "+++ b/fs/ext4/mballoc.c\n" - "@@ -119,7 +119,7 @@ MODULE_PARM_DESC(mballoc_debug, \"Debugging level for ext4's mballoc\");\n" - " *\n" - " *\n" - " * one block each for bitmap and buddy information. So for each group we\n" - "- * take up 2 blocks. A page can contain blocks_per_page (PAGE_CACHE_SIZE /\n" - "+ * take up 2 blocks. A page can contain blocks_per_page (PAGE_SIZE /\n" - " * blocksize) blocks. So it can have information regarding groups_per_page\n" - " * which is blocks_per_page/2\n" - " *\n" - "@@ -807,7 +807,7 @@ static void mb_regenerate_buddy(struct ext4_buddy *e4b)\n" - " *\n" - " * one block each for bitmap and buddy information.\n" - " * So for each group we take up 2 blocks. A page can\n" - "- * contain blocks_per_page (PAGE_CACHE_SIZE / blocksize) blocks.\n" - "+ * contain blocks_per_page (PAGE_SIZE / blocksize) blocks.\n" - " * So it can have information regarding groups_per_page which\n" - " * is blocks_per_page/2\n" - " *\n" - "@@ -839,7 +839,7 @@ static int ext4_mb_init_cache(struct page *page, char *incore, gfp_t gfp)\n" - " \tsb = inode->i_sb;\n" - " \tngroups = ext4_get_groups_count(sb);\n" - " \tblocksize = 1 << inode->i_blkbits;\n" - "-\tblocks_per_page = PAGE_CACHE_SIZE / blocksize;\n" - "+\tblocks_per_page = PAGE_SIZE / blocksize;\n" - " \n" - " \tgroups_per_page = blocks_per_page >> 1;\n" - " \tif (groups_per_page == 0)\n" - "@@ -993,7 +993,7 @@ static int ext4_mb_get_buddy_page_lock(struct super_block *sb,\n" - " \te4b->bd_buddy_page = NULL;\n" - " \te4b->bd_bitmap_page = NULL;\n" - " \n" - "-\tblocks_per_page = PAGE_CACHE_SIZE / sb->s_blocksize;\n" - "+\tblocks_per_page = PAGE_SIZE / sb->s_blocksize;\n" - " \t/*\n" - " \t * the buddy cache inode stores the block bitmap\n" - " \t * and buddy information in consecutive blocks.\n" - "@@ -1028,11 +1028,11 @@ static void ext4_mb_put_buddy_page_lock(struct ext4_buddy *e4b)\n" - " {\n" - " \tif (e4b->bd_bitmap_page) {\n" - " \t\tunlock_page(e4b->bd_bitmap_page);\n" - "-\t\tpage_cache_release(e4b->bd_bitmap_page);\n" - "+\t\tput_page(e4b->bd_bitmap_page);\n" - " \t}\n" - " \tif (e4b->bd_buddy_page) {\n" - " \t\tunlock_page(e4b->bd_buddy_page);\n" - "-\t\tpage_cache_release(e4b->bd_buddy_page);\n" - "+\t\tput_page(e4b->bd_buddy_page);\n" - " \t}\n" - " }\n" - " \n" - "@@ -1125,7 +1125,7 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group,\n" - " \tmight_sleep();\n" - " \tmb_debug(1, \"load group %u\\n\", group);\n" - " \n" - "-\tblocks_per_page = PAGE_CACHE_SIZE / sb->s_blocksize;\n" - "+\tblocks_per_page = PAGE_SIZE / sb->s_blocksize;\n" - " \tgrp = ext4_get_group_info(sb, group);\n" - " \n" - " \te4b->bd_blkbits = sb->s_blocksize_bits;\n" - "@@ -1167,7 +1167,7 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group,\n" - " \t\t\t * is yet to initialize the same. So\n" - " \t\t\t * wait for it to initialize.\n" - " \t\t\t */\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\tpage = find_or_create_page(inode->i_mapping, pnum, gfp);\n" - " \t\tif (page) {\n" - " \t\t\tBUG_ON(page->mapping != inode->i_mapping);\n" - "@@ -1203,7 +1203,7 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group,\n" - " \tpage = find_get_page_flags(inode->i_mapping, pnum, FGP_ACCESSED);\n" - " \tif (page == NULL || !PageUptodate(page)) {\n" - " \t\tif (page)\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\tpage = find_or_create_page(inode->i_mapping, pnum, gfp);\n" - " \t\tif (page) {\n" - " \t\t\tBUG_ON(page->mapping != inode->i_mapping);\n" - "@@ -1238,11 +1238,11 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group,\n" - " \n" - " err:\n" - " \tif (page)\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \tif (e4b->bd_bitmap_page)\n" - "-\t\tpage_cache_release(e4b->bd_bitmap_page);\n" - "+\t\tput_page(e4b->bd_bitmap_page);\n" - " \tif (e4b->bd_buddy_page)\n" - "-\t\tpage_cache_release(e4b->bd_buddy_page);\n" - "+\t\tput_page(e4b->bd_buddy_page);\n" - " \te4b->bd_buddy = NULL;\n" - " \te4b->bd_bitmap = NULL;\n" - " \treturn ret;\n" - "@@ -1257,9 +1257,9 @@ static int ext4_mb_load_buddy(struct super_block *sb, ext4_group_t group,\n" - " static void ext4_mb_unload_buddy(struct ext4_buddy *e4b)\n" - " {\n" - " \tif (e4b->bd_bitmap_page)\n" - "-\t\tpage_cache_release(e4b->bd_bitmap_page);\n" - "+\t\tput_page(e4b->bd_bitmap_page);\n" - " \tif (e4b->bd_buddy_page)\n" - "-\t\tpage_cache_release(e4b->bd_buddy_page);\n" - "+\t\tput_page(e4b->bd_buddy_page);\n" - " }\n" - " \n" - " \n" - "@@ -2833,8 +2833,8 @@ static void ext4_free_data_callback(struct super_block *sb,\n" - " \t\t/* No more items in the per group rb tree\n" - " \t\t * balance refcounts from ext4_mb_free_metadata()\n" - " \t\t */\n" - "-\t\tpage_cache_release(e4b.bd_buddy_page);\n" - "-\t\tpage_cache_release(e4b.bd_bitmap_page);\n" - "+\t\tput_page(e4b.bd_buddy_page);\n" - "+\t\tput_page(e4b.bd_bitmap_page);\n" - " \t}\n" - " \text4_unlock_group(sb, entry->efd_group);\n" - " \tkmem_cache_free(ext4_free_data_cachep, entry);\n" - "@@ -4385,9 +4385,9 @@ static int ext4_mb_release_context(struct ext4_allocation_context *ac)\n" - " \t\text4_mb_put_pa(ac, ac->ac_sb, pa);\n" - " \t}\n" - " \tif (ac->ac_bitmap_page)\n" - "-\t\tpage_cache_release(ac->ac_bitmap_page);\n" - "+\t\tput_page(ac->ac_bitmap_page);\n" - " \tif (ac->ac_buddy_page)\n" - "-\t\tpage_cache_release(ac->ac_buddy_page);\n" - "+\t\tput_page(ac->ac_buddy_page);\n" - " \tif (ac->ac_flags & EXT4_MB_HINT_GROUP_ALLOC)\n" - " \t\tmutex_unlock(&ac->ac_lg->lg_mutex);\n" - " \text4_mb_collect_stats(ac);\n" - "@@ -4599,8 +4599,8 @@ ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b,\n" - " \t\t * otherwise we'll refresh it from\n" - " \t\t * on-disk bitmap and lose not-yet-available\n" - " \t\t * blocks */\n" - "-\t\tpage_cache_get(e4b->bd_buddy_page);\n" - "-\t\tpage_cache_get(e4b->bd_bitmap_page);\n" - "+\t\tget_page(e4b->bd_buddy_page);\n" - "+\t\tget_page(e4b->bd_bitmap_page);\n" - " \t}\n" - " \twhile (*n) {\n" - " \t\tparent = *n;\n" - "diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c\n" - "index 4098acc701c3..675b67e5d5c2 100644\n" - "--- a/fs/ext4/move_extent.c\n" - "+++ b/fs/ext4/move_extent.c\n" - "@@ -156,7 +156,7 @@ mext_page_double_lock(struct inode *inode1, struct inode *inode2,\n" - " \tpage[1] = grab_cache_page_write_begin(mapping[1], index2, fl);\n" - " \tif (!page[1]) {\n" - " \t\tunlock_page(page[0]);\n" - "-\t\tpage_cache_release(page[0]);\n" - "+\t\tput_page(page[0]);\n" - " \t\treturn -ENOMEM;\n" - " \t}\n" - " \t/*\n" - "@@ -192,7 +192,7 @@ mext_page_mkuptodate(struct page *page, unsigned from, unsigned to)\n" - " \t\tcreate_empty_buffers(page, blocksize, 0);\n" - " \n" - " \thead = page_buffers(page);\n" - "-\tblock = (sector_t)page->index << (PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "+\tblock = (sector_t)page->index << (PAGE_SHIFT - inode->i_blkbits);\n" - " \tfor (bh = head, block_start = 0; bh != head || !block_start;\n" - " \t block++, block_start = block_end, bh = bh->b_this_page) {\n" - " \t\tblock_end = block_start + blocksize;\n" - "@@ -268,7 +268,7 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode,\n" - " \tint i, err2, jblocks, retries = 0;\n" - " \tint replaced_count = 0;\n" - " \tint from = data_offset_in_page << orig_inode->i_blkbits;\n" - "-\tint blocks_per_page = PAGE_CACHE_SIZE >> orig_inode->i_blkbits;\n" - "+\tint blocks_per_page = PAGE_SIZE >> orig_inode->i_blkbits;\n" - " \tstruct super_block *sb = orig_inode->i_sb;\n" - " \tstruct buffer_head *bh = NULL;\n" - " \n" - "@@ -404,9 +404,9 @@ data_copy:\n" - " \n" - " unlock_pages:\n" - " \tunlock_page(pagep[0]);\n" - "-\tpage_cache_release(pagep[0]);\n" - "+\tput_page(pagep[0]);\n" - " \tunlock_page(pagep[1]);\n" - "-\tpage_cache_release(pagep[1]);\n" - "+\tput_page(pagep[1]);\n" - " stop_journal:\n" - " \text4_journal_stop(handle);\n" - " \tif (*err == -ENOSPC &&\n" - "@@ -554,7 +554,7 @@ ext4_move_extents(struct file *o_filp, struct file *d_filp, __u64 orig_blk,\n" - " \tstruct inode *orig_inode = file_inode(o_filp);\n" - " \tstruct inode *donor_inode = file_inode(d_filp);\n" - " \tstruct ext4_ext_path *path = NULL;\n" - "-\tint blocks_per_page = PAGE_CACHE_SIZE >> orig_inode->i_blkbits;\n" - "+\tint blocks_per_page = PAGE_SIZE >> orig_inode->i_blkbits;\n" - " \text4_lblk_t o_end, o_start = orig_blk;\n" - " \text4_lblk_t d_start = donor_blk;\n" - " \tint ret;\n" - "@@ -648,9 +648,9 @@ ext4_move_extents(struct file *o_filp, struct file *d_filp, __u64 orig_blk,\n" - " \t\tif (o_end - o_start < cur_len)\n" - " \t\t\tcur_len = o_end - o_start;\n" - " \n" - "-\t\torig_page_index = o_start >> (PAGE_CACHE_SHIFT -\n" - "+\t\torig_page_index = o_start >> (PAGE_SHIFT -\n" - " \t\t\t\t\t orig_inode->i_blkbits);\n" - "-\t\tdonor_page_index = d_start >> (PAGE_CACHE_SHIFT -\n" - "+\t\tdonor_page_index = d_start >> (PAGE_SHIFT -\n" - " \t\t\t\t\t donor_inode->i_blkbits);\n" - " \t\toffset_in_page = o_start % blocks_per_page;\n" - " \t\tif (cur_len > blocks_per_page- offset_in_page)\n" - "diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c\n" - "index 349d7aa04fe7..741599a011c1 100644\n" - "--- a/fs/ext4/page-io.c\n" - "+++ b/fs/ext4/page-io.c\n" - "@@ -442,8 +442,8 @@ int ext4_bio_write_page(struct ext4_io_submit *io,\n" - " \t * the page size, the remaining memory is zeroed when mapped, and\n" - " \t * writes to that region are not written out to the file.\"\n" - " \t */\n" - "-\tif (len < PAGE_CACHE_SIZE)\n" - "-\t\tzero_user_segment(page, len, PAGE_CACHE_SIZE);\n" - "+\tif (len < PAGE_SIZE)\n" - "+\t\tzero_user_segment(page, len, PAGE_SIZE);\n" - " \t/*\n" - " \t * In the first loop we prepare and mark buffers to submit. We have to\n" - " \t * mark all buffers in the page before submitting so that\n" - "diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c\n" - "index 5dc5e95063de..f24e7299e1c8 100644\n" - "--- a/fs/ext4/readpage.c\n" - "+++ b/fs/ext4/readpage.c\n" - "@@ -23,7 +23,7 @@\n" - " *\n" - " * then this code just gives up and calls the buffer_head-based read function.\n" - " * It does handle a page which has holes at the end - that is a common case:\n" - "- * the end-of-file on blocksize < PAGE_CACHE_SIZE setups.\n" - "+ * the end-of-file on blocksize < PAGE_SIZE setups.\n" - " *\n" - " */\n" - " \n" - "@@ -140,7 +140,7 @@ int ext4_mpage_readpages(struct address_space *mapping,\n" - " \n" - " \tstruct inode *inode = mapping->host;\n" - " \tconst unsigned blkbits = inode->i_blkbits;\n" - "-\tconst unsigned blocks_per_page = PAGE_CACHE_SIZE >> blkbits;\n" - "+\tconst unsigned blocks_per_page = PAGE_SIZE >> blkbits;\n" - " \tconst unsigned blocksize = 1 << blkbits;\n" - " \tsector_t block_in_file;\n" - " \tsector_t last_block;\n" - "@@ -173,7 +173,7 @@ int ext4_mpage_readpages(struct address_space *mapping,\n" - " \t\tif (page_has_buffers(page))\n" - " \t\t\tgoto confused;\n" - " \n" - "-\t\tblock_in_file = (sector_t)page->index << (PAGE_CACHE_SHIFT - blkbits);\n" - "+\t\tblock_in_file = (sector_t)page->index << (PAGE_SHIFT - blkbits);\n" - " \t\tlast_block = block_in_file + nr_pages * blocks_per_page;\n" - " \t\tlast_block_in_file = (i_size_read(inode) + blocksize - 1) >> blkbits;\n" - " \t\tif (last_block > last_block_in_file)\n" - "@@ -217,7 +217,7 @@ int ext4_mpage_readpages(struct address_space *mapping,\n" - " \t\t\t\tset_error_page:\n" - " \t\t\t\t\tSetPageError(page);\n" - " \t\t\t\t\tzero_user_segment(page, 0,\n" - "-\t\t\t\t\t\t\t PAGE_CACHE_SIZE);\n" - "+\t\t\t\t\t\t\t PAGE_SIZE);\n" - " \t\t\t\t\tunlock_page(page);\n" - " \t\t\t\t\tgoto next_page;\n" - " \t\t\t\t}\n" - "@@ -250,7 +250,7 @@ int ext4_mpage_readpages(struct address_space *mapping,\n" - " \t\t}\n" - " \t\tif (first_hole != blocks_per_page) {\n" - " \t\t\tzero_user_segment(page, first_hole << blkbits,\n" - "-\t\t\t\t\t PAGE_CACHE_SIZE);\n" - "+\t\t\t\t\t PAGE_SIZE);\n" - " \t\t\tif (first_hole == 0) {\n" - " \t\t\t\tSetPageUptodate(page);\n" - " \t\t\t\tunlock_page(page);\n" - "@@ -319,7 +319,7 @@ int ext4_mpage_readpages(struct address_space *mapping,\n" - " \t\t\tunlock_page(page);\n" - " \tnext_page:\n" - " \t\tif (pages)\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t}\n" - " \tBUG_ON(pages && !list_empty(pages));\n" - " \tif (bio)\n" - "diff --git a/fs/ext4/super.c b/fs/ext4/super.c\n" - "index 99996e9a8f57..75b229414ee8 100644\n" - "--- a/fs/ext4/super.c\n" - "+++ b/fs/ext4/super.c\n" - "@@ -1782,7 +1782,7 @@ static int parse_options(char *options, struct super_block *sb,\n" - " \t\tint blocksize =\n" - " \t\t\tBLOCK_SIZE << le32_to_cpu(sbi->s_es->s_log_block_size);\n" - " \n" - "-\t\tif (blocksize < PAGE_CACHE_SIZE) {\n" - "+\t\tif (blocksize < PAGE_SIZE) {\n" - " \t\t\text4_msg(sb, KERN_ERR, \"can't mount with \"\n" - " \t\t\t\t \"dioread_nolock if block size != PAGE_SIZE\");\n" - " \t\t\treturn 0;\n" - "@@ -3806,7 +3806,7 @@ no_journal:\n" - " \t}\n" - " \n" - " \tif ((DUMMY_ENCRYPTION_ENABLED(sbi) || ext4_has_feature_encrypt(sb)) &&\n" - "-\t (blocksize != PAGE_CACHE_SIZE)) {\n" - "+\t (blocksize != PAGE_SIZE)) {\n" - " \t\text4_msg(sb, KERN_ERR,\n" - " \t\t\t \"Unsupported blocksize for fs encryption\");\n" - " \t\tgoto failed_mount_wq;\n" - "diff --git a/fs/ext4/symlink.c b/fs/ext4/symlink.c\n" - "index 6f7ee30a89ce..75ed5c2f0c16 100644\n" - "--- a/fs/ext4/symlink.c\n" - "+++ b/fs/ext4/symlink.c\n" - "@@ -80,12 +80,12 @@ static const char *ext4_encrypted_get_link(struct dentry *dentry,\n" - " \tif (res <= plen)\n" - " \t\tpaddr[res] = '\\0';\n" - " \tif (cpage)\n" - "-\t\tpage_cache_release(cpage);\n" - "+\t\tput_page(cpage);\n" - " \tset_delayed_call(done, kfree_link, paddr);\n" - " \treturn paddr;\n" - " errout:\n" - " \tif (cpage)\n" - "-\t\tpage_cache_release(cpage);\n" - "+\t\tput_page(cpage);\n" - " \tkfree(paddr);\n" - " \treturn ERR_PTR(res);\n" - " }\n" - "diff --git a/fs/f2fs/crypto.c b/fs/f2fs/crypto.c\n" - "index 95c5cf039711..da186961a5f0 100644\n" - "--- a/fs/f2fs/crypto.c\n" - "+++ b/fs/f2fs/crypto.c\n" - "@@ -350,10 +350,10 @@ static int f2fs_page_crypto(struct f2fs_crypto_ctx *ctx,\n" - " \t\t\tF2FS_XTS_TWEAK_SIZE - sizeof(index));\n" - " \n" - " \tsg_init_table(&dst, 1);\n" - "-\tsg_set_page(&dst, dest_page, PAGE_CACHE_SIZE, 0);\n" - "+\tsg_set_page(&dst, dest_page, PAGE_SIZE, 0);\n" - " \tsg_init_table(&src, 1);\n" - "-\tsg_set_page(&src, src_page, PAGE_CACHE_SIZE, 0);\n" - "-\tskcipher_request_set_crypt(req, &src, &dst, PAGE_CACHE_SIZE,\n" - "+\tsg_set_page(&src, src_page, PAGE_SIZE, 0);\n" - "+\tskcipher_request_set_crypt(req, &src, &dst, PAGE_SIZE,\n" - " \t\t\t\t xts_tweak);\n" - " \tif (rw == F2FS_DECRYPT)\n" - " \t\tres = crypto_skcipher_decrypt(req);\n" - "diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c\n" - "index 5c06db17e41f..8654e83bcea1 100644\n" - "--- a/fs/f2fs/data.c\n" - "+++ b/fs/f2fs/data.c\n" - "@@ -153,7 +153,7 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio)\n" - " \t/* Allocate a new bio */\n" - " \tbio = __bio_alloc(fio->sbi, fio->blk_addr, 1, is_read_io(fio->rw));\n" - " \n" - "-\tif (bio_add_page(bio, page, PAGE_CACHE_SIZE, 0) < PAGE_CACHE_SIZE) {\n" - "+\tif (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {\n" - " \t\tbio_put(bio);\n" - " \t\treturn -EFAULT;\n" - " \t}\n" - "@@ -192,8 +192,8 @@ alloc_new:\n" - " \n" - " \tbio_page = fio->encrypted_page ? fio->encrypted_page : fio->page;\n" - " \n" - "-\tif (bio_add_page(io->bio, bio_page, PAGE_CACHE_SIZE, 0) <\n" - "-\t\t\t\t\t\t\tPAGE_CACHE_SIZE) {\n" - "+\tif (bio_add_page(io->bio, bio_page, PAGE_SIZE, 0) <\n" - "+\t\t\t\t\t\t\tPAGE_SIZE) {\n" - " \t\t__submit_merged_bio(io);\n" - " \t\tgoto alloc_new;\n" - " \t}\n" - "@@ -326,7 +326,7 @@ got_it:\n" - " \t * see, f2fs_add_link -> get_new_data_page -> init_inode_metadata.\n" - " \t */\n" - " \tif (dn.data_blkaddr == NEW_ADDR) {\n" - "-\t\tzero_user_segment(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user_segment(page, 0, PAGE_SIZE);\n" - " \t\tSetPageUptodate(page);\n" - " \t\tunlock_page(page);\n" - " \t\treturn page;\n" - "@@ -437,7 +437,7 @@ struct page *get_new_data_page(struct inode *inode,\n" - " \t\tgoto got_it;\n" - " \n" - " \tif (dn.data_blkaddr == NEW_ADDR) {\n" - "-\t\tzero_user_segment(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user_segment(page, 0, PAGE_SIZE);\n" - " \t\tSetPageUptodate(page);\n" - " \t} else {\n" - " \t\tf2fs_put_page(page, 1);\n" - "@@ -450,8 +450,8 @@ struct page *get_new_data_page(struct inode *inode,\n" - " \t}\n" - " got_it:\n" - " \tif (new_i_size && i_size_read(inode) <\n" - "-\t\t\t\t((loff_t)(index + 1) << PAGE_CACHE_SHIFT)) {\n" - "-\t\ti_size_write(inode, ((loff_t)(index + 1) << PAGE_CACHE_SHIFT));\n" - "+\t\t\t\t((loff_t)(index + 1) << PAGE_SHIFT)) {\n" - "+\t\ti_size_write(inode, ((loff_t)(index + 1) << PAGE_SHIFT));\n" - " \t\t/* Only the directory inode sets new_i_size */\n" - " \t\tset_inode_flag(F2FS_I(inode), FI_UPDATE_DIR);\n" - " \t}\n" - "@@ -491,9 +491,9 @@ alloc:\n" - " \t/* update i_size */\n" - " \tfofs = start_bidx_of_node(ofs_of_node(dn->node_page), fi) +\n" - " \t\t\t\t\t\t\tdn->ofs_in_node;\n" - "-\tif (i_size_read(dn->inode) < ((loff_t)(fofs + 1) << PAGE_CACHE_SHIFT))\n" - "+\tif (i_size_read(dn->inode) < ((loff_t)(fofs + 1) << PAGE_SHIFT))\n" - " \t\ti_size_write(dn->inode,\n" - "-\t\t\t\t((loff_t)(fofs + 1) << PAGE_CACHE_SHIFT));\n" - "+\t\t\t\t((loff_t)(fofs + 1) << PAGE_SHIFT));\n" - " \treturn 0;\n" - " }\n" - " \n" - "@@ -940,7 +940,7 @@ got_it:\n" - " \t\t\t\tgoto confused;\n" - " \t\t\t}\n" - " \t\t} else {\n" - "-\t\t\tzero_user_segment(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\t\tzero_user_segment(page, 0, PAGE_SIZE);\n" - " \t\t\tSetPageUptodate(page);\n" - " \t\t\tunlock_page(page);\n" - " \t\t\tgoto next_page;\n" - "@@ -990,7 +990,7 @@ submit_and_realloc:\n" - " \t\tgoto next_page;\n" - " set_error_page:\n" - " \t\tSetPageError(page);\n" - "-\t\tzero_user_segment(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user_segment(page, 0, PAGE_SIZE);\n" - " \t\tunlock_page(page);\n" - " \t\tgoto next_page;\n" - " confused:\n" - "@@ -1001,7 +1001,7 @@ confused:\n" - " \t\tunlock_page(page);\n" - " next_page:\n" - " \t\tif (pages)\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t}\n" - " \tBUG_ON(pages && !list_empty(pages));\n" - " \tif (bio)\n" - "@@ -1107,7 +1107,7 @@ static int f2fs_write_data_page(struct page *page,\n" - " \tstruct f2fs_sb_info *sbi = F2FS_I_SB(inode);\n" - " \tloff_t i_size = i_size_read(inode);\n" - " \tconst pgoff_t end_index = ((unsigned long long) i_size)\n" - "-\t\t\t\t\t\t\t>> PAGE_CACHE_SHIFT;\n" - "+\t\t\t\t\t\t\t>> PAGE_SHIFT;\n" - " \tunsigned offset = 0;\n" - " \tbool need_balance_fs = false;\n" - " \tint err = 0;\n" - "@@ -1128,11 +1128,11 @@ static int f2fs_write_data_page(struct page *page,\n" - " \t * If the offset is out-of-range of file size,\n" - " \t * this page does not have to be written to disk.\n" - " \t */\n" - "-\toffset = i_size & (PAGE_CACHE_SIZE - 1);\n" - "+\toffset = i_size & (PAGE_SIZE - 1);\n" - " \tif ((page->index >= end_index + 1) || !offset)\n" - " \t\tgoto out;\n" - " \n" - "-\tzero_user_segment(page, offset, PAGE_CACHE_SIZE);\n" - "+\tzero_user_segment(page, offset, PAGE_SIZE);\n" - " write:\n" - " \tif (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))\n" - " \t\tgoto redirty_out;\n" - "@@ -1232,8 +1232,8 @@ next:\n" - " \t\t\tcycled = 0;\n" - " \t\tend = -1;\n" - " \t} else {\n" - "-\t\tindex = wbc->range_start >> PAGE_CACHE_SHIFT;\n" - "-\t\tend = wbc->range_end >> PAGE_CACHE_SHIFT;\n" - "+\t\tindex = wbc->range_start >> PAGE_SHIFT;\n" - "+\t\tend = wbc->range_end >> PAGE_SHIFT;\n" - " \t\tif (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)\n" - " \t\t\trange_whole = 1;\n" - " \t\tcycled = 1; /* ignore range_cyclic tests */\n" - "@@ -1407,7 +1407,7 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,\n" - " \tint err = 0;\n" - " \n" - " \tif (f2fs_has_inline_data(inode) ||\n" - "-\t\t\t(pos & PAGE_CACHE_MASK) >= i_size_read(inode)) {\n" - "+\t\t\t(pos & PAGE_MASK) >= i_size_read(inode)) {\n" - " \t\tf2fs_lock_op(sbi);\n" - " \t\tlocked = true;\n" - " \t}\n" - "@@ -1472,7 +1472,7 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping,\n" - " \tstruct inode *inode = mapping->host;\n" - " \tstruct f2fs_sb_info *sbi = F2FS_I_SB(inode);\n" - " \tstruct page *page = NULL;\n" - "-\tpgoff_t index = ((unsigned long long) pos) >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = ((unsigned long long) pos) >> PAGE_SHIFT;\n" - " \tbool need_balance = false;\n" - " \tblock_t blkaddr = NULL_ADDR;\n" - " \tint err = 0;\n" - "@@ -1520,22 +1520,22 @@ repeat:\n" - " \tif (f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode))\n" - " \t\tf2fs_wait_on_encrypted_page_writeback(sbi, blkaddr);\n" - " \n" - "-\tif (len == PAGE_CACHE_SIZE)\n" - "+\tif (len == PAGE_SIZE)\n" - " \t\tgoto out_update;\n" - " \tif (PageUptodate(page))\n" - " \t\tgoto out_clear;\n" - " \n" - "-\tif ((pos & PAGE_CACHE_MASK) >= i_size_read(inode)) {\n" - "-\t\tunsigned start = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tif ((pos & PAGE_MASK) >= i_size_read(inode)) {\n" - "+\t\tunsigned start = pos & (PAGE_SIZE - 1);\n" - " \t\tunsigned end = start + len;\n" - " \n" - " \t\t/* Reading beyond i_size is simple: memset to zero */\n" - "-\t\tzero_user_segments(page, 0, start, end, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user_segments(page, 0, start, end, PAGE_SIZE);\n" - " \t\tgoto out_update;\n" - " \t}\n" - " \n" - " \tif (blkaddr == NEW_ADDR) {\n" - "-\t\tzero_user_segment(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user_segment(page, 0, PAGE_SIZE);\n" - " \t} else {\n" - " \t\tstruct f2fs_io_info fio = {\n" - " \t\t\t.sbi = sbi,\n" - "@@ -1660,7 +1660,7 @@ void f2fs_invalidate_page(struct page *page, unsigned int offset,\n" - " \tstruct f2fs_sb_info *sbi = F2FS_I_SB(inode);\n" - " \n" - " \tif (inode->i_ino >= F2FS_ROOT_INO(sbi) &&\n" - "-\t\t(offset % PAGE_CACHE_SIZE || length != PAGE_CACHE_SIZE))\n" - "+\t\t(offset % PAGE_SIZE || length != PAGE_SIZE))\n" - " \t\treturn;\n" - " \n" - " \tif (PageDirty(page)) {\n" - "diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c\n" - "index 4fb6ef88a34f..f4a61a5ff79f 100644\n" - "--- a/fs/f2fs/debug.c\n" - "+++ b/fs/f2fs/debug.c\n" - "@@ -164,7 +164,7 @@ static void update_mem_info(struct f2fs_sb_info *sbi)\n" - " \n" - " \t/* build curseg */\n" - " \tsi->base_mem += sizeof(struct curseg_info) * NR_CURSEG_TYPE;\n" - "-\tsi->base_mem += PAGE_CACHE_SIZE * NR_CURSEG_TYPE;\n" - "+\tsi->base_mem += PAGE_SIZE * NR_CURSEG_TYPE;\n" - " \n" - " \t/* build dirty segmap */\n" - " \tsi->base_mem += sizeof(struct dirty_seglist_info);\n" - "@@ -201,9 +201,9 @@ get_cache:\n" - " \n" - " \tsi->page_mem = 0;\n" - " \tnpages = NODE_MAPPING(sbi)->nrpages;\n" - "-\tsi->page_mem += (unsigned long long)npages << PAGE_CACHE_SHIFT;\n" - "+\tsi->page_mem += (unsigned long long)npages << PAGE_SHIFT;\n" - " \tnpages = META_MAPPING(sbi)->nrpages;\n" - "-\tsi->page_mem += (unsigned long long)npages << PAGE_CACHE_SHIFT;\n" - "+\tsi->page_mem += (unsigned long long)npages << PAGE_SHIFT;\n" - " }\n" - " \n" - " static int stat_show(struct seq_file *s, void *v)\n" - "diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c\n" - "index faa7495e2d7e..8e07acbaeae6 100644\n" - "--- a/fs/f2fs/dir.c\n" - "+++ b/fs/f2fs/dir.c\n" - "@@ -17,8 +17,8 @@\n" - " \n" - " static unsigned long dir_blocks(struct inode *inode)\n" - " {\n" - "-\treturn ((unsigned long long) (i_size_read(inode) + PAGE_CACHE_SIZE - 1))\n" - "-\t\t\t\t\t\t\t>> PAGE_CACHE_SHIFT;\n" - "+\treturn ((unsigned long long) (i_size_read(inode) + PAGE_SIZE - 1))\n" - "+\t\t\t\t\t\t\t>> PAGE_SHIFT;\n" - " }\n" - " \n" - " static unsigned int dir_buckets(unsigned int level, int dir_level)\n" - "diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h\n" - "index ff79054c6cf6..0de2ee482828 100644\n" - "--- a/fs/f2fs/f2fs.h\n" - "+++ b/fs/f2fs/f2fs.h\n" - "@@ -1306,7 +1306,7 @@ static inline void f2fs_put_page(struct page *page, int unlock)\n" - " \t\tf2fs_bug_on(F2FS_P_SB(page), !PageLocked(page));\n" - " \t\tunlock_page(page);\n" - " \t}\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " static inline void f2fs_put_dnode(struct dnode_of_data *dn)\n" - "diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c\n" - "index ea272be62677..eafaa6dceefc 100644\n" - "--- a/fs/f2fs/file.c\n" - "+++ b/fs/f2fs/file.c\n" - "@@ -74,11 +74,11 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma,\n" - " \t\tgoto mapped;\n" - " \n" - " \t/* page is wholly or partially inside EOF */\n" - "-\tif (((loff_t)(page->index + 1) << PAGE_CACHE_SHIFT) >\n" - "+\tif (((loff_t)(page->index + 1) << PAGE_SHIFT) >\n" - " \t\t\t\t\t\ti_size_read(inode)) {\n" - " \t\tunsigned offset;\n" - "-\t\toffset = i_size_read(inode) & ~PAGE_CACHE_MASK;\n" - "-\t\tzero_user_segment(page, offset, PAGE_CACHE_SIZE);\n" - "+\t\toffset = i_size_read(inode) & ~PAGE_MASK;\n" - "+\t\tzero_user_segment(page, offset, PAGE_SIZE);\n" - " \t}\n" - " \tset_page_dirty(page);\n" - " \tSetPageUptodate(page);\n" - "@@ -346,11 +346,11 @@ static loff_t f2fs_seek_block(struct file *file, loff_t offset, int whence)\n" - " \t\tgoto found;\n" - " \t}\n" - " \n" - "-\tpgofs = (pgoff_t)(offset >> PAGE_CACHE_SHIFT);\n" - "+\tpgofs = (pgoff_t)(offset >> PAGE_SHIFT);\n" - " \n" - " \tdirty = __get_first_dirty_index(inode->i_mapping, pgofs, whence);\n" - " \n" - "-\tfor (; data_ofs < isize; data_ofs = (loff_t)pgofs << PAGE_CACHE_SHIFT) {\n" - "+\tfor (; data_ofs < isize; data_ofs = (loff_t)pgofs << PAGE_SHIFT) {\n" - " \t\tset_new_dnode(&dn, inode, NULL, NULL, 0);\n" - " \t\terr = get_dnode_of_data(&dn, pgofs, LOOKUP_NODE_RA);\n" - " \t\tif (err && err != -ENOENT) {\n" - "@@ -371,7 +371,7 @@ static loff_t f2fs_seek_block(struct file *file, loff_t offset, int whence)\n" - " \t\t/* find data/hole in dnode block */\n" - " \t\tfor (; dn.ofs_in_node < end_offset;\n" - " \t\t\t\tdn.ofs_in_node++, pgofs++,\n" - "-\t\t\t\tdata_ofs = (loff_t)pgofs << PAGE_CACHE_SHIFT) {\n" - "+\t\t\t\tdata_ofs = (loff_t)pgofs << PAGE_SHIFT) {\n" - " \t\t\tblock_t blkaddr;\n" - " \t\t\tblkaddr = datablock_addr(dn.node_page, dn.ofs_in_node);\n" - " \n" - "@@ -501,8 +501,8 @@ void truncate_data_blocks(struct dnode_of_data *dn)\n" - " static int truncate_partial_data_page(struct inode *inode, u64 from,\n" - " \t\t\t\t\t\t\t\tbool cache_only)\n" - " {\n" - "-\tunsigned offset = from & (PAGE_CACHE_SIZE - 1);\n" - "-\tpgoff_t index = from >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned offset = from & (PAGE_SIZE - 1);\n" - "+\tpgoff_t index = from >> PAGE_SHIFT;\n" - " \tstruct address_space *mapping = inode->i_mapping;\n" - " \tstruct page *page;\n" - " \n" - "@@ -522,7 +522,7 @@ static int truncate_partial_data_page(struct inode *inode, u64 from,\n" - " \t\treturn 0;\n" - " truncate_out:\n" - " \tf2fs_wait_on_page_writeback(page, DATA);\n" - "-\tzero_user(page, offset, PAGE_CACHE_SIZE - offset);\n" - "+\tzero_user(page, offset, PAGE_SIZE - offset);\n" - " \tif (!cache_only || !f2fs_encrypted_inode(inode) || !S_ISREG(inode->i_mode))\n" - " \t\tset_page_dirty(page);\n" - " \tf2fs_put_page(page, 1);\n" - "@@ -791,11 +791,11 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len)\n" - " \tif (ret)\n" - " \t\treturn ret;\n" - " \n" - "-\tpg_start = ((unsigned long long) offset) >> PAGE_CACHE_SHIFT;\n" - "-\tpg_end = ((unsigned long long) offset + len) >> PAGE_CACHE_SHIFT;\n" - "+\tpg_start = ((unsigned long long) offset) >> PAGE_SHIFT;\n" - "+\tpg_end = ((unsigned long long) offset + len) >> PAGE_SHIFT;\n" - " \n" - "-\toff_start = offset & (PAGE_CACHE_SIZE - 1);\n" - "-\toff_end = (offset + len) & (PAGE_CACHE_SIZE - 1);\n" - "+\toff_start = offset & (PAGE_SIZE - 1);\n" - "+\toff_end = (offset + len) & (PAGE_SIZE - 1);\n" - " \n" - " \tif (pg_start == pg_end) {\n" - " \t\tret = fill_zero(inode, pg_start, off_start,\n" - "@@ -805,7 +805,7 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len)\n" - " \t} else {\n" - " \t\tif (off_start) {\n" - " \t\t\tret = fill_zero(inode, pg_start++, off_start,\n" - "-\t\t\t\t\t\tPAGE_CACHE_SIZE - off_start);\n" - "+\t\t\t\t\t\tPAGE_SIZE - off_start);\n" - " \t\t\tif (ret)\n" - " \t\t\t\treturn ret;\n" - " \t\t}\n" - "@@ -822,8 +822,8 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len)\n" - " \n" - " \t\t\tf2fs_balance_fs(sbi, true);\n" - " \n" - "-\t\t\tblk_start = (loff_t)pg_start << PAGE_CACHE_SHIFT;\n" - "-\t\t\tblk_end = (loff_t)pg_end << PAGE_CACHE_SHIFT;\n" - "+\t\t\tblk_start = (loff_t)pg_start << PAGE_SHIFT;\n" - "+\t\t\tblk_end = (loff_t)pg_end << PAGE_SHIFT;\n" - " \t\t\ttruncate_inode_pages_range(mapping, blk_start,\n" - " \t\t\t\t\tblk_end - 1);\n" - " \n" - "@@ -950,8 +950,8 @@ static int f2fs_collapse_range(struct inode *inode, loff_t offset, loff_t len)\n" - " \tif (ret)\n" - " \t\treturn ret;\n" - " \n" - "-\tpg_start = offset >> PAGE_CACHE_SHIFT;\n" - "-\tpg_end = (offset + len) >> PAGE_CACHE_SHIFT;\n" - "+\tpg_start = offset >> PAGE_SHIFT;\n" - "+\tpg_end = (offset + len) >> PAGE_SHIFT;\n" - " \n" - " \t/* write out all dirty pages from offset */\n" - " \tret = filemap_write_and_wait_range(inode->i_mapping, offset, LLONG_MAX);\n" - "@@ -1002,11 +1002,11 @@ static int f2fs_zero_range(struct inode *inode, loff_t offset, loff_t len,\n" - " \n" - " \ttruncate_pagecache_range(inode, offset, offset + len - 1);\n" - " \n" - "-\tpg_start = ((unsigned long long) offset) >> PAGE_CACHE_SHIFT;\n" - "-\tpg_end = ((unsigned long long) offset + len) >> PAGE_CACHE_SHIFT;\n" - "+\tpg_start = ((unsigned long long) offset) >> PAGE_SHIFT;\n" - "+\tpg_end = ((unsigned long long) offset + len) >> PAGE_SHIFT;\n" - " \n" - "-\toff_start = offset & (PAGE_CACHE_SIZE - 1);\n" - "-\toff_end = (offset + len) & (PAGE_CACHE_SIZE - 1);\n" - "+\toff_start = offset & (PAGE_SIZE - 1);\n" - "+\toff_end = (offset + len) & (PAGE_SIZE - 1);\n" - " \n" - " \tif (pg_start == pg_end) {\n" - " \t\tret = fill_zero(inode, pg_start, off_start,\n" - "@@ -1020,12 +1020,12 @@ static int f2fs_zero_range(struct inode *inode, loff_t offset, loff_t len,\n" - " \t} else {\n" - " \t\tif (off_start) {\n" - " \t\t\tret = fill_zero(inode, pg_start++, off_start,\n" - "-\t\t\t\t\t\tPAGE_CACHE_SIZE - off_start);\n" - "+\t\t\t\t\t\tPAGE_SIZE - off_start);\n" - " \t\t\tif (ret)\n" - " \t\t\t\treturn ret;\n" - " \n" - " \t\t\tnew_size = max_t(loff_t, new_size,\n" - "-\t\t\t\t\t(loff_t)pg_start << PAGE_CACHE_SHIFT);\n" - "+\t\t\t\t\t(loff_t)pg_start << PAGE_SHIFT);\n" - " \t\t}\n" - " \n" - " \t\tfor (index = pg_start; index < pg_end; index++) {\n" - "@@ -1061,7 +1061,7 @@ static int f2fs_zero_range(struct inode *inode, loff_t offset, loff_t len,\n" - " \t\t\tf2fs_unlock_op(sbi);\n" - " \n" - " \t\t\tnew_size = max_t(loff_t, new_size,\n" - "-\t\t\t\t(loff_t)(index + 1) << PAGE_CACHE_SHIFT);\n" - "+\t\t\t\t(loff_t)(index + 1) << PAGE_SHIFT);\n" - " \t\t}\n" - " \n" - " \t\tif (off_end) {\n" - "@@ -1118,8 +1118,8 @@ static int f2fs_insert_range(struct inode *inode, loff_t offset, loff_t len)\n" - " \n" - " \ttruncate_pagecache(inode, offset);\n" - " \n" - "-\tpg_start = offset >> PAGE_CACHE_SHIFT;\n" - "-\tpg_end = (offset + len) >> PAGE_CACHE_SHIFT;\n" - "+\tpg_start = offset >> PAGE_SHIFT;\n" - "+\tpg_end = (offset + len) >> PAGE_SHIFT;\n" - " \tdelta = pg_end - pg_start;\n" - " \tnrpages = (i_size_read(inode) + PAGE_SIZE - 1) / PAGE_SIZE;\n" - " \n" - "@@ -1159,11 +1159,11 @@ static int expand_inode_data(struct inode *inode, loff_t offset,\n" - " \n" - " \tf2fs_balance_fs(sbi, true);\n" - " \n" - "-\tpg_start = ((unsigned long long) offset) >> PAGE_CACHE_SHIFT;\n" - "-\tpg_end = ((unsigned long long) offset + len) >> PAGE_CACHE_SHIFT;\n" - "+\tpg_start = ((unsigned long long) offset) >> PAGE_SHIFT;\n" - "+\tpg_end = ((unsigned long long) offset + len) >> PAGE_SHIFT;\n" - " \n" - "-\toff_start = offset & (PAGE_CACHE_SIZE - 1);\n" - "-\toff_end = (offset + len) & (PAGE_CACHE_SIZE - 1);\n" - "+\toff_start = offset & (PAGE_SIZE - 1);\n" - "+\toff_end = (offset + len) & (PAGE_SIZE - 1);\n" - " \n" - " \tf2fs_lock_op(sbi);\n" - " \n" - "@@ -1181,12 +1181,12 @@ noalloc:\n" - " \t\tif (pg_start == pg_end)\n" - " \t\t\tnew_size = offset + len;\n" - " \t\telse if (index == pg_start && off_start)\n" - "-\t\t\tnew_size = (loff_t)(index + 1) << PAGE_CACHE_SHIFT;\n" - "+\t\t\tnew_size = (loff_t)(index + 1) << PAGE_SHIFT;\n" - " \t\telse if (index == pg_end)\n" - "-\t\t\tnew_size = ((loff_t)index << PAGE_CACHE_SHIFT) +\n" - "+\t\t\tnew_size = ((loff_t)index << PAGE_SHIFT) +\n" - " \t\t\t\t\t\t\t\toff_end;\n" - " \t\telse\n" - "-\t\t\tnew_size += PAGE_CACHE_SIZE;\n" - "+\t\t\tnew_size += PAGE_SIZE;\n" - " \t}\n" - " \n" - " \tif (!(mode & FALLOC_FL_KEEP_SIZE) &&\n" - "@@ -1662,8 +1662,8 @@ static int f2fs_defragment_range(struct f2fs_sb_info *sbi,\n" - " \tif (need_inplace_update(inode))\n" - " \t\treturn -EINVAL;\n" - " \n" - "-\tpg_start = range->start >> PAGE_CACHE_SHIFT;\n" - "-\tpg_end = (range->start + range->len) >> PAGE_CACHE_SHIFT;\n" - "+\tpg_start = range->start >> PAGE_SHIFT;\n" - "+\tpg_end = (range->start + range->len) >> PAGE_SHIFT;\n" - " \n" - " \tf2fs_balance_fs(sbi, true);\n" - " \n" - "@@ -1780,7 +1780,7 @@ clear_out:\n" - " out:\n" - " \tinode_unlock(inode);\n" - " \tif (!err)\n" - "-\t\trange->len = (u64)total << PAGE_CACHE_SHIFT;\n" - "+\t\trange->len = (u64)total << PAGE_SHIFT;\n" - " \treturn err;\n" - " }\n" - " \n" - "diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c\n" - "index c3f0b7d4cfca..b42042e79558 100644\n" - "--- a/fs/f2fs/inline.c\n" - "+++ b/fs/f2fs/inline.c\n" - "@@ -51,7 +51,7 @@ void read_inline_data(struct page *page, struct page *ipage)\n" - " \n" - " \tf2fs_bug_on(F2FS_P_SB(page), page->index);\n" - " \n" - "-\tzero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE);\n" - "+\tzero_user_segment(page, MAX_INLINE_DATA, PAGE_SIZE);\n" - " \n" - " \t/* Copy the whole inline data block */\n" - " \tsrc_addr = inline_data_addr(ipage);\n" - "@@ -93,7 +93,7 @@ int f2fs_read_inline_data(struct inode *inode, struct page *page)\n" - " \t}\n" - " \n" - " \tif (page->index)\n" - "-\t\tzero_user_segment(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user_segment(page, 0, PAGE_SIZE);\n" - " \telse\n" - " \t\tread_inline_data(page, ipage);\n" - " \n" - "@@ -129,7 +129,7 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page)\n" - " \tif (PageUptodate(page))\n" - " \t\tgoto no_update;\n" - " \n" - "-\tzero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE);\n" - "+\tzero_user_segment(page, MAX_INLINE_DATA, PAGE_SIZE);\n" - " \n" - " \t/* Copy the whole inline data block */\n" - " \tsrc_addr = inline_data_addr(dn->inode_page);\n" - "@@ -390,7 +390,7 @@ static int f2fs_convert_inline_dir(struct inode *dir, struct page *ipage,\n" - " \t\tgoto out;\n" - " \n" - " \tf2fs_wait_on_page_writeback(page, DATA);\n" - "-\tzero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE);\n" - "+\tzero_user_segment(page, MAX_INLINE_DATA, PAGE_SIZE);\n" - " \n" - " \tdentry_blk = kmap_atomic(page);\n" - " \n" - "@@ -420,8 +420,8 @@ static int f2fs_convert_inline_dir(struct inode *dir, struct page *ipage,\n" - " \tstat_dec_inline_dir(dir);\n" - " \tclear_inode_flag(F2FS_I(dir), FI_INLINE_DENTRY);\n" - " \n" - "-\tif (i_size_read(dir) < PAGE_CACHE_SIZE) {\n" - "-\t\ti_size_write(dir, PAGE_CACHE_SIZE);\n" - "+\tif (i_size_read(dir) < PAGE_SIZE) {\n" - "+\t\ti_size_write(dir, PAGE_SIZE);\n" - " \t\tset_inode_flag(F2FS_I(dir), FI_UPDATE_DIR);\n" - " \t}\n" - " \n" - "diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c\n" - "index 6f944e5eb76e..5a5538f2b53b 100644\n" - "--- a/fs/f2fs/namei.c\n" - "+++ b/fs/f2fs/namei.c\n" - "@@ -1007,13 +1007,13 @@ static const char *f2fs_encrypted_get_link(struct dentry *dentry,\n" - " \t/* Null-terminate the name */\n" - " \tpaddr[res] = '\\0';\n" - " \n" - "-\tpage_cache_release(cpage);\n" - "+\tput_page(cpage);\n" - " \tset_delayed_call(done, kfree_link, paddr);\n" - " \treturn paddr;\n" - " errout:\n" - " \tkfree(cstr.name);\n" - " \tf2fs_fname_crypto_free_buffer(&pstr);\n" - "-\tpage_cache_release(cpage);\n" - "+\tput_page(cpage);\n" - " \treturn ERR_PTR(res);\n" - " }\n" - " \n" - "diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c\n" - "index 342597a5897f..7b9ff127093a 100644\n" - "--- a/fs/f2fs/node.c\n" - "+++ b/fs/f2fs/node.c\n" - "@@ -46,11 +46,11 @@ bool available_free_memory(struct f2fs_sb_info *sbi, int type)\n" - " \t */\n" - " \tif (type == FREE_NIDS) {\n" - " \t\tmem_size = (nm_i->fcnt * sizeof(struct free_nid)) >>\n" - "-\t\t\t\t\t\t\tPAGE_CACHE_SHIFT;\n" - "+\t\t\t\t\t\t\tPAGE_SHIFT;\n" - " \t\tres = mem_size < ((avail_ram * nm_i->ram_thresh / 100) >> 2);\n" - " \t} else if (type == NAT_ENTRIES) {\n" - " \t\tmem_size = (nm_i->nat_cnt * sizeof(struct nat_entry)) >>\n" - "-\t\t\t\t\t\t\tPAGE_CACHE_SHIFT;\n" - "+\t\t\t\t\t\t\tPAGE_SHIFT;\n" - " \t\tres = mem_size < ((avail_ram * nm_i->ram_thresh / 100) >> 2);\n" - " \t} else if (type == DIRTY_DENTS) {\n" - " \t\tif (sbi->sb->s_bdi->wb.dirty_exceeded)\n" - "@@ -62,13 +62,13 @@ bool available_free_memory(struct f2fs_sb_info *sbi, int type)\n" - " \n" - " \t\tfor (i = 0; i <= UPDATE_INO; i++)\n" - " \t\t\tmem_size += (sbi->im[i].ino_num *\n" - "-\t\t\t\tsizeof(struct ino_entry)) >> PAGE_CACHE_SHIFT;\n" - "+\t\t\t\tsizeof(struct ino_entry)) >> PAGE_SHIFT;\n" - " \t\tres = mem_size < ((avail_ram * nm_i->ram_thresh / 100) >> 1);\n" - " \t} else if (type == EXTENT_CACHE) {\n" - " \t\tmem_size = (atomic_read(&sbi->total_ext_tree) *\n" - " \t\t\t\tsizeof(struct extent_tree) +\n" - " \t\t\t\tatomic_read(&sbi->total_ext_node) *\n" - "-\t\t\t\tsizeof(struct extent_node)) >> PAGE_CACHE_SHIFT;\n" - "+\t\t\t\tsizeof(struct extent_node)) >> PAGE_SHIFT;\n" - " \t\tres = mem_size < ((avail_ram * nm_i->ram_thresh / 100) >> 1);\n" - " \t} else {\n" - " \t\tif (!sbi->sb->s_bdi->wb.dirty_exceeded)\n" - "@@ -121,7 +121,7 @@ static struct page *get_next_nat_page(struct f2fs_sb_info *sbi, nid_t nid)\n" - " \n" - " \tsrc_addr = page_address(src_page);\n" - " \tdst_addr = page_address(dst_page);\n" - "-\tmemcpy(dst_addr, src_addr, PAGE_CACHE_SIZE);\n" - "+\tmemcpy(dst_addr, src_addr, PAGE_SIZE);\n" - " \tset_page_dirty(dst_page);\n" - " \tf2fs_put_page(src_page, 1);\n" - " \n" - "diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c\n" - "index 589b20b8677b..45f53f27a5f6 100644\n" - "--- a/fs/f2fs/recovery.c\n" - "+++ b/fs/f2fs/recovery.c\n" - "@@ -593,7 +593,7 @@ out:\n" - " \n" - " \t/* truncate meta pages to be used by the recovery */\n" - " \ttruncate_inode_pages_range(META_MAPPING(sbi),\n" - "-\t\t\t(loff_t)MAIN_BLKADDR(sbi) << PAGE_CACHE_SHIFT, -1);\n" - "+\t\t\t(loff_t)MAIN_BLKADDR(sbi) << PAGE_SHIFT, -1);\n" - " \n" - " \tif (err) {\n" - " \t\ttruncate_inode_pages_final(NODE_MAPPING(sbi));\n" - "diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c\n" - "index 5904a411c86f..89ba77786772 100644\n" - "--- a/fs/f2fs/segment.c\n" - "+++ b/fs/f2fs/segment.c\n" - "@@ -804,12 +804,12 @@ int npages_for_summary_flush(struct f2fs_sb_info *sbi, bool for_ra)\n" - " \t\t}\n" - " \t}\n" - " \n" - "-\tsum_in_page = (PAGE_CACHE_SIZE - 2 * SUM_JOURNAL_SIZE -\n" - "+\tsum_in_page = (PAGE_SIZE - 2 * SUM_JOURNAL_SIZE -\n" - " \t\t\tSUM_FOOTER_SIZE) / SUMMARY_SIZE;\n" - " \tif (valid_sum_count <= sum_in_page)\n" - " \t\treturn 1;\n" - " \telse if ((valid_sum_count - sum_in_page) <=\n" - "-\t\t(PAGE_CACHE_SIZE - SUM_FOOTER_SIZE) / SUMMARY_SIZE)\n" - "+\t\t(PAGE_SIZE - SUM_FOOTER_SIZE) / SUMMARY_SIZE)\n" - " \t\treturn 2;\n" - " \treturn 3;\n" - " }\n" - "@@ -828,9 +828,9 @@ void update_meta_page(struct f2fs_sb_info *sbi, void *src, block_t blk_addr)\n" - " \tvoid *dst = page_address(page);\n" - " \n" - " \tif (src)\n" - "-\t\tmemcpy(dst, src, PAGE_CACHE_SIZE);\n" - "+\t\tmemcpy(dst, src, PAGE_SIZE);\n" - " \telse\n" - "-\t\tmemset(dst, 0, PAGE_CACHE_SIZE);\n" - "+\t\tmemset(dst, 0, PAGE_SIZE);\n" - " \tset_page_dirty(page);\n" - " \tf2fs_put_page(page, 1);\n" - " }\n" - "@@ -1527,7 +1527,7 @@ static int read_compacted_summaries(struct f2fs_sb_info *sbi)\n" - " \t\t\ts = (struct f2fs_summary *)(kaddr + offset);\n" - " \t\t\tseg_i->sum_blk->entries[j] = *s;\n" - " \t\t\toffset += SUMMARY_SIZE;\n" - "-\t\t\tif (offset + SUMMARY_SIZE <= PAGE_CACHE_SIZE -\n" - "+\t\t\tif (offset + SUMMARY_SIZE <= PAGE_SIZE -\n" - " \t\t\t\t\t\tSUM_FOOTER_SIZE)\n" - " \t\t\t\tcontinue;\n" - " \n" - "@@ -1599,7 +1599,7 @@ static int read_normal_summaries(struct f2fs_sb_info *sbi, int type)\n" - " \t/* set uncompleted segment to curseg */\n" - " \tcurseg = CURSEG_I(sbi, type);\n" - " \tmutex_lock(&curseg->curseg_mutex);\n" - "-\tmemcpy(curseg->sum_blk, sum, PAGE_CACHE_SIZE);\n" - "+\tmemcpy(curseg->sum_blk, sum, PAGE_SIZE);\n" - " \tcurseg->next_segno = segno;\n" - " \treset_curseg(sbi, type, 0);\n" - " \tcurseg->alloc_type = ckpt->alloc_type[type];\n" - "@@ -1682,7 +1682,7 @@ static void write_compacted_summaries(struct f2fs_sb_info *sbi, block_t blkaddr)\n" - " \t\t\t*summary = seg_i->sum_blk->entries[j];\n" - " \t\t\twritten_size += SUMMARY_SIZE;\n" - " \n" - "-\t\t\tif (written_size + SUMMARY_SIZE <= PAGE_CACHE_SIZE -\n" - "+\t\t\tif (written_size + SUMMARY_SIZE <= PAGE_SIZE -\n" - " \t\t\t\t\t\t\tSUM_FOOTER_SIZE)\n" - " \t\t\t\tcontinue;\n" - " \n" - "@@ -1773,7 +1773,7 @@ static struct page *get_next_sit_page(struct f2fs_sb_info *sbi,\n" - " \n" - " \tsrc_addr = page_address(src_page);\n" - " \tdst_addr = page_address(dst_page);\n" - "-\tmemcpy(dst_addr, src_addr, PAGE_CACHE_SIZE);\n" - "+\tmemcpy(dst_addr, src_addr, PAGE_SIZE);\n" - " \n" - " \tset_page_dirty(dst_page);\n" - " \tf2fs_put_page(src_page, 1);\n" - "@@ -2096,7 +2096,7 @@ static int build_curseg(struct f2fs_sb_info *sbi)\n" - " \n" - " \tfor (i = 0; i < NR_CURSEG_TYPE; i++) {\n" - " \t\tmutex_init(&array[i].curseg_mutex);\n" - "-\t\tarray[i].sum_blk = kzalloc(PAGE_CACHE_SIZE, GFP_KERNEL);\n" - "+\t\tarray[i].sum_blk = kzalloc(PAGE_SIZE, GFP_KERNEL);\n" - " \t\tif (!array[i].sum_blk)\n" - " \t\t\treturn -ENOMEM;\n" - " \t\tarray[i].segno = NULL_SEGNO;\n" - "diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c\n" - "index 6134832baaaf..6d35862ce113 100644\n" - "--- a/fs/f2fs/super.c\n" - "+++ b/fs/f2fs/super.c\n" - "@@ -1012,10 +1012,10 @@ static int sanity_check_raw_super(struct super_block *sb,\n" - " \t}\n" - " \n" - " \t/* Currently, support only 4KB page cache size */\n" - "-\tif (F2FS_BLKSIZE != PAGE_CACHE_SIZE) {\n" - "+\tif (F2FS_BLKSIZE != PAGE_SIZE) {\n" - " \t\tf2fs_msg(sb, KERN_INFO,\n" - " \t\t\t\"Invalid page_cache_size (%lu), supports only 4KB\\n\",\n" - "-\t\t\tPAGE_CACHE_SIZE);\n" - "+\t\t\tPAGE_SIZE);\n" - " \t\treturn 1;\n" - " \t}\n" - " \n" - "diff --git a/fs/freevxfs/vxfs_immed.c b/fs/freevxfs/vxfs_immed.c\n" - "index cb84f0fcc72a..bfc780c682fb 100644\n" - "--- a/fs/freevxfs/vxfs_immed.c\n" - "+++ b/fs/freevxfs/vxfs_immed.c\n" - "@@ -66,11 +66,11 @@ static int\n" - " vxfs_immed_readpage(struct file *fp, struct page *pp)\n" - " {\n" - " \tstruct vxfs_inode_info\t*vip = VXFS_INO(pp->mapping->host);\n" - "-\tu_int64_t\toffset = (u_int64_t)pp->index << PAGE_CACHE_SHIFT;\n" - "+\tu_int64_t\toffset = (u_int64_t)pp->index << PAGE_SHIFT;\n" - " \tcaddr_t\t\tkaddr;\n" - " \n" - " \tkaddr = kmap(pp);\n" - "-\tmemcpy(kaddr, vip->vii_immed.vi_immed + offset, PAGE_CACHE_SIZE);\n" - "+\tmemcpy(kaddr, vip->vii_immed.vi_immed + offset, PAGE_SIZE);\n" - " \tkunmap(pp);\n" - " \t\n" - " \tflush_dcache_page(pp);\n" - "diff --git a/fs/freevxfs/vxfs_lookup.c b/fs/freevxfs/vxfs_lookup.c\n" - "index 1cff72df0389..a49e0cfbb686 100644\n" - "--- a/fs/freevxfs/vxfs_lookup.c\n" - "+++ b/fs/freevxfs/vxfs_lookup.c\n" - "@@ -45,7 +45,7 @@\n" - " /*\n" - " * Number of VxFS blocks per page.\n" - " */\n" - "-#define VXFS_BLOCK_PER_PAGE(sbp) ((PAGE_CACHE_SIZE / (sbp)->s_blocksize))\n" - "+#define VXFS_BLOCK_PER_PAGE(sbp) ((PAGE_SIZE / (sbp)->s_blocksize))\n" - " \n" - " \n" - " static struct dentry *\tvxfs_lookup(struct inode *, struct dentry *, unsigned int);\n" - "@@ -175,7 +175,7 @@ vxfs_inode_by_name(struct inode *dip, struct dentry *dp)\n" - " \tif (de) {\n" - " \t\tino = de->d_ino;\n" - " \t\tkunmap(pp);\n" - "-\t\tpage_cache_release(pp);\n" - "+\t\tput_page(pp);\n" - " \t}\n" - " \t\n" - " \treturn (ino);\n" - "@@ -255,8 +255,8 @@ vxfs_readdir(struct file *fp, struct dir_context *ctx)\n" - " \tnblocks = dir_blocks(ip);\n" - " \tpblocks = VXFS_BLOCK_PER_PAGE(sbp);\n" - " \n" - "-\tpage = pos >> PAGE_CACHE_SHIFT;\n" - "-\toffset = pos & ~PAGE_CACHE_MASK;\n" - "+\tpage = pos >> PAGE_SHIFT;\n" - "+\toffset = pos & ~PAGE_MASK;\n" - " \tblock = (u_long)(pos >> sbp->s_blocksize_bits) % pblocks;\n" - " \n" - " \tfor (; page < npages; page++, block = 0) {\n" - "@@ -289,7 +289,7 @@ vxfs_readdir(struct file *fp, struct dir_context *ctx)\n" - " \t\t\t\t\tcontinue;\n" - " \n" - " \t\t\t\toffset = (char *)de - kaddr;\n" - "-\t\t\t\tctx->pos = ((page << PAGE_CACHE_SHIFT) | offset) + 2;\n" - "+\t\t\t\tctx->pos = ((page << PAGE_SHIFT) | offset) + 2;\n" - " \t\t\t\tif (!dir_emit(ctx, de->d_name, de->d_namelen,\n" - " \t\t\t\t\tde->d_ino, DT_UNKNOWN)) {\n" - " \t\t\t\t\tvxfs_put_page(pp);\n" - "@@ -301,6 +301,6 @@ vxfs_readdir(struct file *fp, struct dir_context *ctx)\n" - " \t\tvxfs_put_page(pp);\n" - " \t\toffset = 0;\n" - " \t}\n" - "-\tctx->pos = ((page << PAGE_CACHE_SHIFT) | offset) + 2;\n" - "+\tctx->pos = ((page << PAGE_SHIFT) | offset) + 2;\n" - " \treturn 0;\n" - " }\n" - "diff --git a/fs/freevxfs/vxfs_subr.c b/fs/freevxfs/vxfs_subr.c\n" - "index 5d318c44f855..e806694d4145 100644\n" - "--- a/fs/freevxfs/vxfs_subr.c\n" - "+++ b/fs/freevxfs/vxfs_subr.c\n" - "@@ -50,7 +50,7 @@ inline void\n" - " vxfs_put_page(struct page *pp)\n" - " {\n" - " \tkunmap(pp);\n" - "-\tpage_cache_release(pp);\n" - "+\tput_page(pp);\n" - " }\n" - " \n" - " /**\n" - "diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c\n" - "index 5c46ed9f3e14..671e1780afc3 100644\n" - "--- a/fs/fs-writeback.c\n" - "+++ b/fs/fs-writeback.c\n" - "@@ -33,7 +33,7 @@\n" - " /*\n" - " * 4MB minimal write chunk size\n" - " */\n" - "-#define MIN_WRITEBACK_PAGES\t(4096UL >> (PAGE_CACHE_SHIFT - 10))\n" - "+#define MIN_WRITEBACK_PAGES\t(4096UL >> (PAGE_SHIFT - 10))\n" - " \n" - " struct wb_completion {\n" - " \tatomic_t\t\tcnt;\n" - "diff --git a/fs/fscache/page.c b/fs/fscache/page.c\n" - "index 6b35fc4860a0..3078b679fcd1 100644\n" - "--- a/fs/fscache/page.c\n" - "+++ b/fs/fscache/page.c\n" - "@@ -113,7 +113,7 @@ try_again:\n" - " \n" - " \twake_up_bit(&cookie->flags, 0);\n" - " \tif (xpage)\n" - "-\t\tpage_cache_release(xpage);\n" - "+\t\tput_page(xpage);\n" - " \t__fscache_uncache_page(cookie, page);\n" - " \treturn true;\n" - " \n" - "@@ -164,7 +164,7 @@ static void fscache_end_page_write(struct fscache_object *object,\n" - " \t}\n" - " \tspin_unlock(&object->lock);\n" - " \tif (xpage)\n" - "-\t\tpage_cache_release(xpage);\n" - "+\t\tput_page(xpage);\n" - " }\n" - " \n" - " /*\n" - "@@ -884,7 +884,7 @@ void fscache_invalidate_writes(struct fscache_cookie *cookie)\n" - " \t\tspin_unlock(&cookie->stores_lock);\n" - " \n" - " \t\tfor (i = n - 1; i >= 0; i--)\n" - "-\t\t\tpage_cache_release(results[i]);\n" - "+\t\t\tput_page(results[i]);\n" - " \t}\n" - " \n" - " \t_leave(\"\");\n" - "@@ -982,7 +982,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,\n" - " \n" - " \tradix_tree_tag_set(&cookie->stores, page->index,\n" - " \t\t\t FSCACHE_COOKIE_PENDING_TAG);\n" - "-\tpage_cache_get(page);\n" - "+\tget_page(page);\n" - " \n" - " \t/* we only want one writer at a time, but we do need to queue new\n" - " \t * writers after exclusive ops */\n" - "@@ -1026,7 +1026,7 @@ submit_failed:\n" - " \tradix_tree_delete(&cookie->stores, page->index);\n" - " \tspin_unlock(&cookie->stores_lock);\n" - " \twake_cookie = __fscache_unuse_cookie(cookie);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \tret = -ENOBUFS;\n" - " \tgoto nobufs;\n" - " \n" - "diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c\n" - "index ebb5e37455a0..cbece1221417 100644\n" - "--- a/fs/fuse/dev.c\n" - "+++ b/fs/fuse/dev.c\n" - "@@ -897,7 +897,7 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)\n" - " \t\treturn err;\n" - " \t}\n" - " \n" - "-\tpage_cache_get(newpage);\n" - "+\tget_page(newpage);\n" - " \n" - " \tif (!(buf->flags & PIPE_BUF_FLAG_LRU))\n" - " \t\tlru_cache_add_file(newpage);\n" - "@@ -912,12 +912,12 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)\n" - " \n" - " \tif (err) {\n" - " \t\tunlock_page(newpage);\n" - "-\t\tpage_cache_release(newpage);\n" - "+\t\tput_page(newpage);\n" - " \t\treturn err;\n" - " \t}\n" - " \n" - " \tunlock_page(oldpage);\n" - "-\tpage_cache_release(oldpage);\n" - "+\tput_page(oldpage);\n" - " \tcs->len = 0;\n" - " \n" - " \treturn 0;\n" - "@@ -951,7 +951,7 @@ static int fuse_ref_page(struct fuse_copy_state *cs, struct page *page,\n" - " \tfuse_copy_finish(cs);\n" - " \n" - " \tbuf = cs->pipebufs;\n" - "-\tpage_cache_get(page);\n" - "+\tget_page(page);\n" - " \tbuf->page = page;\n" - " \tbuf->offset = offset;\n" - " \tbuf->len = count;\n" - "@@ -1435,7 +1435,7 @@ out_unlock:\n" - " \n" - " out:\n" - " \tfor (; page_nr < cs.nr_segs; page_nr++)\n" - "-\t\tpage_cache_release(bufs[page_nr].page);\n" - "+\t\tput_page(bufs[page_nr].page);\n" - " \n" - " \tkfree(bufs);\n" - " \treturn ret;\n" - "@@ -1632,8 +1632,8 @@ static int fuse_notify_store(struct fuse_conn *fc, unsigned int size,\n" - " \t\tgoto out_up_killsb;\n" - " \n" - " \tmapping = inode->i_mapping;\n" - "-\tindex = outarg.offset >> PAGE_CACHE_SHIFT;\n" - "-\toffset = outarg.offset & ~PAGE_CACHE_MASK;\n" - "+\tindex = outarg.offset >> PAGE_SHIFT;\n" - "+\toffset = outarg.offset & ~PAGE_MASK;\n" - " \tfile_size = i_size_read(inode);\n" - " \tend = outarg.offset + outarg.size;\n" - " \tif (end > file_size) {\n" - "@@ -1652,13 +1652,13 @@ static int fuse_notify_store(struct fuse_conn *fc, unsigned int size,\n" - " \t\tif (!page)\n" - " \t\t\tgoto out_iput;\n" - " \n" - "-\t\tthis_num = min_t(unsigned, num, PAGE_CACHE_SIZE - offset);\n" - "+\t\tthis_num = min_t(unsigned, num, PAGE_SIZE - offset);\n" - " \t\terr = fuse_copy_page(cs, &page, offset, this_num, 0);\n" - " \t\tif (!err && offset == 0 &&\n" - "-\t\t (this_num == PAGE_CACHE_SIZE || file_size == end))\n" - "+\t\t (this_num == PAGE_SIZE || file_size == end))\n" - " \t\t\tSetPageUptodate(page);\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \n" - " \t\tif (err)\n" - " \t\t\tgoto out_iput;\n" - "@@ -1697,7 +1697,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode,\n" - " \tsize_t total_len = 0;\n" - " \tint num_pages;\n" - " \n" - "-\toffset = outarg->offset & ~PAGE_CACHE_MASK;\n" - "+\toffset = outarg->offset & ~PAGE_MASK;\n" - " \tfile_size = i_size_read(inode);\n" - " \n" - " \tnum = outarg->size;\n" - "@@ -1720,7 +1720,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode,\n" - " \treq->page_descs[0].offset = offset;\n" - " \treq->end = fuse_retrieve_end;\n" - " \n" - "-\tindex = outarg->offset >> PAGE_CACHE_SHIFT;\n" - "+\tindex = outarg->offset >> PAGE_SHIFT;\n" - " \n" - " \twhile (num && req->num_pages < num_pages) {\n" - " \t\tstruct page *page;\n" - "@@ -1730,7 +1730,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode,\n" - " \t\tif (!page)\n" - " \t\t\tbreak;\n" - " \n" - "-\t\tthis_num = min_t(unsigned, num, PAGE_CACHE_SIZE - offset);\n" - "+\t\tthis_num = min_t(unsigned, num, PAGE_SIZE - offset);\n" - " \t\treq->pages[req->num_pages] = page;\n" - " \t\treq->page_descs[req->num_pages].length = this_num;\n" - " \t\treq->num_pages++;\n" - "diff --git a/fs/fuse/file.c b/fs/fuse/file.c\n" - "index b03d253ece15..6fc09c6fc80c 100644\n" - "--- a/fs/fuse/file.c\n" - "+++ b/fs/fuse/file.c\n" - "@@ -348,7 +348,7 @@ static bool fuse_range_is_writeback(struct inode *inode, pgoff_t idx_from,\n" - " \t\tpgoff_t curr_index;\n" - " \n" - " \t\tBUG_ON(req->inode != inode);\n" - "-\t\tcurr_index = req->misc.write.in.offset >> PAGE_CACHE_SHIFT;\n" - "+\t\tcurr_index = req->misc.write.in.offset >> PAGE_SHIFT;\n" - " \t\tif (idx_from < curr_index + req->num_pages &&\n" - " \t\t curr_index <= idx_to) {\n" - " \t\t\tfound = true;\n" - "@@ -676,11 +676,11 @@ static void fuse_short_read(struct fuse_req *req, struct inode *inode,\n" - " \t\t * present there.\n" - " \t\t */\n" - " \t\tint i;\n" - "-\t\tint start_idx = num_read >> PAGE_CACHE_SHIFT;\n" - "-\t\tsize_t off = num_read & (PAGE_CACHE_SIZE - 1);\n" - "+\t\tint start_idx = num_read >> PAGE_SHIFT;\n" - "+\t\tsize_t off = num_read & (PAGE_SIZE - 1);\n" - " \n" - " \t\tfor (i = start_idx; i < req->num_pages; i++) {\n" - "-\t\t\tzero_user_segment(req->pages[i], off, PAGE_CACHE_SIZE);\n" - "+\t\t\tzero_user_segment(req->pages[i], off, PAGE_SIZE);\n" - " \t\t\toff = 0;\n" - " \t\t}\n" - " \t} else {\n" - "@@ -697,7 +697,7 @@ static int fuse_do_readpage(struct file *file, struct page *page)\n" - " \tstruct fuse_req *req;\n" - " \tsize_t num_read;\n" - " \tloff_t pos = page_offset(page);\n" - "-\tsize_t count = PAGE_CACHE_SIZE;\n" - "+\tsize_t count = PAGE_SIZE;\n" - " \tu64 attr_ver;\n" - " \tint err;\n" - " \n" - "@@ -782,7 +782,7 @@ static void fuse_readpages_end(struct fuse_conn *fc, struct fuse_req *req)\n" - " \t\telse\n" - " \t\t\tSetPageError(page);\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \tif (req->ff)\n" - " \t\tfuse_file_put(req->ff, false);\n" - "@@ -793,7 +793,7 @@ static void fuse_send_readpages(struct fuse_req *req, struct file *file)\n" - " \tstruct fuse_file *ff = file->private_data;\n" - " \tstruct fuse_conn *fc = ff->fc;\n" - " \tloff_t pos = page_offset(req->pages[0]);\n" - "-\tsize_t count = req->num_pages << PAGE_CACHE_SHIFT;\n" - "+\tsize_t count = req->num_pages << PAGE_SHIFT;\n" - " \n" - " \treq->out.argpages = 1;\n" - " \treq->out.page_zeroing = 1;\n" - "@@ -829,7 +829,7 @@ static int fuse_readpages_fill(void *_data, struct page *page)\n" - " \n" - " \tif (req->num_pages &&\n" - " \t (req->num_pages == FUSE_MAX_PAGES_PER_REQ ||\n" - "-\t (req->num_pages + 1) * PAGE_CACHE_SIZE > fc->max_read ||\n" - "+\t (req->num_pages + 1) * PAGE_SIZE > fc->max_read ||\n" - " \t req->pages[req->num_pages - 1]->index + 1 != page->index)) {\n" - " \t\tint nr_alloc = min_t(unsigned, data->nr_pages,\n" - " \t\t\t\t FUSE_MAX_PAGES_PER_REQ);\n" - "@@ -851,7 +851,7 @@ static int fuse_readpages_fill(void *_data, struct page *page)\n" - " \t\treturn -EIO;\n" - " \t}\n" - " \n" - "-\tpage_cache_get(page);\n" - "+\tget_page(page);\n" - " \treq->pages[req->num_pages] = page;\n" - " \treq->page_descs[req->num_pages].length = PAGE_SIZE;\n" - " \treq->num_pages++;\n" - "@@ -996,17 +996,17 @@ static size_t fuse_send_write_pages(struct fuse_req *req, struct file *file,\n" - " \tfor (i = 0; i < req->num_pages; i++) {\n" - " \t\tstruct page *page = req->pages[i];\n" - " \n" - "-\t\tif (!req->out.h.error && !offset && count >= PAGE_CACHE_SIZE)\n" - "+\t\tif (!req->out.h.error && !offset && count >= PAGE_SIZE)\n" - " \t\t\tSetPageUptodate(page);\n" - " \n" - "-\t\tif (count > PAGE_CACHE_SIZE - offset)\n" - "-\t\t\tcount -= PAGE_CACHE_SIZE - offset;\n" - "+\t\tif (count > PAGE_SIZE - offset)\n" - "+\t\t\tcount -= PAGE_SIZE - offset;\n" - " \t\telse\n" - " \t\t\tcount = 0;\n" - " \t\toffset = 0;\n" - " \n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \n" - " \treturn res;\n" - "@@ -1017,7 +1017,7 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req,\n" - " \t\t\t struct iov_iter *ii, loff_t pos)\n" - " {\n" - " \tstruct fuse_conn *fc = get_fuse_conn(mapping->host);\n" - "-\tunsigned offset = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tunsigned offset = pos & (PAGE_SIZE - 1);\n" - " \tsize_t count = 0;\n" - " \tint err;\n" - " \n" - "@@ -1027,8 +1027,8 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req,\n" - " \tdo {\n" - " \t\tsize_t tmp;\n" - " \t\tstruct page *page;\n" - "-\t\tpgoff_t index = pos >> PAGE_CACHE_SHIFT;\n" - "-\t\tsize_t bytes = min_t(size_t, PAGE_CACHE_SIZE - offset,\n" - "+\t\tpgoff_t index = pos >> PAGE_SHIFT;\n" - "+\t\tsize_t bytes = min_t(size_t, PAGE_SIZE - offset,\n" - " \t\t\t\t iov_iter_count(ii));\n" - " \n" - " \t\tbytes = min_t(size_t, bytes, fc->max_write - count);\n" - "@@ -1052,7 +1052,7 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req,\n" - " \t\tiov_iter_advance(ii, tmp);\n" - " \t\tif (!tmp) {\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tbytes = min(bytes, iov_iter_single_seg_count(ii));\n" - " \t\t\tgoto again;\n" - " \t\t}\n" - "@@ -1065,7 +1065,7 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req,\n" - " \t\tcount += tmp;\n" - " \t\tpos += tmp;\n" - " \t\toffset += tmp;\n" - "-\t\tif (offset == PAGE_CACHE_SIZE)\n" - "+\t\tif (offset == PAGE_SIZE)\n" - " \t\t\toffset = 0;\n" - " \n" - " \t\tif (!fc->big_writes)\n" - "@@ -1079,8 +1079,8 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req,\n" - " static inline unsigned fuse_wr_pages(loff_t pos, size_t len)\n" - " {\n" - " \treturn min_t(unsigned,\n" - "-\t\t ((pos + len - 1) >> PAGE_CACHE_SHIFT) -\n" - "-\t\t (pos >> PAGE_CACHE_SHIFT) + 1,\n" - "+\t\t ((pos + len - 1) >> PAGE_SHIFT) -\n" - "+\t\t (pos >> PAGE_SHIFT) + 1,\n" - " \t\t FUSE_MAX_PAGES_PER_REQ);\n" - " }\n" - " \n" - "@@ -1198,8 +1198,8 @@ static ssize_t fuse_file_write_iter(struct kiocb *iocb, struct iov_iter *from)\n" - " \t\t\tgoto out;\n" - " \n" - " \t\tinvalidate_mapping_pages(file->f_mapping,\n" - "-\t\t\t\t\t pos >> PAGE_CACHE_SHIFT,\n" - "-\t\t\t\t\t endbyte >> PAGE_CACHE_SHIFT);\n" - "+\t\t\t\t\t pos >> PAGE_SHIFT,\n" - "+\t\t\t\t\t endbyte >> PAGE_SHIFT);\n" - " \n" - " \t\twritten += written_buffered;\n" - " \t\tiocb->ki_pos = pos + written_buffered;\n" - "@@ -1308,8 +1308,8 @@ ssize_t fuse_direct_io(struct fuse_io_priv *io, struct iov_iter *iter,\n" - " \tsize_t nmax = write ? fc->max_write : fc->max_read;\n" - " \tloff_t pos = *ppos;\n" - " \tsize_t count = iov_iter_count(iter);\n" - "-\tpgoff_t idx_from = pos >> PAGE_CACHE_SHIFT;\n" - "-\tpgoff_t idx_to = (pos + count - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t idx_from = pos >> PAGE_SHIFT;\n" - "+\tpgoff_t idx_to = (pos + count - 1) >> PAGE_SHIFT;\n" - " \tssize_t res = 0;\n" - " \tstruct fuse_req *req;\n" - " \n" - "@@ -1460,7 +1460,7 @@ __acquires(fc->lock)\n" - " {\n" - " \tstruct fuse_inode *fi = get_fuse_inode(req->inode);\n" - " \tstruct fuse_write_in *inarg = &req->misc.write.in;\n" - "-\t__u64 data_size = req->num_pages * PAGE_CACHE_SIZE;\n" - "+\t__u64 data_size = req->num_pages * PAGE_SIZE;\n" - " \n" - " \tif (!fc->connected)\n" - " \t\tgoto out_free;\n" - "@@ -1721,7 +1721,7 @@ static bool fuse_writepage_in_flight(struct fuse_req *new_req,\n" - " \tlist_del(&new_req->writepages_entry);\n" - " \tlist_for_each_entry(old_req, &fi->writepages, writepages_entry) {\n" - " \t\tBUG_ON(old_req->inode != new_req->inode);\n" - "-\t\tcurr_index = old_req->misc.write.in.offset >> PAGE_CACHE_SHIFT;\n" - "+\t\tcurr_index = old_req->misc.write.in.offset >> PAGE_SHIFT;\n" - " \t\tif (curr_index <= page->index &&\n" - " \t\t page->index < curr_index + old_req->num_pages) {\n" - " \t\t\tfound = true;\n" - "@@ -1736,7 +1736,7 @@ static bool fuse_writepage_in_flight(struct fuse_req *new_req,\n" - " \tnew_req->num_pages = 1;\n" - " \tfor (tmp = old_req; tmp != NULL; tmp = tmp->misc.write.next) {\n" - " \t\tBUG_ON(tmp->inode != new_req->inode);\n" - "-\t\tcurr_index = tmp->misc.write.in.offset >> PAGE_CACHE_SHIFT;\n" - "+\t\tcurr_index = tmp->misc.write.in.offset >> PAGE_SHIFT;\n" - " \t\tif (tmp->num_pages == 1 &&\n" - " \t\t curr_index == page->index) {\n" - " \t\t\told_req = tmp;\n" - "@@ -1793,7 +1793,7 @@ static int fuse_writepages_fill(struct page *page,\n" - " \n" - " \tif (req && req->num_pages &&\n" - " \t (is_writeback || req->num_pages == FUSE_MAX_PAGES_PER_REQ ||\n" - "-\t (req->num_pages + 1) * PAGE_CACHE_SIZE > fc->max_write ||\n" - "+\t (req->num_pages + 1) * PAGE_SIZE > fc->max_write ||\n" - " \t data->orig_pages[req->num_pages - 1]->index + 1 != page->index)) {\n" - " \t\tfuse_writepages_send(data);\n" - " \t\tdata->req = NULL;\n" - "@@ -1918,7 +1918,7 @@ static int fuse_write_begin(struct file *file, struct address_space *mapping,\n" - " \t\tloff_t pos, unsigned len, unsigned flags,\n" - " \t\tstruct page **pagep, void **fsdata)\n" - " {\n" - "-\tpgoff_t index = pos >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = pos >> PAGE_SHIFT;\n" - " \tstruct fuse_conn *fc = get_fuse_conn(file_inode(file));\n" - " \tstruct page *page;\n" - " \tloff_t fsize;\n" - "@@ -1932,15 +1932,15 @@ static int fuse_write_begin(struct file *file, struct address_space *mapping,\n" - " \n" - " \tfuse_wait_on_page_writeback(mapping->host, page->index);\n" - " \n" - "-\tif (PageUptodate(page) || len == PAGE_CACHE_SIZE)\n" - "+\tif (PageUptodate(page) || len == PAGE_SIZE)\n" - " \t\tgoto success;\n" - " \t/*\n" - " \t * Check if the start this page comes after the end of file, in which\n" - " \t * case the readpage can be optimized away.\n" - " \t */\n" - " \tfsize = i_size_read(mapping->host);\n" - "-\tif (fsize <= (pos & PAGE_CACHE_MASK)) {\n" - "-\t\tsize_t off = pos & ~PAGE_CACHE_MASK;\n" - "+\tif (fsize <= (pos & PAGE_MASK)) {\n" - "+\t\tsize_t off = pos & ~PAGE_MASK;\n" - " \t\tif (off)\n" - " \t\t\tzero_user_segment(page, 0, off);\n" - " \t\tgoto success;\n" - "@@ -1954,7 +1954,7 @@ success:\n" - " \n" - " cleanup:\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " error:\n" - " \treturn err;\n" - " }\n" - "@@ -1967,16 +1967,16 @@ static int fuse_write_end(struct file *file, struct address_space *mapping,\n" - " \n" - " \tif (!PageUptodate(page)) {\n" - " \t\t/* Zero any unwritten bytes at the end of the page */\n" - "-\t\tsize_t endoff = (pos + copied) & ~PAGE_CACHE_MASK;\n" - "+\t\tsize_t endoff = (pos + copied) & ~PAGE_MASK;\n" - " \t\tif (endoff)\n" - "-\t\t\tzero_user_segment(page, endoff, PAGE_CACHE_SIZE);\n" - "+\t\t\tzero_user_segment(page, endoff, PAGE_SIZE);\n" - " \t\tSetPageUptodate(page);\n" - " \t}\n" - " \n" - " \tfuse_write_update_size(inode, pos + copied);\n" - " \tset_page_dirty(page);\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \treturn copied;\n" - " }\n" - "diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c\n" - "index 4d69d5c0bedc..1ce67668a8e1 100644\n" - "--- a/fs/fuse/inode.c\n" - "+++ b/fs/fuse/inode.c\n" - "@@ -339,11 +339,11 @@ int fuse_reverse_inval_inode(struct super_block *sb, u64 nodeid,\n" - " \n" - " \tfuse_invalidate_attr(inode);\n" - " \tif (offset >= 0) {\n" - "-\t\tpg_start = offset >> PAGE_CACHE_SHIFT;\n" - "+\t\tpg_start = offset >> PAGE_SHIFT;\n" - " \t\tif (len <= 0)\n" - " \t\t\tpg_end = -1;\n" - " \t\telse\n" - "-\t\t\tpg_end = (offset + len - 1) >> PAGE_CACHE_SHIFT;\n" - "+\t\t\tpg_end = (offset + len - 1) >> PAGE_SHIFT;\n" - " \t\tinvalidate_inode_pages2_range(inode->i_mapping,\n" - " \t\t\t\t\t pg_start, pg_end);\n" - " \t}\n" - "@@ -864,7 +864,7 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req)\n" - " \t\tprocess_init_limits(fc, arg);\n" - " \n" - " \t\tif (arg->minor >= 6) {\n" - "-\t\t\tra_pages = arg->max_readahead / PAGE_CACHE_SIZE;\n" - "+\t\t\tra_pages = arg->max_readahead / PAGE_SIZE;\n" - " \t\t\tif (arg->flags & FUSE_ASYNC_READ)\n" - " \t\t\t\tfc->async_read = 1;\n" - " \t\t\tif (!(arg->flags & FUSE_POSIX_LOCKS))\n" - "@@ -901,7 +901,7 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req)\n" - " \t\t\tif (arg->time_gran && arg->time_gran <= 1000000000)\n" - " \t\t\t\tfc->sb->s_time_gran = arg->time_gran;\n" - " \t\t} else {\n" - "-\t\t\tra_pages = fc->max_read / PAGE_CACHE_SIZE;\n" - "+\t\t\tra_pages = fc->max_read / PAGE_SIZE;\n" - " \t\t\tfc->no_lock = 1;\n" - " \t\t\tfc->no_flock = 1;\n" - " \t\t}\n" - "@@ -922,7 +922,7 @@ static void fuse_send_init(struct fuse_conn *fc, struct fuse_req *req)\n" - " \n" - " \targ->major = FUSE_KERNEL_VERSION;\n" - " \targ->minor = FUSE_KERNEL_MINOR_VERSION;\n" - "-\targ->max_readahead = fc->bdi.ra_pages * PAGE_CACHE_SIZE;\n" - "+\targ->max_readahead = fc->bdi.ra_pages * PAGE_SIZE;\n" - " \targ->flags |= FUSE_ASYNC_READ | FUSE_POSIX_LOCKS | FUSE_ATOMIC_O_TRUNC |\n" - " \t\tFUSE_EXPORT_SUPPORT | FUSE_BIG_WRITES | FUSE_DONT_MASK |\n" - " \t\tFUSE_SPLICE_WRITE | FUSE_SPLICE_MOVE | FUSE_SPLICE_READ |\n" - "@@ -955,7 +955,7 @@ static int fuse_bdi_init(struct fuse_conn *fc, struct super_block *sb)\n" - " \tint err;\n" - " \n" - " \tfc->bdi.name = \"fuse\";\n" - "-\tfc->bdi.ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;\n" - "+\tfc->bdi.ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_SIZE;\n" - " \t/* fuse does it's own writeback accounting */\n" - " \tfc->bdi.capabilities = BDI_CAP_NO_ACCT_WB | BDI_CAP_STRICTLIMIT;\n" - " \n" - "@@ -1053,8 +1053,8 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)\n" - " \t\t\tgoto err;\n" - " #endif\n" - " \t} else {\n" - "-\t\tsb->s_blocksize = PAGE_CACHE_SIZE;\n" - "-\t\tsb->s_blocksize_bits = PAGE_CACHE_SHIFT;\n" - "+\t\tsb->s_blocksize = PAGE_SIZE;\n" - "+\t\tsb->s_blocksize_bits = PAGE_SHIFT;\n" - " \t}\n" - " \tsb->s_magic = FUSE_SUPER_MAGIC;\n" - " \tsb->s_op = &fuse_super_operations;\n" - "diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c\n" - "index aa016e4b8bec..1bbbee945f46 100644\n" - "--- a/fs/gfs2/aops.c\n" - "+++ b/fs/gfs2/aops.c\n" - "@@ -101,7 +101,7 @@ static int gfs2_writepage_common(struct page *page,\n" - " \tstruct gfs2_inode *ip = GFS2_I(inode);\n" - " \tstruct gfs2_sbd *sdp = GFS2_SB(inode);\n" - " \tloff_t i_size = i_size_read(inode);\n" - "-\tpgoff_t end_index = i_size >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t end_index = i_size >> PAGE_SHIFT;\n" - " \tunsigned offset;\n" - " \n" - " \tif (gfs2_assert_withdraw(sdp, gfs2_glock_is_held_excl(ip->i_gl)))\n" - "@@ -109,9 +109,9 @@ static int gfs2_writepage_common(struct page *page,\n" - " \tif (current->journal_info)\n" - " \t\tgoto redirty;\n" - " \t/* Is the page fully outside i_size? (truncate in progress) */\n" - "-\toffset = i_size & (PAGE_CACHE_SIZE-1);\n" - "+\toffset = i_size & (PAGE_SIZE-1);\n" - " \tif (page->index > end_index || (page->index == end_index && !offset)) {\n" - "-\t\tpage->mapping->a_ops->invalidatepage(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\tpage->mapping->a_ops->invalidatepage(page, 0, PAGE_SIZE);\n" - " \t\tgoto out;\n" - " \t}\n" - " \treturn 1;\n" - "@@ -238,7 +238,7 @@ static int gfs2_write_jdata_pagevec(struct address_space *mapping,\n" - " {\n" - " \tstruct inode *inode = mapping->host;\n" - " \tstruct gfs2_sbd *sdp = GFS2_SB(inode);\n" - "-\tunsigned nrblocks = nr_pages * (PAGE_CACHE_SIZE/inode->i_sb->s_blocksize);\n" - "+\tunsigned nrblocks = nr_pages * (PAGE_SIZE/inode->i_sb->s_blocksize);\n" - " \tint i;\n" - " \tint ret;\n" - " \n" - "@@ -366,8 +366,8 @@ static int gfs2_write_cache_jdata(struct address_space *mapping,\n" - " \t\t\tcycled = 0;\n" - " \t\tend = -1;\n" - " \t} else {\n" - "-\t\tindex = wbc->range_start >> PAGE_CACHE_SHIFT;\n" - "-\t\tend = wbc->range_end >> PAGE_CACHE_SHIFT;\n" - "+\t\tindex = wbc->range_start >> PAGE_SHIFT;\n" - "+\t\tend = wbc->range_end >> PAGE_SHIFT;\n" - " \t\tif (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)\n" - " \t\t\trange_whole = 1;\n" - " \t\tcycled = 1; /* ignore range_cyclic tests */\n" - "@@ -458,7 +458,7 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page)\n" - " \t * so we need to supply one here. It doesn't happen often.\n" - " \t */\n" - " \tif (unlikely(page->index)) {\n" - "-\t\tzero_user(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user(page, 0, PAGE_SIZE);\n" - " \t\tSetPageUptodate(page);\n" - " \t\treturn 0;\n" - " \t}\n" - "@@ -471,7 +471,7 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page)\n" - " \tif (dsize > (dibh->b_size - sizeof(struct gfs2_dinode)))\n" - " \t\tdsize = (dibh->b_size - sizeof(struct gfs2_dinode));\n" - " \tmemcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), dsize);\n" - "-\tmemset(kaddr + dsize, 0, PAGE_CACHE_SIZE - dsize);\n" - "+\tmemset(kaddr + dsize, 0, PAGE_SIZE - dsize);\n" - " \tkunmap_atomic(kaddr);\n" - " \tflush_dcache_page(page);\n" - " \tbrelse(dibh);\n" - "@@ -560,8 +560,8 @@ int gfs2_internal_read(struct gfs2_inode *ip, char *buf, loff_t *pos,\n" - " unsigned size)\n" - " {\n" - " \tstruct address_space *mapping = ip->i_inode.i_mapping;\n" - "-\tunsigned long index = *pos / PAGE_CACHE_SIZE;\n" - "-\tunsigned offset = *pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tunsigned long index = *pos / PAGE_SIZE;\n" - "+\tunsigned offset = *pos & (PAGE_SIZE - 1);\n" - " \tunsigned copied = 0;\n" - " \tunsigned amt;\n" - " \tstruct page *page;\n" - "@@ -569,15 +569,15 @@ int gfs2_internal_read(struct gfs2_inode *ip, char *buf, loff_t *pos,\n" - " \n" - " \tdo {\n" - " \t\tamt = size - copied;\n" - "-\t\tif (offset + size > PAGE_CACHE_SIZE)\n" - "-\t\t\tamt = PAGE_CACHE_SIZE - offset;\n" - "+\t\tif (offset + size > PAGE_SIZE)\n" - "+\t\t\tamt = PAGE_SIZE - offset;\n" - " \t\tpage = read_cache_page(mapping, index, __gfs2_readpage, NULL);\n" - " \t\tif (IS_ERR(page))\n" - " \t\t\treturn PTR_ERR(page);\n" - " \t\tp = kmap_atomic(page);\n" - " \t\tmemcpy(buf + copied, p + offset, amt);\n" - " \t\tkunmap_atomic(p);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tcopied += amt;\n" - " \t\tindex++;\n" - " \t\toffset = 0;\n" - "@@ -651,8 +651,8 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping,\n" - " \tunsigned requested = 0;\n" - " \tint alloc_required;\n" - " \tint error = 0;\n" - "-\tpgoff_t index = pos >> PAGE_CACHE_SHIFT;\n" - "-\tunsigned from = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tpgoff_t index = pos >> PAGE_SHIFT;\n" - "+\tunsigned from = pos & (PAGE_SIZE - 1);\n" - " \tstruct page *page;\n" - " \n" - " \tgfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &ip->i_gh);\n" - "@@ -697,7 +697,7 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping,\n" - " \t\trblocks += gfs2_rg_blocks(ip, requested);\n" - " \n" - " \terror = gfs2_trans_begin(sdp, rblocks,\n" - "-\t\t\t\t PAGE_CACHE_SIZE/sdp->sd_sb.sb_bsize);\n" - "+\t\t\t\t PAGE_SIZE/sdp->sd_sb.sb_bsize);\n" - " \tif (error)\n" - " \t\tgoto out_trans_fail;\n" - " \n" - "@@ -727,7 +727,7 @@ out:\n" - " \t\treturn 0;\n" - " \n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \tgfs2_trans_end(sdp);\n" - " \tif (pos + len > ip->i_inode.i_size)\n" - "@@ -827,7 +827,7 @@ static int gfs2_stuffed_write_end(struct inode *inode, struct buffer_head *dibh,\n" - " \tif (!PageUptodate(page))\n" - " \t\tSetPageUptodate(page);\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \tif (copied) {\n" - " \t\tif (inode->i_size < to)\n" - "@@ -877,7 +877,7 @@ static int gfs2_write_end(struct file *file, struct address_space *mapping,\n" - " \tstruct gfs2_sbd *sdp = GFS2_SB(inode);\n" - " \tstruct gfs2_inode *m_ip = GFS2_I(sdp->sd_statfs_inode);\n" - " \tstruct buffer_head *dibh;\n" - "-\tunsigned int from = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tunsigned int from = pos & (PAGE_SIZE - 1);\n" - " \tunsigned int to = from + len;\n" - " \tint ret;\n" - " \tstruct gfs2_trans *tr = current->journal_info;\n" - "@@ -888,7 +888,7 @@ static int gfs2_write_end(struct file *file, struct address_space *mapping,\n" - " \tret = gfs2_meta_inode_buffer(ip, &dibh);\n" - " \tif (unlikely(ret)) {\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tgoto failed;\n" - " \t}\n" - " \n" - "@@ -992,7 +992,7 @@ static void gfs2_invalidatepage(struct page *page, unsigned int offset,\n" - " {\n" - " \tstruct gfs2_sbd *sdp = GFS2_SB(page->mapping->host);\n" - " \tunsigned int stop = offset + length;\n" - "-\tint partial_page = (offset || length < PAGE_CACHE_SIZE);\n" - "+\tint partial_page = (offset || length < PAGE_SIZE);\n" - " \tstruct buffer_head *bh, *head;\n" - " \tunsigned long pos = 0;\n" - " \n" - "@@ -1082,7 +1082,7 @@ static ssize_t gfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter,\n" - " \t * the first place, mapping->nr_pages will always be zero.\n" - " \t */\n" - " \tif (mapping->nrpages) {\n" - "-\t\tloff_t lstart = offset & ~(PAGE_CACHE_SIZE - 1);\n" - "+\t\tloff_t lstart = offset & ~(PAGE_SIZE - 1);\n" - " \t\tloff_t len = iov_iter_count(iter);\n" - " \t\tloff_t end = PAGE_ALIGN(offset + len) - 1;\n" - " \n" - "diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c\n" - "index 0860f0b5b3f1..24ce1cdd434a 100644\n" - "--- a/fs/gfs2/bmap.c\n" - "+++ b/fs/gfs2/bmap.c\n" - "@@ -75,7 +75,7 @@ static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh,\n" - " \t\t\tdsize = dibh->b_size - sizeof(struct gfs2_dinode);\n" - " \n" - " \t\tmemcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), dsize);\n" - "-\t\tmemset(kaddr + dsize, 0, PAGE_CACHE_SIZE - dsize);\n" - "+\t\tmemset(kaddr + dsize, 0, PAGE_SIZE - dsize);\n" - " \t\tkunmap(page);\n" - " \n" - " \t\tSetPageUptodate(page);\n" - "@@ -98,7 +98,7 @@ static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh,\n" - " \n" - " \tif (release) {\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \n" - " \treturn 0;\n" - "@@ -932,8 +932,8 @@ static int gfs2_block_truncate_page(struct address_space *mapping, loff_t from)\n" - " {\n" - " \tstruct inode *inode = mapping->host;\n" - " \tstruct gfs2_inode *ip = GFS2_I(inode);\n" - "-\tunsigned long index = from >> PAGE_CACHE_SHIFT;\n" - "-\tunsigned offset = from & (PAGE_CACHE_SIZE-1);\n" - "+\tunsigned long index = from >> PAGE_SHIFT;\n" - "+\tunsigned offset = from & (PAGE_SIZE-1);\n" - " \tunsigned blocksize, iblock, length, pos;\n" - " \tstruct buffer_head *bh;\n" - " \tstruct page *page;\n" - "@@ -945,7 +945,7 @@ static int gfs2_block_truncate_page(struct address_space *mapping, loff_t from)\n" - " \n" - " \tblocksize = inode->i_sb->s_blocksize;\n" - " \tlength = blocksize - (offset & (blocksize - 1));\n" - "-\tiblock = index << (PAGE_CACHE_SHIFT - inode->i_sb->s_blocksize_bits);\n" - "+\tiblock = index << (PAGE_SHIFT - inode->i_sb->s_blocksize_bits);\n" - " \n" - " \tif (!page_has_buffers(page))\n" - " \t\tcreate_empty_buffers(page, blocksize, 0);\n" - "@@ -989,7 +989,7 @@ static int gfs2_block_truncate_page(struct address_space *mapping, loff_t from)\n" - " \tmark_buffer_dirty(bh);\n" - " unlock:\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn err;\n" - " }\n" - " \n" - "diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c\n" - "index c9384f932975..208efc70ad49 100644\n" - "--- a/fs/gfs2/file.c\n" - "+++ b/fs/gfs2/file.c\n" - "@@ -354,8 +354,8 @@ static int gfs2_allocate_page_backing(struct page *page)\n" - " {\n" - " \tstruct inode *inode = page->mapping->host;\n" - " \tstruct buffer_head bh;\n" - "-\tunsigned long size = PAGE_CACHE_SIZE;\n" - "-\tu64 lblock = page->index << (PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "+\tunsigned long size = PAGE_SIZE;\n" - "+\tu64 lblock = page->index << (PAGE_SHIFT - inode->i_blkbits);\n" - " \n" - " \tdo {\n" - " \t\tbh.b_state = 0;\n" - "@@ -386,7 +386,7 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)\n" - " \tstruct gfs2_sbd *sdp = GFS2_SB(inode);\n" - " \tstruct gfs2_alloc_parms ap = { .aflags = 0, };\n" - " \tunsigned long last_index;\n" - "-\tu64 pos = page->index << PAGE_CACHE_SHIFT;\n" - "+\tu64 pos = page->index << PAGE_SHIFT;\n" - " \tunsigned int data_blocks, ind_blocks, rblocks;\n" - " \tstruct gfs2_holder gh;\n" - " \tloff_t size;\n" - "@@ -401,7 +401,7 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)\n" - " \tif (ret)\n" - " \t\tgoto out;\n" - " \n" - "-\tgfs2_size_hint(vma->vm_file, pos, PAGE_CACHE_SIZE);\n" - "+\tgfs2_size_hint(vma->vm_file, pos, PAGE_SIZE);\n" - " \n" - " \tgfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);\n" - " \tret = gfs2_glock_nq(&gh);\n" - "@@ -411,7 +411,7 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)\n" - " \tset_bit(GLF_DIRTY, &ip->i_gl->gl_flags);\n" - " \tset_bit(GIF_SW_PAGED, &ip->i_flags);\n" - " \n" - "-\tif (!gfs2_write_alloc_required(ip, pos, PAGE_CACHE_SIZE)) {\n" - "+\tif (!gfs2_write_alloc_required(ip, pos, PAGE_SIZE)) {\n" - " \t\tlock_page(page);\n" - " \t\tif (!PageUptodate(page) || page->mapping != inode->i_mapping) {\n" - " \t\t\tret = -EAGAIN;\n" - "@@ -424,7 +424,7 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)\n" - " \tif (ret)\n" - " \t\tgoto out_unlock;\n" - " \n" - "-\tgfs2_write_calc_reserv(ip, PAGE_CACHE_SIZE, &data_blocks, &ind_blocks);\n" - "+\tgfs2_write_calc_reserv(ip, PAGE_SIZE, &data_blocks, &ind_blocks);\n" - " \tap.target = data_blocks + ind_blocks;\n" - " \tret = gfs2_quota_lock_check(ip, &ap);\n" - " \tif (ret)\n" - "@@ -447,7 +447,7 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)\n" - " \tlock_page(page);\n" - " \tret = -EINVAL;\n" - " \tsize = i_size_read(inode);\n" - "-\tlast_index = (size - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tlast_index = (size - 1) >> PAGE_SHIFT;\n" - " \t/* Check page index against inode size */\n" - " \tif (size == 0 || (page->index > last_index))\n" - " \t\tgoto out_trans_end;\n" - "@@ -873,7 +873,7 @@ static long __gfs2_fallocate(struct file *file, int mode, loff_t offset, loff_t\n" - " \t\t\trblocks += data_blocks ? data_blocks : 1;\n" - " \n" - " \t\terror = gfs2_trans_begin(sdp, rblocks,\n" - "-\t\t\t\t\t PAGE_CACHE_SIZE/sdp->sd_sb.sb_bsize);\n" - "+\t\t\t\t\t PAGE_SIZE/sdp->sd_sb.sb_bsize);\n" - " \t\tif (error)\n" - " \t\t\tgoto out_trans_fail;\n" - " \n" - "diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c\n" - "index e137d96f1b17..0448524c11bc 100644\n" - "--- a/fs/gfs2/meta_io.c\n" - "+++ b/fs/gfs2/meta_io.c\n" - "@@ -124,7 +124,7 @@ struct buffer_head *gfs2_getbuf(struct gfs2_glock *gl, u64 blkno, int create)\n" - " \tif (mapping == NULL)\n" - " \t\tmapping = &sdp->sd_aspace;\n" - " \n" - "-\tshift = PAGE_CACHE_SHIFT - sdp->sd_sb.sb_bsize_shift;\n" - "+\tshift = PAGE_SHIFT - sdp->sd_sb.sb_bsize_shift;\n" - " \tindex = blkno >> shift; /* convert block to page */\n" - " \tbufnum = blkno - (index << shift); /* block buf index within page */\n" - " \n" - "@@ -154,7 +154,7 @@ struct buffer_head *gfs2_getbuf(struct gfs2_glock *gl, u64 blkno, int create)\n" - " \t\tmap_bh(bh, sdp->sd_vfs, blkno);\n" - " \n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \treturn bh;\n" - " }\n" - "diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c\n" - "index a39891344259..ce7d69a2fdc0 100644\n" - "--- a/fs/gfs2/quota.c\n" - "+++ b/fs/gfs2/quota.c\n" - "@@ -701,7 +701,7 @@ static int gfs2_write_buf_to_page(struct gfs2_inode *ip, unsigned long index,\n" - " \tunsigned to_write = bytes, pg_off = off;\n" - " \tint done = 0;\n" - " \n" - "-\tblk = index << (PAGE_CACHE_SHIFT - sdp->sd_sb.sb_bsize_shift);\n" - "+\tblk = index << (PAGE_SHIFT - sdp->sd_sb.sb_bsize_shift);\n" - " \tboff = off % bsize;\n" - " \n" - " \tpage = find_or_create_page(mapping, index, GFP_NOFS);\n" - "@@ -753,13 +753,13 @@ static int gfs2_write_buf_to_page(struct gfs2_inode *ip, unsigned long index,\n" - " \tflush_dcache_page(page);\n" - " \tkunmap_atomic(kaddr);\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \treturn 0;\n" - " \n" - " unlock_out:\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn -EIO;\n" - " }\n" - " \n" - "@@ -773,13 +773,13 @@ static int gfs2_write_disk_quota(struct gfs2_inode *ip, struct gfs2_quota *qp,\n" - " \n" - " \tnbytes = sizeof(struct gfs2_quota);\n" - " \n" - "-\tpg_beg = loc >> PAGE_CACHE_SHIFT;\n" - "-\tpg_off = loc % PAGE_CACHE_SIZE;\n" - "+\tpg_beg = loc >> PAGE_SHIFT;\n" - "+\tpg_off = loc % PAGE_SIZE;\n" - " \n" - " \t/* If the quota straddles a page boundary, split the write in two */\n" - "-\tif ((pg_off + nbytes) > PAGE_CACHE_SIZE) {\n" - "+\tif ((pg_off + nbytes) > PAGE_SIZE) {\n" - " \t\tpg_oflow = 1;\n" - "-\t\toverflow = (pg_off + nbytes) - PAGE_CACHE_SIZE;\n" - "+\t\toverflow = (pg_off + nbytes) - PAGE_SIZE;\n" - " \t}\n" - " \n" - " \tptr = qp;\n" - "diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c\n" - "index 07c0265aa195..99a0bdac8796 100644\n" - "--- a/fs/gfs2/rgrp.c\n" - "+++ b/fs/gfs2/rgrp.c\n" - "@@ -918,9 +918,8 @@ static int read_rindex_entry(struct gfs2_inode *ip)\n" - " \t\tgoto fail;\n" - " \n" - " \trgd->rd_gl->gl_object = rgd;\n" - "-\trgd->rd_gl->gl_vm.start = (rgd->rd_addr * bsize) & PAGE_CACHE_MASK;\n" - "-\trgd->rd_gl->gl_vm.end = PAGE_CACHE_ALIGN((rgd->rd_addr +\n" - "-\t\t\t\t\t\t rgd->rd_length) * bsize) - 1;\n" - "+\trgd->rd_gl->gl_vm.start = (rgd->rd_addr * bsize) & PAGE_MASK;\n" - "+\trgd->rd_gl->gl_vm.end = PAGE_ALIGN((rgd->rd_addr + rgd->rd_length) * bsize) - 1;\n" - " \trgd->rd_rgl = (struct gfs2_rgrp_lvb *)rgd->rd_gl->gl_lksb.sb_lvbptr;\n" - " \trgd->rd_flags &= ~(GFS2_RDF_UPTODATE | GFS2_RDF_PREFERRED);\n" - " \tif (rgd->rd_data > sdp->sd_max_rg_data)\n" - "diff --git a/fs/hfs/bnode.c b/fs/hfs/bnode.c\n" - "index 221719eac5de..d77d844b668b 100644\n" - "--- a/fs/hfs/bnode.c\n" - "+++ b/fs/hfs/bnode.c\n" - "@@ -278,14 +278,14 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)\n" - " \n" - " \tmapping = tree->inode->i_mapping;\n" - " \toff = (loff_t)cnid * tree->node_size;\n" - "-\tblock = off >> PAGE_CACHE_SHIFT;\n" - "-\tnode->page_offset = off & ~PAGE_CACHE_MASK;\n" - "+\tblock = off >> PAGE_SHIFT;\n" - "+\tnode->page_offset = off & ~PAGE_MASK;\n" - " \tfor (i = 0; i < tree->pages_per_bnode; i++) {\n" - " \t\tpage = read_mapping_page(mapping, block++, NULL);\n" - " \t\tif (IS_ERR(page))\n" - " \t\t\tgoto fail;\n" - " \t\tif (PageError(page)) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tgoto fail;\n" - " \t\t}\n" - " \t\tnode->page[i] = page;\n" - "@@ -401,7 +401,7 @@ void hfs_bnode_free(struct hfs_bnode *node)\n" - " \n" - " \tfor (i = 0; i < node->tree->pages_per_bnode; i++)\n" - " \t\tif (node->page[i])\n" - "-\t\t\tpage_cache_release(node->page[i]);\n" - "+\t\t\tput_page(node->page[i]);\n" - " \tkfree(node);\n" - " }\n" - " \n" - "@@ -429,11 +429,11 @@ struct hfs_bnode *hfs_bnode_create(struct hfs_btree *tree, u32 num)\n" - " \n" - " \tpagep = node->page;\n" - " \tmemset(kmap(*pagep) + node->page_offset, 0,\n" - "-\t min((int)PAGE_CACHE_SIZE, (int)tree->node_size));\n" - "+\t min((int)PAGE_SIZE, (int)tree->node_size));\n" - " \tset_page_dirty(*pagep);\n" - " \tkunmap(*pagep);\n" - " \tfor (i = 1; i < tree->pages_per_bnode; i++) {\n" - "-\t\tmemset(kmap(*++pagep), 0, PAGE_CACHE_SIZE);\n" - "+\t\tmemset(kmap(*++pagep), 0, PAGE_SIZE);\n" - " \t\tset_page_dirty(*pagep);\n" - " \t\tkunmap(*pagep);\n" - " \t}\n" - "diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c\n" - "index 1ab19e660e69..37cdd955eceb 100644\n" - "--- a/fs/hfs/btree.c\n" - "+++ b/fs/hfs/btree.c\n" - "@@ -116,14 +116,14 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke\n" - " \t}\n" - " \n" - " \ttree->node_size_shift = ffs(size) - 1;\n" - "-\ttree->pages_per_bnode = (tree->node_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "+\ttree->pages_per_bnode = (tree->node_size + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \n" - " \tkunmap(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn tree;\n" - " \n" - " fail_page:\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " free_inode:\n" - " \ttree->inode->i_mapping->a_ops = &hfs_aops;\n" - " \tiput(tree->inode);\n" - "@@ -257,9 +257,9 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree)\n" - " \toff = off16;\n" - " \n" - " \toff += node->page_offset;\n" - "-\tpagep = node->page + (off >> PAGE_CACHE_SHIFT);\n" - "+\tpagep = node->page + (off >> PAGE_SHIFT);\n" - " \tdata = kmap(*pagep);\n" - "-\toff &= ~PAGE_CACHE_MASK;\n" - "+\toff &= ~PAGE_MASK;\n" - " \tidx = 0;\n" - " \n" - " \tfor (;;) {\n" - "@@ -279,7 +279,7 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree)\n" - " \t\t\t\t\t}\n" - " \t\t\t\t}\n" - " \t\t\t}\n" - "-\t\t\tif (++off >= PAGE_CACHE_SIZE) {\n" - "+\t\t\tif (++off >= PAGE_SIZE) {\n" - " \t\t\t\tkunmap(*pagep);\n" - " \t\t\t\tdata = kmap(*++pagep);\n" - " \t\t\t\toff = 0;\n" - "@@ -302,9 +302,9 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree)\n" - " \t\tlen = hfs_brec_lenoff(node, 0, &off16);\n" - " \t\toff = off16;\n" - " \t\toff += node->page_offset;\n" - "-\t\tpagep = node->page + (off >> PAGE_CACHE_SHIFT);\n" - "+\t\tpagep = node->page + (off >> PAGE_SHIFT);\n" - " \t\tdata = kmap(*pagep);\n" - "-\t\toff &= ~PAGE_CACHE_MASK;\n" - "+\t\toff &= ~PAGE_MASK;\n" - " \t}\n" - " }\n" - " \n" - "@@ -348,9 +348,9 @@ void hfs_bmap_free(struct hfs_bnode *node)\n" - " \t\tlen = hfs_brec_lenoff(node, 0, &off);\n" - " \t}\n" - " \toff += node->page_offset + nidx / 8;\n" - "-\tpage = node->page[off >> PAGE_CACHE_SHIFT];\n" - "+\tpage = node->page[off >> PAGE_SHIFT];\n" - " \tdata = kmap(page);\n" - "-\toff &= ~PAGE_CACHE_MASK;\n" - "+\toff &= ~PAGE_MASK;\n" - " \tm = 1 << (~nidx & 7);\n" - " \tbyte = data[off];\n" - " \tif (!(byte & m)) {\n" - "diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c\n" - "index 6686bf39a5b5..cb1e5faa2fb7 100644\n" - "--- a/fs/hfs/inode.c\n" - "+++ b/fs/hfs/inode.c\n" - "@@ -91,8 +91,8 @@ static int hfs_releasepage(struct page *page, gfp_t mask)\n" - " \tif (!tree)\n" - " \t\treturn 0;\n" - " \n" - "-\tif (tree->node_size >= PAGE_CACHE_SIZE) {\n" - "-\t\tnidx = page->index >> (tree->node_size_shift - PAGE_CACHE_SHIFT);\n" - "+\tif (tree->node_size >= PAGE_SIZE) {\n" - "+\t\tnidx = page->index >> (tree->node_size_shift - PAGE_SHIFT);\n" - " \t\tspin_lock(&tree->hash_lock);\n" - " \t\tnode = hfs_bnode_findhash(tree, nidx);\n" - " \t\tif (!node)\n" - "@@ -105,8 +105,8 @@ static int hfs_releasepage(struct page *page, gfp_t mask)\n" - " \t\t}\n" - " \t\tspin_unlock(&tree->hash_lock);\n" - " \t} else {\n" - "-\t\tnidx = page->index << (PAGE_CACHE_SHIFT - tree->node_size_shift);\n" - "-\t\ti = 1 << (PAGE_CACHE_SHIFT - tree->node_size_shift);\n" - "+\t\tnidx = page->index << (PAGE_SHIFT - tree->node_size_shift);\n" - "+\t\ti = 1 << (PAGE_SHIFT - tree->node_size_shift);\n" - " \t\tspin_lock(&tree->hash_lock);\n" - " \t\tdo {\n" - " \t\t\tnode = hfs_bnode_findhash(tree, nidx++);\n" - "diff --git a/fs/hfsplus/bitmap.c b/fs/hfsplus/bitmap.c\n" - "index d2954451519e..c0ae274c0a22 100644\n" - "--- a/fs/hfsplus/bitmap.c\n" - "+++ b/fs/hfsplus/bitmap.c\n" - "@@ -13,7 +13,7 @@\n" - " #include \"hfsplus_fs.h\"\n" - " #include \"hfsplus_raw.h\"\n" - " \n" - "-#define PAGE_CACHE_BITS\t(PAGE_CACHE_SIZE * 8)\n" - "+#define PAGE_CACHE_BITS\t(PAGE_SIZE * 8)\n" - " \n" - " int hfsplus_block_allocate(struct super_block *sb, u32 size,\n" - " \t\tu32 offset, u32 *max)\n" - "diff --git a/fs/hfsplus/bnode.c b/fs/hfsplus/bnode.c\n" - "index 63924662aaf3..ce014ceb89ef 100644\n" - "--- a/fs/hfsplus/bnode.c\n" - "+++ b/fs/hfsplus/bnode.c\n" - "@@ -24,16 +24,16 @@ void hfs_bnode_read(struct hfs_bnode *node, void *buf, int off, int len)\n" - " \tint l;\n" - " \n" - " \toff += node->page_offset;\n" - "-\tpagep = node->page + (off >> PAGE_CACHE_SHIFT);\n" - "-\toff &= ~PAGE_CACHE_MASK;\n" - "+\tpagep = node->page + (off >> PAGE_SHIFT);\n" - "+\toff &= ~PAGE_MASK;\n" - " \n" - "-\tl = min_t(int, len, PAGE_CACHE_SIZE - off);\n" - "+\tl = min_t(int, len, PAGE_SIZE - off);\n" - " \tmemcpy(buf, kmap(*pagep) + off, l);\n" - " \tkunmap(*pagep);\n" - " \n" - " \twhile ((len -= l) != 0) {\n" - " \t\tbuf += l;\n" - "-\t\tl = min_t(int, len, PAGE_CACHE_SIZE);\n" - "+\t\tl = min_t(int, len, PAGE_SIZE);\n" - " \t\tmemcpy(buf, kmap(*++pagep), l);\n" - " \t\tkunmap(*pagep);\n" - " \t}\n" - "@@ -77,17 +77,17 @@ void hfs_bnode_write(struct hfs_bnode *node, void *buf, int off, int len)\n" - " \tint l;\n" - " \n" - " \toff += node->page_offset;\n" - "-\tpagep = node->page + (off >> PAGE_CACHE_SHIFT);\n" - "-\toff &= ~PAGE_CACHE_MASK;\n" - "+\tpagep = node->page + (off >> PAGE_SHIFT);\n" - "+\toff &= ~PAGE_MASK;\n" - " \n" - "-\tl = min_t(int, len, PAGE_CACHE_SIZE - off);\n" - "+\tl = min_t(int, len, PAGE_SIZE - off);\n" - " \tmemcpy(kmap(*pagep) + off, buf, l);\n" - " \tset_page_dirty(*pagep);\n" - " \tkunmap(*pagep);\n" - " \n" - " \twhile ((len -= l) != 0) {\n" - " \t\tbuf += l;\n" - "-\t\tl = min_t(int, len, PAGE_CACHE_SIZE);\n" - "+\t\tl = min_t(int, len, PAGE_SIZE);\n" - " \t\tmemcpy(kmap(*++pagep), buf, l);\n" - " \t\tset_page_dirty(*pagep);\n" - " \t\tkunmap(*pagep);\n" - "@@ -107,16 +107,16 @@ void hfs_bnode_clear(struct hfs_bnode *node, int off, int len)\n" - " \tint l;\n" - " \n" - " \toff += node->page_offset;\n" - "-\tpagep = node->page + (off >> PAGE_CACHE_SHIFT);\n" - "-\toff &= ~PAGE_CACHE_MASK;\n" - "+\tpagep = node->page + (off >> PAGE_SHIFT);\n" - "+\toff &= ~PAGE_MASK;\n" - " \n" - "-\tl = min_t(int, len, PAGE_CACHE_SIZE - off);\n" - "+\tl = min_t(int, len, PAGE_SIZE - off);\n" - " \tmemset(kmap(*pagep) + off, 0, l);\n" - " \tset_page_dirty(*pagep);\n" - " \tkunmap(*pagep);\n" - " \n" - " \twhile ((len -= l) != 0) {\n" - "-\t\tl = min_t(int, len, PAGE_CACHE_SIZE);\n" - "+\t\tl = min_t(int, len, PAGE_SIZE);\n" - " \t\tmemset(kmap(*++pagep), 0, l);\n" - " \t\tset_page_dirty(*pagep);\n" - " \t\tkunmap(*pagep);\n" - "@@ -136,20 +136,20 @@ void hfs_bnode_copy(struct hfs_bnode *dst_node, int dst,\n" - " \ttree = src_node->tree;\n" - " \tsrc += src_node->page_offset;\n" - " \tdst += dst_node->page_offset;\n" - "-\tsrc_page = src_node->page + (src >> PAGE_CACHE_SHIFT);\n" - "-\tsrc &= ~PAGE_CACHE_MASK;\n" - "-\tdst_page = dst_node->page + (dst >> PAGE_CACHE_SHIFT);\n" - "-\tdst &= ~PAGE_CACHE_MASK;\n" - "+\tsrc_page = src_node->page + (src >> PAGE_SHIFT);\n" - "+\tsrc &= ~PAGE_MASK;\n" - "+\tdst_page = dst_node->page + (dst >> PAGE_SHIFT);\n" - "+\tdst &= ~PAGE_MASK;\n" - " \n" - " \tif (src == dst) {\n" - "-\t\tl = min_t(int, len, PAGE_CACHE_SIZE - src);\n" - "+\t\tl = min_t(int, len, PAGE_SIZE - src);\n" - " \t\tmemcpy(kmap(*dst_page) + src, kmap(*src_page) + src, l);\n" - " \t\tkunmap(*src_page);\n" - " \t\tset_page_dirty(*dst_page);\n" - " \t\tkunmap(*dst_page);\n" - " \n" - " \t\twhile ((len -= l) != 0) {\n" - "-\t\t\tl = min_t(int, len, PAGE_CACHE_SIZE);\n" - "+\t\t\tl = min_t(int, len, PAGE_SIZE);\n" - " \t\t\tmemcpy(kmap(*++dst_page), kmap(*++src_page), l);\n" - " \t\t\tkunmap(*src_page);\n" - " \t\t\tset_page_dirty(*dst_page);\n" - "@@ -161,12 +161,12 @@ void hfs_bnode_copy(struct hfs_bnode *dst_node, int dst,\n" - " \t\tdo {\n" - " \t\t\tsrc_ptr = kmap(*src_page) + src;\n" - " \t\t\tdst_ptr = kmap(*dst_page) + dst;\n" - "-\t\t\tif (PAGE_CACHE_SIZE - src < PAGE_CACHE_SIZE - dst) {\n" - "-\t\t\t\tl = PAGE_CACHE_SIZE - src;\n" - "+\t\t\tif (PAGE_SIZE - src < PAGE_SIZE - dst) {\n" - "+\t\t\t\tl = PAGE_SIZE - src;\n" - " \t\t\t\tsrc = 0;\n" - " \t\t\t\tdst += l;\n" - " \t\t\t} else {\n" - "-\t\t\t\tl = PAGE_CACHE_SIZE - dst;\n" - "+\t\t\t\tl = PAGE_SIZE - dst;\n" - " \t\t\t\tsrc += l;\n" - " \t\t\t\tdst = 0;\n" - " \t\t\t}\n" - "@@ -195,11 +195,11 @@ void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len)\n" - " \tdst += node->page_offset;\n" - " \tif (dst > src) {\n" - " \t\tsrc += len - 1;\n" - "-\t\tsrc_page = node->page + (src >> PAGE_CACHE_SHIFT);\n" - "-\t\tsrc = (src & ~PAGE_CACHE_MASK) + 1;\n" - "+\t\tsrc_page = node->page + (src >> PAGE_SHIFT);\n" - "+\t\tsrc = (src & ~PAGE_MASK) + 1;\n" - " \t\tdst += len - 1;\n" - "-\t\tdst_page = node->page + (dst >> PAGE_CACHE_SHIFT);\n" - "-\t\tdst = (dst & ~PAGE_CACHE_MASK) + 1;\n" - "+\t\tdst_page = node->page + (dst >> PAGE_SHIFT);\n" - "+\t\tdst = (dst & ~PAGE_MASK) + 1;\n" - " \n" - " \t\tif (src == dst) {\n" - " \t\t\twhile (src < len) {\n" - "@@ -208,7 +208,7 @@ void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len)\n" - " \t\t\t\tset_page_dirty(*dst_page);\n" - " \t\t\t\tkunmap(*dst_page);\n" - " \t\t\t\tlen -= src;\n" - "-\t\t\t\tsrc = PAGE_CACHE_SIZE;\n" - "+\t\t\t\tsrc = PAGE_SIZE;\n" - " \t\t\t\tsrc_page--;\n" - " \t\t\t\tdst_page--;\n" - " \t\t\t}\n" - "@@ -226,32 +226,32 @@ void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len)\n" - " \t\t\t\tdst_ptr = kmap(*dst_page) + dst;\n" - " \t\t\t\tif (src < dst) {\n" - " \t\t\t\t\tl = src;\n" - "-\t\t\t\t\tsrc = PAGE_CACHE_SIZE;\n" - "+\t\t\t\t\tsrc = PAGE_SIZE;\n" - " \t\t\t\t\tdst -= l;\n" - " \t\t\t\t} else {\n" - " \t\t\t\t\tl = dst;\n" - " \t\t\t\t\tsrc -= l;\n" - "-\t\t\t\t\tdst = PAGE_CACHE_SIZE;\n" - "+\t\t\t\t\tdst = PAGE_SIZE;\n" - " \t\t\t\t}\n" - " \t\t\t\tl = min(len, l);\n" - " \t\t\t\tmemmove(dst_ptr - l, src_ptr - l, l);\n" - " \t\t\t\tkunmap(*src_page);\n" - " \t\t\t\tset_page_dirty(*dst_page);\n" - " \t\t\t\tkunmap(*dst_page);\n" - "-\t\t\t\tif (dst == PAGE_CACHE_SIZE)\n" - "+\t\t\t\tif (dst == PAGE_SIZE)\n" - " \t\t\t\t\tdst_page--;\n" - " \t\t\t\telse\n" - " \t\t\t\t\tsrc_page--;\n" - " \t\t\t} while ((len -= l));\n" - " \t\t}\n" - " \t} else {\n" - "-\t\tsrc_page = node->page + (src >> PAGE_CACHE_SHIFT);\n" - "-\t\tsrc &= ~PAGE_CACHE_MASK;\n" - "-\t\tdst_page = node->page + (dst >> PAGE_CACHE_SHIFT);\n" - "-\t\tdst &= ~PAGE_CACHE_MASK;\n" - "+\t\tsrc_page = node->page + (src >> PAGE_SHIFT);\n" - "+\t\tsrc &= ~PAGE_MASK;\n" - "+\t\tdst_page = node->page + (dst >> PAGE_SHIFT);\n" - "+\t\tdst &= ~PAGE_MASK;\n" - " \n" - " \t\tif (src == dst) {\n" - "-\t\t\tl = min_t(int, len, PAGE_CACHE_SIZE - src);\n" - "+\t\t\tl = min_t(int, len, PAGE_SIZE - src);\n" - " \t\t\tmemmove(kmap(*dst_page) + src,\n" - " \t\t\t\tkmap(*src_page) + src, l);\n" - " \t\t\tkunmap(*src_page);\n" - "@@ -259,7 +259,7 @@ void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len)\n" - " \t\t\tkunmap(*dst_page);\n" - " \n" - " \t\t\twhile ((len -= l) != 0) {\n" - "-\t\t\t\tl = min_t(int, len, PAGE_CACHE_SIZE);\n" - "+\t\t\t\tl = min_t(int, len, PAGE_SIZE);\n" - " \t\t\t\tmemmove(kmap(*++dst_page),\n" - " \t\t\t\t\tkmap(*++src_page), l);\n" - " \t\t\t\tkunmap(*src_page);\n" - "@@ -272,13 +272,13 @@ void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len)\n" - " \t\t\tdo {\n" - " \t\t\t\tsrc_ptr = kmap(*src_page) + src;\n" - " \t\t\t\tdst_ptr = kmap(*dst_page) + dst;\n" - "-\t\t\t\tif (PAGE_CACHE_SIZE - src <\n" - "-\t\t\t\t\t\tPAGE_CACHE_SIZE - dst) {\n" - "-\t\t\t\t\tl = PAGE_CACHE_SIZE - src;\n" - "+\t\t\t\tif (PAGE_SIZE - src <\n" - "+\t\t\t\t\t\tPAGE_SIZE - dst) {\n" - "+\t\t\t\t\tl = PAGE_SIZE - src;\n" - " \t\t\t\t\tsrc = 0;\n" - " \t\t\t\t\tdst += l;\n" - " \t\t\t\t} else {\n" - "-\t\t\t\t\tl = PAGE_CACHE_SIZE - dst;\n" - "+\t\t\t\t\tl = PAGE_SIZE - dst;\n" - " \t\t\t\t\tsrc += l;\n" - " \t\t\t\t\tdst = 0;\n" - " \t\t\t\t}\n" - "@@ -444,14 +444,14 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)\n" - " \n" - " \tmapping = tree->inode->i_mapping;\n" - " \toff = (loff_t)cnid << tree->node_size_shift;\n" - "-\tblock = off >> PAGE_CACHE_SHIFT;\n" - "-\tnode->page_offset = off & ~PAGE_CACHE_MASK;\n" - "+\tblock = off >> PAGE_SHIFT;\n" - "+\tnode->page_offset = off & ~PAGE_MASK;\n" - " \tfor (i = 0; i < tree->pages_per_bnode; block++, i++) {\n" - " \t\tpage = read_mapping_page(mapping, block, NULL);\n" - " \t\tif (IS_ERR(page))\n" - " \t\t\tgoto fail;\n" - " \t\tif (PageError(page)) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tgoto fail;\n" - " \t\t}\n" - " \t\tnode->page[i] = page;\n" - "@@ -569,7 +569,7 @@ void hfs_bnode_free(struct hfs_bnode *node)\n" - " \n" - " \tfor (i = 0; i < node->tree->pages_per_bnode; i++)\n" - " \t\tif (node->page[i])\n" - "-\t\t\tpage_cache_release(node->page[i]);\n" - "+\t\t\tput_page(node->page[i]);\n" - " \tkfree(node);\n" - " }\n" - " \n" - "@@ -597,11 +597,11 @@ struct hfs_bnode *hfs_bnode_create(struct hfs_btree *tree, u32 num)\n" - " \n" - " \tpagep = node->page;\n" - " \tmemset(kmap(*pagep) + node->page_offset, 0,\n" - "-\t min_t(int, PAGE_CACHE_SIZE, tree->node_size));\n" - "+\t min_t(int, PAGE_SIZE, tree->node_size));\n" - " \tset_page_dirty(*pagep);\n" - " \tkunmap(*pagep);\n" - " \tfor (i = 1; i < tree->pages_per_bnode; i++) {\n" - "-\t\tmemset(kmap(*++pagep), 0, PAGE_CACHE_SIZE);\n" - "+\t\tmemset(kmap(*++pagep), 0, PAGE_SIZE);\n" - " \t\tset_page_dirty(*pagep);\n" - " \t\tkunmap(*pagep);\n" - " \t}\n" - "diff --git a/fs/hfsplus/btree.c b/fs/hfsplus/btree.c\n" - "index 3345c7553edc..d9d1a36ba826 100644\n" - "--- a/fs/hfsplus/btree.c\n" - "+++ b/fs/hfsplus/btree.c\n" - "@@ -236,15 +236,15 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id)\n" - " \ttree->node_size_shift = ffs(size) - 1;\n" - " \n" - " \ttree->pages_per_bnode =\n" - "-\t\t(tree->node_size + PAGE_CACHE_SIZE - 1) >>\n" - "-\t\tPAGE_CACHE_SHIFT;\n" - "+\t\t(tree->node_size + PAGE_SIZE - 1) >>\n" - "+\t\tPAGE_SHIFT;\n" - " \n" - " \tkunmap(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn tree;\n" - " \n" - " fail_page:\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " free_inode:\n" - " \ttree->inode->i_mapping->a_ops = &hfsplus_aops;\n" - " \tiput(tree->inode);\n" - "@@ -380,9 +380,9 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree)\n" - " \toff = off16;\n" - " \n" - " \toff += node->page_offset;\n" - "-\tpagep = node->page + (off >> PAGE_CACHE_SHIFT);\n" - "+\tpagep = node->page + (off >> PAGE_SHIFT);\n" - " \tdata = kmap(*pagep);\n" - "-\toff &= ~PAGE_CACHE_MASK;\n" - "+\toff &= ~PAGE_MASK;\n" - " \tidx = 0;\n" - " \n" - " \tfor (;;) {\n" - "@@ -403,7 +403,7 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree)\n" - " \t\t\t\t\t}\n" - " \t\t\t\t}\n" - " \t\t\t}\n" - "-\t\t\tif (++off >= PAGE_CACHE_SIZE) {\n" - "+\t\t\tif (++off >= PAGE_SIZE) {\n" - " \t\t\t\tkunmap(*pagep);\n" - " \t\t\t\tdata = kmap(*++pagep);\n" - " \t\t\t\toff = 0;\n" - "@@ -426,9 +426,9 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree)\n" - " \t\tlen = hfs_brec_lenoff(node, 0, &off16);\n" - " \t\toff = off16;\n" - " \t\toff += node->page_offset;\n" - "-\t\tpagep = node->page + (off >> PAGE_CACHE_SHIFT);\n" - "+\t\tpagep = node->page + (off >> PAGE_SHIFT);\n" - " \t\tdata = kmap(*pagep);\n" - "-\t\toff &= ~PAGE_CACHE_MASK;\n" - "+\t\toff &= ~PAGE_MASK;\n" - " \t}\n" - " }\n" - " \n" - "@@ -475,9 +475,9 @@ void hfs_bmap_free(struct hfs_bnode *node)\n" - " \t\tlen = hfs_brec_lenoff(node, 0, &off);\n" - " \t}\n" - " \toff += node->page_offset + nidx / 8;\n" - "-\tpage = node->page[off >> PAGE_CACHE_SHIFT];\n" - "+\tpage = node->page[off >> PAGE_SHIFT];\n" - " \tdata = kmap(page);\n" - "-\toff &= ~PAGE_CACHE_MASK;\n" - "+\toff &= ~PAGE_MASK;\n" - " \tm = 1 << (~nidx & 7);\n" - " \tbyte = data[off];\n" - " \tif (!(byte & m)) {\n" - "diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c\n" - "index 1a6394cdb54e..b28f39865c3a 100644\n" - "--- a/fs/hfsplus/inode.c\n" - "+++ b/fs/hfsplus/inode.c\n" - "@@ -87,9 +87,9 @@ static int hfsplus_releasepage(struct page *page, gfp_t mask)\n" - " \t}\n" - " \tif (!tree)\n" - " \t\treturn 0;\n" - "-\tif (tree->node_size >= PAGE_CACHE_SIZE) {\n" - "+\tif (tree->node_size >= PAGE_SIZE) {\n" - " \t\tnidx = page->index >>\n" - "-\t\t\t(tree->node_size_shift - PAGE_CACHE_SHIFT);\n" - "+\t\t\t(tree->node_size_shift - PAGE_SHIFT);\n" - " \t\tspin_lock(&tree->hash_lock);\n" - " \t\tnode = hfs_bnode_findhash(tree, nidx);\n" - " \t\tif (!node)\n" - "@@ -103,8 +103,8 @@ static int hfsplus_releasepage(struct page *page, gfp_t mask)\n" - " \t\tspin_unlock(&tree->hash_lock);\n" - " \t} else {\n" - " \t\tnidx = page->index <<\n" - "-\t\t\t(PAGE_CACHE_SHIFT - tree->node_size_shift);\n" - "-\t\ti = 1 << (PAGE_CACHE_SHIFT - tree->node_size_shift);\n" - "+\t\t\t(PAGE_SHIFT - tree->node_size_shift);\n" - "+\t\ti = 1 << (PAGE_SHIFT - tree->node_size_shift);\n" - " \t\tspin_lock(&tree->hash_lock);\n" - " \t\tdo {\n" - " \t\t\tnode = hfs_bnode_findhash(tree, nidx++);\n" - "diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c\n" - "index 5d54490a136d..c35911362ff9 100644\n" - "--- a/fs/hfsplus/super.c\n" - "+++ b/fs/hfsplus/super.c\n" - "@@ -438,7 +438,7 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)\n" - " \terr = -EFBIG;\n" - " \tlast_fs_block = sbi->total_blocks - 1;\n" - " \tlast_fs_page = (last_fs_block << sbi->alloc_blksz_shift) >>\n" - "-\t\t\tPAGE_CACHE_SHIFT;\n" - "+\t\t\tPAGE_SHIFT;\n" - " \n" - " \tif ((last_fs_block > (sector_t)(~0ULL) >> (sbi->alloc_blksz_shift - 9)) ||\n" - " \t (last_fs_page > (pgoff_t)(~0ULL))) {\n" - "diff --git a/fs/hfsplus/xattr.c b/fs/hfsplus/xattr.c\n" - "index ab01530b4930..70e445ff0cff 100644\n" - "--- a/fs/hfsplus/xattr.c\n" - "+++ b/fs/hfsplus/xattr.c\n" - "@@ -220,7 +220,7 @@ check_attr_tree_state_again:\n" - " \n" - " \tindex = 0;\n" - " \twritten = 0;\n" - "-\tfor (; written < node_size; index++, written += PAGE_CACHE_SIZE) {\n" - "+\tfor (; written < node_size; index++, written += PAGE_SIZE) {\n" - " \t\tvoid *kaddr;\n" - " \n" - " \t\tpage = read_mapping_page(mapping, index, NULL);\n" - "@@ -231,11 +231,11 @@ check_attr_tree_state_again:\n" - " \n" - " \t\tkaddr = kmap_atomic(page);\n" - " \t\tmemcpy(kaddr, buf + written,\n" - "-\t\t\tmin_t(size_t, PAGE_CACHE_SIZE, node_size - written));\n" - "+\t\t\tmin_t(size_t, PAGE_SIZE, node_size - written));\n" - " \t\tkunmap_atomic(kaddr);\n" - " \n" - " \t\tset_page_dirty(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \n" - " \thfsplus_mark_inode_dirty(attr_file, HFSPLUS_I_ATTR_DIRTY);\n" - "diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c\n" - "index d1abbee281d1..7016653f3e41 100644\n" - "--- a/fs/hostfs/hostfs_kern.c\n" - "+++ b/fs/hostfs/hostfs_kern.c\n" - "@@ -410,12 +410,12 @@ static int hostfs_writepage(struct page *page, struct writeback_control *wbc)\n" - " \tstruct inode *inode = mapping->host;\n" - " \tchar *buffer;\n" - " \tloff_t base = page_offset(page);\n" - "-\tint count = PAGE_CACHE_SIZE;\n" - "-\tint end_index = inode->i_size >> PAGE_CACHE_SHIFT;\n" - "+\tint count = PAGE_SIZE;\n" - "+\tint end_index = inode->i_size >> PAGE_SHIFT;\n" - " \tint err;\n" - " \n" - " \tif (page->index >= end_index)\n" - "-\t\tcount = inode->i_size & (PAGE_CACHE_SIZE-1);\n" - "+\t\tcount = inode->i_size & (PAGE_SIZE-1);\n" - " \n" - " \tbuffer = kmap(page);\n" - " \n" - "@@ -447,7 +447,7 @@ static int hostfs_readpage(struct file *file, struct page *page)\n" - " \n" - " \tbuffer = kmap(page);\n" - " \tbytes_read = read_file(FILE_HOSTFS_I(file)->fd, &start, buffer,\n" - "-\t\t\tPAGE_CACHE_SIZE);\n" - "+\t\t\tPAGE_SIZE);\n" - " \tif (bytes_read < 0) {\n" - " \t\tClearPageUptodate(page);\n" - " \t\tSetPageError(page);\n" - "@@ -455,7 +455,7 @@ static int hostfs_readpage(struct file *file, struct page *page)\n" - " \t\tgoto out;\n" - " \t}\n" - " \n" - "-\tmemset(buffer + bytes_read, 0, PAGE_CACHE_SIZE - bytes_read);\n" - "+\tmemset(buffer + bytes_read, 0, PAGE_SIZE - bytes_read);\n" - " \n" - " \tClearPageError(page);\n" - " \tSetPageUptodate(page);\n" - "@@ -471,7 +471,7 @@ static int hostfs_write_begin(struct file *file, struct address_space *mapping,\n" - " \t\t\t loff_t pos, unsigned len, unsigned flags,\n" - " \t\t\t struct page **pagep, void **fsdata)\n" - " {\n" - "-\tpgoff_t index = pos >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = pos >> PAGE_SHIFT;\n" - " \n" - " \t*pagep = grab_cache_page_write_begin(mapping, index, flags);\n" - " \tif (!*pagep)\n" - "@@ -485,14 +485,14 @@ static int hostfs_write_end(struct file *file, struct address_space *mapping,\n" - " {\n" - " \tstruct inode *inode = mapping->host;\n" - " \tvoid *buffer;\n" - "-\tunsigned from = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tunsigned from = pos & (PAGE_SIZE - 1);\n" - " \tint err;\n" - " \n" - " \tbuffer = kmap(page);\n" - " \terr = write_file(FILE_HOSTFS_I(file)->fd, &pos, buffer + from, copied);\n" - " \tkunmap(page);\n" - " \n" - "-\tif (!PageUptodate(page) && err == PAGE_CACHE_SIZE)\n" - "+\tif (!PageUptodate(page) && err == PAGE_SIZE)\n" - " \t\tSetPageUptodate(page);\n" - " \n" - " \t/*\n" - "@@ -502,7 +502,7 @@ static int hostfs_write_end(struct file *file, struct address_space *mapping,\n" - " \tif (err > 0 && (pos > inode->i_size))\n" - " \t\tinode->i_size = pos;\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \treturn err;\n" - " }\n" - "diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c\n" - "index e1f465a389d5..4ea71eba40a5 100644\n" - "--- a/fs/hugetlbfs/inode.c\n" - "+++ b/fs/hugetlbfs/inode.c\n" - "@@ -213,12 +213,12 @@ hugetlbfs_read_actor(struct page *page, unsigned long offset,\n" - " \tint i, chunksize;\n" - " \n" - " \t/* Find which 4k chunk and offset with in that chunk */\n" - "-\ti = offset >> PAGE_CACHE_SHIFT;\n" - "-\toffset = offset & ~PAGE_CACHE_MASK;\n" - "+\ti = offset >> PAGE_SHIFT;\n" - "+\toffset = offset & ~PAGE_MASK;\n" - " \n" - " \twhile (size) {\n" - " \t\tsize_t n;\n" - "-\t\tchunksize = PAGE_CACHE_SIZE;\n" - "+\t\tchunksize = PAGE_SIZE;\n" - " \t\tif (offset)\n" - " \t\t\tchunksize -= offset;\n" - " \t\tif (chunksize > size)\n" - "@@ -237,7 +237,7 @@ hugetlbfs_read_actor(struct page *page, unsigned long offset,\n" - " /*\n" - " * Support for read() - Find the page attached to f_mapping and copy out the\n" - " * data. Its *very* similar to do_generic_mapping_read(), we can't use that\n" - "- * since it has PAGE_CACHE_SIZE assumptions.\n" - "+ * since it has PAGE_SIZE assumptions.\n" - " */\n" - " static ssize_t hugetlbfs_read_iter(struct kiocb *iocb, struct iov_iter *to)\n" - " {\n" - "@@ -285,7 +285,7 @@ static ssize_t hugetlbfs_read_iter(struct kiocb *iocb, struct iov_iter *to)\n" - " \t\t\t * We have the page, copy it to user space buffer.\n" - " \t\t\t */\n" - " \t\t\tcopied = hugetlbfs_read_actor(page, offset, to, nr);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t}\n" - " \t\toffset += copied;\n" - " \t\tretval += copied;\n" - "diff --git a/fs/isofs/compress.c b/fs/isofs/compress.c\n" - "index f311bf084015..2e4e834d1a98 100644\n" - "--- a/fs/isofs/compress.c\n" - "+++ b/fs/isofs/compress.c\n" - "@@ -26,7 +26,7 @@\n" - " #include \"zisofs.h\"\n" - " \n" - " /* This should probably be global. */\n" - "-static char zisofs_sink_page[PAGE_CACHE_SIZE];\n" - "+static char zisofs_sink_page[PAGE_SIZE];\n" - " \n" - " /*\n" - " * This contains the zlib memory allocation and the mutex for the\n" - "@@ -70,11 +70,11 @@ static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start,\n" - " \t\tfor ( i = 0 ; i < pcount ; i++ ) {\n" - " \t\t\tif (!pages[i])\n" - " \t\t\t\tcontinue;\n" - "-\t\t\tmemset(page_address(pages[i]), 0, PAGE_CACHE_SIZE);\n" - "+\t\t\tmemset(page_address(pages[i]), 0, PAGE_SIZE);\n" - " \t\t\tflush_dcache_page(pages[i]);\n" - " \t\t\tSetPageUptodate(pages[i]);\n" - " \t\t}\n" - "-\t\treturn ((loff_t)pcount) << PAGE_CACHE_SHIFT;\n" - "+\t\treturn ((loff_t)pcount) << PAGE_SHIFT;\n" - " \t}\n" - " \n" - " \t/* Because zlib is not thread-safe, do all the I/O at the top. */\n" - "@@ -121,11 +121,11 @@ static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start,\n" - " \t\t\tif (pages[curpage]) {\n" - " \t\t\t\tstream.next_out = page_address(pages[curpage])\n" - " \t\t\t\t\t\t+ poffset;\n" - "-\t\t\t\tstream.avail_out = PAGE_CACHE_SIZE - poffset;\n" - "+\t\t\t\tstream.avail_out = PAGE_SIZE - poffset;\n" - " \t\t\t\tpoffset = 0;\n" - " \t\t\t} else {\n" - " \t\t\t\tstream.next_out = (void *)&zisofs_sink_page;\n" - "-\t\t\t\tstream.avail_out = PAGE_CACHE_SIZE;\n" - "+\t\t\t\tstream.avail_out = PAGE_SIZE;\n" - " \t\t\t}\n" - " \t\t}\n" - " \t\tif (!stream.avail_in) {\n" - "@@ -220,14 +220,14 @@ static int zisofs_fill_pages(struct inode *inode, int full_page, int pcount,\n" - " \t * pages with the data we have anyway...\n" - " \t */\n" - " \tstart_off = page_offset(pages[full_page]);\n" - "-\tend_off = min_t(loff_t, start_off + PAGE_CACHE_SIZE, inode->i_size);\n" - "+\tend_off = min_t(loff_t, start_off + PAGE_SIZE, inode->i_size);\n" - " \n" - " \tcstart_block = start_off >> zisofs_block_shift;\n" - " \tcend_block = (end_off + (1 << zisofs_block_shift) - 1)\n" - " \t\t\t>> zisofs_block_shift;\n" - " \n" - "-\tWARN_ON(start_off - (full_page << PAGE_CACHE_SHIFT) !=\n" - "-\t\t((cstart_block << zisofs_block_shift) & PAGE_CACHE_MASK));\n" - "+\tWARN_ON(start_off - (full_page << PAGE_SHIFT) !=\n" - "+\t\t((cstart_block << zisofs_block_shift) & PAGE_MASK));\n" - " \n" - " \t/* Find the pointer to this specific chunk */\n" - " \t/* Note: we're not using isonum_731() here because the data is known aligned */\n" - "@@ -260,10 +260,10 @@ static int zisofs_fill_pages(struct inode *inode, int full_page, int pcount,\n" - " \t\tret = zisofs_uncompress_block(inode, block_start, block_end,\n" - " \t\t\t\t\t pcount, pages, poffset, &err);\n" - " \t\tpoffset += ret;\n" - "-\t\tpages += poffset >> PAGE_CACHE_SHIFT;\n" - "-\t\tpcount -= poffset >> PAGE_CACHE_SHIFT;\n" - "-\t\tfull_page -= poffset >> PAGE_CACHE_SHIFT;\n" - "-\t\tpoffset &= ~PAGE_CACHE_MASK;\n" - "+\t\tpages += poffset >> PAGE_SHIFT;\n" - "+\t\tpcount -= poffset >> PAGE_SHIFT;\n" - "+\t\tfull_page -= poffset >> PAGE_SHIFT;\n" - "+\t\tpoffset &= ~PAGE_MASK;\n" - " \n" - " \t\tif (err) {\n" - " \t\t\tbrelse(bh);\n" - "@@ -282,7 +282,7 @@ static int zisofs_fill_pages(struct inode *inode, int full_page, int pcount,\n" - " \n" - " \tif (poffset && *pages) {\n" - " \t\tmemset(page_address(*pages) + poffset, 0,\n" - "-\t\t PAGE_CACHE_SIZE - poffset);\n" - "+\t\t PAGE_SIZE - poffset);\n" - " \t\tflush_dcache_page(*pages);\n" - " \t\tSetPageUptodate(*pages);\n" - " \t}\n" - "@@ -302,12 +302,12 @@ static int zisofs_readpage(struct file *file, struct page *page)\n" - " \tint i, pcount, full_page;\n" - " \tunsigned int zisofs_block_shift = ISOFS_I(inode)->i_format_parm[1];\n" - " \tunsigned int zisofs_pages_per_cblock =\n" - "-\t\tPAGE_CACHE_SHIFT <= zisofs_block_shift ?\n" - "-\t\t(1 << (zisofs_block_shift - PAGE_CACHE_SHIFT)) : 0;\n" - "+\t\tPAGE_SHIFT <= zisofs_block_shift ?\n" - "+\t\t(1 << (zisofs_block_shift - PAGE_SHIFT)) : 0;\n" - " \tstruct page *pages[max_t(unsigned, zisofs_pages_per_cblock, 1)];\n" - " \tpgoff_t index = page->index, end_index;\n" - " \n" - "-\tend_index = (inode->i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tend_index = (inode->i_size + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \t/*\n" - " \t * If this page is wholly outside i_size we just return zero;\n" - " \t * do_generic_file_read() will handle this for us\n" - "@@ -318,7 +318,7 @@ static int zisofs_readpage(struct file *file, struct page *page)\n" - " \t\treturn 0;\n" - " \t}\n" - " \n" - "-\tif (PAGE_CACHE_SHIFT <= zisofs_block_shift) {\n" - "+\tif (PAGE_SHIFT <= zisofs_block_shift) {\n" - " \t\t/* We have already been given one page, this is the one\n" - " \t\t we must do. */\n" - " \t\tfull_page = index & (zisofs_pages_per_cblock - 1);\n" - "@@ -351,7 +351,7 @@ static int zisofs_readpage(struct file *file, struct page *page)\n" - " \t\t\tkunmap(pages[i]);\n" - " \t\t\tunlock_page(pages[i]);\n" - " \t\t\tif (i != full_page)\n" - "-\t\t\t\tpage_cache_release(pages[i]);\n" - "+\t\t\t\tput_page(pages[i]);\n" - " \t\t}\n" - " \t}\t\t\t\n" - " \n" - "diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c\n" - "index bcd2d41b318a..131dedc920d8 100644\n" - "--- a/fs/isofs/inode.c\n" - "+++ b/fs/isofs/inode.c\n" - "@@ -1021,7 +1021,7 @@ int isofs_get_blocks(struct inode *inode, sector_t iblock,\n" - " \t\t * the page with useless information without generating any\n" - " \t\t * I/O errors.\n" - " \t\t */\n" - "-\t\tif (b_off > ((inode->i_size + PAGE_CACHE_SIZE - 1) >> ISOFS_BUFFER_BITS(inode))) {\n" - "+\t\tif (b_off > ((inode->i_size + PAGE_SIZE - 1) >> ISOFS_BUFFER_BITS(inode))) {\n" - " \t\t\tprintk(KERN_DEBUG \"%s: block >= EOF (%lu, %llu)\\n\",\n" - " \t\t\t\t__func__, b_off,\n" - " \t\t\t\t(unsigned long long)inode->i_size);\n" - "diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c\n" - "index 517f2de784cf..2ad98d6e19f4 100644\n" - "--- a/fs/jbd2/commit.c\n" - "+++ b/fs/jbd2/commit.c\n" - "@@ -81,11 +81,11 @@ static void release_buffer_page(struct buffer_head *bh)\n" - " \tif (!trylock_page(page))\n" - " \t\tgoto nope;\n" - " \n" - "-\tpage_cache_get(page);\n" - "+\tget_page(page);\n" - " \t__brelse(bh);\n" - " \ttry_to_free_buffers(page);\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn;\n" - " \n" - " nope:\n" - "diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c\n" - "index de73a9516a54..435f0b26ac20 100644\n" - "--- a/fs/jbd2/journal.c\n" - "+++ b/fs/jbd2/journal.c\n" - "@@ -2221,7 +2221,7 @@ void jbd2_journal_ack_err(journal_t *journal)\n" - " \n" - " int jbd2_journal_blocks_per_page(struct inode *inode)\n" - " {\n" - "-\treturn 1 << (PAGE_CACHE_SHIFT - inode->i_sb->s_blocksize_bits);\n" - "+\treturn 1 << (PAGE_SHIFT - inode->i_sb->s_blocksize_bits);\n" - " }\n" - " \n" - " /*\n" - "diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c\n" - "index 01e4652d88f6..67c103867bf8 100644\n" - "--- a/fs/jbd2/transaction.c\n" - "+++ b/fs/jbd2/transaction.c\n" - "@@ -2263,7 +2263,7 @@ int jbd2_journal_invalidatepage(journal_t *journal,\n" - " \tstruct buffer_head *head, *bh, *next;\n" - " \tunsigned int stop = offset + length;\n" - " \tunsigned int curr_off = 0;\n" - "-\tint partial_page = (offset || length < PAGE_CACHE_SIZE);\n" - "+\tint partial_page = (offset || length < PAGE_SIZE);\n" - " \tint may_free = 1;\n" - " \tint ret = 0;\n" - " \n" - "@@ -2272,7 +2272,7 @@ int jbd2_journal_invalidatepage(journal_t *journal,\n" - " \tif (!page_has_buffers(page))\n" - " \t\treturn 0;\n" - " \n" - "-\tBUG_ON(stop > PAGE_CACHE_SIZE || stop < length);\n" - "+\tBUG_ON(stop > PAGE_SIZE || stop < length);\n" - " \n" - " \t/* We will potentially be playing with lists other than just the\n" - " \t * data lists (especially for journaled data mode), so be\n" - "diff --git a/fs/jffs2/debug.c b/fs/jffs2/debug.c\n" - "index 1090eb64b90d..9d26b1b9fc01 100644\n" - "--- a/fs/jffs2/debug.c\n" - "+++ b/fs/jffs2/debug.c\n" - "@@ -95,15 +95,15 @@ __jffs2_dbg_fragtree_paranoia_check_nolock(struct jffs2_inode_info *f)\n" - " \t\t\t rather than mucking around with actually reading the node\n" - " \t\t\t and checking the compression type, which is the real way\n" - " \t\t\t to tell a hole node. */\n" - "-\t\t\tif (frag->ofs & (PAGE_CACHE_SIZE-1) && frag_prev(frag)\n" - "-\t\t\t\t\t&& frag_prev(frag)->size < PAGE_CACHE_SIZE && frag_prev(frag)->node) {\n" - "+\t\t\tif (frag->ofs & (PAGE_SIZE-1) && frag_prev(frag)\n" - "+\t\t\t\t\t&& frag_prev(frag)->size < PAGE_SIZE && frag_prev(frag)->node) {\n" - " \t\t\t\tJFFS2_ERROR(\"REF_PRISTINE node at 0x%08x had a previous non-hole frag in the same page. Tell dwmw2.\\n\",\n" - " \t\t\t\t\tref_offset(fn->raw));\n" - " \t\t\t\tbitched = 1;\n" - " \t\t\t}\n" - " \n" - "-\t\t\tif ((frag->ofs+frag->size) & (PAGE_CACHE_SIZE-1) && frag_next(frag)\n" - "-\t\t\t\t\t&& frag_next(frag)->size < PAGE_CACHE_SIZE && frag_next(frag)->node) {\n" - "+\t\t\tif ((frag->ofs+frag->size) & (PAGE_SIZE-1) && frag_next(frag)\n" - "+\t\t\t\t\t&& frag_next(frag)->size < PAGE_SIZE && frag_next(frag)->node) {\n" - " \t\t\t\tJFFS2_ERROR(\"REF_PRISTINE node at 0x%08x (%08x-%08x) had a following non-hole frag in the same page. Tell dwmw2.\\n\",\n" - " \t\t\t\t ref_offset(fn->raw), frag->ofs, frag->ofs+frag->size);\n" - " \t\t\t\tbitched = 1;\n" - "diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c\n" - "index cad86bac3453..0e62dec3effc 100644\n" - "--- a/fs/jffs2/file.c\n" - "+++ b/fs/jffs2/file.c\n" - "@@ -87,14 +87,15 @@ static int jffs2_do_readpage_nolock (struct inode *inode, struct page *pg)\n" - " \tint ret;\n" - " \n" - " \tjffs2_dbg(2, \"%s(): ino #%lu, page at offset 0x%lx\\n\",\n" - "-\t\t __func__, inode->i_ino, pg->index << PAGE_CACHE_SHIFT);\n" - "+\t\t __func__, inode->i_ino, pg->index << PAGE_SHIFT);\n" - " \n" - " \tBUG_ON(!PageLocked(pg));\n" - " \n" - " \tpg_buf = kmap(pg);\n" - " \t/* FIXME: Can kmap fail? */\n" - " \n" - "-\tret = jffs2_read_inode_range(c, f, pg_buf, pg->index << PAGE_CACHE_SHIFT, PAGE_CACHE_SIZE);\n" - "+\tret = jffs2_read_inode_range(c, f, pg_buf, pg->index << PAGE_SHIFT,\n" - "+\t\t\t\t PAGE_SIZE);\n" - " \n" - " \tif (ret) {\n" - " \t\tClearPageUptodate(pg);\n" - "@@ -137,8 +138,8 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping,\n" - " \tstruct page *pg;\n" - " \tstruct inode *inode = mapping->host;\n" - " \tstruct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);\n" - "-\tpgoff_t index = pos >> PAGE_CACHE_SHIFT;\n" - "-\tuint32_t pageofs = index << PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = pos >> PAGE_SHIFT;\n" - "+\tuint32_t pageofs = index << PAGE_SHIFT;\n" - " \tint ret = 0;\n" - " \n" - " \tpg = grab_cache_page_write_begin(mapping, index, flags);\n" - "@@ -230,7 +231,7 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping,\n" - " \n" - " out_page:\n" - " \tunlock_page(pg);\n" - "-\tpage_cache_release(pg);\n" - "+\tput_page(pg);\n" - " \treturn ret;\n" - " }\n" - " \n" - "@@ -245,14 +246,14 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping,\n" - " \tstruct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);\n" - " \tstruct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);\n" - " \tstruct jffs2_raw_inode *ri;\n" - "-\tunsigned start = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tunsigned start = pos & (PAGE_SIZE - 1);\n" - " \tunsigned end = start + copied;\n" - " \tunsigned aligned_start = start & ~3;\n" - " \tint ret = 0;\n" - " \tuint32_t writtenlen = 0;\n" - " \n" - " \tjffs2_dbg(1, \"%s(): ino #%lu, page at 0x%lx, range %d-%d, flags %lx\\n\",\n" - "-\t\t __func__, inode->i_ino, pg->index << PAGE_CACHE_SHIFT,\n" - "+\t\t __func__, inode->i_ino, pg->index << PAGE_SHIFT,\n" - " \t\t start, end, pg->flags);\n" - " \n" - " \t/* We need to avoid deadlock with page_cache_read() in\n" - "@@ -261,7 +262,7 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping,\n" - " \t to re-lock it. */\n" - " \tBUG_ON(!PageUptodate(pg));\n" - " \n" - "-\tif (end == PAGE_CACHE_SIZE) {\n" - "+\tif (end == PAGE_SIZE) {\n" - " \t\t/* When writing out the end of a page, write out the\n" - " \t\t _whole_ page. This helps to reduce the number of\n" - " \t\t nodes in files which have many short writes, like\n" - "@@ -275,7 +276,7 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping,\n" - " \t\tjffs2_dbg(1, \"%s(): Allocation of raw inode failed\\n\",\n" - " \t\t\t __func__);\n" - " \t\tunlock_page(pg);\n" - "-\t\tpage_cache_release(pg);\n" - "+\t\tput_page(pg);\n" - " \t\treturn -ENOMEM;\n" - " \t}\n" - " \n" - "@@ -292,7 +293,7 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping,\n" - " \tkmap(pg);\n" - " \n" - " \tret = jffs2_write_inode_range(c, f, ri, page_address(pg) + aligned_start,\n" - "-\t\t\t\t (pg->index << PAGE_CACHE_SHIFT) + aligned_start,\n" - "+\t\t\t\t (pg->index << PAGE_SHIFT) + aligned_start,\n" - " \t\t\t\t end - aligned_start, &writtenlen);\n" - " \n" - " \tkunmap(pg);\n" - "@@ -329,6 +330,6 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping,\n" - " \tjffs2_dbg(1, \"%s() returning %d\\n\",\n" - " \t\t __func__, writtenlen > 0 ? writtenlen : ret);\n" - " \tunlock_page(pg);\n" - "-\tpage_cache_release(pg);\n" - "+\tput_page(pg);\n" - " \treturn writtenlen > 0 ? writtenlen : ret;\n" - " }\n" - "diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c\n" - "index bead25ae8fe4..ae2ebb26b446 100644\n" - "--- a/fs/jffs2/fs.c\n" - "+++ b/fs/jffs2/fs.c\n" - "@@ -586,8 +586,8 @@ int jffs2_do_fill_super(struct super_block *sb, void *data, int silent)\n" - " \t\tgoto out_root;\n" - " \n" - " \tsb->s_maxbytes = 0xFFFFFFFF;\n" - "-\tsb->s_blocksize = PAGE_CACHE_SIZE;\n" - "-\tsb->s_blocksize_bits = PAGE_CACHE_SHIFT;\n" - "+\tsb->s_blocksize = PAGE_SIZE;\n" - "+\tsb->s_blocksize_bits = PAGE_SHIFT;\n" - " \tsb->s_magic = JFFS2_SUPER_MAGIC;\n" - " \tif (!(sb->s_flags & MS_RDONLY))\n" - " \t\tjffs2_start_garbage_collect_thread(c);\n" - "@@ -685,7 +685,7 @@ unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c,\n" - " \tstruct inode *inode = OFNI_EDONI_2SFFJ(f);\n" - " \tstruct page *pg;\n" - " \n" - "-\tpg = read_cache_page(inode->i_mapping, offset >> PAGE_CACHE_SHIFT,\n" - "+\tpg = read_cache_page(inode->i_mapping, offset >> PAGE_SHIFT,\n" - " \t\t\t (void *)jffs2_do_readpage_unlock, inode);\n" - " \tif (IS_ERR(pg))\n" - " \t\treturn (void *)pg;\n" - "@@ -701,7 +701,7 @@ void jffs2_gc_release_page(struct jffs2_sb_info *c,\n" - " \tstruct page *pg = (void *)*priv;\n" - " \n" - " \tkunmap(pg);\n" - "-\tpage_cache_release(pg);\n" - "+\tput_page(pg);\n" - " }\n" - " \n" - " static int jffs2_flash_setup(struct jffs2_sb_info *c) {\n" - "diff --git a/fs/jffs2/gc.c b/fs/jffs2/gc.c\n" - "index 95d5880a63ee..7c82e6159826 100644\n" - "--- a/fs/jffs2/gc.c\n" - "+++ b/fs/jffs2/gc.c\n" - "@@ -532,7 +532,7 @@ static int jffs2_garbage_collect_live(struct jffs2_sb_info *c, struct jffs2_era\n" - " \t\t\t\tgoto upnout;\n" - " \t\t}\n" - " \t\t/* We found a datanode. Do the GC */\n" - "-\t\tif((start >> PAGE_CACHE_SHIFT) < ((end-1) >> PAGE_CACHE_SHIFT)) {\n" - "+\t\tif((start >> PAGE_SHIFT) < ((end-1) >> PAGE_SHIFT)) {\n" - " \t\t\t/* It crosses a page boundary. Therefore, it must be a hole. */\n" - " \t\t\tret = jffs2_garbage_collect_hole(c, jeb, f, fn, start, end);\n" - " \t\t} else {\n" - "@@ -1172,8 +1172,8 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era\n" - " \t\tstruct jffs2_node_frag *frag;\n" - " \t\tuint32_t min, max;\n" - " \n" - "-\t\tmin = start & ~(PAGE_CACHE_SIZE-1);\n" - "-\t\tmax = min + PAGE_CACHE_SIZE;\n" - "+\t\tmin = start & ~(PAGE_SIZE-1);\n" - "+\t\tmax = min + PAGE_SIZE;\n" - " \n" - " \t\tfrag = jffs2_lookup_node_frag(&f->fragtree, start);\n" - " \n" - "@@ -1331,7 +1331,7 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era\n" - " \t\tcdatalen = min_t(uint32_t, alloclen - sizeof(ri), end - offset);\n" - " \t\tdatalen = end - offset;\n" - " \n" - "-\t\twritebuf = pg_ptr + (offset & (PAGE_CACHE_SIZE -1));\n" - "+\t\twritebuf = pg_ptr + (offset & (PAGE_SIZE -1));\n" - " \n" - " \t\tcomprtype = jffs2_compress(c, f, writebuf, &comprbuf, &datalen, &cdatalen);\n" - " \n" - "diff --git a/fs/jffs2/nodelist.c b/fs/jffs2/nodelist.c\n" - "index 9a5449bc3afb..b86c78d178c6 100644\n" - "--- a/fs/jffs2/nodelist.c\n" - "+++ b/fs/jffs2/nodelist.c\n" - "@@ -90,7 +90,7 @@ uint32_t jffs2_truncate_fragtree(struct jffs2_sb_info *c, struct rb_root *list,\n" - " \n" - " \t/* If the last fragment starts at the RAM page boundary, it is\n" - " \t * REF_PRISTINE irrespective of its size. */\n" - "-\tif (frag->node && (frag->ofs & (PAGE_CACHE_SIZE - 1)) == 0) {\n" - "+\tif (frag->node && (frag->ofs & (PAGE_SIZE - 1)) == 0) {\n" - " \t\tdbg_fragtree2(\"marking the last fragment 0x%08x-0x%08x REF_PRISTINE.\\n\",\n" - " \t\t\tfrag->ofs, frag->ofs + frag->size);\n" - " \t\tfrag->node->raw->flash_offset = ref_offset(frag->node->raw) | REF_PRISTINE;\n" - "@@ -237,7 +237,7 @@ static int jffs2_add_frag_to_fragtree(struct jffs2_sb_info *c, struct rb_root *r\n" - " \t\t If so, both 'this' and the new node get marked REF_NORMAL so\n" - " \t\t the GC can take a look.\n" - " \t\t*/\n" - "-\t\tif (lastend && (lastend-1) >> PAGE_CACHE_SHIFT == newfrag->ofs >> PAGE_CACHE_SHIFT) {\n" - "+\t\tif (lastend && (lastend-1) >> PAGE_SHIFT == newfrag->ofs >> PAGE_SHIFT) {\n" - " \t\t\tif (this->node)\n" - " \t\t\t\tmark_ref_normal(this->node->raw);\n" - " \t\t\tmark_ref_normal(newfrag->node->raw);\n" - "@@ -382,7 +382,7 @@ int jffs2_add_full_dnode_to_inode(struct jffs2_sb_info *c, struct jffs2_inode_in\n" - " \n" - " \t/* If we now share a page with other nodes, mark either previous\n" - " \t or next node REF_NORMAL, as appropriate. */\n" - "-\tif (newfrag->ofs & (PAGE_CACHE_SIZE-1)) {\n" - "+\tif (newfrag->ofs & (PAGE_SIZE-1)) {\n" - " \t\tstruct jffs2_node_frag *prev = frag_prev(newfrag);\n" - " \n" - " \t\tmark_ref_normal(fn->raw);\n" - "@@ -391,7 +391,7 @@ int jffs2_add_full_dnode_to_inode(struct jffs2_sb_info *c, struct jffs2_inode_in\n" - " \t\t\tmark_ref_normal(prev->node->raw);\n" - " \t}\n" - " \n" - "-\tif ((newfrag->ofs+newfrag->size) & (PAGE_CACHE_SIZE-1)) {\n" - "+\tif ((newfrag->ofs+newfrag->size) & (PAGE_SIZE-1)) {\n" - " \t\tstruct jffs2_node_frag *next = frag_next(newfrag);\n" - " \n" - " \t\tif (next) {\n" - "diff --git a/fs/jffs2/write.c b/fs/jffs2/write.c\n" - "index b634de4c8101..7fb187ab2682 100644\n" - "--- a/fs/jffs2/write.c\n" - "+++ b/fs/jffs2/write.c\n" - "@@ -172,8 +172,8 @@ struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2\n" - " \t beginning of a page and runs to the end of the file, or if\n" - " \t it's a hole node, mark it REF_PRISTINE, else REF_NORMAL.\n" - " \t*/\n" - "-\tif ((je32_to_cpu(ri->dsize) >= PAGE_CACHE_SIZE) ||\n" - "-\t ( ((je32_to_cpu(ri->offset)&(PAGE_CACHE_SIZE-1))==0) &&\n" - "+\tif ((je32_to_cpu(ri->dsize) >= PAGE_SIZE) ||\n" - "+\t ( ((je32_to_cpu(ri->offset)&(PAGE_SIZE-1))==0) &&\n" - " \t (je32_to_cpu(ri->dsize)+je32_to_cpu(ri->offset) == je32_to_cpu(ri->isize)))) {\n" - " \t\tflash_ofs |= REF_PRISTINE;\n" - " \t} else {\n" - "@@ -366,7 +366,8 @@ int jffs2_write_inode_range(struct jffs2_sb_info *c, struct jffs2_inode_info *f,\n" - " \t\t\tbreak;\n" - " \t\t}\n" - " \t\tmutex_lock(&f->sem);\n" - "-\t\tdatalen = min_t(uint32_t, writelen, PAGE_CACHE_SIZE - (offset & (PAGE_CACHE_SIZE-1)));\n" - "+\t\tdatalen = min_t(uint32_t, writelen,\n" - "+\t\t\t\tPAGE_SIZE - (offset & (PAGE_SIZE-1)));\n" - " \t\tcdatalen = min_t(uint32_t, alloclen - sizeof(*ri), datalen);\n" - " \n" - " \t\tcomprtype = jffs2_compress(c, f, buf, &comprbuf, &datalen, &cdatalen);\n" - "diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c\n" - "index a3eb316b1ac3..b60e015cc757 100644\n" - "--- a/fs/jfs/jfs_metapage.c\n" - "+++ b/fs/jfs/jfs_metapage.c\n" - "@@ -80,7 +80,7 @@ static inline void lock_metapage(struct metapage *mp)\n" - " static struct kmem_cache *metapage_cache;\n" - " static mempool_t *metapage_mempool;\n" - " \n" - "-#define MPS_PER_PAGE (PAGE_CACHE_SIZE >> L2PSIZE)\n" - "+#define MPS_PER_PAGE (PAGE_SIZE >> L2PSIZE)\n" - " \n" - " #if MPS_PER_PAGE > 1\n" - " \n" - "@@ -316,7 +316,7 @@ static void last_write_complete(struct page *page)\n" - " \tstruct metapage *mp;\n" - " \tunsigned int offset;\n" - " \n" - "-\tfor (offset = 0; offset < PAGE_CACHE_SIZE; offset += PSIZE) {\n" - "+\tfor (offset = 0; offset < PAGE_SIZE; offset += PSIZE) {\n" - " \t\tmp = page_to_mp(page, offset);\n" - " \t\tif (mp && test_bit(META_io, &mp->flag)) {\n" - " \t\t\tif (mp->lsn)\n" - "@@ -366,12 +366,12 @@ static int metapage_writepage(struct page *page, struct writeback_control *wbc)\n" - " \tint bad_blocks = 0;\n" - " \n" - " \tpage_start = (sector_t)page->index <<\n" - "-\t\t (PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "+\t\t (PAGE_SHIFT - inode->i_blkbits);\n" - " \tBUG_ON(!PageLocked(page));\n" - " \tBUG_ON(PageWriteback(page));\n" - " \tset_page_writeback(page);\n" - " \n" - "-\tfor (offset = 0; offset < PAGE_CACHE_SIZE; offset += PSIZE) {\n" - "+\tfor (offset = 0; offset < PAGE_SIZE; offset += PSIZE) {\n" - " \t\tmp = page_to_mp(page, offset);\n" - " \n" - " \t\tif (!mp || !test_bit(META_dirty, &mp->flag))\n" - "@@ -416,7 +416,7 @@ static int metapage_writepage(struct page *page, struct writeback_control *wbc)\n" - " \t\t\tbio = NULL;\n" - " \t\t} else\n" - " \t\t\tinc_io(page);\n" - "-\t\txlen = (PAGE_CACHE_SIZE - offset) >> inode->i_blkbits;\n" - "+\t\txlen = (PAGE_SIZE - offset) >> inode->i_blkbits;\n" - " \t\tpblock = metapage_get_blocks(inode, lblock, &xlen);\n" - " \t\tif (!pblock) {\n" - " \t\t\tprintk(KERN_ERR \"JFS: metapage_get_blocks failed\\n\");\n" - "@@ -485,7 +485,7 @@ static int metapage_readpage(struct file *fp, struct page *page)\n" - " \tstruct inode *inode = page->mapping->host;\n" - " \tstruct bio *bio = NULL;\n" - " \tint block_offset;\n" - "-\tint blocks_per_page = PAGE_CACHE_SIZE >> inode->i_blkbits;\n" - "+\tint blocks_per_page = PAGE_SIZE >> inode->i_blkbits;\n" - " \tsector_t page_start;\t/* address of page in fs blocks */\n" - " \tsector_t pblock;\n" - " \tint xlen;\n" - "@@ -494,7 +494,7 @@ static int metapage_readpage(struct file *fp, struct page *page)\n" - " \n" - " \tBUG_ON(!PageLocked(page));\n" - " \tpage_start = (sector_t)page->index <<\n" - "-\t\t (PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "+\t\t (PAGE_SHIFT - inode->i_blkbits);\n" - " \n" - " \tblock_offset = 0;\n" - " \twhile (block_offset < blocks_per_page) {\n" - "@@ -542,7 +542,7 @@ static int metapage_releasepage(struct page *page, gfp_t gfp_mask)\n" - " \tint ret = 1;\n" - " \tint offset;\n" - " \n" - "-\tfor (offset = 0; offset < PAGE_CACHE_SIZE; offset += PSIZE) {\n" - "+\tfor (offset = 0; offset < PAGE_SIZE; offset += PSIZE) {\n" - " \t\tmp = page_to_mp(page, offset);\n" - " \n" - " \t\tif (!mp)\n" - "@@ -568,7 +568,7 @@ static int metapage_releasepage(struct page *page, gfp_t gfp_mask)\n" - " static void metapage_invalidatepage(struct page *page, unsigned int offset,\n" - " \t\t\t\t unsigned int length)\n" - " {\n" - "-\tBUG_ON(offset || length < PAGE_CACHE_SIZE);\n" - "+\tBUG_ON(offset || length < PAGE_SIZE);\n" - " \n" - " \tBUG_ON(PageWriteback(page));\n" - " \n" - "@@ -599,10 +599,10 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,\n" - " \t\t inode->i_ino, lblock, absolute);\n" - " \n" - " \tl2bsize = inode->i_blkbits;\n" - "-\tl2BlocksPerPage = PAGE_CACHE_SHIFT - l2bsize;\n" - "+\tl2BlocksPerPage = PAGE_SHIFT - l2bsize;\n" - " \tpage_index = lblock >> l2BlocksPerPage;\n" - " \tpage_offset = (lblock - (page_index << l2BlocksPerPage)) << l2bsize;\n" - "-\tif ((page_offset + size) > PAGE_CACHE_SIZE) {\n" - "+\tif ((page_offset + size) > PAGE_SIZE) {\n" - " \t\tjfs_err(\"MetaData crosses page boundary!!\");\n" - " \t\tjfs_err(\"lblock = %lx, size = %d\", lblock, size);\n" - " \t\tdump_stack();\n" - "@@ -621,7 +621,7 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,\n" - " \t\tmapping = inode->i_mapping;\n" - " \t}\n" - " \n" - "-\tif (new && (PSIZE == PAGE_CACHE_SIZE)) {\n" - "+\tif (new && (PSIZE == PAGE_SIZE)) {\n" - " \t\tpage = grab_cache_page(mapping, page_index);\n" - " \t\tif (!page) {\n" - " \t\t\tjfs_err(\"grab_cache_page failed!\");\n" - "@@ -693,7 +693,7 @@ unlock:\n" - " void grab_metapage(struct metapage * mp)\n" - " {\n" - " \tjfs_info(\"grab_metapage: mp = 0x%p\", mp);\n" - "-\tpage_cache_get(mp->page);\n" - "+\tget_page(mp->page);\n" - " \tlock_page(mp->page);\n" - " \tmp->count++;\n" - " \tlock_metapage(mp);\n" - "@@ -706,12 +706,12 @@ void force_metapage(struct metapage *mp)\n" - " \tjfs_info(\"force_metapage: mp = 0x%p\", mp);\n" - " \tset_bit(META_forcewrite, &mp->flag);\n" - " \tclear_bit(META_sync, &mp->flag);\n" - "-\tpage_cache_get(page);\n" - "+\tget_page(page);\n" - " \tlock_page(page);\n" - " \tset_page_dirty(page);\n" - " \twrite_one_page(page, 1);\n" - " \tclear_bit(META_forcewrite, &mp->flag);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " void hold_metapage(struct metapage *mp)\n" - "@@ -726,7 +726,7 @@ void put_metapage(struct metapage *mp)\n" - " \t\tunlock_page(mp->page);\n" - " \t\treturn;\n" - " \t}\n" - "-\tpage_cache_get(mp->page);\n" - "+\tget_page(mp->page);\n" - " \tmp->count++;\n" - " \tlock_metapage(mp);\n" - " \tunlock_page(mp->page);\n" - "@@ -746,7 +746,7 @@ void release_metapage(struct metapage * mp)\n" - " \tassert(mp->count);\n" - " \tif (--mp->count || mp->nohomeok) {\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\treturn;\n" - " \t}\n" - " \n" - "@@ -764,13 +764,13 @@ void release_metapage(struct metapage * mp)\n" - " \tdrop_metapage(page, mp);\n" - " \n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " void __invalidate_metapages(struct inode *ip, s64 addr, int len)\n" - " {\n" - " \tsector_t lblock;\n" - "-\tint l2BlocksPerPage = PAGE_CACHE_SHIFT - ip->i_blkbits;\n" - "+\tint l2BlocksPerPage = PAGE_SHIFT - ip->i_blkbits;\n" - " \tint BlocksPerPage = 1 << l2BlocksPerPage;\n" - " \t/* All callers are interested in block device's mapping */\n" - " \tstruct address_space *mapping =\n" - "@@ -788,7 +788,7 @@ void __invalidate_metapages(struct inode *ip, s64 addr, int len)\n" - " \t\tpage = find_lock_page(mapping, lblock >> l2BlocksPerPage);\n" - " \t\tif (!page)\n" - " \t\t\tcontinue;\n" - "-\t\tfor (offset = 0; offset < PAGE_CACHE_SIZE; offset += PSIZE) {\n" - "+\t\tfor (offset = 0; offset < PAGE_SIZE; offset += PSIZE) {\n" - " \t\t\tmp = page_to_mp(page, offset);\n" - " \t\t\tif (!mp)\n" - " \t\t\t\tcontinue;\n" - "@@ -803,7 +803,7 @@ void __invalidate_metapages(struct inode *ip, s64 addr, int len)\n" - " \t\t\t\tremove_from_logsync(mp);\n" - " \t\t}\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " }\n" - " \n" - "diff --git a/fs/jfs/jfs_metapage.h b/fs/jfs/jfs_metapage.h\n" - "index 337e9e51ac06..a869fb4a20d6 100644\n" - "--- a/fs/jfs/jfs_metapage.h\n" - "+++ b/fs/jfs/jfs_metapage.h\n" - "@@ -106,7 +106,7 @@ static inline void metapage_nohomeok(struct metapage *mp)\n" - " \tlock_page(page);\n" - " \tif (!mp->nohomeok++) {\n" - " \t\tmark_metapage_dirty(mp);\n" - "-\t\tpage_cache_get(page);\n" - "+\t\tget_page(page);\n" - " \t\twait_on_page_writeback(page);\n" - " \t}\n" - " \tunlock_page(page);\n" - "@@ -128,7 +128,7 @@ static inline void metapage_wait_for_io(struct metapage *mp)\n" - " static inline void _metapage_homeok(struct metapage *mp)\n" - " {\n" - " \tif (!--mp->nohomeok)\n" - "-\t\tpage_cache_release(mp->page);\n" - "+\t\tput_page(mp->page);\n" - " }\n" - " \n" - " static inline void metapage_homeok(struct metapage *mp)\n" - "diff --git a/fs/jfs/super.c b/fs/jfs/super.c\n" - "index 4f5d85ba8e23..78d599198bf5 100644\n" - "--- a/fs/jfs/super.c\n" - "+++ b/fs/jfs/super.c\n" - "@@ -596,7 +596,7 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)\n" - " \t * Page cache is indexed by long.\n" - " \t * I would use MAX_LFS_FILESIZE, but it's only half as big\n" - " \t */\n" - "-\tsb->s_maxbytes = min(((u64) PAGE_CACHE_SIZE << 32) - 1,\n" - "+\tsb->s_maxbytes = min(((u64) PAGE_SIZE << 32) - 1,\n" - " \t\t\t (u64)sb->s_maxbytes);\n" - " #endif\n" - " \tsb->s_time_gran = 1;\n" - "diff --git a/fs/kernfs/mount.c b/fs/kernfs/mount.c\n" - "index 8eaf417187f1..43393e1008d1 100644\n" - "--- a/fs/kernfs/mount.c\n" - "+++ b/fs/kernfs/mount.c\n" - "@@ -69,8 +69,8 @@ static int kernfs_fill_super(struct super_block *sb, unsigned long magic)\n" - " \tstruct dentry *root;\n" - " \n" - " \tinfo->sb = sb;\n" - "-\tsb->s_blocksize = PAGE_CACHE_SIZE;\n" - "-\tsb->s_blocksize_bits = PAGE_CACHE_SHIFT;\n" - "+\tsb->s_blocksize = PAGE_SIZE;\n" - "+\tsb->s_blocksize_bits = PAGE_SHIFT;\n" - " \tsb->s_magic = magic;\n" - " \tsb->s_op = &kernfs_sops;\n" - " \tsb->s_time_gran = 1;\n" - "diff --git a/fs/libfs.c b/fs/libfs.c\n" - "index 0ca80b2af420..f3fa82ce9b70 100644\n" - "--- a/fs/libfs.c\n" - "+++ b/fs/libfs.c\n" - "@@ -25,7 +25,7 @@ int simple_getattr(struct vfsmount *mnt, struct dentry *dentry,\n" - " {\n" - " \tstruct inode *inode = d_inode(dentry);\n" - " \tgeneric_fillattr(inode, stat);\n" - "-\tstat->blocks = inode->i_mapping->nrpages << (PAGE_CACHE_SHIFT - 9);\n" - "+\tstat->blocks = inode->i_mapping->nrpages << (PAGE_SHIFT - 9);\n" - " \treturn 0;\n" - " }\n" - " EXPORT_SYMBOL(simple_getattr);\n" - "@@ -33,7 +33,7 @@ EXPORT_SYMBOL(simple_getattr);\n" - " int simple_statfs(struct dentry *dentry, struct kstatfs *buf)\n" - " {\n" - " \tbuf->f_type = dentry->d_sb->s_magic;\n" - "-\tbuf->f_bsize = PAGE_CACHE_SIZE;\n" - "+\tbuf->f_bsize = PAGE_SIZE;\n" - " \tbuf->f_namelen = NAME_MAX;\n" - " \treturn 0;\n" - " }\n" - "@@ -395,7 +395,7 @@ int simple_write_begin(struct file *file, struct address_space *mapping,\n" - " \tstruct page *page;\n" - " \tpgoff_t index;\n" - " \n" - "-\tindex = pos >> PAGE_CACHE_SHIFT;\n" - "+\tindex = pos >> PAGE_SHIFT;\n" - " \n" - " \tpage = grab_cache_page_write_begin(mapping, index, flags);\n" - " \tif (!page)\n" - "@@ -403,10 +403,10 @@ int simple_write_begin(struct file *file, struct address_space *mapping,\n" - " \n" - " \t*pagep = page;\n" - " \n" - "-\tif (!PageUptodate(page) && (len != PAGE_CACHE_SIZE)) {\n" - "-\t\tunsigned from = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tif (!PageUptodate(page) && (len != PAGE_SIZE)) {\n" - "+\t\tunsigned from = pos & (PAGE_SIZE - 1);\n" - " \n" - "-\t\tzero_user_segments(page, 0, from, from + len, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user_segments(page, 0, from, from + len, PAGE_SIZE);\n" - " \t}\n" - " \treturn 0;\n" - " }\n" - "@@ -442,7 +442,7 @@ int simple_write_end(struct file *file, struct address_space *mapping,\n" - " \n" - " \t/* zero the stale part of the page if we did a short copy */\n" - " \tif (copied < len) {\n" - "-\t\tunsigned from = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\t\tunsigned from = pos & (PAGE_SIZE - 1);\n" - " \n" - " \t\tzero_user(page, from + copied, len - copied);\n" - " \t}\n" - "@@ -458,7 +458,7 @@ int simple_write_end(struct file *file, struct address_space *mapping,\n" - " \n" - " \tset_page_dirty(page);\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \treturn copied;\n" - " }\n" - "@@ -477,8 +477,8 @@ int simple_fill_super(struct super_block *s, unsigned long magic,\n" - " \tstruct dentry *dentry;\n" - " \tint i;\n" - " \n" - "-\ts->s_blocksize = PAGE_CACHE_SIZE;\n" - "-\ts->s_blocksize_bits = PAGE_CACHE_SHIFT;\n" - "+\ts->s_blocksize = PAGE_SIZE;\n" - "+\ts->s_blocksize_bits = PAGE_SHIFT;\n" - " \ts->s_magic = magic;\n" - " \ts->s_op = &simple_super_operations;\n" - " \ts->s_time_gran = 1;\n" - "@@ -994,12 +994,12 @@ int generic_check_addressable(unsigned blocksize_bits, u64 num_blocks)\n" - " {\n" - " \tu64 last_fs_block = num_blocks - 1;\n" - " \tu64 last_fs_page =\n" - "-\t\tlast_fs_block >> (PAGE_CACHE_SHIFT - blocksize_bits);\n" - "+\t\tlast_fs_block >> (PAGE_SHIFT - blocksize_bits);\n" - " \n" - " \tif (unlikely(num_blocks == 0))\n" - " \t\treturn 0;\n" - " \n" - "-\tif ((blocksize_bits < 9) || (blocksize_bits > PAGE_CACHE_SHIFT))\n" - "+\tif ((blocksize_bits < 9) || (blocksize_bits > PAGE_SHIFT))\n" - " \t\treturn -EINVAL;\n" - " \n" - " \tif ((last_fs_block > (sector_t)(~0ULL) >> (blocksize_bits - 9)) ||\n" - "diff --git a/fs/logfs/dev_bdev.c b/fs/logfs/dev_bdev.c\n" - "index a709d80c8ebc..cc26f8f215f5 100644\n" - "--- a/fs/logfs/dev_bdev.c\n" - "+++ b/fs/logfs/dev_bdev.c\n" - "@@ -64,7 +64,7 @@ static void writeseg_end_io(struct bio *bio)\n" - " \n" - " \tbio_for_each_segment_all(bvec, bio, i) {\n" - " \t\tend_page_writeback(bvec->bv_page);\n" - "-\t\tpage_cache_release(bvec->bv_page);\n" - "+\t\tput_page(bvec->bv_page);\n" - " \t}\n" - " \tbio_put(bio);\n" - " \tif (atomic_dec_and_test(&super->s_pending_writes))\n" - "diff --git a/fs/logfs/dev_mtd.c b/fs/logfs/dev_mtd.c\n" - "index 9c501449450d..b76a62b1978f 100644\n" - "--- a/fs/logfs/dev_mtd.c\n" - "+++ b/fs/logfs/dev_mtd.c\n" - "@@ -46,9 +46,9 @@ static int loffs_mtd_write(struct super_block *sb, loff_t ofs, size_t len,\n" - " \n" - " \tBUG_ON((ofs >= mtd->size) || (len > mtd->size - ofs));\n" - " \tBUG_ON(ofs != (ofs >> super->s_writeshift) << super->s_writeshift);\n" - "-\tBUG_ON(len > PAGE_CACHE_SIZE);\n" - "-\tpage_start = ofs & PAGE_CACHE_MASK;\n" - "-\tpage_end = PAGE_CACHE_ALIGN(ofs + len) - 1;\n" - "+\tBUG_ON(len > PAGE_SIZE);\n" - "+\tpage_start = ofs & PAGE_MASK;\n" - "+\tpage_end = PAGE_ALIGN(ofs + len) - 1;\n" - " \tret = mtd_write(mtd, ofs, len, &retlen, buf);\n" - " \tif (ret || (retlen != len))\n" - " \t\treturn -EIO;\n" - "@@ -82,7 +82,7 @@ static int logfs_mtd_erase_mapping(struct super_block *sb, loff_t ofs,\n" - " \t\tif (!page)\n" - " \t\t\tcontinue;\n" - " \t\tmemset(page_address(page), 0xFF, PAGE_SIZE);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \treturn 0;\n" - " }\n" - "@@ -195,7 +195,7 @@ static int __logfs_mtd_writeseg(struct super_block *sb, u64 ofs, pgoff_t index,\n" - " \t\terr = loffs_mtd_write(sb, page->index << PAGE_SHIFT, PAGE_SIZE,\n" - " \t\t\t\t\tpage_address(page));\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tif (err)\n" - " \t\t\treturn err;\n" - " \t}\n" - "diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c\n" - "index 542468e9bfb4..ddbed2be5366 100644\n" - "--- a/fs/logfs/dir.c\n" - "+++ b/fs/logfs/dir.c\n" - "@@ -183,7 +183,7 @@ static struct page *logfs_get_dd_page(struct inode *dir, struct dentry *dentry)\n" - " \t\tif (name->len != be16_to_cpu(dd->namelen) ||\n" - " \t\t\t\tmemcmp(name->name, dd->name, name->len)) {\n" - " \t\t\tkunmap_atomic(dd);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tcontinue;\n" - " \t\t}\n" - " \n" - "@@ -238,7 +238,7 @@ static int logfs_unlink(struct inode *dir, struct dentry *dentry)\n" - " \t\treturn PTR_ERR(page);\n" - " \t}\n" - " \tindex = page->index;\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \tmutex_lock(&super->s_dirop_mutex);\n" - " \tlogfs_add_transaction(dir, ta);\n" - "@@ -316,7 +316,7 @@ static int logfs_readdir(struct file *file, struct dir_context *ctx)\n" - " \t\t\t\tbe16_to_cpu(dd->namelen),\n" - " \t\t\t\tbe64_to_cpu(dd->ino), dd->type);\n" - " \t\tkunmap(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tif (full)\n" - " \t\t\tbreak;\n" - " \t}\n" - "@@ -349,7 +349,7 @@ static struct dentry *logfs_lookup(struct inode *dir, struct dentry *dentry,\n" - " \tdd = kmap_atomic(page);\n" - " \tino = be64_to_cpu(dd->ino);\n" - " \tkunmap_atomic(dd);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \tinode = logfs_iget(dir->i_sb, ino);\n" - " \tif (IS_ERR(inode))\n" - "@@ -392,7 +392,7 @@ static int logfs_write_dir(struct inode *dir, struct dentry *dentry,\n" - " \n" - " \t\terr = logfs_write_buf(dir, page, WF_LOCK);\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tif (!err)\n" - " \t\t\tgrow_dir(dir, index);\n" - " \t\treturn err;\n" - "@@ -561,7 +561,7 @@ static int logfs_get_dd(struct inode *dir, struct dentry *dentry,\n" - " \tmap = kmap_atomic(page);\n" - " \tmemcpy(dd, map, sizeof(*dd));\n" - " \tkunmap_atomic(map);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn 0;\n" - " }\n" - " \n" - "diff --git a/fs/logfs/file.c b/fs/logfs/file.c\n" - "index 61eaeb1b6cac..f01ddfb1a03b 100644\n" - "--- a/fs/logfs/file.c\n" - "+++ b/fs/logfs/file.c\n" - "@@ -15,21 +15,21 @@ static int logfs_write_begin(struct file *file, struct address_space *mapping,\n" - " {\n" - " \tstruct inode *inode = mapping->host;\n" - " \tstruct page *page;\n" - "-\tpgoff_t index = pos >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = pos >> PAGE_SHIFT;\n" - " \n" - " \tpage = grab_cache_page_write_begin(mapping, index, flags);\n" - " \tif (!page)\n" - " \t\treturn -ENOMEM;\n" - " \t*pagep = page;\n" - " \n" - "-\tif ((len == PAGE_CACHE_SIZE) || PageUptodate(page))\n" - "+\tif ((len == PAGE_SIZE) || PageUptodate(page))\n" - " \t\treturn 0;\n" - "-\tif ((pos & PAGE_CACHE_MASK) >= i_size_read(inode)) {\n" - "-\t\tunsigned start = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tif ((pos & PAGE_MASK) >= i_size_read(inode)) {\n" - "+\t\tunsigned start = pos & (PAGE_SIZE - 1);\n" - " \t\tunsigned end = start + len;\n" - " \n" - " \t\t/* Reading beyond i_size is simple: memset to zero */\n" - "-\t\tzero_user_segments(page, 0, start, end, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user_segments(page, 0, start, end, PAGE_SIZE);\n" - " \t\treturn 0;\n" - " \t}\n" - " \treturn logfs_readpage_nolock(page);\n" - "@@ -41,11 +41,11 @@ static int logfs_write_end(struct file *file, struct address_space *mapping,\n" - " {\n" - " \tstruct inode *inode = mapping->host;\n" - " \tpgoff_t index = page->index;\n" - "-\tunsigned start = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tunsigned start = pos & (PAGE_SIZE - 1);\n" - " \tunsigned end = start + copied;\n" - " \tint ret = 0;\n" - " \n" - "-\tBUG_ON(PAGE_CACHE_SIZE != inode->i_sb->s_blocksize);\n" - "+\tBUG_ON(PAGE_SIZE != inode->i_sb->s_blocksize);\n" - " \tBUG_ON(page->index > I3_BLOCKS);\n" - " \n" - " \tif (copied < len) {\n" - "@@ -61,8 +61,8 @@ static int logfs_write_end(struct file *file, struct address_space *mapping,\n" - " \tif (copied == 0)\n" - " \t\tgoto out; /* FIXME: do we need to update inode? */\n" - " \n" - "-\tif (i_size_read(inode) < (index << PAGE_CACHE_SHIFT) + end) {\n" - "-\t\ti_size_write(inode, (index << PAGE_CACHE_SHIFT) + end);\n" - "+\tif (i_size_read(inode) < (index << PAGE_SHIFT) + end) {\n" - "+\t\ti_size_write(inode, (index << PAGE_SHIFT) + end);\n" - " \t\tmark_inode_dirty_sync(inode);\n" - " \t}\n" - " \n" - "@@ -75,7 +75,7 @@ static int logfs_write_end(struct file *file, struct address_space *mapping,\n" - " \t}\n" - " out:\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn ret ? ret : copied;\n" - " }\n" - " \n" - "@@ -118,7 +118,7 @@ static int logfs_writepage(struct page *page, struct writeback_control *wbc)\n" - " {\n" - " \tstruct inode *inode = page->mapping->host;\n" - " \tloff_t i_size = i_size_read(inode);\n" - "-\tpgoff_t end_index = i_size >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t end_index = i_size >> PAGE_SHIFT;\n" - " \tunsigned offset;\n" - " \tu64 bix;\n" - " \tlevel_t level;\n" - "@@ -142,7 +142,7 @@ static int logfs_writepage(struct page *page, struct writeback_control *wbc)\n" - " \t\treturn __logfs_writepage(page);\n" - " \n" - " \t /* Is the page fully outside i_size? (truncate in progress) */\n" - "-\toffset = i_size & (PAGE_CACHE_SIZE-1);\n" - "+\toffset = i_size & (PAGE_SIZE-1);\n" - " \tif (bix > end_index || offset == 0) {\n" - " \t\tunlock_page(page);\n" - " \t\treturn 0; /* don't care */\n" - "@@ -155,7 +155,7 @@ static int logfs_writepage(struct page *page, struct writeback_control *wbc)\n" - " \t * the page size, the remaining memory is zeroed when mapped, and\n" - " \t * writes to that region are not written out to the file.\"\n" - " \t */\n" - "-\tzero_user_segment(page, offset, PAGE_CACHE_SIZE);\n" - "+\tzero_user_segment(page, offset, PAGE_SIZE);\n" - " \treturn __logfs_writepage(page);\n" - " }\n" - " \n" - "diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c\n" - "index 20973c9e52f8..3fb8c6d67303 100644\n" - "--- a/fs/logfs/readwrite.c\n" - "+++ b/fs/logfs/readwrite.c\n" - "@@ -281,7 +281,7 @@ static struct page *logfs_get_read_page(struct inode *inode, u64 bix,\n" - " static void logfs_put_read_page(struct page *page)\n" - " {\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " static void logfs_lock_write_page(struct page *page)\n" - "@@ -323,7 +323,7 @@ repeat:\n" - " \t\t\treturn NULL;\n" - " \t\terr = add_to_page_cache_lru(page, mapping, index, GFP_NOFS);\n" - " \t\tif (unlikely(err)) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tif (err == -EEXIST)\n" - " \t\t\t\tgoto repeat;\n" - " \t\t\treturn NULL;\n" - "@@ -342,7 +342,7 @@ static void logfs_unlock_write_page(struct page *page)\n" - " static void logfs_put_write_page(struct page *page)\n" - " {\n" - " \tlogfs_unlock_write_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " static struct page *logfs_get_page(struct inode *inode, u64 bix, level_t level,\n" - "@@ -562,7 +562,7 @@ static void indirect_free_block(struct super_block *sb,\n" - " \n" - " \tif (PagePrivate(page)) {\n" - " \t\tClearPagePrivate(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tset_page_private(page, 0);\n" - " \t}\n" - " \t__free_block(sb, block);\n" - "@@ -655,7 +655,7 @@ static void alloc_data_block(struct inode *inode, struct page *page)\n" - " \tblock->page = page;\n" - " \n" - " \tSetPagePrivate(page);\n" - "-\tpage_cache_get(page);\n" - "+\tget_page(page);\n" - " \tset_page_private(page, (unsigned long) block);\n" - " \n" - " \tblock->ops = &indirect_block_ops;\n" - "@@ -709,7 +709,7 @@ static u64 block_get_pointer(struct page *page, int index)\n" - " \n" - " static int logfs_read_empty(struct page *page)\n" - " {\n" - "-\tzero_user_segment(page, 0, PAGE_CACHE_SIZE);\n" - "+\tzero_user_segment(page, 0, PAGE_SIZE);\n" - " \treturn 0;\n" - " }\n" - " \n" - "@@ -1660,7 +1660,7 @@ static int truncate_data_block(struct inode *inode, struct page *page,\n" - " \tif (err)\n" - " \t\treturn err;\n" - " \n" - "-\tzero_user_segment(page, size - pageofs, PAGE_CACHE_SIZE);\n" - "+\tzero_user_segment(page, size - pageofs, PAGE_SIZE);\n" - " \treturn logfs_segment_write(inode, page, shadow);\n" - " }\n" - " \n" - "@@ -1919,7 +1919,7 @@ static void move_page_to_inode(struct inode *inode, struct page *page)\n" - " \tblock->page = NULL;\n" - " \tif (PagePrivate(page)) {\n" - " \t\tClearPagePrivate(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tset_page_private(page, 0);\n" - " \t}\n" - " }\n" - "@@ -1940,7 +1940,7 @@ static void move_inode_to_page(struct page *page, struct inode *inode)\n" - " \n" - " \tif (!PagePrivate(page)) {\n" - " \t\tSetPagePrivate(page);\n" - "-\t\tpage_cache_get(page);\n" - "+\t\tget_page(page);\n" - " \t\tset_page_private(page, (unsigned long) block);\n" - " \t}\n" - " \n" - "@@ -1971,7 +1971,7 @@ int logfs_read_inode(struct inode *inode)\n" - " \tlogfs_disk_to_inode(di, inode);\n" - " \tkunmap_atomic(di);\n" - " \tmove_page_to_inode(inode, page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn 0;\n" - " }\n" - " \n" - "diff --git a/fs/logfs/segment.c b/fs/logfs/segment.c\n" - "index d270e4b2ab6b..1efd6055f4b0 100644\n" - "--- a/fs/logfs/segment.c\n" - "+++ b/fs/logfs/segment.c\n" - "@@ -90,9 +90,9 @@ int __logfs_buf_write(struct logfs_area *area, u64 ofs, void *buf, size_t len,\n" - " \n" - " \t\tif (!PagePrivate(page)) {\n" - " \t\t\tSetPagePrivate(page);\n" - "-\t\t\tpage_cache_get(page);\n" - "+\t\t\tget_page(page);\n" - " \t\t}\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \n" - " \t\tbuf += copylen;\n" - " \t\tlen -= copylen;\n" - "@@ -117,9 +117,9 @@ static void pad_partial_page(struct logfs_area *area)\n" - " \t\tmemset(page_address(page) + offset, 0xff, len);\n" - " \t\tif (!PagePrivate(page)) {\n" - " \t\t\tSetPagePrivate(page);\n" - "-\t\t\tpage_cache_get(page);\n" - "+\t\t\tget_page(page);\n" - " \t\t}\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " }\n" - " \n" - "@@ -129,20 +129,20 @@ static void pad_full_pages(struct logfs_area *area)\n" - " \tstruct logfs_super *super = logfs_super(sb);\n" - " \tu64 ofs = dev_ofs(sb, area->a_segno, area->a_used_bytes);\n" - " \tu32 len = super->s_segsize - area->a_used_bytes;\n" - "-\tpgoff_t index = PAGE_CACHE_ALIGN(ofs) >> PAGE_CACHE_SHIFT;\n" - "-\tpgoff_t no_indizes = len >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = PAGE_ALIGN(ofs) >> PAGE_SHIFT;\n" - "+\tpgoff_t no_indizes = len >> PAGE_SHIFT;\n" - " \tstruct page *page;\n" - " \n" - " \twhile (no_indizes) {\n" - " \t\tpage = get_mapping_page(sb, index, 0);\n" - " \t\tBUG_ON(!page); /* FIXME: reserve a pool */\n" - " \t\tSetPageUptodate(page);\n" - "-\t\tmemset(page_address(page), 0xff, PAGE_CACHE_SIZE);\n" - "+\t\tmemset(page_address(page), 0xff, PAGE_SIZE);\n" - " \t\tif (!PagePrivate(page)) {\n" - " \t\t\tSetPagePrivate(page);\n" - "-\t\t\tpage_cache_get(page);\n" - "+\t\t\tget_page(page);\n" - " \t\t}\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tindex++;\n" - " \t\tno_indizes--;\n" - " \t}\n" - "@@ -411,7 +411,7 @@ int wbuf_read(struct super_block *sb, u64 ofs, size_t len, void *buf)\n" - " \t\tif (IS_ERR(page))\n" - " \t\t\treturn PTR_ERR(page);\n" - " \t\tmemcpy(buf, page_address(page) + offset, copylen);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \n" - " \t\tbuf += copylen;\n" - " \t\tlen -= copylen;\n" - "@@ -499,7 +499,7 @@ static void move_btree_to_page(struct inode *inode, struct page *page,\n" - " \n" - " \tif (!PagePrivate(page)) {\n" - " \t\tSetPagePrivate(page);\n" - "-\t\tpage_cache_get(page);\n" - "+\t\tget_page(page);\n" - " \t\tset_page_private(page, (unsigned long) block);\n" - " \t}\n" - " \tblock->ops = &indirect_block_ops;\n" - "@@ -554,7 +554,7 @@ void move_page_to_btree(struct page *page)\n" - " \n" - " \tif (PagePrivate(page)) {\n" - " \t\tClearPagePrivate(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tset_page_private(page, 0);\n" - " \t}\n" - " \tblock->ops = &btree_block_ops;\n" - "@@ -723,9 +723,9 @@ void freeseg(struct super_block *sb, u32 segno)\n" - " \t\t\tcontinue;\n" - " \t\tif (PagePrivate(page)) {\n" - " \t\t\tClearPagePrivate(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t}\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " }\n" - " \n" - "diff --git a/fs/logfs/super.c b/fs/logfs/super.c\n" - "index 54360293bcb5..5751082dba52 100644\n" - "--- a/fs/logfs/super.c\n" - "+++ b/fs/logfs/super.c\n" - "@@ -48,7 +48,7 @@ void emergency_read_end(struct page *page)\n" - " \tif (page == emergency_page)\n" - " \t\tmutex_unlock(&emergency_mutex);\n" - " \telse\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " }\n" - " \n" - " static void dump_segfile(struct super_block *sb)\n" - "@@ -206,7 +206,7 @@ static int write_one_sb(struct super_block *sb,\n" - " \tlogfs_set_segment_erased(sb, segno, ec, 0);\n" - " \tlogfs_write_ds(sb, ds, segno, ec);\n" - " \terr = super->s_devops->write_sb(sb, page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn err;\n" - " }\n" - " \n" - "@@ -366,24 +366,24 @@ static struct page *find_super_block(struct super_block *sb)\n" - " \t\treturn NULL;\n" - " \tlast = super->s_devops->find_last_sb(sb, &super->s_sb_ofs[1]);\n" - " \tif (!last || IS_ERR(last)) {\n" - "-\t\tpage_cache_release(first);\n" - "+\t\tput_page(first);\n" - " \t\treturn NULL;\n" - " \t}\n" - " \n" - " \tif (!logfs_check_ds(page_address(first))) {\n" - "-\t\tpage_cache_release(last);\n" - "+\t\tput_page(last);\n" - " \t\treturn first;\n" - " \t}\n" - " \n" - " \t/* First one didn't work, try the second superblock */\n" - " \tif (!logfs_check_ds(page_address(last))) {\n" - "-\t\tpage_cache_release(first);\n" - "+\t\tput_page(first);\n" - " \t\treturn last;\n" - " \t}\n" - " \n" - " \t/* Neither worked, sorry folks */\n" - "-\tpage_cache_release(first);\n" - "-\tpage_cache_release(last);\n" - "+\tput_page(first);\n" - "+\tput_page(last);\n" - " \treturn NULL;\n" - " }\n" - " \n" - "@@ -425,7 +425,7 @@ static int __logfs_read_sb(struct super_block *sb)\n" - " \tsuper->s_data_levels = ds->ds_data_levels;\n" - " \tsuper->s_total_levels = super->s_ifile_levels + super->s_iblock_levels\n" - " \t\t+ super->s_data_levels;\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn 0;\n" - " }\n" - " \n" - "diff --git a/fs/minix/dir.c b/fs/minix/dir.c\n" - "index d19ac258105a..33957c07cd11 100644\n" - "--- a/fs/minix/dir.c\n" - "+++ b/fs/minix/dir.c\n" - "@@ -28,7 +28,7 @@ const struct file_operations minix_dir_operations = {\n" - " static inline void dir_put_page(struct page *page)\n" - " {\n" - " \tkunmap(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " /*\n" - "@@ -38,10 +38,10 @@ static inline void dir_put_page(struct page *page)\n" - " static unsigned\n" - " minix_last_byte(struct inode *inode, unsigned long page_nr)\n" - " {\n" - "-\tunsigned last_byte = PAGE_CACHE_SIZE;\n" - "+\tunsigned last_byte = PAGE_SIZE;\n" - " \n" - "-\tif (page_nr == (inode->i_size >> PAGE_CACHE_SHIFT))\n" - "-\t\tlast_byte = inode->i_size & (PAGE_CACHE_SIZE - 1);\n" - "+\tif (page_nr == (inode->i_size >> PAGE_SHIFT))\n" - "+\t\tlast_byte = inode->i_size & (PAGE_SIZE - 1);\n" - " \treturn last_byte;\n" - " }\n" - " \n" - "@@ -92,8 +92,8 @@ static int minix_readdir(struct file *file, struct dir_context *ctx)\n" - " \tif (pos >= inode->i_size)\n" - " \t\treturn 0;\n" - " \n" - "-\toffset = pos & ~PAGE_CACHE_MASK;\n" - "-\tn = pos >> PAGE_CACHE_SHIFT;\n" - "+\toffset = pos & ~PAGE_MASK;\n" - "+\tn = pos >> PAGE_SHIFT;\n" - " \n" - " \tfor ( ; n < npages; n++, offset = 0) {\n" - " \t\tchar *p, *kaddr, *limit;\n" - "@@ -229,7 +229,7 @@ int minix_add_link(struct dentry *dentry, struct inode *inode)\n" - " \t\tlock_page(page);\n" - " \t\tkaddr = (char*)page_address(page);\n" - " \t\tdir_end = kaddr + minix_last_byte(dir, n);\n" - "-\t\tlimit = kaddr + PAGE_CACHE_SIZE - sbi->s_dirsize;\n" - "+\t\tlimit = kaddr + PAGE_SIZE - sbi->s_dirsize;\n" - " \t\tfor (p = kaddr; p <= limit; p = minix_next_entry(p, sbi)) {\n" - " \t\t\tde = (minix_dirent *)p;\n" - " \t\t\tde3 = (minix3_dirent *)p;\n" - "@@ -327,7 +327,7 @@ int minix_make_empty(struct inode *inode, struct inode *dir)\n" - " \t}\n" - " \n" - " \tkaddr = kmap_atomic(page);\n" - "-\tmemset(kaddr, 0, PAGE_CACHE_SIZE);\n" - "+\tmemset(kaddr, 0, PAGE_SIZE);\n" - " \n" - " \tif (sbi->s_version == MINIX_V3) {\n" - " \t\tminix3_dirent *de3 = (minix3_dirent *)kaddr;\n" - "@@ -350,7 +350,7 @@ int minix_make_empty(struct inode *inode, struct inode *dir)\n" - " \n" - " \terr = dir_commit_chunk(page, 0, 2 * sbi->s_dirsize);\n" - " fail:\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn err;\n" - " }\n" - " \n" - "diff --git a/fs/minix/namei.c b/fs/minix/namei.c\n" - "index a795a11e50c7..2887d1d95ce2 100644\n" - "--- a/fs/minix/namei.c\n" - "+++ b/fs/minix/namei.c\n" - "@@ -243,11 +243,11 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry,\n" - " out_dir:\n" - " \tif (dir_de) {\n" - " \t\tkunmap(dir_page);\n" - "-\t\tpage_cache_release(dir_page);\n" - "+\t\tput_page(dir_page);\n" - " \t}\n" - " out_old:\n" - " \tkunmap(old_page);\n" - "-\tpage_cache_release(old_page);\n" - "+\tput_page(old_page);\n" - " out:\n" - " \treturn err;\n" - " }\n" - "diff --git a/fs/mpage.c b/fs/mpage.c\n" - "index 6bd9fd90964e..1a4076ba3e04 100644\n" - "--- a/fs/mpage.c\n" - "+++ b/fs/mpage.c\n" - "@@ -107,7 +107,7 @@ map_buffer_to_page(struct page *page, struct buffer_head *bh, int page_block)\n" - " \t\t * don't make any buffers if there is only one buffer on\n" - " \t\t * the page and the page just needs to be set up to date\n" - " \t\t */\n" - "-\t\tif (inode->i_blkbits == PAGE_CACHE_SHIFT && \n" - "+\t\tif (inode->i_blkbits == PAGE_SHIFT && \n" - " \t\t buffer_uptodate(bh)) {\n" - " \t\t\tSetPageUptodate(page); \n" - " \t\t\treturn;\n" - "@@ -145,7 +145,7 @@ do_mpage_readpage(struct bio *bio, struct page *page, unsigned nr_pages,\n" - " {\n" - " \tstruct inode *inode = page->mapping->host;\n" - " \tconst unsigned blkbits = inode->i_blkbits;\n" - "-\tconst unsigned blocks_per_page = PAGE_CACHE_SIZE >> blkbits;\n" - "+\tconst unsigned blocks_per_page = PAGE_SIZE >> blkbits;\n" - " \tconst unsigned blocksize = 1 << blkbits;\n" - " \tsector_t block_in_file;\n" - " \tsector_t last_block;\n" - "@@ -162,7 +162,7 @@ do_mpage_readpage(struct bio *bio, struct page *page, unsigned nr_pages,\n" - " \tif (page_has_buffers(page))\n" - " \t\tgoto confused;\n" - " \n" - "-\tblock_in_file = (sector_t)page->index << (PAGE_CACHE_SHIFT - blkbits);\n" - "+\tblock_in_file = (sector_t)page->index << (PAGE_SHIFT - blkbits);\n" - " \tlast_block = block_in_file + nr_pages * blocks_per_page;\n" - " \tlast_block_in_file = (i_size_read(inode) + blocksize - 1) >> blkbits;\n" - " \tif (last_block > last_block_in_file)\n" - "@@ -249,7 +249,7 @@ do_mpage_readpage(struct bio *bio, struct page *page, unsigned nr_pages,\n" - " \t}\n" - " \n" - " \tif (first_hole != blocks_per_page) {\n" - "-\t\tzero_user_segment(page, first_hole << blkbits, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user_segment(page, first_hole << blkbits, PAGE_SIZE);\n" - " \t\tif (first_hole == 0) {\n" - " \t\t\tSetPageUptodate(page);\n" - " \t\t\tunlock_page(page);\n" - "@@ -331,7 +331,7 @@ confused:\n" - " *\n" - " * then this code just gives up and calls the buffer_head-based read function.\n" - " * It does handle a page which has holes at the end - that is a common case:\n" - "- * the end-of-file on blocksize < PAGE_CACHE_SIZE setups.\n" - "+ * the end-of-file on blocksize < PAGE_SIZE setups.\n" - " *\n" - " * BH_Boundary explanation:\n" - " *\n" - "@@ -380,7 +380,7 @@ mpage_readpages(struct address_space *mapping, struct list_head *pages,\n" - " \t\t\t\t\t&first_logical_block,\n" - " \t\t\t\t\tget_block, gfp);\n" - " \t\t}\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \tBUG_ON(!list_empty(pages));\n" - " \tif (bio)\n" - "@@ -472,7 +472,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc,\n" - " \tstruct inode *inode = page->mapping->host;\n" - " \tconst unsigned blkbits = inode->i_blkbits;\n" - " \tunsigned long end_index;\n" - "-\tconst unsigned blocks_per_page = PAGE_CACHE_SIZE >> blkbits;\n" - "+\tconst unsigned blocks_per_page = PAGE_SIZE >> blkbits;\n" - " \tsector_t last_block;\n" - " \tsector_t block_in_file;\n" - " \tsector_t blocks[MAX_BUF_PER_PAGE];\n" - "@@ -542,7 +542,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc,\n" - " \t * The page has no buffers: map it to disk\n" - " \t */\n" - " \tBUG_ON(!PageUptodate(page));\n" - "-\tblock_in_file = (sector_t)page->index << (PAGE_CACHE_SHIFT - blkbits);\n" - "+\tblock_in_file = (sector_t)page->index << (PAGE_SHIFT - blkbits);\n" - " \tlast_block = (i_size - 1) >> blkbits;\n" - " \tmap_bh.b_page = page;\n" - " \tfor (page_block = 0; page_block < blocks_per_page; ) {\n" - "@@ -574,7 +574,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc,\n" - " \tfirst_unmapped = page_block;\n" - " \n" - " page_is_mapped:\n" - "-\tend_index = i_size >> PAGE_CACHE_SHIFT;\n" - "+\tend_index = i_size >> PAGE_SHIFT;\n" - " \tif (page->index >= end_index) {\n" - " \t\t/*\n" - " \t\t * The page straddles i_size. It must be zeroed out on each\n" - "@@ -584,11 +584,11 @@ page_is_mapped:\n" - " \t\t * is zeroed when mapped, and writes to that region are not\n" - " \t\t * written out to the file.\"\n" - " \t\t */\n" - "-\t\tunsigned offset = i_size & (PAGE_CACHE_SIZE - 1);\n" - "+\t\tunsigned offset = i_size & (PAGE_SIZE - 1);\n" - " \n" - " \t\tif (page->index > end_index || !offset)\n" - " \t\t\tgoto confused;\n" - "-\t\tzero_user_segment(page, offset, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user_segment(page, offset, PAGE_SIZE);\n" - " \t}\n" - " \n" - " \t/*\n" - "diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c\n" - "index b7f8eaeea5d8..bfdad003ee56 100644\n" - "--- a/fs/ncpfs/dir.c\n" - "+++ b/fs/ncpfs/dir.c\n" - "@@ -510,7 +510,7 @@ static int ncp_readdir(struct file *file, struct dir_context *ctx)\n" - " \t\t\tkunmap(ctl.page);\n" - " \t\t\tSetPageUptodate(ctl.page);\n" - " \t\t\tunlock_page(ctl.page);\n" - "-\t\t\tpage_cache_release(ctl.page);\n" - "+\t\t\tput_page(ctl.page);\n" - " \t\t\tctl.page = NULL;\n" - " \t\t}\n" - " \t\tctl.idx = 0;\n" - "@@ -520,7 +520,7 @@ invalid_cache:\n" - " \tif (ctl.page) {\n" - " \t\tkunmap(ctl.page);\n" - " \t\tunlock_page(ctl.page);\n" - "-\t\tpage_cache_release(ctl.page);\n" - "+\t\tput_page(ctl.page);\n" - " \t\tctl.page = NULL;\n" - " \t}\n" - " \tctl.cache = cache;\n" - "@@ -554,14 +554,14 @@ finished:\n" - " \t\tkunmap(ctl.page);\n" - " \t\tSetPageUptodate(ctl.page);\n" - " \t\tunlock_page(ctl.page);\n" - "-\t\tpage_cache_release(ctl.page);\n" - "+\t\tput_page(ctl.page);\n" - " \t}\n" - " \tif (page) {\n" - " \t\tcache->head = ctl.head;\n" - " \t\tkunmap(page);\n" - " \t\tSetPageUptodate(page);\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " out:\n" - " \treturn result;\n" - "@@ -649,7 +649,7 @@ ncp_fill_cache(struct file *file, struct dir_context *ctx,\n" - " \t\t\tkunmap(ctl.page);\n" - " \t\t\tSetPageUptodate(ctl.page);\n" - " \t\t\tunlock_page(ctl.page);\n" - "-\t\t\tpage_cache_release(ctl.page);\n" - "+\t\t\tput_page(ctl.page);\n" - " \t\t}\n" - " \t\tctl.cache = NULL;\n" - " \t\tctl.idx -= NCP_DIRCACHE_SIZE;\n" - "diff --git a/fs/ncpfs/ncplib_kernel.h b/fs/ncpfs/ncplib_kernel.h\n" - "index 5233fbc1747a..17cfb743b5bf 100644\n" - "--- a/fs/ncpfs/ncplib_kernel.h\n" - "+++ b/fs/ncpfs/ncplib_kernel.h\n" - "@@ -191,7 +191,7 @@ struct ncp_cache_head {\n" - " \tint\t\teof;\n" - " };\n" - " \n" - "-#define NCP_DIRCACHE_SIZE\t((int)(PAGE_CACHE_SIZE/sizeof(struct dentry *)))\n" - "+#define NCP_DIRCACHE_SIZE\t((int)(PAGE_SIZE/sizeof(struct dentry *)))\n" - " union ncp_dir_cache {\n" - " \tstruct ncp_cache_head\thead;\n" - " \tstruct dentry\t\t*dentry[NCP_DIRCACHE_SIZE];\n" - "diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c\n" - "index ddd0138f410c..bba0ba9f7eb1 100644\n" - "--- a/fs/nfs/blocklayout/blocklayout.c\n" - "+++ b/fs/nfs/blocklayout/blocklayout.c\n" - "@@ -231,7 +231,7 @@ bl_read_pagelist(struct nfs_pgio_header *header)\n" - " \tsize_t bytes_left = header->args.count;\n" - " \tunsigned int pg_offset = header->args.pgbase, pg_len;\n" - " \tstruct page **pages = header->args.pages;\n" - "-\tint pg_index = header->args.pgbase >> PAGE_CACHE_SHIFT;\n" - "+\tint pg_index = header->args.pgbase >> PAGE_SHIFT;\n" - " \tconst bool is_dio = (header->dreq != NULL);\n" - " \tstruct blk_plug plug;\n" - " \tint i;\n" - "@@ -263,13 +263,13 @@ bl_read_pagelist(struct nfs_pgio_header *header)\n" - " \t\t}\n" - " \n" - " \t\tif (is_dio) {\n" - "-\t\t\tif (pg_offset + bytes_left > PAGE_CACHE_SIZE)\n" - "-\t\t\t\tpg_len = PAGE_CACHE_SIZE - pg_offset;\n" - "+\t\t\tif (pg_offset + bytes_left > PAGE_SIZE)\n" - "+\t\t\t\tpg_len = PAGE_SIZE - pg_offset;\n" - " \t\t\telse\n" - " \t\t\t\tpg_len = bytes_left;\n" - " \t\t} else {\n" - " \t\t\tBUG_ON(pg_offset != 0);\n" - "-\t\t\tpg_len = PAGE_CACHE_SIZE;\n" - "+\t\t\tpg_len = PAGE_SIZE;\n" - " \t\t}\n" - " \n" - " \t\tif (is_hole(&be)) {\n" - "@@ -339,9 +339,9 @@ static void bl_write_cleanup(struct work_struct *work)\n" - " \n" - " \tif (likely(!hdr->pnfs_error)) {\n" - " \t\tstruct pnfs_block_layout *bl = BLK_LSEG2EXT(hdr->lseg);\n" - "-\t\tu64 start = hdr->args.offset & (loff_t)PAGE_CACHE_MASK;\n" - "+\t\tu64 start = hdr->args.offset & (loff_t)PAGE_MASK;\n" - " \t\tu64 end = (hdr->args.offset + hdr->args.count +\n" - "-\t\t\tPAGE_CACHE_SIZE - 1) & (loff_t)PAGE_CACHE_MASK;\n" - "+\t\t\tPAGE_SIZE - 1) & (loff_t)PAGE_MASK;\n" - " \n" - " \t\text_tree_mark_written(bl, start >> SECTOR_SHIFT,\n" - " \t\t\t\t\t(end - start) >> SECTOR_SHIFT);\n" - "@@ -373,7 +373,7 @@ bl_write_pagelist(struct nfs_pgio_header *header, int sync)\n" - " \tloff_t offset = header->args.offset;\n" - " \tsize_t count = header->args.count;\n" - " \tstruct page **pages = header->args.pages;\n" - "-\tint pg_index = header->args.pgbase >> PAGE_CACHE_SHIFT;\n" - "+\tint pg_index = header->args.pgbase >> PAGE_SHIFT;\n" - " \tunsigned int pg_len;\n" - " \tstruct blk_plug plug;\n" - " \tint i;\n" - "@@ -392,7 +392,7 @@ bl_write_pagelist(struct nfs_pgio_header *header, int sync)\n" - " \tblk_start_plug(&plug);\n" - " \n" - " \t/* we always write out the whole page */\n" - "-\toffset = offset & (loff_t)PAGE_CACHE_MASK;\n" - "+\toffset = offset & (loff_t)PAGE_MASK;\n" - " \tisect = offset >> SECTOR_SHIFT;\n" - " \n" - " \tfor (i = pg_index; i < header->page_array.npages; i++) {\n" - "@@ -408,7 +408,7 @@ bl_write_pagelist(struct nfs_pgio_header *header, int sync)\n" - " \t\t\textent_length = be.be_length - (isect - be.be_f_offset);\n" - " \t\t}\n" - " \n" - "-\t\tpg_len = PAGE_CACHE_SIZE;\n" - "+\t\tpg_len = PAGE_SIZE;\n" - " \t\tbio = do_add_page_to_bio(bio, header->page_array.npages - i,\n" - " \t\t\t\t\t WRITE, isect, pages[i], &map, &be,\n" - " \t\t\t\t\t bl_end_io_write, par,\n" - "@@ -806,7 +806,7 @@ static u64 pnfs_num_cont_bytes(struct inode *inode, pgoff_t idx)\n" - " \tpgoff_t end;\n" - " \n" - " \t/* Optimize common case that writes from 0 to end of file */\n" - "-\tend = DIV_ROUND_UP(i_size_read(inode), PAGE_CACHE_SIZE);\n" - "+\tend = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE);\n" - " \tif (end != inode->i_mapping->nrpages) {\n" - " \t\trcu_read_lock();\n" - " \t\tend = page_cache_next_hole(mapping, idx + 1, ULONG_MAX);\n" - "@@ -814,9 +814,9 @@ static u64 pnfs_num_cont_bytes(struct inode *inode, pgoff_t idx)\n" - " \t}\n" - " \n" - " \tif (!end)\n" - "-\t\treturn i_size_read(inode) - (idx << PAGE_CACHE_SHIFT);\n" - "+\t\treturn i_size_read(inode) - (idx << PAGE_SHIFT);\n" - " \telse\n" - "-\t\treturn (end - idx) << PAGE_CACHE_SHIFT;\n" - "+\t\treturn (end - idx) << PAGE_SHIFT;\n" - " }\n" - " \n" - " static void\n" - "diff --git a/fs/nfs/blocklayout/blocklayout.h b/fs/nfs/blocklayout/blocklayout.h\n" - "index c556640dcf3b..f99371796c63 100644\n" - "--- a/fs/nfs/blocklayout/blocklayout.h\n" - "+++ b/fs/nfs/blocklayout/blocklayout.h\n" - "@@ -40,8 +40,8 @@\n" - " #include \"../pnfs.h\"\n" - " #include \"../netns.h\"\n" - " \n" - "-#define PAGE_CACHE_SECTORS (PAGE_CACHE_SIZE >> SECTOR_SHIFT)\n" - "-#define PAGE_CACHE_SECTOR_SHIFT (PAGE_CACHE_SHIFT - SECTOR_SHIFT)\n" - "+#define PAGE_CACHE_SECTORS (PAGE_SIZE >> SECTOR_SHIFT)\n" - "+#define PAGE_CACHE_SECTOR_SHIFT (PAGE_SHIFT - SECTOR_SHIFT)\n" - " #define SECTOR_SIZE (1 << SECTOR_SHIFT)\n" - " \n" - " struct pnfs_block_dev;\n" - "diff --git a/fs/nfs/client.c b/fs/nfs/client.c\n" - "index d6d5d2a48e83..0c96528db94a 100644\n" - "--- a/fs/nfs/client.c\n" - "+++ b/fs/nfs/client.c\n" - "@@ -736,7 +736,7 @@ static void nfs_server_set_fsinfo(struct nfs_server *server,\n" - " \t\tserver->rsize = max_rpc_payload;\n" - " \tif (server->rsize > NFS_MAX_FILE_IO_SIZE)\n" - " \t\tserver->rsize = NFS_MAX_FILE_IO_SIZE;\n" - "-\tserver->rpages = (server->rsize + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tserver->rpages = (server->rsize + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \n" - " \tserver->backing_dev_info.name = \"nfs\";\n" - " \tserver->backing_dev_info.ra_pages = server->rpages * NFS_MAX_READAHEAD;\n" - "@@ -745,13 +745,13 @@ static void nfs_server_set_fsinfo(struct nfs_server *server,\n" - " \t\tserver->wsize = max_rpc_payload;\n" - " \tif (server->wsize > NFS_MAX_FILE_IO_SIZE)\n" - " \t\tserver->wsize = NFS_MAX_FILE_IO_SIZE;\n" - "-\tserver->wpages = (server->wsize + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tserver->wpages = (server->wsize + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \n" - " \tserver->wtmult = nfs_block_bits(fsinfo->wtmult, NULL);\n" - " \n" - " \tserver->dtsize = nfs_block_size(fsinfo->dtpref, NULL);\n" - "-\tif (server->dtsize > PAGE_CACHE_SIZE * NFS_MAX_READDIR_PAGES)\n" - "-\t\tserver->dtsize = PAGE_CACHE_SIZE * NFS_MAX_READDIR_PAGES;\n" - "+\tif (server->dtsize > PAGE_SIZE * NFS_MAX_READDIR_PAGES)\n" - "+\t\tserver->dtsize = PAGE_SIZE * NFS_MAX_READDIR_PAGES;\n" - " \tif (server->dtsize > server->rsize)\n" - " \t\tserver->dtsize = server->rsize;\n" - " \n" - "diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c\n" - "index 4bfa7d8bcade..adef506c5786 100644\n" - "--- a/fs/nfs/dir.c\n" - "+++ b/fs/nfs/dir.c\n" - "@@ -707,7 +707,7 @@ void cache_page_release(nfs_readdir_descriptor_t *desc)\n" - " {\n" - " \tif (!desc->page->mapping)\n" - " \t\tnfs_readdir_clear_array(desc->page);\n" - "-\tpage_cache_release(desc->page);\n" - "+\tput_page(desc->page);\n" - " \tdesc->page = NULL;\n" - " }\n" - " \n" - "@@ -1923,7 +1923,7 @@ int nfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)\n" - " \t\t * add_to_page_cache_lru() grabs an extra page refcount.\n" - " \t\t * Drop it here to avoid leaking this page later.\n" - " \t\t */\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t} else\n" - " \t\t__free_page(page);\n" - " \n" - "diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c\n" - "index 7a0cfd3266e5..c93826e4a8c6 100644\n" - "--- a/fs/nfs/direct.c\n" - "+++ b/fs/nfs/direct.c\n" - "@@ -269,7 +269,7 @@ static void nfs_direct_release_pages(struct page **pages, unsigned int npages)\n" - " {\n" - " \tunsigned int i;\n" - " \tfor (i = 0; i < npages; i++)\n" - "-\t\tpage_cache_release(pages[i]);\n" - "+\t\tput_page(pages[i]);\n" - " }\n" - " \n" - " void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo,\n" - "@@ -1003,7 +1003,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter)\n" - " \t\t iov_iter_count(iter));\n" - " \n" - " \tpos = iocb->ki_pos;\n" - "-\tend = (pos + iov_iter_count(iter) - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tend = (pos + iov_iter_count(iter) - 1) >> PAGE_SHIFT;\n" - " \n" - " \tinode_lock(inode);\n" - " \n" - "@@ -1013,7 +1013,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter)\n" - " \n" - " \tif (mapping->nrpages) {\n" - " \t\tresult = invalidate_inode_pages2_range(mapping,\n" - "-\t\t\t\t\tpos >> PAGE_CACHE_SHIFT, end);\n" - "+\t\t\t\t\tpos >> PAGE_SHIFT, end);\n" - " \t\tif (result)\n" - " \t\t\tgoto out_unlock;\n" - " \t}\n" - "@@ -1042,7 +1042,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter)\n" - " \n" - " \tif (mapping->nrpages) {\n" - " \t\tinvalidate_inode_pages2_range(mapping,\n" - "-\t\t\t\t\t pos >> PAGE_CACHE_SHIFT, end);\n" - "+\t\t\t\t\t pos >> PAGE_SHIFT, end);\n" - " \t}\n" - " \n" - " \tinode_unlock(inode);\n" - "diff --git a/fs/nfs/file.c b/fs/nfs/file.c\n" - "index 748bb813b8ec..1ef3ac728ff4 100644\n" - "--- a/fs/nfs/file.c\n" - "+++ b/fs/nfs/file.c\n" - "@@ -318,7 +318,7 @@ static int nfs_want_read_modify_write(struct file *file, struct page *page,\n" - " \t\t\tloff_t pos, unsigned len)\n" - " {\n" - " \tunsigned int pglen = nfs_page_length(page);\n" - "-\tunsigned int offset = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tunsigned int offset = pos & (PAGE_SIZE - 1);\n" - " \tunsigned int end = offset + len;\n" - " \n" - " \tif (pnfs_ld_read_whole_page(file->f_mapping->host)) {\n" - "@@ -349,7 +349,7 @@ static int nfs_write_begin(struct file *file, struct address_space *mapping,\n" - " \t\t\tstruct page **pagep, void **fsdata)\n" - " {\n" - " \tint ret;\n" - "-\tpgoff_t index = pos >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = pos >> PAGE_SHIFT;\n" - " \tstruct page *page;\n" - " \tint once_thru = 0;\n" - " \n" - "@@ -378,12 +378,12 @@ start:\n" - " \tret = nfs_flush_incompatible(file, page);\n" - " \tif (ret) {\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t} else if (!once_thru &&\n" - " \t\t nfs_want_read_modify_write(file, page, pos, len)) {\n" - " \t\tonce_thru = 1;\n" - " \t\tret = nfs_readpage(file, page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tif (!ret)\n" - " \t\t\tgoto start;\n" - " \t}\n" - "@@ -394,7 +394,7 @@ static int nfs_write_end(struct file *file, struct address_space *mapping,\n" - " \t\t\tloff_t pos, unsigned len, unsigned copied,\n" - " \t\t\tstruct page *page, void *fsdata)\n" - " {\n" - "-\tunsigned offset = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tunsigned offset = pos & (PAGE_SIZE - 1);\n" - " \tstruct nfs_open_context *ctx = nfs_file_open_context(file);\n" - " \tint status;\n" - " \n" - "@@ -411,20 +411,20 @@ static int nfs_write_end(struct file *file, struct address_space *mapping,\n" - " \n" - " \t\tif (pglen == 0) {\n" - " \t\t\tzero_user_segments(page, 0, offset,\n" - "-\t\t\t\t\tend, PAGE_CACHE_SIZE);\n" - "+\t\t\t\t\tend, PAGE_SIZE);\n" - " \t\t\tSetPageUptodate(page);\n" - " \t\t} else if (end >= pglen) {\n" - "-\t\t\tzero_user_segment(page, end, PAGE_CACHE_SIZE);\n" - "+\t\t\tzero_user_segment(page, end, PAGE_SIZE);\n" - " \t\t\tif (offset == 0)\n" - " \t\t\t\tSetPageUptodate(page);\n" - " \t\t} else\n" - "-\t\t\tzero_user_segment(page, pglen, PAGE_CACHE_SIZE);\n" - "+\t\t\tzero_user_segment(page, pglen, PAGE_SIZE);\n" - " \t}\n" - " \n" - " \tstatus = nfs_updatepage(file, page, offset, copied);\n" - " \n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \tif (status < 0)\n" - " \t\treturn status;\n" - "@@ -452,7 +452,7 @@ static void nfs_invalidate_page(struct page *page, unsigned int offset,\n" - " \tdfprintk(PAGECACHE, \"NFS: invalidate_page(%p, %u, %u)\\n\",\n" - " \t\t page, offset, length);\n" - " \n" - "-\tif (offset != 0 || length < PAGE_CACHE_SIZE)\n" - "+\tif (offset != 0 || length < PAGE_SIZE)\n" - " \t\treturn;\n" - " \t/* Cancel any unstarted writes on this page */\n" - " \tnfs_wb_page_cancel(page_file_mapping(page)->host, page);\n" - "diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h\n" - "index 9a547aa3ec8e..dd822c9a052d 100644\n" - "--- a/fs/nfs/internal.h\n" - "+++ b/fs/nfs/internal.h\n" - "@@ -642,11 +642,11 @@ unsigned int nfs_page_length(struct page *page)\n" - " \n" - " \tif (i_size > 0) {\n" - " \t\tpgoff_t page_index = page_file_index(page);\n" - "-\t\tpgoff_t end_index = (i_size - 1) >> PAGE_CACHE_SHIFT;\n" - "+\t\tpgoff_t end_index = (i_size - 1) >> PAGE_SHIFT;\n" - " \t\tif (page_index < end_index)\n" - "-\t\t\treturn PAGE_CACHE_SIZE;\n" - "+\t\t\treturn PAGE_SIZE;\n" - " \t\tif (page_index == end_index)\n" - "-\t\t\treturn ((i_size - 1) & ~PAGE_CACHE_MASK) + 1;\n" - "+\t\t\treturn ((i_size - 1) & ~PAGE_MASK) + 1;\n" - " \t}\n" - " \treturn 0;\n" - " }\n" - "diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c\n" - "index 4e4441216804..88474a4fc669 100644\n" - "--- a/fs/nfs/nfs4xdr.c\n" - "+++ b/fs/nfs/nfs4xdr.c\n" - "@@ -5001,7 +5001,7 @@ static int decode_space_limit(struct xdr_stream *xdr,\n" - " \t\tblocksize = be32_to_cpup(p);\n" - " \t\tmaxsize = (uint64_t)nblocks * (uint64_t)blocksize;\n" - " \t}\n" - "-\tmaxsize >>= PAGE_CACHE_SHIFT;\n" - "+\tmaxsize >>= PAGE_SHIFT;\n" - " \t*pagemod_limit = min_t(u64, maxsize, ULONG_MAX);\n" - " \treturn 0;\n" - " out_overflow:\n" - "diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c\n" - "index 9aebffb40505..049c1b1f2932 100644\n" - "--- a/fs/nfs/objlayout/objio_osd.c\n" - "+++ b/fs/nfs/objlayout/objio_osd.c\n" - "@@ -486,7 +486,7 @@ static void __r4w_put_page(void *priv, struct page *page)\n" - " \tdprintk(\"%s: index=0x%lx\\n\", __func__,\n" - " \t\t(page == ZERO_PAGE(0)) ? -1UL : page->index);\n" - " \tif (ZERO_PAGE(0) != page)\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \treturn;\n" - " }\n" - " \n" - "diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c\n" - "index 8ce4f61cbaa5..1f6db4231057 100644\n" - "--- a/fs/nfs/pagelist.c\n" - "+++ b/fs/nfs/pagelist.c\n" - "@@ -342,7 +342,7 @@ nfs_create_request(struct nfs_open_context *ctx, struct page *page,\n" - " \t * update_nfs_request below if the region is not locked. */\n" - " \treq->wb_page = page;\n" - " \treq->wb_index\t= page_file_index(page);\n" - "-\tpage_cache_get(page);\n" - "+\tget_page(page);\n" - " \treq->wb_offset = offset;\n" - " \treq->wb_pgbase\t= offset;\n" - " \treq->wb_bytes = count;\n" - "@@ -392,7 +392,7 @@ static void nfs_clear_request(struct nfs_page *req)\n" - " \tstruct nfs_lock_context *l_ctx = req->wb_lock_context;\n" - " \n" - " \tif (page != NULL) {\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\treq->wb_page = NULL;\n" - " \t}\n" - " \tif (l_ctx != NULL) {\n" - "@@ -904,7 +904,7 @@ static bool nfs_can_coalesce_requests(struct nfs_page *prev,\n" - " \t\t\t\treturn false;\n" - " \t\t} else {\n" - " \t\t\tif (req->wb_pgbase != 0 ||\n" - "-\t\t\t prev->wb_pgbase + prev->wb_bytes != PAGE_CACHE_SIZE)\n" - "+\t\t\t prev->wb_pgbase + prev->wb_bytes != PAGE_SIZE)\n" - " \t\t\t\treturn false;\n" - " \t\t}\n" - " \t}\n" - "diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c\n" - "index 2fa483e6dbe2..89a5ef4df08a 100644\n" - "--- a/fs/nfs/pnfs.c\n" - "+++ b/fs/nfs/pnfs.c\n" - "@@ -841,7 +841,7 @@ send_layoutget(struct pnfs_layout_hdr *lo,\n" - " \n" - " \t\ti_size = i_size_read(ino);\n" - " \n" - "-\t\tlgp->args.minlength = PAGE_CACHE_SIZE;\n" - "+\t\tlgp->args.minlength = PAGE_SIZE;\n" - " \t\tif (lgp->args.minlength > range->length)\n" - " \t\t\tlgp->args.minlength = range->length;\n" - " \t\tif (range->iomode == IOMODE_READ) {\n" - "@@ -1618,13 +1618,13 @@ lookup_again:\n" - " \t\tspin_unlock(&clp->cl_lock);\n" - " \t}\n" - " \n" - "-\tpg_offset = arg.offset & ~PAGE_CACHE_MASK;\n" - "+\tpg_offset = arg.offset & ~PAGE_MASK;\n" - " \tif (pg_offset) {\n" - " \t\targ.offset -= pg_offset;\n" - " \t\targ.length += pg_offset;\n" - " \t}\n" - " \tif (arg.length != NFS4_MAX_UINT64)\n" - "-\t\targ.length = PAGE_CACHE_ALIGN(arg.length);\n" - "+\t\targ.length = PAGE_ALIGN(arg.length);\n" - " \n" - " \tlseg = send_layoutget(lo, ctx, &arg, gfp_flags);\n" - " \tatomic_dec(&lo->plh_outstanding);\n" - "diff --git a/fs/nfs/read.c b/fs/nfs/read.c\n" - "index eb31e23e7def..6776d7a7839e 100644\n" - "--- a/fs/nfs/read.c\n" - "+++ b/fs/nfs/read.c\n" - "@@ -46,7 +46,7 @@ static void nfs_readhdr_free(struct nfs_pgio_header *rhdr)\n" - " static\n" - " int nfs_return_empty_page(struct page *page)\n" - " {\n" - "-\tzero_user(page, 0, PAGE_CACHE_SIZE);\n" - "+\tzero_user(page, 0, PAGE_SIZE);\n" - " \tSetPageUptodate(page);\n" - " \tunlock_page(page);\n" - " \treturn 0;\n" - "@@ -118,8 +118,8 @@ int nfs_readpage_async(struct nfs_open_context *ctx, struct inode *inode,\n" - " \t\tunlock_page(page);\n" - " \t\treturn PTR_ERR(new);\n" - " \t}\n" - "-\tif (len < PAGE_CACHE_SIZE)\n" - "-\t\tzero_user_segment(page, len, PAGE_CACHE_SIZE);\n" - "+\tif (len < PAGE_SIZE)\n" - "+\t\tzero_user_segment(page, len, PAGE_SIZE);\n" - " \n" - " \tnfs_pageio_init_read(&pgio, inode, false,\n" - " \t\t\t &nfs_async_read_completion_ops);\n" - "@@ -295,7 +295,7 @@ int nfs_readpage(struct file *file, struct page *page)\n" - " \tint\t\terror;\n" - " \n" - " \tdprintk(\"NFS: nfs_readpage (%p %ld@%lu)\\n\",\n" - "-\t\tpage, PAGE_CACHE_SIZE, page_file_index(page));\n" - "+\t\tpage, PAGE_SIZE, page_file_index(page));\n" - " \tnfs_inc_stats(inode, NFSIOS_VFSREADPAGE);\n" - " \tnfs_add_stats(inode, NFSIOS_READPAGES, 1);\n" - " \n" - "@@ -361,8 +361,8 @@ readpage_async_filler(void *data, struct page *page)\n" - " \tif (IS_ERR(new))\n" - " \t\tgoto out_error;\n" - " \n" - "-\tif (len < PAGE_CACHE_SIZE)\n" - "-\t\tzero_user_segment(page, len, PAGE_CACHE_SIZE);\n" - "+\tif (len < PAGE_SIZE)\n" - "+\t\tzero_user_segment(page, len, PAGE_SIZE);\n" - " \tif (!nfs_pageio_add_request(desc->pgio, new)) {\n" - " \t\tnfs_list_remove_request(new);\n" - " \t\tnfs_readpage_release(new);\n" - "@@ -424,8 +424,8 @@ int nfs_readpages(struct file *filp, struct address_space *mapping,\n" - " \n" - " \tpgm = &pgio.pg_mirrors[0];\n" - " \tNFS_I(inode)->read_io += pgm->pg_bytes_written;\n" - "-\tnpages = (pgm->pg_bytes_written + PAGE_CACHE_SIZE - 1) >>\n" - "-\t\t PAGE_CACHE_SHIFT;\n" - "+\tnpages = (pgm->pg_bytes_written + PAGE_SIZE - 1) >>\n" - "+\t\t PAGE_SHIFT;\n" - " \tnfs_add_stats(inode, NFSIOS_READPAGES, npages);\n" - " read_complete:\n" - " \tput_nfs_open_context(desc.ctx);\n" - "diff --git a/fs/nfs/write.c b/fs/nfs/write.c\n" - "index 5754835a2886..5f4fd53e5764 100644\n" - "--- a/fs/nfs/write.c\n" - "+++ b/fs/nfs/write.c\n" - "@@ -150,7 +150,7 @@ static void nfs_grow_file(struct page *page, unsigned int offset, unsigned int c\n" - " \n" - " \tspin_lock(&inode->i_lock);\n" - " \ti_size = i_size_read(inode);\n" - "-\tend_index = (i_size - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tend_index = (i_size - 1) >> PAGE_SHIFT;\n" - " \tif (i_size > 0 && page_file_index(page) < end_index)\n" - " \t\tgoto out;\n" - " \tend = page_file_offset(page) + ((loff_t)offset+count);\n" - "@@ -1942,7 +1942,7 @@ int nfs_wb_page_cancel(struct inode *inode, struct page *page)\n" - " int nfs_wb_single_page(struct inode *inode, struct page *page, bool launder)\n" - " {\n" - " \tloff_t range_start = page_file_offset(page);\n" - "-\tloff_t range_end = range_start + (loff_t)(PAGE_CACHE_SIZE - 1);\n" - "+\tloff_t range_end = range_start + (loff_t)(PAGE_SIZE - 1);\n" - " \tstruct writeback_control wbc = {\n" - " \t\t.sync_mode = WB_SYNC_ALL,\n" - " \t\t.nr_to_write = 0,\n" - "diff --git a/fs/nilfs2/bmap.c b/fs/nilfs2/bmap.c\n" - "index 27f75bcbeb30..a9fb3636c142 100644\n" - "--- a/fs/nilfs2/bmap.c\n" - "+++ b/fs/nilfs2/bmap.c\n" - "@@ -458,7 +458,7 @@ __u64 nilfs_bmap_data_get_key(const struct nilfs_bmap *bmap,\n" - " \tstruct buffer_head *pbh;\n" - " \t__u64 key;\n" - " \n" - "-\tkey = page_index(bh->b_page) << (PAGE_CACHE_SHIFT -\n" - "+\tkey = page_index(bh->b_page) << (PAGE_SHIFT -\n" - " \t\t\t\t\t bmap->b_inode->i_blkbits);\n" - " \tfor (pbh = page_buffers(bh->b_page); pbh != bh; pbh = pbh->b_this_page)\n" - " \t\tkey++;\n" - "diff --git a/fs/nilfs2/btnode.c b/fs/nilfs2/btnode.c\n" - "index a35ae35e6932..e0c9daf9aa22 100644\n" - "--- a/fs/nilfs2/btnode.c\n" - "+++ b/fs/nilfs2/btnode.c\n" - "@@ -62,7 +62,7 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr)\n" - " \tset_buffer_uptodate(bh);\n" - " \n" - " \tunlock_page(bh->b_page);\n" - "-\tpage_cache_release(bh->b_page);\n" - "+\tput_page(bh->b_page);\n" - " \treturn bh;\n" - " }\n" - " \n" - "@@ -128,7 +128,7 @@ found:\n" - " \n" - " out_locked:\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn err;\n" - " }\n" - " \n" - "@@ -146,7 +146,7 @@ void nilfs_btnode_delete(struct buffer_head *bh)\n" - " \tpgoff_t index = page_index(page);\n" - " \tint still_dirty;\n" - " \n" - "-\tpage_cache_get(page);\n" - "+\tget_page(page);\n" - " \tlock_page(page);\n" - " \twait_on_page_writeback(page);\n" - " \n" - "@@ -154,7 +154,7 @@ void nilfs_btnode_delete(struct buffer_head *bh)\n" - " \tstill_dirty = PageDirty(page);\n" - " \tmapping = page->mapping;\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \tif (!still_dirty && mapping)\n" - " \t\tinvalidate_inode_pages2_range(mapping, index, index);\n" - "@@ -181,7 +181,7 @@ int nilfs_btnode_prepare_change_key(struct address_space *btnc,\n" - " \tobh = ctxt->bh;\n" - " \tctxt->newbh = NULL;\n" - " \n" - "-\tif (inode->i_blkbits == PAGE_CACHE_SHIFT) {\n" - "+\tif (inode->i_blkbits == PAGE_SHIFT) {\n" - " \t\tlock_page(obh->b_page);\n" - " \t\t/*\n" - " \t\t * We cannot call radix_tree_preload for the kernels older\n" - "diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c\n" - "index 6b8b92b19cec..e08f064e4bd7 100644\n" - "--- a/fs/nilfs2/dir.c\n" - "+++ b/fs/nilfs2/dir.c\n" - "@@ -58,7 +58,7 @@ static inline unsigned nilfs_chunk_size(struct inode *inode)\n" - " static inline void nilfs_put_page(struct page *page)\n" - " {\n" - " \tkunmap(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " /*\n" - "@@ -69,9 +69,9 @@ static unsigned nilfs_last_byte(struct inode *inode, unsigned long page_nr)\n" - " {\n" - " \tunsigned last_byte = inode->i_size;\n" - " \n" - "-\tlast_byte -= page_nr << PAGE_CACHE_SHIFT;\n" - "-\tif (last_byte > PAGE_CACHE_SIZE)\n" - "-\t\tlast_byte = PAGE_CACHE_SIZE;\n" - "+\tlast_byte -= page_nr << PAGE_SHIFT;\n" - "+\tif (last_byte > PAGE_SIZE)\n" - "+\t\tlast_byte = PAGE_SIZE;\n" - " \treturn last_byte;\n" - " }\n" - " \n" - "@@ -109,12 +109,12 @@ static void nilfs_check_page(struct page *page)\n" - " \tunsigned chunk_size = nilfs_chunk_size(dir);\n" - " \tchar *kaddr = page_address(page);\n" - " \tunsigned offs, rec_len;\n" - "-\tunsigned limit = PAGE_CACHE_SIZE;\n" - "+\tunsigned limit = PAGE_SIZE;\n" - " \tstruct nilfs_dir_entry *p;\n" - " \tchar *error;\n" - " \n" - "-\tif ((dir->i_size >> PAGE_CACHE_SHIFT) == page->index) {\n" - "-\t\tlimit = dir->i_size & ~PAGE_CACHE_MASK;\n" - "+\tif ((dir->i_size >> PAGE_SHIFT) == page->index) {\n" - "+\t\tlimit = dir->i_size & ~PAGE_MASK;\n" - " \t\tif (limit & (chunk_size - 1))\n" - " \t\t\tgoto Ebadsize;\n" - " \t\tif (!limit)\n" - "@@ -161,7 +161,7 @@ Espan:\n" - " bad_entry:\n" - " \tnilfs_error(sb, \"nilfs_check_page\", \"bad entry in directory #%lu: %s - \"\n" - " \t\t \"offset=%lu, inode=%lu, rec_len=%d, name_len=%d\",\n" - "-\t\t dir->i_ino, error, (page->index<<PAGE_CACHE_SHIFT)+offs,\n" - "+\t\t dir->i_ino, error, (page->index<<PAGE_SHIFT)+offs,\n" - " \t\t (unsigned long) le64_to_cpu(p->inode),\n" - " \t\t rec_len, p->name_len);\n" - " \tgoto fail;\n" - "@@ -170,7 +170,7 @@ Eend:\n" - " \tnilfs_error(sb, \"nilfs_check_page\",\n" - " \t\t \"entry in directory #%lu spans the page boundary\"\n" - " \t\t \"offset=%lu, inode=%lu\",\n" - "-\t\t dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs,\n" - "+\t\t dir->i_ino, (page->index<<PAGE_SHIFT)+offs,\n" - " \t\t (unsigned long) le64_to_cpu(p->inode));\n" - " fail:\n" - " \tSetPageChecked(page);\n" - "@@ -256,8 +256,8 @@ static int nilfs_readdir(struct file *file, struct dir_context *ctx)\n" - " \tloff_t pos = ctx->pos;\n" - " \tstruct inode *inode = file_inode(file);\n" - " \tstruct super_block *sb = inode->i_sb;\n" - "-\tunsigned int offset = pos & ~PAGE_CACHE_MASK;\n" - "-\tunsigned long n = pos >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned int offset = pos & ~PAGE_MASK;\n" - "+\tunsigned long n = pos >> PAGE_SHIFT;\n" - " \tunsigned long npages = dir_pages(inode);\n" - " /*\tunsigned chunk_mask = ~(nilfs_chunk_size(inode)-1); */\n" - " \n" - "@@ -272,7 +272,7 @@ static int nilfs_readdir(struct file *file, struct dir_context *ctx)\n" - " \t\tif (IS_ERR(page)) {\n" - " \t\t\tnilfs_error(sb, __func__, \"bad page in #%lu\",\n" - " \t\t\t\t inode->i_ino);\n" - "-\t\t\tctx->pos += PAGE_CACHE_SIZE - offset;\n" - "+\t\t\tctx->pos += PAGE_SIZE - offset;\n" - " \t\t\treturn -EIO;\n" - " \t\t}\n" - " \t\tkaddr = page_address(page);\n" - "@@ -361,7 +361,7 @@ nilfs_find_entry(struct inode *dir, const struct qstr *qstr,\n" - " \t\tif (++n >= npages)\n" - " \t\t\tn = 0;\n" - " \t\t/* next page is past the blocks we've got */\n" - "-\t\tif (unlikely(n > (dir->i_blocks >> (PAGE_CACHE_SHIFT - 9)))) {\n" - "+\t\tif (unlikely(n > (dir->i_blocks >> (PAGE_SHIFT - 9)))) {\n" - " \t\t\tnilfs_error(dir->i_sb, __func__,\n" - " \t\t\t \"dir %lu size %lld exceeds block count %llu\",\n" - " \t\t\t dir->i_ino, dir->i_size,\n" - "@@ -401,7 +401,7 @@ ino_t nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr)\n" - " \tif (de) {\n" - " \t\tres = le64_to_cpu(de->inode);\n" - " \t\tkunmap(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \treturn res;\n" - " }\n" - "@@ -460,7 +460,7 @@ int nilfs_add_link(struct dentry *dentry, struct inode *inode)\n" - " \t\tkaddr = page_address(page);\n" - " \t\tdir_end = kaddr + nilfs_last_byte(dir, n);\n" - " \t\tde = (struct nilfs_dir_entry *)kaddr;\n" - "-\t\tkaddr += PAGE_CACHE_SIZE - reclen;\n" - "+\t\tkaddr += PAGE_SIZE - reclen;\n" - " \t\twhile ((char *)de <= kaddr) {\n" - " \t\t\tif ((char *)de == dir_end) {\n" - " \t\t\t\t/* We hit i_size */\n" - "@@ -603,7 +603,7 @@ int nilfs_make_empty(struct inode *inode, struct inode *parent)\n" - " \tkunmap_atomic(kaddr);\n" - " \tnilfs_commit_chunk(page, mapping, 0, chunk_size);\n" - " fail:\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn err;\n" - " }\n" - " \n" - "diff --git a/fs/nilfs2/gcinode.c b/fs/nilfs2/gcinode.c\n" - "index 748ca238915a..0224b7826ace 100644\n" - "--- a/fs/nilfs2/gcinode.c\n" - "+++ b/fs/nilfs2/gcinode.c\n" - "@@ -115,7 +115,7 @@ int nilfs_gccache_submit_read_data(struct inode *inode, sector_t blkoff,\n" - " \n" - " failed:\n" - " \tunlock_page(bh->b_page);\n" - "-\tpage_cache_release(bh->b_page);\n" - "+\tput_page(bh->b_page);\n" - " \treturn err;\n" - " }\n" - " \n" - "diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c\n" - "index 21a1e2e0d92f..534631358b13 100644\n" - "--- a/fs/nilfs2/inode.c\n" - "+++ b/fs/nilfs2/inode.c\n" - "@@ -249,7 +249,7 @@ static int nilfs_set_page_dirty(struct page *page)\n" - " \t\tif (nr_dirty)\n" - " \t\t\tnilfs_set_file_dirty(inode, nr_dirty);\n" - " \t} else if (ret) {\n" - "-\t\tunsigned nr_dirty = 1 << (PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "+\t\tunsigned nr_dirty = 1 << (PAGE_SHIFT - inode->i_blkbits);\n" - " \n" - " \t\tnilfs_set_file_dirty(inode, nr_dirty);\n" - " \t}\n" - "@@ -291,7 +291,7 @@ static int nilfs_write_end(struct file *file, struct address_space *mapping,\n" - " \t\t\t struct page *page, void *fsdata)\n" - " {\n" - " \tstruct inode *inode = mapping->host;\n" - "-\tunsigned start = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tunsigned start = pos & (PAGE_SIZE - 1);\n" - " \tunsigned nr_dirty;\n" - " \tint err;\n" - " \n" - "diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c\n" - "index 1125f40233ff..f6982b9153d5 100644\n" - "--- a/fs/nilfs2/mdt.c\n" - "+++ b/fs/nilfs2/mdt.c\n" - "@@ -110,7 +110,7 @@ static int nilfs_mdt_create_block(struct inode *inode, unsigned long block,\n" - " \n" - " failed_bh:\n" - " \tunlock_page(bh->b_page);\n" - "-\tpage_cache_release(bh->b_page);\n" - "+\tput_page(bh->b_page);\n" - " \tbrelse(bh);\n" - " \n" - " failed_unlock:\n" - "@@ -170,7 +170,7 @@ nilfs_mdt_submit_block(struct inode *inode, unsigned long blkoff,\n" - " \n" - " failed_bh:\n" - " \tunlock_page(bh->b_page);\n" - "-\tpage_cache_release(bh->b_page);\n" - "+\tput_page(bh->b_page);\n" - " \tbrelse(bh);\n" - " failed:\n" - " \treturn ret;\n" - "@@ -363,7 +363,7 @@ int nilfs_mdt_delete_block(struct inode *inode, unsigned long block)\n" - " int nilfs_mdt_forget_block(struct inode *inode, unsigned long block)\n" - " {\n" - " \tpgoff_t index = (pgoff_t)block >>\n" - "-\t\t(PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "+\t\t(PAGE_SHIFT - inode->i_blkbits);\n" - " \tstruct page *page;\n" - " \tunsigned long first_block;\n" - " \tint ret = 0;\n" - "@@ -376,7 +376,7 @@ int nilfs_mdt_forget_block(struct inode *inode, unsigned long block)\n" - " \twait_on_page_writeback(page);\n" - " \n" - " \tfirst_block = (unsigned long)index <<\n" - "-\t\t(PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "+\t\t(PAGE_SHIFT - inode->i_blkbits);\n" - " \tif (page_has_buffers(page)) {\n" - " \t\tstruct buffer_head *bh;\n" - " \n" - "@@ -385,7 +385,7 @@ int nilfs_mdt_forget_block(struct inode *inode, unsigned long block)\n" - " \t}\n" - " \tstill_dirty = PageDirty(page);\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \tif (still_dirty ||\n" - " \t invalidate_inode_pages2_range(inode->i_mapping, index, index) != 0)\n" - "@@ -578,7 +578,7 @@ int nilfs_mdt_freeze_buffer(struct inode *inode, struct buffer_head *bh)\n" - " \t}\n" - " \n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn 0;\n" - " }\n" - " \n" - "@@ -597,7 +597,7 @@ nilfs_mdt_get_frozen_buffer(struct inode *inode, struct buffer_head *bh)\n" - " \t\t\tbh_frozen = nilfs_page_get_nth_block(page, n);\n" - " \t\t}\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \treturn bh_frozen;\n" - " }\n" - "diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c\n" - "index 7ccdb961eea9..151bc19d47c0 100644\n" - "--- a/fs/nilfs2/namei.c\n" - "+++ b/fs/nilfs2/namei.c\n" - "@@ -431,11 +431,11 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry,\n" - " out_dir:\n" - " \tif (dir_de) {\n" - " \t\tkunmap(dir_page);\n" - "-\t\tpage_cache_release(dir_page);\n" - "+\t\tput_page(dir_page);\n" - " \t}\n" - " out_old:\n" - " \tkunmap(old_page);\n" - "-\tpage_cache_release(old_page);\n" - "+\tput_page(old_page);\n" - " out:\n" - " \tnilfs_transaction_abort(old_dir->i_sb);\n" - " \treturn err;\n" - "diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c\n" - "index c20df77eff99..489391561cda 100644\n" - "--- a/fs/nilfs2/page.c\n" - "+++ b/fs/nilfs2/page.c\n" - "@@ -50,7 +50,7 @@ __nilfs_get_page_block(struct page *page, unsigned long block, pgoff_t index,\n" - " \tif (!page_has_buffers(page))\n" - " \t\tcreate_empty_buffers(page, 1 << blkbits, b_state);\n" - " \n" - "-\tfirst_block = (unsigned long)index << (PAGE_CACHE_SHIFT - blkbits);\n" - "+\tfirst_block = (unsigned long)index << (PAGE_SHIFT - blkbits);\n" - " \tbh = nilfs_page_get_nth_block(page, block - first_block);\n" - " \n" - " \ttouch_buffer(bh);\n" - "@@ -64,7 +64,7 @@ struct buffer_head *nilfs_grab_buffer(struct inode *inode,\n" - " \t\t\t\t unsigned long b_state)\n" - " {\n" - " \tint blkbits = inode->i_blkbits;\n" - "-\tpgoff_t index = blkoff >> (PAGE_CACHE_SHIFT - blkbits);\n" - "+\tpgoff_t index = blkoff >> (PAGE_SHIFT - blkbits);\n" - " \tstruct page *page;\n" - " \tstruct buffer_head *bh;\n" - " \n" - "@@ -75,7 +75,7 @@ struct buffer_head *nilfs_grab_buffer(struct inode *inode,\n" - " \tbh = __nilfs_get_page_block(page, blkoff, index, blkbits, b_state);\n" - " \tif (unlikely(!bh)) {\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\treturn NULL;\n" - " \t}\n" - " \treturn bh;\n" - "@@ -288,7 +288,7 @@ repeat:\n" - " \t\t__set_page_dirty_nobuffers(dpage);\n" - " \n" - " \t\tunlock_page(dpage);\n" - "-\t\tpage_cache_release(dpage);\n" - "+\t\tput_page(dpage);\n" - " \t\tunlock_page(page);\n" - " \t}\n" - " \tpagevec_release(&pvec);\n" - "@@ -333,7 +333,7 @@ repeat:\n" - " \t\t\tWARN_ON(PageDirty(dpage));\n" - " \t\t\tnilfs_copy_page(dpage, page, 0);\n" - " \t\t\tunlock_page(dpage);\n" - "-\t\t\tpage_cache_release(dpage);\n" - "+\t\t\tput_page(dpage);\n" - " \t\t} else {\n" - " \t\t\tstruct page *page2;\n" - " \n" - "@@ -350,7 +350,7 @@ repeat:\n" - " \t\t\tif (unlikely(err < 0)) {\n" - " \t\t\t\tWARN_ON(err == -EEXIST);\n" - " \t\t\t\tpage->mapping = NULL;\n" - "-\t\t\t\tpage_cache_release(page); /* for cache */\n" - "+\t\t\t\tput_page(page); /* for cache */\n" - " \t\t\t} else {\n" - " \t\t\t\tpage->mapping = dmap;\n" - " \t\t\t\tdmap->nrpages++;\n" - "@@ -523,8 +523,8 @@ unsigned long nilfs_find_uncommitted_extent(struct inode *inode,\n" - " \tif (inode->i_mapping->nrpages == 0)\n" - " \t\treturn 0;\n" - " \n" - "-\tindex = start_blk >> (PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "-\tnblocks_in_page = 1U << (PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "+\tindex = start_blk >> (PAGE_SHIFT - inode->i_blkbits);\n" - "+\tnblocks_in_page = 1U << (PAGE_SHIFT - inode->i_blkbits);\n" - " \n" - " \tpagevec_init(&pvec, 0);\n" - " \n" - "@@ -537,7 +537,7 @@ repeat:\n" - " \tif (length > 0 && pvec.pages[0]->index > index)\n" - " \t\tgoto out;\n" - " \n" - "-\tb = pvec.pages[0]->index << (PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "+\tb = pvec.pages[0]->index << (PAGE_SHIFT - inode->i_blkbits);\n" - " \ti = 0;\n" - " \tdo {\n" - " \t\tpage = pvec.pages[i];\n" - "diff --git a/fs/nilfs2/recovery.c b/fs/nilfs2/recovery.c\n" - "index 9b4f205d1173..5afa77fadc11 100644\n" - "--- a/fs/nilfs2/recovery.c\n" - "+++ b/fs/nilfs2/recovery.c\n" - "@@ -544,14 +544,14 @@ static int nilfs_recover_dsync_blocks(struct the_nilfs *nilfs,\n" - " \t\t\t\tblocksize, page, NULL);\n" - " \n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \n" - " \t\t(*nr_salvaged_blocks)++;\n" - " \t\tgoto next;\n" - " \n" - " failed_page:\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \n" - " failed_inode:\n" - " \t\tprintk(KERN_WARNING\n" - "diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c\n" - "index 3b65adaae7e4..4317f72568e6 100644\n" - "--- a/fs/nilfs2/segment.c\n" - "+++ b/fs/nilfs2/segment.c\n" - "@@ -2070,7 +2070,7 @@ static int nilfs_segctor_do_construct(struct nilfs_sc_info *sci, int mode)\n" - " \t\t\tgoto failed_to_write;\n" - " \n" - " \t\tif (nilfs_sc_cstage_get(sci) == NILFS_ST_DONE ||\n" - "-\t\t nilfs->ns_blocksize_bits != PAGE_CACHE_SHIFT) {\n" - "+\t\t nilfs->ns_blocksize_bits != PAGE_SHIFT) {\n" - " \t\t\t/*\n" - " \t\t\t * At this point, we avoid double buffering\n" - " \t\t\t * for blocksize < pagesize because page dirty\n" - "diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c\n" - "index 7521e11db728..97768a1379f2 100644\n" - "--- a/fs/ntfs/aops.c\n" - "+++ b/fs/ntfs/aops.c\n" - "@@ -74,7 +74,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)\n" - " \n" - " \t\tset_buffer_uptodate(bh);\n" - " \n" - "-\t\tfile_ofs = ((s64)page->index << PAGE_CACHE_SHIFT) +\n" - "+\t\tfile_ofs = ((s64)page->index << PAGE_SHIFT) +\n" - " \t\t\t\tbh_offset(bh);\n" - " \t\tread_lock_irqsave(&ni->size_lock, flags);\n" - " \t\tinit_size = ni->initialized_size;\n" - "@@ -142,7 +142,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)\n" - " \t\tu32 rec_size;\n" - " \n" - " \t\trec_size = ni->itype.index.block_size;\n" - "-\t\trecs = PAGE_CACHE_SIZE / rec_size;\n" - "+\t\trecs = PAGE_SIZE / rec_size;\n" - " \t\t/* Should have been verified before we got here... */\n" - " \t\tBUG_ON(!recs);\n" - " \t\tlocal_irq_save(flags);\n" - "@@ -229,7 +229,7 @@ static int ntfs_read_block(struct page *page)\n" - " \t * fully truncated, truncate will throw it away as soon as we unlock\n" - " \t * it so no need to worry what we do with it.\n" - " \t */\n" - "-\tiblock = (s64)page->index << (PAGE_CACHE_SHIFT - blocksize_bits);\n" - "+\tiblock = (s64)page->index << (PAGE_SHIFT - blocksize_bits);\n" - " \tread_lock_irqsave(&ni->size_lock, flags);\n" - " \tlblock = (ni->allocated_size + blocksize - 1) >> blocksize_bits;\n" - " \tinit_size = ni->initialized_size;\n" - "@@ -412,9 +412,9 @@ retry_readpage:\n" - " \tvi = page->mapping->host;\n" - " \ti_size = i_size_read(vi);\n" - " \t/* Is the page fully outside i_size? (truncate in progress) */\n" - "-\tif (unlikely(page->index >= (i_size + PAGE_CACHE_SIZE - 1) >>\n" - "-\t\t\tPAGE_CACHE_SHIFT)) {\n" - "-\t\tzero_user(page, 0, PAGE_CACHE_SIZE);\n" - "+\tif (unlikely(page->index >= (i_size + PAGE_SIZE - 1) >>\n" - "+\t\t\tPAGE_SHIFT)) {\n" - "+\t\tzero_user(page, 0, PAGE_SIZE);\n" - " \t\tntfs_debug(\"Read outside i_size - truncated?\");\n" - " \t\tgoto done;\n" - " \t}\n" - "@@ -463,7 +463,7 @@ retry_readpage:\n" - " \t * ok to ignore the compressed flag here.\n" - " \t */\n" - " \tif (unlikely(page->index > 0)) {\n" - "-\t\tzero_user(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user(page, 0, PAGE_SIZE);\n" - " \t\tgoto done;\n" - " \t}\n" - " \tif (!NInoAttr(ni))\n" - "@@ -509,7 +509,7 @@ retry_readpage:\n" - " \t\t\tle16_to_cpu(ctx->attr->data.resident.value_offset),\n" - " \t\t\tattr_len);\n" - " \t/* Zero the remainder of the page. */\n" - "-\tmemset(addr + attr_len, 0, PAGE_CACHE_SIZE - attr_len);\n" - "+\tmemset(addr + attr_len, 0, PAGE_SIZE - attr_len);\n" - " \tflush_dcache_page(page);\n" - " \tkunmap_atomic(addr);\n" - " put_unm_err_out:\n" - "@@ -599,7 +599,7 @@ static int ntfs_write_block(struct page *page, struct writeback_control *wbc)\n" - " \t/* NOTE: Different naming scheme to ntfs_read_block()! */\n" - " \n" - " \t/* The first block in the page. */\n" - "-\tblock = (s64)page->index << (PAGE_CACHE_SHIFT - blocksize_bits);\n" - "+\tblock = (s64)page->index << (PAGE_SHIFT - blocksize_bits);\n" - " \n" - " \tread_lock_irqsave(&ni->size_lock, flags);\n" - " \ti_size = i_size_read(vi);\n" - "@@ -674,7 +674,7 @@ static int ntfs_write_block(struct page *page, struct writeback_control *wbc)\n" - " \t\t\t\t// in the inode.\n" - " \t\t\t\t// Again, for each page do:\n" - " \t\t\t\t//\t__set_page_dirty_buffers();\n" - "-\t\t\t\t// page_cache_release()\n" - "+\t\t\t\t// put_page()\n" - " \t\t\t\t// We don't need to wait on the writes.\n" - " \t\t\t\t// Update iblock.\n" - " \t\t\t}\n" - "@@ -925,7 +925,7 @@ static int ntfs_write_mst_block(struct page *page,\n" - " \tntfs_volume *vol = ni->vol;\n" - " \tu8 *kaddr;\n" - " \tunsigned int rec_size = ni->itype.index.block_size;\n" - "-\tntfs_inode *locked_nis[PAGE_CACHE_SIZE / rec_size];\n" - "+\tntfs_inode *locked_nis[PAGE_SIZE / rec_size];\n" - " \tstruct buffer_head *bh, *head, *tbh, *rec_start_bh;\n" - " \tstruct buffer_head *bhs[MAX_BUF_PER_PAGE];\n" - " \trunlist_element *rl;\n" - "@@ -949,7 +949,7 @@ static int ntfs_write_mst_block(struct page *page,\n" - " \t\t\t(NInoAttr(ni) && ni->type == AT_INDEX_ALLOCATION)));\n" - " \tbh_size = vol->sb->s_blocksize;\n" - " \tbh_size_bits = vol->sb->s_blocksize_bits;\n" - "-\tmax_bhs = PAGE_CACHE_SIZE / bh_size;\n" - "+\tmax_bhs = PAGE_SIZE / bh_size;\n" - " \tBUG_ON(!max_bhs);\n" - " \tBUG_ON(max_bhs > MAX_BUF_PER_PAGE);\n" - " \n" - "@@ -961,13 +961,13 @@ static int ntfs_write_mst_block(struct page *page,\n" - " \tBUG_ON(!bh);\n" - " \n" - " \trec_size_bits = ni->itype.index.block_size_bits;\n" - "-\tBUG_ON(!(PAGE_CACHE_SIZE >> rec_size_bits));\n" - "+\tBUG_ON(!(PAGE_SIZE >> rec_size_bits));\n" - " \tbhs_per_rec = rec_size >> bh_size_bits;\n" - " \tBUG_ON(!bhs_per_rec);\n" - " \n" - " \t/* The first block in the page. */\n" - " \trec_block = block = (sector_t)page->index <<\n" - "-\t\t\t(PAGE_CACHE_SHIFT - bh_size_bits);\n" - "+\t\t\t(PAGE_SHIFT - bh_size_bits);\n" - " \n" - " \t/* The first out of bounds block for the data size. */\n" - " \tdblock = (i_size_read(vi) + bh_size - 1) >> bh_size_bits;\n" - "@@ -1133,7 +1133,7 @@ lock_retry_remap:\n" - " \t\t\tunsigned long mft_no;\n" - " \n" - " \t\t\t/* Get the mft record number. */\n" - "-\t\t\tmft_no = (((s64)page->index << PAGE_CACHE_SHIFT) + ofs)\n" - "+\t\t\tmft_no = (((s64)page->index << PAGE_SHIFT) + ofs)\n" - " \t\t\t\t\t>> rec_size_bits;\n" - " \t\t\t/* Check whether to write this mft record. */\n" - " \t\t\ttni = NULL;\n" - "@@ -1249,7 +1249,7 @@ do_mirror:\n" - " \t\t\t\tcontinue;\n" - " \t\t\tofs = bh_offset(tbh);\n" - " \t\t\t/* Get the mft record number. */\n" - "-\t\t\tmft_no = (((s64)page->index << PAGE_CACHE_SHIFT) + ofs)\n" - "+\t\t\tmft_no = (((s64)page->index << PAGE_SHIFT) + ofs)\n" - " \t\t\t\t\t>> rec_size_bits;\n" - " \t\t\tif (mft_no < vol->mftmirr_size)\n" - " \t\t\t\tntfs_sync_mft_mirror(vol, mft_no,\n" - "@@ -1300,7 +1300,7 @@ done:\n" - " \t\t * Set page error if there is only one ntfs record in the page.\n" - " \t\t * Otherwise we would loose per-record granularity.\n" - " \t\t */\n" - "-\t\tif (ni->itype.index.block_size == PAGE_CACHE_SIZE)\n" - "+\t\tif (ni->itype.index.block_size == PAGE_SIZE)\n" - " \t\t\tSetPageError(page);\n" - " \t\tNVolSetErrors(vol);\n" - " \t}\n" - "@@ -1308,7 +1308,7 @@ done:\n" - " \t\tntfs_debug(\"Page still contains one or more dirty ntfs \"\n" - " \t\t\t\t\"records. Redirtying the page starting at \"\n" - " \t\t\t\t\"record 0x%lx.\", page->index <<\n" - "-\t\t\t\t(PAGE_CACHE_SHIFT - rec_size_bits));\n" - "+\t\t\t\t(PAGE_SHIFT - rec_size_bits));\n" - " \t\tredirty_page_for_writepage(wbc, page);\n" - " \t\tunlock_page(page);\n" - " \t} else {\n" - "@@ -1365,13 +1365,13 @@ retry_writepage:\n" - " \tBUG_ON(!PageLocked(page));\n" - " \ti_size = i_size_read(vi);\n" - " \t/* Is the page fully outside i_size? (truncate in progress) */\n" - "-\tif (unlikely(page->index >= (i_size + PAGE_CACHE_SIZE - 1) >>\n" - "-\t\t\tPAGE_CACHE_SHIFT)) {\n" - "+\tif (unlikely(page->index >= (i_size + PAGE_SIZE - 1) >>\n" - "+\t\t\tPAGE_SHIFT)) {\n" - " \t\t/*\n" - " \t\t * The page may have dirty, unmapped buffers. Make them\n" - " \t\t * freeable here, so the page does not leak.\n" - " \t\t */\n" - "-\t\tblock_invalidatepage(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\tblock_invalidatepage(page, 0, PAGE_SIZE);\n" - " \t\tunlock_page(page);\n" - " \t\tntfs_debug(\"Write outside i_size - truncated?\");\n" - " \t\treturn 0;\n" - "@@ -1414,10 +1414,10 @@ retry_writepage:\n" - " \t/* NInoNonResident() == NInoIndexAllocPresent() */\n" - " \tif (NInoNonResident(ni)) {\n" - " \t\t/* We have to zero every time due to mmap-at-end-of-file. */\n" - "-\t\tif (page->index >= (i_size >> PAGE_CACHE_SHIFT)) {\n" - "+\t\tif (page->index >= (i_size >> PAGE_SHIFT)) {\n" - " \t\t\t/* The page straddles i_size. */\n" - "-\t\t\tunsigned int ofs = i_size & ~PAGE_CACHE_MASK;\n" - "-\t\t\tzero_user_segment(page, ofs, PAGE_CACHE_SIZE);\n" - "+\t\t\tunsigned int ofs = i_size & ~PAGE_MASK;\n" - "+\t\t\tzero_user_segment(page, ofs, PAGE_SIZE);\n" - " \t\t}\n" - " \t\t/* Handle mst protected attributes. */\n" - " \t\tif (NInoMstProtected(ni))\n" - "@@ -1500,7 +1500,7 @@ retry_writepage:\n" - " \t\t\tle16_to_cpu(ctx->attr->data.resident.value_offset),\n" - " \t\t\taddr, attr_len);\n" - " \t/* Zero out of bounds area in the page cache page. */\n" - "-\tmemset(addr + attr_len, 0, PAGE_CACHE_SIZE - attr_len);\n" - "+\tmemset(addr + attr_len, 0, PAGE_SIZE - attr_len);\n" - " \tkunmap_atomic(addr);\n" - " \tflush_dcache_page(page);\n" - " \tflush_dcache_mft_record_page(ctx->ntfs_ino);\n" - "diff --git a/fs/ntfs/aops.h b/fs/ntfs/aops.h\n" - "index caecc58f529c..820d6eabf60f 100644\n" - "--- a/fs/ntfs/aops.h\n" - "+++ b/fs/ntfs/aops.h\n" - "@@ -40,7 +40,7 @@\n" - " static inline void ntfs_unmap_page(struct page *page)\n" - " {\n" - " \tkunmap(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " /**\n" - "@@ -49,7 +49,7 @@ static inline void ntfs_unmap_page(struct page *page)\n" - " * @index:\tindex into the page cache for @mapping of the page to map\n" - " *\n" - " * Read a page from the page cache of the address space @mapping at position\n" - "- * @index, where @index is in units of PAGE_CACHE_SIZE, and not in bytes.\n" - "+ * @index, where @index is in units of PAGE_SIZE, and not in bytes.\n" - " *\n" - " * If the page is not in memory it is loaded from disk first using the readpage\n" - " * method defined in the address space operations of @mapping and the page is\n" - "diff --git a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c\n" - "index 250ed5b20c8f..44a39a099b54 100644\n" - "--- a/fs/ntfs/attrib.c\n" - "+++ b/fs/ntfs/attrib.c\n" - "@@ -152,7 +152,7 @@ int ntfs_map_runlist_nolock(ntfs_inode *ni, VCN vcn, ntfs_attr_search_ctx *ctx)\n" - " \t\t\tif (old_ctx.base_ntfs_ino && old_ctx.ntfs_ino !=\n" - " \t\t\t\t\told_ctx.base_ntfs_ino) {\n" - " \t\t\t\tput_this_page = old_ctx.ntfs_ino->page;\n" - "-\t\t\t\tpage_cache_get(put_this_page);\n" - "+\t\t\t\tget_page(put_this_page);\n" - " \t\t\t}\n" - " \t\t\t/*\n" - " \t\t\t * Reinitialize the search context so we can lookup the\n" - "@@ -275,7 +275,7 @@ retry_map:\n" - " \t\t * the pieces anyway.\n" - " \t\t */\n" - " \t\tif (put_this_page)\n" - "-\t\t\tpage_cache_release(put_this_page);\n" - "+\t\t\tput_page(put_this_page);\n" - " \t}\n" - " \treturn err;\n" - " }\n" - "@@ -1660,7 +1660,7 @@ int ntfs_attr_make_non_resident(ntfs_inode *ni, const u32 data_size)\n" - " \t\tmemcpy(kaddr, (u8*)a +\n" - " \t\t\t\tle16_to_cpu(a->data.resident.value_offset),\n" - " \t\t\t\tattr_size);\n" - "-\t\tmemset(kaddr + attr_size, 0, PAGE_CACHE_SIZE - attr_size);\n" - "+\t\tmemset(kaddr + attr_size, 0, PAGE_SIZE - attr_size);\n" - " \t\tkunmap_atomic(kaddr);\n" - " \t\tflush_dcache_page(page);\n" - " \t\tSetPageUptodate(page);\n" - "@@ -1748,7 +1748,7 @@ int ntfs_attr_make_non_resident(ntfs_inode *ni, const u32 data_size)\n" - " \tif (page) {\n" - " \t\tset_page_dirty(page);\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \tntfs_debug(\"Done.\");\n" - " \treturn 0;\n" - "@@ -1835,7 +1835,7 @@ rl_err_out:\n" - " \t\tntfs_free(rl);\n" - " page_err_out:\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \tif (err == -EINVAL)\n" - " \t\terr = -EIO;\n" - "@@ -2513,17 +2513,17 @@ int ntfs_attr_set(ntfs_inode *ni, const s64 ofs, const s64 cnt, const u8 val)\n" - " \tBUG_ON(NInoEncrypted(ni));\n" - " \tmapping = VFS_I(ni)->i_mapping;\n" - " \t/* Work out the starting index and page offset. */\n" - "-\tidx = ofs >> PAGE_CACHE_SHIFT;\n" - "-\tstart_ofs = ofs & ~PAGE_CACHE_MASK;\n" - "+\tidx = ofs >> PAGE_SHIFT;\n" - "+\tstart_ofs = ofs & ~PAGE_MASK;\n" - " \t/* Work out the ending index and page offset. */\n" - " \tend = ofs + cnt;\n" - "-\tend_ofs = end & ~PAGE_CACHE_MASK;\n" - "+\tend_ofs = end & ~PAGE_MASK;\n" - " \t/* If the end is outside the inode size return -ESPIPE. */\n" - " \tif (unlikely(end > i_size_read(VFS_I(ni)))) {\n" - " \t\tntfs_error(vol->sb, \"Request exceeds end of attribute.\");\n" - " \t\treturn -ESPIPE;\n" - " \t}\n" - "-\tend >>= PAGE_CACHE_SHIFT;\n" - "+\tend >>= PAGE_SHIFT;\n" - " \t/* If there is a first partial page, need to do it the slow way. */\n" - " \tif (start_ofs) {\n" - " \t\tpage = read_mapping_page(mapping, idx, NULL);\n" - "@@ -2536,7 +2536,7 @@ int ntfs_attr_set(ntfs_inode *ni, const s64 ofs, const s64 cnt, const u8 val)\n" - " \t\t * If the last page is the same as the first page, need to\n" - " \t\t * limit the write to the end offset.\n" - " \t\t */\n" - "-\t\tsize = PAGE_CACHE_SIZE;\n" - "+\t\tsize = PAGE_SIZE;\n" - " \t\tif (idx == end)\n" - " \t\t\tsize = end_ofs;\n" - " \t\tkaddr = kmap_atomic(page);\n" - "@@ -2544,7 +2544,7 @@ int ntfs_attr_set(ntfs_inode *ni, const s64 ofs, const s64 cnt, const u8 val)\n" - " \t\tflush_dcache_page(page);\n" - " \t\tkunmap_atomic(kaddr);\n" - " \t\tset_page_dirty(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tbalance_dirty_pages_ratelimited(mapping);\n" - " \t\tcond_resched();\n" - " \t\tif (idx == end)\n" - "@@ -2561,7 +2561,7 @@ int ntfs_attr_set(ntfs_inode *ni, const s64 ofs, const s64 cnt, const u8 val)\n" - " \t\t\treturn -ENOMEM;\n" - " \t\t}\n" - " \t\tkaddr = kmap_atomic(page);\n" - "-\t\tmemset(kaddr, val, PAGE_CACHE_SIZE);\n" - "+\t\tmemset(kaddr, val, PAGE_SIZE);\n" - " \t\tflush_dcache_page(page);\n" - " \t\tkunmap_atomic(kaddr);\n" - " \t\t/*\n" - "@@ -2585,7 +2585,7 @@ int ntfs_attr_set(ntfs_inode *ni, const s64 ofs, const s64 cnt, const u8 val)\n" - " \t\tset_page_dirty(page);\n" - " \t\t/* Finally unlock and release the page. */\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tbalance_dirty_pages_ratelimited(mapping);\n" - " \t\tcond_resched();\n" - " \t}\n" - "@@ -2602,7 +2602,7 @@ int ntfs_attr_set(ntfs_inode *ni, const s64 ofs, const s64 cnt, const u8 val)\n" - " \t\tflush_dcache_page(page);\n" - " \t\tkunmap_atomic(kaddr);\n" - " \t\tset_page_dirty(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tbalance_dirty_pages_ratelimited(mapping);\n" - " \t\tcond_resched();\n" - " \t}\n" - "diff --git a/fs/ntfs/bitmap.c b/fs/ntfs/bitmap.c\n" - "index 0809cf876098..ec130c588d2b 100644\n" - "--- a/fs/ntfs/bitmap.c\n" - "+++ b/fs/ntfs/bitmap.c\n" - "@@ -67,8 +67,8 @@ int __ntfs_bitmap_set_bits_in_run(struct inode *vi, const s64 start_bit,\n" - " \t * Calculate the indices for the pages containing the first and last\n" - " \t * bits, i.e. @start_bit and @start_bit + @cnt - 1, respectively.\n" - " \t */\n" - "-\tindex = start_bit >> (3 + PAGE_CACHE_SHIFT);\n" - "-\tend_index = (start_bit + cnt - 1) >> (3 + PAGE_CACHE_SHIFT);\n" - "+\tindex = start_bit >> (3 + PAGE_SHIFT);\n" - "+\tend_index = (start_bit + cnt - 1) >> (3 + PAGE_SHIFT);\n" - " \n" - " \t/* Get the page containing the first bit (@start_bit). */\n" - " \tmapping = vi->i_mapping;\n" - "@@ -82,7 +82,7 @@ int __ntfs_bitmap_set_bits_in_run(struct inode *vi, const s64 start_bit,\n" - " \tkaddr = page_address(page);\n" - " \n" - " \t/* Set @pos to the position of the byte containing @start_bit. */\n" - "-\tpos = (start_bit >> 3) & ~PAGE_CACHE_MASK;\n" - "+\tpos = (start_bit >> 3) & ~PAGE_MASK;\n" - " \n" - " \t/* Calculate the position of @start_bit in the first byte. */\n" - " \tbit = start_bit & 7;\n" - "@@ -108,7 +108,7 @@ int __ntfs_bitmap_set_bits_in_run(struct inode *vi, const s64 start_bit,\n" - " \t * Depending on @value, modify all remaining whole bytes in the page up\n" - " \t * to @cnt.\n" - " \t */\n" - "-\tlen = min_t(s64, cnt >> 3, PAGE_CACHE_SIZE - pos);\n" - "+\tlen = min_t(s64, cnt >> 3, PAGE_SIZE - pos);\n" - " \tmemset(kaddr + pos, value ? 0xff : 0, len);\n" - " \tcnt -= len << 3;\n" - " \n" - "@@ -132,7 +132,7 @@ int __ntfs_bitmap_set_bits_in_run(struct inode *vi, const s64 start_bit,\n" - " \t\t * Depending on @value, modify all remaining whole bytes in the\n" - " \t\t * page up to @cnt.\n" - " \t\t */\n" - "-\t\tlen = min_t(s64, cnt >> 3, PAGE_CACHE_SIZE);\n" - "+\t\tlen = min_t(s64, cnt >> 3, PAGE_SIZE);\n" - " \t\tmemset(kaddr, value ? 0xff : 0, len);\n" - " \t\tcnt -= len << 3;\n" - " \t}\n" - "diff --git a/fs/ntfs/compress.c b/fs/ntfs/compress.c\n" - "index f82498c35e78..f2b5e746f49b 100644\n" - "--- a/fs/ntfs/compress.c\n" - "+++ b/fs/ntfs/compress.c\n" - "@@ -104,16 +104,12 @@ static void zero_partial_compressed_page(struct page *page,\n" - " \tunsigned int kp_ofs;\n" - " \n" - " \tntfs_debug(\"Zeroing page region outside initialized size.\");\n" - "-\tif (((s64)page->index << PAGE_CACHE_SHIFT) >= initialized_size) {\n" - "-\t\t/*\n" - "-\t\t * FIXME: Using clear_page() will become wrong when we get\n" - "-\t\t * PAGE_CACHE_SIZE != PAGE_SIZE but for now there is no problem.\n" - "-\t\t */\n" - "+\tif (((s64)page->index << PAGE_SHIFT) >= initialized_size) {\n" - " \t\tclear_page(kp);\n" - " \t\treturn;\n" - " \t}\n" - "-\tkp_ofs = initialized_size & ~PAGE_CACHE_MASK;\n" - "-\tmemset(kp + kp_ofs, 0, PAGE_CACHE_SIZE - kp_ofs);\n" - "+\tkp_ofs = initialized_size & ~PAGE_MASK;\n" - "+\tmemset(kp + kp_ofs, 0, PAGE_SIZE - kp_ofs);\n" - " \treturn;\n" - " }\n" - " \n" - "@@ -123,7 +119,7 @@ static void zero_partial_compressed_page(struct page *page,\n" - " static inline void handle_bounds_compressed_page(struct page *page,\n" - " \t\tconst loff_t i_size, const s64 initialized_size)\n" - " {\n" - "-\tif ((page->index >= (initialized_size >> PAGE_CACHE_SHIFT)) &&\n" - "+\tif ((page->index >= (initialized_size >> PAGE_SHIFT)) &&\n" - " \t\t\t(initialized_size < i_size))\n" - " \t\tzero_partial_compressed_page(page, initialized_size);\n" - " \treturn;\n" - "@@ -160,7 +156,7 @@ static inline void handle_bounds_compressed_page(struct page *page,\n" - " * @xpage_done indicates whether the target page (@dest_pages[@xpage]) was\n" - " * completed during the decompression of the compression block (@cb_start).\n" - " *\n" - "- * Warning: This function *REQUIRES* PAGE_CACHE_SIZE >= 4096 or it will blow up\n" - "+ * Warning: This function *REQUIRES* PAGE_SIZE >= 4096 or it will blow up\n" - " * unpredicatbly! You have been warned!\n" - " *\n" - " * Note to hackers: This function may not sleep until it has finished accessing\n" - "@@ -241,7 +237,7 @@ return_error:\n" - " \t\t\t\tif (di == xpage)\n" - " \t\t\t\t\t*xpage_done = 1;\n" - " \t\t\t\telse\n" - "-\t\t\t\t\tpage_cache_release(dp);\n" - "+\t\t\t\t\tput_page(dp);\n" - " \t\t\t\tdest_pages[di] = NULL;\n" - " \t\t\t}\n" - " \t\t}\n" - "@@ -274,7 +270,7 @@ return_error:\n" - " \t\tcb = cb_sb_end;\n" - " \n" - " \t\t/* Advance destination position to next sub-block. */\n" - "-\t\t*dest_ofs = (*dest_ofs + NTFS_SB_SIZE) & ~PAGE_CACHE_MASK;\n" - "+\t\t*dest_ofs = (*dest_ofs + NTFS_SB_SIZE) & ~PAGE_MASK;\n" - " \t\tif (!*dest_ofs && (++*dest_index > dest_max_index))\n" - " \t\t\tgoto return_overflow;\n" - " \t\tgoto do_next_sb;\n" - "@@ -301,7 +297,7 @@ return_error:\n" - " \n" - " \t\t/* Advance destination position to next sub-block. */\n" - " \t\t*dest_ofs += NTFS_SB_SIZE;\n" - "-\t\tif (!(*dest_ofs &= ~PAGE_CACHE_MASK)) {\n" - "+\t\tif (!(*dest_ofs &= ~PAGE_MASK)) {\n" - " finalize_page:\n" - " \t\t\t/*\n" - " \t\t\t * First stage: add current page index to array of\n" - "@@ -335,7 +331,7 @@ do_next_tag:\n" - " \t\t\t*dest_ofs += nr_bytes;\n" - " \t\t}\n" - " \t\t/* We have finished the current sub-block. */\n" - "-\t\tif (!(*dest_ofs &= ~PAGE_CACHE_MASK))\n" - "+\t\tif (!(*dest_ofs &= ~PAGE_MASK))\n" - " \t\t\tgoto finalize_page;\n" - " \t\tgoto do_next_sb;\n" - " \t}\n" - "@@ -462,7 +458,7 @@ return_overflow:\n" - " * have been written to so that we would lose data if we were to just overwrite\n" - " * them with the out-of-date uncompressed data.\n" - " *\n" - "- * FIXME: For PAGE_CACHE_SIZE > cb_size we are not doing the Right Thing(TM) at\n" - "+ * FIXME: For PAGE_SIZE > cb_size we are not doing the Right Thing(TM) at\n" - " * the end of the file I think. We need to detect this case and zero the out\n" - " * of bounds remainder of the page in question and mark it as handled. At the\n" - " * moment we would just return -EIO on such a page. This bug will only become\n" - "@@ -470,7 +466,7 @@ return_overflow:\n" - " * clusters so is probably not going to be seen by anyone. Still this should\n" - " * be fixed. (AIA)\n" - " *\n" - "- * FIXME: Again for PAGE_CACHE_SIZE > cb_size we are screwing up both in\n" - "+ * FIXME: Again for PAGE_SIZE > cb_size we are screwing up both in\n" - " * handling sparse and compressed cbs. (AIA)\n" - " *\n" - " * FIXME: At the moment we don't do any zeroing out in the case that\n" - "@@ -497,14 +493,14 @@ int ntfs_read_compressed_block(struct page *page)\n" - " \tu64 cb_size_mask = cb_size - 1UL;\n" - " \tVCN vcn;\n" - " \tLCN lcn;\n" - "-\t/* The first wanted vcn (minimum alignment is PAGE_CACHE_SIZE). */\n" - "-\tVCN start_vcn = (((s64)index << PAGE_CACHE_SHIFT) & ~cb_size_mask) >>\n" - "+\t/* The first wanted vcn (minimum alignment is PAGE_SIZE). */\n" - "+\tVCN start_vcn = (((s64)index << PAGE_SHIFT) & ~cb_size_mask) >>\n" - " \t\t\tvol->cluster_size_bits;\n" - " \t/*\n" - " \t * The first vcn after the last wanted vcn (minimum alignment is again\n" - "-\t * PAGE_CACHE_SIZE.\n" - "+\t * PAGE_SIZE.\n" - " \t */\n" - "-\tVCN end_vcn = ((((s64)(index + 1UL) << PAGE_CACHE_SHIFT) + cb_size - 1)\n" - "+\tVCN end_vcn = ((((s64)(index + 1UL) << PAGE_SHIFT) + cb_size - 1)\n" - " \t\t\t& ~cb_size_mask) >> vol->cluster_size_bits;\n" - " \t/* Number of compression blocks (cbs) in the wanted vcn range. */\n" - " \tunsigned int nr_cbs = (end_vcn - start_vcn) << vol->cluster_size_bits\n" - "@@ -515,7 +511,7 @@ int ntfs_read_compressed_block(struct page *page)\n" - " \t * guarantees of start_vcn and end_vcn, no need to round up here.\n" - " \t */\n" - " \tunsigned int nr_pages = (end_vcn - start_vcn) <<\n" - "-\t\t\tvol->cluster_size_bits >> PAGE_CACHE_SHIFT;\n" - "+\t\t\tvol->cluster_size_bits >> PAGE_SHIFT;\n" - " \tunsigned int xpage, max_page, cur_page, cur_ofs, i;\n" - " \tunsigned int cb_clusters, cb_max_ofs;\n" - " \tint block, max_block, cb_max_page, bhs_size, nr_bhs, err = 0;\n" - "@@ -549,7 +545,7 @@ int ntfs_read_compressed_block(struct page *page)\n" - " \t * We have already been given one page, this is the one we must do.\n" - " \t * Once again, the alignment guarantees keep it simple.\n" - " \t */\n" - "-\toffset = start_vcn << vol->cluster_size_bits >> PAGE_CACHE_SHIFT;\n" - "+\toffset = start_vcn << vol->cluster_size_bits >> PAGE_SHIFT;\n" - " \txpage = index - offset;\n" - " \tpages[xpage] = page;\n" - " \t/*\n" - "@@ -560,13 +556,13 @@ int ntfs_read_compressed_block(struct page *page)\n" - " \ti_size = i_size_read(VFS_I(ni));\n" - " \tinitialized_size = ni->initialized_size;\n" - " \tread_unlock_irqrestore(&ni->size_lock, flags);\n" - "-\tmax_page = ((i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT) -\n" - "+\tmax_page = ((i_size + PAGE_SIZE - 1) >> PAGE_SHIFT) -\n" - " \t\t\toffset;\n" - " \t/* Is the page fully outside i_size? (truncate in progress) */\n" - " \tif (xpage >= max_page) {\n" - " \t\tkfree(bhs);\n" - " \t\tkfree(pages);\n" - "-\t\tzero_user(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user(page, 0, PAGE_SIZE);\n" - " \t\tntfs_debug(\"Compressed read outside i_size - truncated?\");\n" - " \t\tSetPageUptodate(page);\n" - " \t\tunlock_page(page);\n" - "@@ -591,7 +587,7 @@ int ntfs_read_compressed_block(struct page *page)\n" - " \t\t\t\tcontinue;\n" - " \t\t\t}\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tpages[i] = NULL;\n" - " \t\t}\n" - " \t}\n" - "@@ -735,9 +731,9 @@ lock_retry_remap:\n" - " \tntfs_debug(\"Successfully read the compression block.\");\n" - " \n" - " \t/* The last page and maximum offset within it for the current cb. */\n" - "-\tcb_max_page = (cur_page << PAGE_CACHE_SHIFT) + cur_ofs + cb_size;\n" - "-\tcb_max_ofs = cb_max_page & ~PAGE_CACHE_MASK;\n" - "-\tcb_max_page >>= PAGE_CACHE_SHIFT;\n" - "+\tcb_max_page = (cur_page << PAGE_SHIFT) + cur_ofs + cb_size;\n" - "+\tcb_max_ofs = cb_max_page & ~PAGE_MASK;\n" - "+\tcb_max_page >>= PAGE_SHIFT;\n" - " \n" - " \t/* Catch end of file inside a compression block. */\n" - " \tif (cb_max_page > max_page)\n" - "@@ -753,16 +749,11 @@ lock_retry_remap:\n" - " \t\tfor (; cur_page < cb_max_page; cur_page++) {\n" - " \t\t\tpage = pages[cur_page];\n" - " \t\t\tif (page) {\n" - "-\t\t\t\t/*\n" - "-\t\t\t\t * FIXME: Using clear_page() will become wrong\n" - "-\t\t\t\t * when we get PAGE_CACHE_SIZE != PAGE_SIZE but\n" - "-\t\t\t\t * for now there is no problem.\n" - "-\t\t\t\t */\n" - " \t\t\t\tif (likely(!cur_ofs))\n" - " \t\t\t\t\tclear_page(page_address(page));\n" - " \t\t\t\telse\n" - " \t\t\t\t\tmemset(page_address(page) + cur_ofs, 0,\n" - "-\t\t\t\t\t\t\tPAGE_CACHE_SIZE -\n" - "+\t\t\t\t\t\t\tPAGE_SIZE -\n" - " \t\t\t\t\t\t\tcur_ofs);\n" - " \t\t\t\tflush_dcache_page(page);\n" - " \t\t\t\tkunmap(page);\n" - "@@ -771,10 +762,10 @@ lock_retry_remap:\n" - " \t\t\t\tif (cur_page == xpage)\n" - " \t\t\t\t\txpage_done = 1;\n" - " \t\t\t\telse\n" - "-\t\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\t\tput_page(page);\n" - " \t\t\t\tpages[cur_page] = NULL;\n" - " \t\t\t}\n" - "-\t\t\tcb_pos += PAGE_CACHE_SIZE - cur_ofs;\n" - "+\t\t\tcb_pos += PAGE_SIZE - cur_ofs;\n" - " \t\t\tcur_ofs = 0;\n" - " \t\t\tif (cb_pos >= cb_end)\n" - " \t\t\t\tbreak;\n" - "@@ -807,7 +798,7 @@ lock_retry_remap:\n" - " \t\t * synchronous io for the majority of pages.\n" - " \t\t * Or if we choose not to do the read-ahead/-behind stuff, we\n" - " \t\t * could just return block_read_full_page(pages[xpage]) as long\n" - "-\t\t * as PAGE_CACHE_SIZE <= cb_size.\n" - "+\t\t * as PAGE_SIZE <= cb_size.\n" - " \t\t */\n" - " \t\tif (cb_max_ofs)\n" - " \t\t\tcb_max_page--;\n" - "@@ -816,8 +807,8 @@ lock_retry_remap:\n" - " \t\t\tpage = pages[cur_page];\n" - " \t\t\tif (page)\n" - " \t\t\t\tmemcpy(page_address(page) + cur_ofs, cb_pos,\n" - "-\t\t\t\t\t\tPAGE_CACHE_SIZE - cur_ofs);\n" - "-\t\t\tcb_pos += PAGE_CACHE_SIZE - cur_ofs;\n" - "+\t\t\t\t\t\tPAGE_SIZE - cur_ofs);\n" - "+\t\t\tcb_pos += PAGE_SIZE - cur_ofs;\n" - " \t\t\tcur_ofs = 0;\n" - " \t\t\tif (cb_pos >= cb_end)\n" - " \t\t\t\tbreak;\n" - "@@ -850,10 +841,10 @@ lock_retry_remap:\n" - " \t\t\t\tif (cur2_page == xpage)\n" - " \t\t\t\t\txpage_done = 1;\n" - " \t\t\t\telse\n" - "-\t\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\t\tput_page(page);\n" - " \t\t\t\tpages[cur2_page] = NULL;\n" - " \t\t\t}\n" - "-\t\t\tcb_pos2 += PAGE_CACHE_SIZE - cur_ofs2;\n" - "+\t\t\tcb_pos2 += PAGE_SIZE - cur_ofs2;\n" - " \t\t\tcur_ofs2 = 0;\n" - " \t\t\tif (cb_pos2 >= cb_end)\n" - " \t\t\t\tbreak;\n" - "@@ -884,7 +875,7 @@ lock_retry_remap:\n" - " \t\t\t\t\tkunmap(page);\n" - " \t\t\t\t\tunlock_page(page);\n" - " \t\t\t\t\tif (prev_cur_page != xpage)\n" - "-\t\t\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\t\t\tput_page(page);\n" - " \t\t\t\t\tpages[prev_cur_page] = NULL;\n" - " \t\t\t\t}\n" - " \t\t\t}\n" - "@@ -914,7 +905,7 @@ lock_retry_remap:\n" - " \t\t\tkunmap(page);\n" - " \t\t\tunlock_page(page);\n" - " \t\t\tif (cur_page != xpage)\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\tpages[cur_page] = NULL;\n" - " \t\t}\n" - " \t}\n" - "@@ -961,7 +952,7 @@ err_out:\n" - " \t\t\tkunmap(page);\n" - " \t\t\tunlock_page(page);\n" - " \t\t\tif (i != xpage)\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t}\n" - " \t}\n" - " \tkfree(pages);\n" - "diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c\n" - "index b2eff5816adc..a18613579001 100644\n" - "--- a/fs/ntfs/dir.c\n" - "+++ b/fs/ntfs/dir.c\n" - "@@ -315,11 +315,11 @@ found_it:\n" - " descend_into_child_node:\n" - " \t/*\n" - " \t * Convert vcn to index into the index allocation attribute in units\n" - "-\t * of PAGE_CACHE_SIZE and map the page cache page, reading it from\n" - "+\t * of PAGE_SIZE and map the page cache page, reading it from\n" - " \t * disk if necessary.\n" - " \t */\n" - " \tpage = ntfs_map_page(ia_mapping, vcn <<\n" - "-\t\t\tdir_ni->itype.index.vcn_size_bits >> PAGE_CACHE_SHIFT);\n" - "+\t\t\tdir_ni->itype.index.vcn_size_bits >> PAGE_SHIFT);\n" - " \tif (IS_ERR(page)) {\n" - " \t\tntfs_error(sb, \"Failed to map directory index page, error %ld.\",\n" - " \t\t\t\t-PTR_ERR(page));\n" - "@@ -331,9 +331,9 @@ descend_into_child_node:\n" - " fast_descend_into_child_node:\n" - " \t/* Get to the index allocation block. */\n" - " \tia = (INDEX_ALLOCATION*)(kaddr + ((vcn <<\n" - "-\t\t\tdir_ni->itype.index.vcn_size_bits) & ~PAGE_CACHE_MASK));\n" - "+\t\t\tdir_ni->itype.index.vcn_size_bits) & ~PAGE_MASK));\n" - " \t/* Bounds checks. */\n" - "-\tif ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE) {\n" - "+\tif ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_SIZE) {\n" - " \t\tntfs_error(sb, \"Out of bounds check failed. Corrupt directory \"\n" - " \t\t\t\t\"inode 0x%lx or driver bug.\", dir_ni->mft_no);\n" - " \t\tgoto unm_err_out;\n" - "@@ -366,7 +366,7 @@ fast_descend_into_child_node:\n" - " \t\tgoto unm_err_out;\n" - " \t}\n" - " \tindex_end = (u8*)ia + dir_ni->itype.index.block_size;\n" - "-\tif (index_end > kaddr + PAGE_CACHE_SIZE) {\n" - "+\tif (index_end > kaddr + PAGE_SIZE) {\n" - " \t\tntfs_error(sb, \"Index buffer (VCN 0x%llx) of directory inode \"\n" - " \t\t\t\t\"0x%lx crosses page boundary. Impossible! \"\n" - " \t\t\t\t\"Cannot access! This is probably a bug in the \"\n" - "@@ -559,9 +559,9 @@ found_it2:\n" - " \t\t\t/* If vcn is in the same page cache page as old_vcn we\n" - " \t\t\t * recycle the mapped page. */\n" - " \t\t\tif (old_vcn << vol->cluster_size_bits >>\n" - "-\t\t\t\t\tPAGE_CACHE_SHIFT == vcn <<\n" - "+\t\t\t\t\tPAGE_SHIFT == vcn <<\n" - " \t\t\t\t\tvol->cluster_size_bits >>\n" - "-\t\t\t\t\tPAGE_CACHE_SHIFT)\n" - "+\t\t\t\t\tPAGE_SHIFT)\n" - " \t\t\t\tgoto fast_descend_into_child_node;\n" - " \t\t\tunlock_page(page);\n" - " \t\t\tntfs_unmap_page(page);\n" - "@@ -793,11 +793,11 @@ found_it:\n" - " descend_into_child_node:\n" - " \t/*\n" - " \t * Convert vcn to index into the index allocation attribute in units\n" - "-\t * of PAGE_CACHE_SIZE and map the page cache page, reading it from\n" - "+\t * of PAGE_SIZE and map the page cache page, reading it from\n" - " \t * disk if necessary.\n" - " \t */\n" - " \tpage = ntfs_map_page(ia_mapping, vcn <<\n" - "-\t\t\tdir_ni->itype.index.vcn_size_bits >> PAGE_CACHE_SHIFT);\n" - "+\t\t\tdir_ni->itype.index.vcn_size_bits >> PAGE_SHIFT);\n" - " \tif (IS_ERR(page)) {\n" - " \t\tntfs_error(sb, \"Failed to map directory index page, error %ld.\",\n" - " \t\t\t\t-PTR_ERR(page));\n" - "@@ -809,9 +809,9 @@ descend_into_child_node:\n" - " fast_descend_into_child_node:\n" - " \t/* Get to the index allocation block. */\n" - " \tia = (INDEX_ALLOCATION*)(kaddr + ((vcn <<\n" - "-\t\t\tdir_ni->itype.index.vcn_size_bits) & ~PAGE_CACHE_MASK));\n" - "+\t\t\tdir_ni->itype.index.vcn_size_bits) & ~PAGE_MASK));\n" - " \t/* Bounds checks. */\n" - "-\tif ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE) {\n" - "+\tif ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_SIZE) {\n" - " \t\tntfs_error(sb, \"Out of bounds check failed. Corrupt directory \"\n" - " \t\t\t\t\"inode 0x%lx or driver bug.\", dir_ni->mft_no);\n" - " \t\tgoto unm_err_out;\n" - "@@ -844,7 +844,7 @@ fast_descend_into_child_node:\n" - " \t\tgoto unm_err_out;\n" - " \t}\n" - " \tindex_end = (u8*)ia + dir_ni->itype.index.block_size;\n" - "-\tif (index_end > kaddr + PAGE_CACHE_SIZE) {\n" - "+\tif (index_end > kaddr + PAGE_SIZE) {\n" - " \t\tntfs_error(sb, \"Index buffer (VCN 0x%llx) of directory inode \"\n" - " \t\t\t\t\"0x%lx crosses page boundary. Impossible! \"\n" - " \t\t\t\t\"Cannot access! This is probably a bug in the \"\n" - "@@ -968,9 +968,9 @@ found_it2:\n" - " \t\t\t/* If vcn is in the same page cache page as old_vcn we\n" - " \t\t\t * recycle the mapped page. */\n" - " \t\t\tif (old_vcn << vol->cluster_size_bits >>\n" - "-\t\t\t\t\tPAGE_CACHE_SHIFT == vcn <<\n" - "+\t\t\t\t\tPAGE_SHIFT == vcn <<\n" - " \t\t\t\t\tvol->cluster_size_bits >>\n" - "-\t\t\t\t\tPAGE_CACHE_SHIFT)\n" - "+\t\t\t\t\tPAGE_SHIFT)\n" - " \t\t\t\tgoto fast_descend_into_child_node;\n" - " \t\t\tunlock_page(page);\n" - " \t\t\tntfs_unmap_page(page);\n" - "@@ -1246,15 +1246,15 @@ skip_index_root:\n" - " \t\tgoto iput_err_out;\n" - " \t}\n" - " \t/* Get the starting bit position in the current bitmap page. */\n" - "-\tcur_bmp_pos = bmp_pos & ((PAGE_CACHE_SIZE * 8) - 1);\n" - "-\tbmp_pos &= ~(u64)((PAGE_CACHE_SIZE * 8) - 1);\n" - "+\tcur_bmp_pos = bmp_pos & ((PAGE_SIZE * 8) - 1);\n" - "+\tbmp_pos &= ~(u64)((PAGE_SIZE * 8) - 1);\n" - " get_next_bmp_page:\n" - " \tntfs_debug(\"Reading bitmap with page index 0x%llx, bit ofs 0x%llx\",\n" - "-\t\t\t(unsigned long long)bmp_pos >> (3 + PAGE_CACHE_SHIFT),\n" - "+\t\t\t(unsigned long long)bmp_pos >> (3 + PAGE_SHIFT),\n" - " \t\t\t(unsigned long long)bmp_pos &\n" - "-\t\t\t(unsigned long long)((PAGE_CACHE_SIZE * 8) - 1));\n" - "+\t\t\t(unsigned long long)((PAGE_SIZE * 8) - 1));\n" - " \tbmp_page = ntfs_map_page(bmp_mapping,\n" - "-\t\t\tbmp_pos >> (3 + PAGE_CACHE_SHIFT));\n" - "+\t\t\tbmp_pos >> (3 + PAGE_SHIFT));\n" - " \tif (IS_ERR(bmp_page)) {\n" - " \t\tntfs_error(sb, \"Reading index bitmap failed.\");\n" - " \t\terr = PTR_ERR(bmp_page);\n" - "@@ -1270,9 +1270,9 @@ find_next_index_buffer:\n" - " \t\t * If we have reached the end of the bitmap page, get the next\n" - " \t\t * page, and put away the old one.\n" - " \t\t */\n" - "-\t\tif (unlikely((cur_bmp_pos >> 3) >= PAGE_CACHE_SIZE)) {\n" - "+\t\tif (unlikely((cur_bmp_pos >> 3) >= PAGE_SIZE)) {\n" - " \t\t\tntfs_unmap_page(bmp_page);\n" - "-\t\t\tbmp_pos += PAGE_CACHE_SIZE * 8;\n" - "+\t\t\tbmp_pos += PAGE_SIZE * 8;\n" - " \t\t\tcur_bmp_pos = 0;\n" - " \t\t\tgoto get_next_bmp_page;\n" - " \t\t}\n" - "@@ -1285,8 +1285,8 @@ find_next_index_buffer:\n" - " \tntfs_debug(\"Handling index buffer 0x%llx.\",\n" - " \t\t\t(unsigned long long)bmp_pos + cur_bmp_pos);\n" - " \t/* If the current index buffer is in the same page we reuse the page. */\n" - "-\tif ((prev_ia_pos & (s64)PAGE_CACHE_MASK) !=\n" - "-\t\t\t(ia_pos & (s64)PAGE_CACHE_MASK)) {\n" - "+\tif ((prev_ia_pos & (s64)PAGE_MASK) !=\n" - "+\t\t\t(ia_pos & (s64)PAGE_MASK)) {\n" - " \t\tprev_ia_pos = ia_pos;\n" - " \t\tif (likely(ia_page != NULL)) {\n" - " \t\t\tunlock_page(ia_page);\n" - "@@ -1296,7 +1296,7 @@ find_next_index_buffer:\n" - " \t\t * Map the page cache page containing the current ia_pos,\n" - " \t\t * reading it from disk if necessary.\n" - " \t\t */\n" - "-\t\tia_page = ntfs_map_page(ia_mapping, ia_pos >> PAGE_CACHE_SHIFT);\n" - "+\t\tia_page = ntfs_map_page(ia_mapping, ia_pos >> PAGE_SHIFT);\n" - " \t\tif (IS_ERR(ia_page)) {\n" - " \t\t\tntfs_error(sb, \"Reading index allocation data failed.\");\n" - " \t\t\terr = PTR_ERR(ia_page);\n" - "@@ -1307,10 +1307,10 @@ find_next_index_buffer:\n" - " \t\tkaddr = (u8*)page_address(ia_page);\n" - " \t}\n" - " \t/* Get the current index buffer. */\n" - "-\tia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &\n" - "-\t\t\t~(s64)(ndir->itype.index.block_size - 1)));\n" - "+\tia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_MASK &\n" - "+\t\t\t\t\t ~(s64)(ndir->itype.index.block_size - 1)));\n" - " \t/* Bounds checks. */\n" - "-\tif (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {\n" - "+\tif (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_SIZE)) {\n" - " \t\tntfs_error(sb, \"Out of bounds check failed. Corrupt directory \"\n" - " \t\t\t\t\"inode 0x%lx or driver bug.\", vdir->i_ino);\n" - " \t\tgoto err_out;\n" - "@@ -1348,7 +1348,7 @@ find_next_index_buffer:\n" - " \t\tgoto err_out;\n" - " \t}\n" - " \tindex_end = (u8*)ia + ndir->itype.index.block_size;\n" - "-\tif (unlikely(index_end > kaddr + PAGE_CACHE_SIZE)) {\n" - "+\tif (unlikely(index_end > kaddr + PAGE_SIZE)) {\n" - " \t\tntfs_error(sb, \"Index buffer (VCN 0x%llx) of directory inode \"\n" - " \t\t\t\t\"0x%lx crosses page boundary. Impossible! \"\n" - " \t\t\t\t\"Cannot access! This is probably a bug in the \"\n" - "diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c\n" - "index bed4d427dfae..91117ada8528 100644\n" - "--- a/fs/ntfs/file.c\n" - "+++ b/fs/ntfs/file.c\n" - "@@ -220,8 +220,8 @@ do_non_resident_extend:\n" - " \t\tm = NULL;\n" - " \t}\n" - " \tmapping = vi->i_mapping;\n" - "-\tindex = old_init_size >> PAGE_CACHE_SHIFT;\n" - "-\tend_index = (new_init_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tindex = old_init_size >> PAGE_SHIFT;\n" - "+\tend_index = (new_init_size + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \tdo {\n" - " \t\t/*\n" - " \t\t * Read the page. If the page is not present, this will zero\n" - "@@ -233,7 +233,7 @@ do_non_resident_extend:\n" - " \t\t\tgoto init_err_out;\n" - " \t\t}\n" - " \t\tif (unlikely(PageError(page))) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\terr = -EIO;\n" - " \t\t\tgoto init_err_out;\n" - " \t\t}\n" - "@@ -242,13 +242,13 @@ do_non_resident_extend:\n" - " \t\t * enough to make ntfs_writepage() work.\n" - " \t\t */\n" - " \t\twrite_lock_irqsave(&ni->size_lock, flags);\n" - "-\t\tni->initialized_size = (s64)(index + 1) << PAGE_CACHE_SHIFT;\n" - "+\t\tni->initialized_size = (s64)(index + 1) << PAGE_SHIFT;\n" - " \t\tif (ni->initialized_size > new_init_size)\n" - " \t\t\tni->initialized_size = new_init_size;\n" - " \t\twrite_unlock_irqrestore(&ni->size_lock, flags);\n" - " \t\t/* Set the page dirty so it gets written out. */\n" - " \t\tset_page_dirty(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\t/*\n" - " \t\t * Play nice with the vm and the rest of the system. This is\n" - " \t\t * very much needed as we can potentially be modifying the\n" - "@@ -543,7 +543,7 @@ out:\n" - " err_out:\n" - " \twhile (nr > 0) {\n" - " \t\tunlock_page(pages[--nr]);\n" - "-\t\tpage_cache_release(pages[nr]);\n" - "+\t\tput_page(pages[nr]);\n" - " \t}\n" - " \tgoto out;\n" - " }\n" - "@@ -573,7 +573,7 @@ static inline int ntfs_submit_bh_for_read(struct buffer_head *bh)\n" - " * only partially being written to.\n" - " *\n" - " * If @nr_pages is greater than one, we are guaranteed that the cluster size is\n" - "- * greater than PAGE_CACHE_SIZE, that all pages in @pages are entirely inside\n" - "+ * greater than PAGE_SIZE, that all pages in @pages are entirely inside\n" - " * the same cluster and that they are the entirety of that cluster, and that\n" - " * the cluster is sparse, i.e. we need to allocate a cluster to fill the hole.\n" - " *\n" - "@@ -653,7 +653,7 @@ static int ntfs_prepare_pages_for_non_resident_write(struct page **pages,\n" - " \tu = 0;\n" - " do_next_page:\n" - " \tpage = pages[u];\n" - "-\tbh_pos = (s64)page->index << PAGE_CACHE_SHIFT;\n" - "+\tbh_pos = (s64)page->index << PAGE_SHIFT;\n" - " \tbh = head = page_buffers(page);\n" - " \tdo {\n" - " \t\tVCN cdelta;\n" - "@@ -810,11 +810,11 @@ map_buffer_cached:\n" - " \t\t\t\t\t\n" - " \t\t\t\tkaddr = kmap_atomic(page);\n" - " \t\t\t\tif (bh_pos < pos) {\n" - "-\t\t\t\t\tpofs = bh_pos & ~PAGE_CACHE_MASK;\n" - "+\t\t\t\t\tpofs = bh_pos & ~PAGE_MASK;\n" - " \t\t\t\t\tmemset(kaddr + pofs, 0, pos - bh_pos);\n" - " \t\t\t\t}\n" - " \t\t\t\tif (bh_end > end) {\n" - "-\t\t\t\t\tpofs = end & ~PAGE_CACHE_MASK;\n" - "+\t\t\t\t\tpofs = end & ~PAGE_MASK;\n" - " \t\t\t\t\tmemset(kaddr + pofs, 0, bh_end - end);\n" - " \t\t\t\t}\n" - " \t\t\t\tkunmap_atomic(kaddr);\n" - "@@ -942,7 +942,7 @@ rl_not_mapped_enoent:\n" - " \t\t * unmapped. This can only happen when the cluster size is\n" - " \t\t * less than the page cache size.\n" - " \t\t */\n" - "-\t\tif (unlikely(vol->cluster_size < PAGE_CACHE_SIZE)) {\n" - "+\t\tif (unlikely(vol->cluster_size < PAGE_SIZE)) {\n" - " \t\t\tbh_cend = (bh_end + vol->cluster_size - 1) >>\n" - " \t\t\t\t\tvol->cluster_size_bits;\n" - " \t\t\tif ((bh_cend <= cpos || bh_cpos >= cend)) {\n" - "@@ -1208,7 +1208,7 @@ rl_not_mapped_enoent:\n" - " \t\twait_on_buffer(bh);\n" - " \t\tif (likely(buffer_uptodate(bh))) {\n" - " \t\t\tpage = bh->b_page;\n" - "-\t\t\tbh_pos = ((s64)page->index << PAGE_CACHE_SHIFT) +\n" - "+\t\t\tbh_pos = ((s64)page->index << PAGE_SHIFT) +\n" - " \t\t\t\t\tbh_offset(bh);\n" - " \t\t\t/*\n" - " \t\t\t * If the buffer overflows the initialized size, need\n" - "@@ -1350,7 +1350,7 @@ rl_not_mapped_enoent:\n" - " \t\tbh = head = page_buffers(page);\n" - " \t\tdo {\n" - " \t\t\tif (u == nr_pages &&\n" - "-\t\t\t\t\t((s64)page->index << PAGE_CACHE_SHIFT) +\n" - "+\t\t\t\t\t((s64)page->index << PAGE_SHIFT) +\n" - " \t\t\t\t\tbh_offset(bh) >= end)\n" - " \t\t\t\tbreak;\n" - " \t\t\tif (!buffer_new(bh))\n" - "@@ -1422,7 +1422,7 @@ static inline int ntfs_commit_pages_after_non_resident_write(\n" - " \t\tbool partial;\n" - " \n" - " \t\tpage = pages[u];\n" - "-\t\tbh_pos = (s64)page->index << PAGE_CACHE_SHIFT;\n" - "+\t\tbh_pos = (s64)page->index << PAGE_SHIFT;\n" - " \t\tbh = head = page_buffers(page);\n" - " \t\tpartial = false;\n" - " \t\tdo {\n" - "@@ -1639,7 +1639,7 @@ static int ntfs_commit_pages_after_write(struct page **pages,\n" - " \t\tif (end < attr_len)\n" - " \t\t\tmemcpy(kaddr + end, kattr + end, attr_len - end);\n" - " \t\t/* Zero the region outside the end of the attribute value. */\n" - "-\t\tmemset(kaddr + attr_len, 0, PAGE_CACHE_SIZE - attr_len);\n" - "+\t\tmemset(kaddr + attr_len, 0, PAGE_SIZE - attr_len);\n" - " \t\tflush_dcache_page(page);\n" - " \t\tSetPageUptodate(page);\n" - " \t}\n" - "@@ -1706,7 +1706,7 @@ static size_t ntfs_copy_from_user_iter(struct page **pages, unsigned nr_pages,\n" - " \tunsigned len, copied;\n" - " \n" - " \tdo {\n" - "-\t\tlen = PAGE_CACHE_SIZE - ofs;\n" - "+\t\tlen = PAGE_SIZE - ofs;\n" - " \t\tif (len > bytes)\n" - " \t\t\tlen = bytes;\n" - " \t\tcopied = iov_iter_copy_from_user_atomic(*pages, &data, ofs,\n" - "@@ -1724,14 +1724,14 @@ out:\n" - " \treturn total;\n" - " err:\n" - " \t/* Zero the rest of the target like __copy_from_user(). */\n" - "-\tlen = PAGE_CACHE_SIZE - copied;\n" - "+\tlen = PAGE_SIZE - copied;\n" - " \tdo {\n" - " \t\tif (len > bytes)\n" - " \t\t\tlen = bytes;\n" - " \t\tzero_user(*pages, copied, len);\n" - " \t\tbytes -= len;\n" - " \t\tcopied = 0;\n" - "-\t\tlen = PAGE_CACHE_SIZE;\n" - "+\t\tlen = PAGE_SIZE;\n" - " \t} while (++pages < last_page);\n" - " \tgoto out;\n" - " }\n" - "@@ -1787,8 +1787,8 @@ static ssize_t ntfs_perform_write(struct file *file, struct iov_iter *i,\n" - " \t * attributes.\n" - " \t */\n" - " \tnr_pages = 1;\n" - "-\tif (vol->cluster_size > PAGE_CACHE_SIZE && NInoNonResident(ni))\n" - "-\t\tnr_pages = vol->cluster_size >> PAGE_CACHE_SHIFT;\n" - "+\tif (vol->cluster_size > PAGE_SIZE && NInoNonResident(ni))\n" - "+\t\tnr_pages = vol->cluster_size >> PAGE_SHIFT;\n" - " \tlast_vcn = -1;\n" - " \tdo {\n" - " \t\tVCN vcn;\n" - "@@ -1796,9 +1796,9 @@ static ssize_t ntfs_perform_write(struct file *file, struct iov_iter *i,\n" - " \t\tunsigned ofs, do_pages, u;\n" - " \t\tsize_t copied;\n" - " \n" - "-\t\tstart_idx = idx = pos >> PAGE_CACHE_SHIFT;\n" - "-\t\tofs = pos & ~PAGE_CACHE_MASK;\n" - "-\t\tbytes = PAGE_CACHE_SIZE - ofs;\n" - "+\t\tstart_idx = idx = pos >> PAGE_SHIFT;\n" - "+\t\tofs = pos & ~PAGE_MASK;\n" - "+\t\tbytes = PAGE_SIZE - ofs;\n" - " \t\tdo_pages = 1;\n" - " \t\tif (nr_pages > 1) {\n" - " \t\t\tvcn = pos >> vol->cluster_size_bits;\n" - "@@ -1832,7 +1832,7 @@ static ssize_t ntfs_perform_write(struct file *file, struct iov_iter *i,\n" - " \t\t\t\tif (lcn == LCN_HOLE) {\n" - " \t\t\t\t\tstart_idx = (pos & ~(s64)\n" - " \t\t\t\t\t\t\tvol->cluster_size_mask)\n" - "-\t\t\t\t\t\t\t>> PAGE_CACHE_SHIFT;\n" - "+\t\t\t\t\t\t\t>> PAGE_SHIFT;\n" - " \t\t\t\t\tbytes = vol->cluster_size - (pos &\n" - " \t\t\t\t\t\t\tvol->cluster_size_mask);\n" - " \t\t\t\t\tdo_pages = nr_pages;\n" - "@@ -1871,12 +1871,12 @@ again:\n" - " \t\t\tif (unlikely(status)) {\n" - " \t\t\t\tdo {\n" - " \t\t\t\t\tunlock_page(pages[--do_pages]);\n" - "-\t\t\t\t\tpage_cache_release(pages[do_pages]);\n" - "+\t\t\t\t\tput_page(pages[do_pages]);\n" - " \t\t\t\t} while (do_pages);\n" - " \t\t\t\tbreak;\n" - " \t\t\t}\n" - " \t\t}\n" - "-\t\tu = (pos >> PAGE_CACHE_SHIFT) - pages[0]->index;\n" - "+\t\tu = (pos >> PAGE_SHIFT) - pages[0]->index;\n" - " \t\tcopied = ntfs_copy_from_user_iter(pages + u, do_pages - u, ofs,\n" - " \t\t\t\t\ti, bytes);\n" - " \t\tntfs_flush_dcache_pages(pages + u, do_pages - u);\n" - "@@ -1889,7 +1889,7 @@ again:\n" - " \t\t}\n" - " \t\tdo {\n" - " \t\t\tunlock_page(pages[--do_pages]);\n" - "-\t\t\tpage_cache_release(pages[do_pages]);\n" - "+\t\t\tput_page(pages[do_pages]);\n" - " \t\t} while (do_pages);\n" - " \t\tif (unlikely(status < 0))\n" - " \t\t\tbreak;\n" - "@@ -1921,7 +1921,7 @@ again:\n" - " \t\t}\n" - " \t} while (iov_iter_count(i));\n" - " \tif (cached_page)\n" - "-\t\tpage_cache_release(cached_page);\n" - "+\t\tput_page(cached_page);\n" - " \tntfs_debug(\"Done. Returning %s (written 0x%lx, status %li).\",\n" - " \t\t\twritten ? \"written\" : \"status\", (unsigned long)written,\n" - " \t\t\t(long)status);\n" - "diff --git a/fs/ntfs/index.c b/fs/ntfs/index.c\n" - "index 096c135691ae..0d645f357930 100644\n" - "--- a/fs/ntfs/index.c\n" - "+++ b/fs/ntfs/index.c\n" - "@@ -272,11 +272,11 @@ done:\n" - " descend_into_child_node:\n" - " \t/*\n" - " \t * Convert vcn to index into the index allocation attribute in units\n" - "-\t * of PAGE_CACHE_SIZE and map the page cache page, reading it from\n" - "+\t * of PAGE_SIZE and map the page cache page, reading it from\n" - " \t * disk if necessary.\n" - " \t */\n" - " \tpage = ntfs_map_page(ia_mapping, vcn <<\n" - "-\t\t\tidx_ni->itype.index.vcn_size_bits >> PAGE_CACHE_SHIFT);\n" - "+\t\t\tidx_ni->itype.index.vcn_size_bits >> PAGE_SHIFT);\n" - " \tif (IS_ERR(page)) {\n" - " \t\tntfs_error(sb, \"Failed to map index page, error %ld.\",\n" - " \t\t\t\t-PTR_ERR(page));\n" - "@@ -288,9 +288,9 @@ descend_into_child_node:\n" - " fast_descend_into_child_node:\n" - " \t/* Get to the index allocation block. */\n" - " \tia = (INDEX_ALLOCATION*)(kaddr + ((vcn <<\n" - "-\t\t\tidx_ni->itype.index.vcn_size_bits) & ~PAGE_CACHE_MASK));\n" - "+\t\t\tidx_ni->itype.index.vcn_size_bits) & ~PAGE_MASK));\n" - " \t/* Bounds checks. */\n" - "-\tif ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE) {\n" - "+\tif ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_SIZE) {\n" - " \t\tntfs_error(sb, \"Out of bounds check failed. Corrupt inode \"\n" - " \t\t\t\t\"0x%lx or driver bug.\", idx_ni->mft_no);\n" - " \t\tgoto unm_err_out;\n" - "@@ -323,7 +323,7 @@ fast_descend_into_child_node:\n" - " \t\tgoto unm_err_out;\n" - " \t}\n" - " \tindex_end = (u8*)ia + idx_ni->itype.index.block_size;\n" - "-\tif (index_end > kaddr + PAGE_CACHE_SIZE) {\n" - "+\tif (index_end > kaddr + PAGE_SIZE) {\n" - " \t\tntfs_error(sb, \"Index buffer (VCN 0x%llx) of inode 0x%lx \"\n" - " \t\t\t\t\"crosses page boundary. Impossible! Cannot \"\n" - " \t\t\t\t\"access! This is probably a bug in the \"\n" - "@@ -427,9 +427,9 @@ ia_done:\n" - " \t\t * the mapped page.\n" - " \t\t */\n" - " \t\tif (old_vcn << vol->cluster_size_bits >>\n" - "-\t\t\t\tPAGE_CACHE_SHIFT == vcn <<\n" - "+\t\t\t\tPAGE_SHIFT == vcn <<\n" - " \t\t\t\tvol->cluster_size_bits >>\n" - "-\t\t\t\tPAGE_CACHE_SHIFT)\n" - "+\t\t\t\tPAGE_SHIFT)\n" - " \t\t\tgoto fast_descend_into_child_node;\n" - " \t\tunlock_page(page);\n" - " \t\tntfs_unmap_page(page);\n" - "diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c\n" - "index d284f07eda77..f40972d6df90 100644\n" - "--- a/fs/ntfs/inode.c\n" - "+++ b/fs/ntfs/inode.c\n" - "@@ -868,12 +868,12 @@ skip_attr_list_load:\n" - " \t\t\t\t\tni->itype.index.block_size);\n" - " \t\t\tgoto unm_err_out;\n" - " \t\t}\n" - "-\t\tif (ni->itype.index.block_size > PAGE_CACHE_SIZE) {\n" - "+\t\tif (ni->itype.index.block_size > PAGE_SIZE) {\n" - " \t\t\tntfs_error(vi->i_sb, \"Index block size (%u) > \"\n" - "-\t\t\t\t\t\"PAGE_CACHE_SIZE (%ld) is not \"\n" - "+\t\t\t\t\t\"PAGE_SIZE (%ld) is not \"\n" - " \t\t\t\t\t\"supported. Sorry.\",\n" - " \t\t\t\t\tni->itype.index.block_size,\n" - "-\t\t\t\t\tPAGE_CACHE_SIZE);\n" - "+\t\t\t\t\tPAGE_SIZE);\n" - " \t\t\terr = -EOPNOTSUPP;\n" - " \t\t\tgoto unm_err_out;\n" - " \t\t}\n" - "@@ -1585,10 +1585,10 @@ static int ntfs_read_locked_index_inode(struct inode *base_vi, struct inode *vi)\n" - " \t\t\t\t\"two.\", ni->itype.index.block_size);\n" - " \t\tgoto unm_err_out;\n" - " \t}\n" - "-\tif (ni->itype.index.block_size > PAGE_CACHE_SIZE) {\n" - "-\t\tntfs_error(vi->i_sb, \"Index block size (%u) > PAGE_CACHE_SIZE \"\n" - "+\tif (ni->itype.index.block_size > PAGE_SIZE) {\n" - "+\t\tntfs_error(vi->i_sb, \"Index block size (%u) > PAGE_SIZE \"\n" - " \t\t\t\t\"(%ld) is not supported. Sorry.\",\n" - "-\t\t\t\tni->itype.index.block_size, PAGE_CACHE_SIZE);\n" - "+\t\t\t\tni->itype.index.block_size, PAGE_SIZE);\n" - " \t\terr = -EOPNOTSUPP;\n" - " \t\tgoto unm_err_out;\n" - " \t}\n" - "diff --git a/fs/ntfs/lcnalloc.c b/fs/ntfs/lcnalloc.c\n" - "index 1711b710b641..27a24a42f712 100644\n" - "--- a/fs/ntfs/lcnalloc.c\n" - "+++ b/fs/ntfs/lcnalloc.c\n" - "@@ -283,15 +283,15 @@ runlist_element *ntfs_cluster_alloc(ntfs_volume *vol, const VCN start_vcn,\n" - " \t\t\tntfs_unmap_page(page);\n" - " \t\t}\n" - " \t\tpage = ntfs_map_page(mapping, last_read_pos >>\n" - "-\t\t\t\tPAGE_CACHE_SHIFT);\n" - "+\t\t\t\tPAGE_SHIFT);\n" - " \t\tif (IS_ERR(page)) {\n" - " \t\t\terr = PTR_ERR(page);\n" - " \t\t\tntfs_error(vol->sb, \"Failed to map page.\");\n" - " \t\t\tgoto out;\n" - " \t\t}\n" - "-\t\tbuf_size = last_read_pos & ~PAGE_CACHE_MASK;\n" - "+\t\tbuf_size = last_read_pos & ~PAGE_MASK;\n" - " \t\tbuf = page_address(page) + buf_size;\n" - "-\t\tbuf_size = PAGE_CACHE_SIZE - buf_size;\n" - "+\t\tbuf_size = PAGE_SIZE - buf_size;\n" - " \t\tif (unlikely(last_read_pos + buf_size > i_size))\n" - " \t\t\tbuf_size = i_size - last_read_pos;\n" - " \t\tbuf_size <<= 3;\n" - "diff --git a/fs/ntfs/logfile.c b/fs/ntfs/logfile.c\n" - "index c71de292c5ad..9d71213ca81e 100644\n" - "--- a/fs/ntfs/logfile.c\n" - "+++ b/fs/ntfs/logfile.c\n" - "@@ -381,7 +381,7 @@ static int ntfs_check_and_load_restart_page(struct inode *vi,\n" - " \t * completely inside @rp, just copy it from there. Otherwise map all\n" - " \t * the required pages and copy the data from them.\n" - " \t */\n" - "-\tsize = PAGE_CACHE_SIZE - (pos & ~PAGE_CACHE_MASK);\n" - "+\tsize = PAGE_SIZE - (pos & ~PAGE_MASK);\n" - " \tif (size >= le32_to_cpu(rp->system_page_size)) {\n" - " \t\tmemcpy(trp, rp, le32_to_cpu(rp->system_page_size));\n" - " \t} else {\n" - "@@ -394,8 +394,8 @@ static int ntfs_check_and_load_restart_page(struct inode *vi,\n" - " \t\t/* Copy the remaining data one page at a time. */\n" - " \t\thave_read = size;\n" - " \t\tto_read = le32_to_cpu(rp->system_page_size) - size;\n" - "-\t\tidx = (pos + size) >> PAGE_CACHE_SHIFT;\n" - "-\t\tBUG_ON((pos + size) & ~PAGE_CACHE_MASK);\n" - "+\t\tidx = (pos + size) >> PAGE_SHIFT;\n" - "+\t\tBUG_ON((pos + size) & ~PAGE_MASK);\n" - " \t\tdo {\n" - " \t\t\tpage = ntfs_map_page(vi->i_mapping, idx);\n" - " \t\t\tif (IS_ERR(page)) {\n" - "@@ -406,7 +406,7 @@ static int ntfs_check_and_load_restart_page(struct inode *vi,\n" - " \t\t\t\t\terr = -EIO;\n" - " \t\t\t\tgoto err_out;\n" - " \t\t\t}\n" - "-\t\t\tsize = min_t(int, to_read, PAGE_CACHE_SIZE);\n" - "+\t\t\tsize = min_t(int, to_read, PAGE_SIZE);\n" - " \t\t\tmemcpy((u8*)trp + have_read, page_address(page), size);\n" - " \t\t\tntfs_unmap_page(page);\n" - " \t\t\thave_read += size;\n" - "@@ -509,11 +509,11 @@ bool ntfs_check_logfile(struct inode *log_vi, RESTART_PAGE_HEADER **rp)\n" - " \t * log page size if the page cache size is between the default log page\n" - " \t * size and twice that.\n" - " \t */\n" - "-\tif (PAGE_CACHE_SIZE >= DefaultLogPageSize && PAGE_CACHE_SIZE <=\n" - "+\tif (PAGE_SIZE >= DefaultLogPageSize && PAGE_SIZE <=\n" - " \t\t\tDefaultLogPageSize * 2)\n" - " \t\tlog_page_size = DefaultLogPageSize;\n" - " \telse\n" - "-\t\tlog_page_size = PAGE_CACHE_SIZE;\n" - "+\t\tlog_page_size = PAGE_SIZE;\n" - " \tlog_page_mask = log_page_size - 1;\n" - " \t/*\n" - " \t * Use ntfs_ffs() instead of ffs() to enable the compiler to\n" - "@@ -539,7 +539,7 @@ bool ntfs_check_logfile(struct inode *log_vi, RESTART_PAGE_HEADER **rp)\n" - " \t * to be empty.\n" - " \t */\n" - " \tfor (pos = 0; pos < size; pos <<= 1) {\n" - "-\t\tpgoff_t idx = pos >> PAGE_CACHE_SHIFT;\n" - "+\t\tpgoff_t idx = pos >> PAGE_SHIFT;\n" - " \t\tif (!page || page->index != idx) {\n" - " \t\t\tif (page)\n" - " \t\t\t\tntfs_unmap_page(page);\n" - "@@ -550,7 +550,7 @@ bool ntfs_check_logfile(struct inode *log_vi, RESTART_PAGE_HEADER **rp)\n" - " \t\t\t\tgoto err_out;\n" - " \t\t\t}\n" - " \t\t}\n" - "-\t\tkaddr = (u8*)page_address(page) + (pos & ~PAGE_CACHE_MASK);\n" - "+\t\tkaddr = (u8*)page_address(page) + (pos & ~PAGE_MASK);\n" - " \t\t/*\n" - " \t\t * A non-empty block means the logfile is not empty while an\n" - " \t\t * empty block after a non-empty block has been encountered\n" - "diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c\n" - "index 3014a36a255b..37b2501caaa4 100644\n" - "--- a/fs/ntfs/mft.c\n" - "+++ b/fs/ntfs/mft.c\n" - "@@ -61,16 +61,16 @@ static inline MFT_RECORD *map_mft_record_page(ntfs_inode *ni)\n" - " \t * here if the volume was that big...\n" - " \t */\n" - " \tindex = (u64)ni->mft_no << vol->mft_record_size_bits >>\n" - "-\t\t\tPAGE_CACHE_SHIFT;\n" - "-\tofs = (ni->mft_no << vol->mft_record_size_bits) & ~PAGE_CACHE_MASK;\n" - "+\t\t\tPAGE_SHIFT;\n" - "+\tofs = (ni->mft_no << vol->mft_record_size_bits) & ~PAGE_MASK;\n" - " \n" - " \ti_size = i_size_read(mft_vi);\n" - " \t/* The maximum valid index into the page cache for $MFT's data. */\n" - "-\tend_index = i_size >> PAGE_CACHE_SHIFT;\n" - "+\tend_index = i_size >> PAGE_SHIFT;\n" - " \n" - " \t/* If the wanted index is out of bounds the mft record doesn't exist. */\n" - " \tif (unlikely(index >= end_index)) {\n" - "-\t\tif (index > end_index || (i_size & ~PAGE_CACHE_MASK) < ofs +\n" - "+\t\tif (index > end_index || (i_size & ~PAGE_MASK) < ofs +\n" - " \t\t\t\tvol->mft_record_size) {\n" - " \t\t\tpage = ERR_PTR(-ENOENT);\n" - " \t\t\tntfs_error(vol->sb, \"Attempt to read mft record 0x%lx, \"\n" - "@@ -487,7 +487,7 @@ int ntfs_sync_mft_mirror(ntfs_volume *vol, const unsigned long mft_no,\n" - " \t}\n" - " \t/* Get the page containing the mirror copy of the mft record @m. */\n" - " \tpage = ntfs_map_page(vol->mftmirr_ino->i_mapping, mft_no >>\n" - "-\t\t\t(PAGE_CACHE_SHIFT - vol->mft_record_size_bits));\n" - "+\t\t\t(PAGE_SHIFT - vol->mft_record_size_bits));\n" - " \tif (IS_ERR(page)) {\n" - " \t\tntfs_error(vol->sb, \"Failed to map mft mirror page.\");\n" - " \t\terr = PTR_ERR(page);\n" - "@@ -497,7 +497,7 @@ int ntfs_sync_mft_mirror(ntfs_volume *vol, const unsigned long mft_no,\n" - " \tBUG_ON(!PageUptodate(page));\n" - " \tClearPageUptodate(page);\n" - " \t/* Offset of the mft mirror record inside the page. */\n" - "-\tpage_ofs = (mft_no << vol->mft_record_size_bits) & ~PAGE_CACHE_MASK;\n" - "+\tpage_ofs = (mft_no << vol->mft_record_size_bits) & ~PAGE_MASK;\n" - " \t/* The address in the page of the mirror copy of the mft record @m. */\n" - " \tkmirr = page_address(page) + page_ofs;\n" - " \t/* Copy the mst protected mft record to the mirror. */\n" - "@@ -1178,8 +1178,8 @@ static int ntfs_mft_bitmap_find_and_alloc_free_rec_nolock(ntfs_volume *vol,\n" - " \tfor (; pass <= 2;) {\n" - " \t\t/* Cap size to pass_end. */\n" - " \t\tofs = data_pos >> 3;\n" - "-\t\tpage_ofs = ofs & ~PAGE_CACHE_MASK;\n" - "-\t\tsize = PAGE_CACHE_SIZE - page_ofs;\n" - "+\t\tpage_ofs = ofs & ~PAGE_MASK;\n" - "+\t\tsize = PAGE_SIZE - page_ofs;\n" - " \t\tll = ((pass_end + 7) >> 3) - ofs;\n" - " \t\tif (size > ll)\n" - " \t\t\tsize = ll;\n" - "@@ -1190,7 +1190,7 @@ static int ntfs_mft_bitmap_find_and_alloc_free_rec_nolock(ntfs_volume *vol,\n" - " \t\t */\n" - " \t\tif (size) {\n" - " \t\t\tpage = ntfs_map_page(mftbmp_mapping,\n" - "-\t\t\t\t\tofs >> PAGE_CACHE_SHIFT);\n" - "+\t\t\t\t\tofs >> PAGE_SHIFT);\n" - " \t\t\tif (IS_ERR(page)) {\n" - " \t\t\t\tntfs_error(vol->sb, \"Failed to read mft \"\n" - " \t\t\t\t\t\t\"bitmap, aborting.\");\n" - "@@ -1328,13 +1328,13 @@ static int ntfs_mft_bitmap_extend_allocation_nolock(ntfs_volume *vol)\n" - " \t */\n" - " \tll = lcn >> 3;\n" - " \tpage = ntfs_map_page(vol->lcnbmp_ino->i_mapping,\n" - "-\t\t\tll >> PAGE_CACHE_SHIFT);\n" - "+\t\t\tll >> PAGE_SHIFT);\n" - " \tif (IS_ERR(page)) {\n" - " \t\tup_write(&mftbmp_ni->runlist.lock);\n" - " \t\tntfs_error(vol->sb, \"Failed to read from lcn bitmap.\");\n" - " \t\treturn PTR_ERR(page);\n" - " \t}\n" - "-\tb = (u8*)page_address(page) + (ll & ~PAGE_CACHE_MASK);\n" - "+\tb = (u8*)page_address(page) + (ll & ~PAGE_MASK);\n" - " \ttb = 1 << (lcn & 7ull);\n" - " \tdown_write(&vol->lcnbmp_lock);\n" - " \tif (*b != 0xff && !(*b & tb)) {\n" - "@@ -2103,14 +2103,14 @@ static int ntfs_mft_record_format(const ntfs_volume *vol, const s64 mft_no)\n" - " \t * The index into the page cache and the offset within the page cache\n" - " \t * page of the wanted mft record.\n" - " \t */\n" - "-\tindex = mft_no << vol->mft_record_size_bits >> PAGE_CACHE_SHIFT;\n" - "-\tofs = (mft_no << vol->mft_record_size_bits) & ~PAGE_CACHE_MASK;\n" - "+\tindex = mft_no << vol->mft_record_size_bits >> PAGE_SHIFT;\n" - "+\tofs = (mft_no << vol->mft_record_size_bits) & ~PAGE_MASK;\n" - " \t/* The maximum valid index into the page cache for $MFT's data. */\n" - " \ti_size = i_size_read(mft_vi);\n" - "-\tend_index = i_size >> PAGE_CACHE_SHIFT;\n" - "+\tend_index = i_size >> PAGE_SHIFT;\n" - " \tif (unlikely(index >= end_index)) {\n" - " \t\tif (unlikely(index > end_index || ofs + vol->mft_record_size >=\n" - "-\t\t\t\t(i_size & ~PAGE_CACHE_MASK))) {\n" - "+\t\t\t\t(i_size & ~PAGE_MASK))) {\n" - " \t\t\tntfs_error(vol->sb, \"Tried to format non-existing mft \"\n" - " \t\t\t\t\t\"record 0x%llx.\", (long long)mft_no);\n" - " \t\t\treturn -ENOENT;\n" - "@@ -2515,8 +2515,8 @@ mft_rec_already_initialized:\n" - " \t * We now have allocated and initialized the mft record. Calculate the\n" - " \t * index of and the offset within the page cache page the record is in.\n" - " \t */\n" - "-\tindex = bit << vol->mft_record_size_bits >> PAGE_CACHE_SHIFT;\n" - "-\tofs = (bit << vol->mft_record_size_bits) & ~PAGE_CACHE_MASK;\n" - "+\tindex = bit << vol->mft_record_size_bits >> PAGE_SHIFT;\n" - "+\tofs = (bit << vol->mft_record_size_bits) & ~PAGE_MASK;\n" - " \t/* Read, map, and pin the page containing the mft record. */\n" - " \tpage = ntfs_map_page(vol->mft_ino->i_mapping, index);\n" - " \tif (IS_ERR(page)) {\n" - "diff --git a/fs/ntfs/ntfs.h b/fs/ntfs/ntfs.h\n" - "index c581e26a350d..12de47b96ca9 100644\n" - "--- a/fs/ntfs/ntfs.h\n" - "+++ b/fs/ntfs/ntfs.h\n" - "@@ -43,7 +43,7 @@ typedef enum {\n" - " \tNTFS_MAX_NAME_LEN\t= 255,\n" - " \tNTFS_MAX_ATTR_NAME_LEN\t= 255,\n" - " \tNTFS_MAX_CLUSTER_SIZE\t= 64 * 1024,\t/* 64kiB */\n" - "-\tNTFS_MAX_PAGES_PER_CLUSTER = NTFS_MAX_CLUSTER_SIZE / PAGE_CACHE_SIZE,\n" - "+\tNTFS_MAX_PAGES_PER_CLUSTER = NTFS_MAX_CLUSTER_SIZE / PAGE_SIZE,\n" - " } NTFS_CONSTANTS;\n" - " \n" - " /* Global variables. */\n" - "diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c\n" - "index 1b38abdaa3ed..ecb49870a680 100644\n" - "--- a/fs/ntfs/super.c\n" - "+++ b/fs/ntfs/super.c\n" - "@@ -823,14 +823,14 @@ static bool parse_ntfs_boot_sector(ntfs_volume *vol, const NTFS_BOOT_SECTOR *b)\n" - " \tntfs_debug(\"vol->mft_record_size_bits = %i (0x%x)\",\n" - " \t\t\tvol->mft_record_size_bits, vol->mft_record_size_bits);\n" - " \t/*\n" - "-\t * We cannot support mft record sizes above the PAGE_CACHE_SIZE since\n" - "+\t * We cannot support mft record sizes above the PAGE_SIZE since\n" - " \t * we store $MFT/$DATA, the table of mft records in the page cache.\n" - " \t */\n" - "-\tif (vol->mft_record_size > PAGE_CACHE_SIZE) {\n" - "+\tif (vol->mft_record_size > PAGE_SIZE) {\n" - " \t\tntfs_error(vol->sb, \"Mft record size (%i) exceeds the \"\n" - "-\t\t\t\t\"PAGE_CACHE_SIZE on your system (%lu). \"\n" - "+\t\t\t\t\"PAGE_SIZE on your system (%lu). \"\n" - " \t\t\t\t\"This is not supported. Sorry.\",\n" - "-\t\t\t\tvol->mft_record_size, PAGE_CACHE_SIZE);\n" - "+\t\t\t\tvol->mft_record_size, PAGE_SIZE);\n" - " \t\treturn false;\n" - " \t}\n" - " \t/* We cannot support mft record sizes below the sector size. */\n" - "@@ -1096,7 +1096,7 @@ static bool check_mft_mirror(ntfs_volume *vol)\n" - " \n" - " \tntfs_debug(\"Entering.\");\n" - " \t/* Compare contents of $MFT and $MFTMirr. */\n" - "-\tmrecs_per_page = PAGE_CACHE_SIZE / vol->mft_record_size;\n" - "+\tmrecs_per_page = PAGE_SIZE / vol->mft_record_size;\n" - " \tBUG_ON(!mrecs_per_page);\n" - " \tBUG_ON(!vol->mftmirr_size);\n" - " \tmft_page = mirr_page = NULL;\n" - "@@ -1615,20 +1615,20 @@ static bool load_and_init_attrdef(ntfs_volume *vol)\n" - " \tif (!vol->attrdef)\n" - " \t\tgoto iput_failed;\n" - " \tindex = 0;\n" - "-\tmax_index = i_size >> PAGE_CACHE_SHIFT;\n" - "-\tsize = PAGE_CACHE_SIZE;\n" - "+\tmax_index = i_size >> PAGE_SHIFT;\n" - "+\tsize = PAGE_SIZE;\n" - " \twhile (index < max_index) {\n" - " \t\t/* Read the attrdef table and copy it into the linear buffer. */\n" - " read_partial_attrdef_page:\n" - " \t\tpage = ntfs_map_page(ino->i_mapping, index);\n" - " \t\tif (IS_ERR(page))\n" - " \t\t\tgoto free_iput_failed;\n" - "-\t\tmemcpy((u8*)vol->attrdef + (index++ << PAGE_CACHE_SHIFT),\n" - "+\t\tmemcpy((u8*)vol->attrdef + (index++ << PAGE_SHIFT),\n" - " \t\t\t\tpage_address(page), size);\n" - " \t\tntfs_unmap_page(page);\n" - " \t};\n" - "-\tif (size == PAGE_CACHE_SIZE) {\n" - "-\t\tsize = i_size & ~PAGE_CACHE_MASK;\n" - "+\tif (size == PAGE_SIZE) {\n" - "+\t\tsize = i_size & ~PAGE_MASK;\n" - " \t\tif (size)\n" - " \t\t\tgoto read_partial_attrdef_page;\n" - " \t}\n" - "@@ -1684,20 +1684,20 @@ static bool load_and_init_upcase(ntfs_volume *vol)\n" - " \tif (!vol->upcase)\n" - " \t\tgoto iput_upcase_failed;\n" - " \tindex = 0;\n" - "-\tmax_index = i_size >> PAGE_CACHE_SHIFT;\n" - "-\tsize = PAGE_CACHE_SIZE;\n" - "+\tmax_index = i_size >> PAGE_SHIFT;\n" - "+\tsize = PAGE_SIZE;\n" - " \twhile (index < max_index) {\n" - " \t\t/* Read the upcase table and copy it into the linear buffer. */\n" - " read_partial_upcase_page:\n" - " \t\tpage = ntfs_map_page(ino->i_mapping, index);\n" - " \t\tif (IS_ERR(page))\n" - " \t\t\tgoto iput_upcase_failed;\n" - "-\t\tmemcpy((char*)vol->upcase + (index++ << PAGE_CACHE_SHIFT),\n" - "+\t\tmemcpy((char*)vol->upcase + (index++ << PAGE_SHIFT),\n" - " \t\t\t\tpage_address(page), size);\n" - " \t\tntfs_unmap_page(page);\n" - " \t};\n" - "-\tif (size == PAGE_CACHE_SIZE) {\n" - "-\t\tsize = i_size & ~PAGE_CACHE_MASK;\n" - "+\tif (size == PAGE_SIZE) {\n" - "+\t\tsize = i_size & ~PAGE_MASK;\n" - " \t\tif (size)\n" - " \t\t\tgoto read_partial_upcase_page;\n" - " \t}\n" - "@@ -2471,14 +2471,14 @@ static s64 get_nr_free_clusters(ntfs_volume *vol)\n" - " \tdown_read(&vol->lcnbmp_lock);\n" - " \t/*\n" - " \t * Convert the number of bits into bytes rounded up, then convert into\n" - "-\t * multiples of PAGE_CACHE_SIZE, rounding up so that if we have one\n" - "+\t * multiples of PAGE_SIZE, rounding up so that if we have one\n" - " \t * full and one partial page max_index = 2.\n" - " \t */\n" - "-\tmax_index = (((vol->nr_clusters + 7) >> 3) + PAGE_CACHE_SIZE - 1) >>\n" - "-\t\t\tPAGE_CACHE_SHIFT;\n" - "-\t/* Use multiples of 4 bytes, thus max_size is PAGE_CACHE_SIZE / 4. */\n" - "+\tmax_index = (((vol->nr_clusters + 7) >> 3) + PAGE_SIZE - 1) >>\n" - "+\t\t\tPAGE_SHIFT;\n" - "+\t/* Use multiples of 4 bytes, thus max_size is PAGE_SIZE / 4. */\n" - " \tntfs_debug(\"Reading $Bitmap, max_index = 0x%lx, max_size = 0x%lx.\",\n" - "-\t\t\tmax_index, PAGE_CACHE_SIZE / 4);\n" - "+\t\t\tmax_index, PAGE_SIZE / 4);\n" - " \tfor (index = 0; index < max_index; index++) {\n" - " \t\tunsigned long *kaddr;\n" - " \n" - "@@ -2491,7 +2491,7 @@ static s64 get_nr_free_clusters(ntfs_volume *vol)\n" - " \t\tif (IS_ERR(page)) {\n" - " \t\t\tntfs_debug(\"read_mapping_page() error. Skipping \"\n" - " \t\t\t\t\t\"page (index 0x%lx).\", index);\n" - "-\t\t\tnr_free -= PAGE_CACHE_SIZE * 8;\n" - "+\t\t\tnr_free -= PAGE_SIZE * 8;\n" - " \t\t\tcontinue;\n" - " \t\t}\n" - " \t\tkaddr = kmap_atomic(page);\n" - "@@ -2503,9 +2503,9 @@ static s64 get_nr_free_clusters(ntfs_volume *vol)\n" - " \t\t * ntfs_readpage().\n" - " \t\t */\n" - " \t\tnr_free -= bitmap_weight(kaddr,\n" - "-\t\t\t\t\tPAGE_CACHE_SIZE * BITS_PER_BYTE);\n" - "+\t\t\t\t\tPAGE_SIZE * BITS_PER_BYTE);\n" - " \t\tkunmap_atomic(kaddr);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \tntfs_debug(\"Finished reading $Bitmap, last index = 0x%lx.\", index - 1);\n" - " \t/*\n" - "@@ -2547,9 +2547,9 @@ static unsigned long __get_nr_free_mft_records(ntfs_volume *vol,\n" - " \tpgoff_t index;\n" - " \n" - " \tntfs_debug(\"Entering.\");\n" - "-\t/* Use multiples of 4 bytes, thus max_size is PAGE_CACHE_SIZE / 4. */\n" - "+\t/* Use multiples of 4 bytes, thus max_size is PAGE_SIZE / 4. */\n" - " \tntfs_debug(\"Reading $MFT/$BITMAP, max_index = 0x%lx, max_size = \"\n" - "-\t\t\t\"0x%lx.\", max_index, PAGE_CACHE_SIZE / 4);\n" - "+\t\t\t\"0x%lx.\", max_index, PAGE_SIZE / 4);\n" - " \tfor (index = 0; index < max_index; index++) {\n" - " \t\tunsigned long *kaddr;\n" - " \n" - "@@ -2562,7 +2562,7 @@ static unsigned long __get_nr_free_mft_records(ntfs_volume *vol,\n" - " \t\tif (IS_ERR(page)) {\n" - " \t\t\tntfs_debug(\"read_mapping_page() error. Skipping \"\n" - " \t\t\t\t\t\"page (index 0x%lx).\", index);\n" - "-\t\t\tnr_free -= PAGE_CACHE_SIZE * 8;\n" - "+\t\t\tnr_free -= PAGE_SIZE * 8;\n" - " \t\t\tcontinue;\n" - " \t\t}\n" - " \t\tkaddr = kmap_atomic(page);\n" - "@@ -2574,9 +2574,9 @@ static unsigned long __get_nr_free_mft_records(ntfs_volume *vol,\n" - " \t\t * ntfs_readpage().\n" - " \t\t */\n" - " \t\tnr_free -= bitmap_weight(kaddr,\n" - "-\t\t\t\t\tPAGE_CACHE_SIZE * BITS_PER_BYTE);\n" - "+\t\t\t\t\tPAGE_SIZE * BITS_PER_BYTE);\n" - " \t\tkunmap_atomic(kaddr);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \tntfs_debug(\"Finished reading $MFT/$BITMAP, last index = 0x%lx.\",\n" - " \t\t\tindex - 1);\n" - "@@ -2618,17 +2618,17 @@ static int ntfs_statfs(struct dentry *dentry, struct kstatfs *sfs)\n" - " \t/* Type of filesystem. */\n" - " \tsfs->f_type = NTFS_SB_MAGIC;\n" - " \t/* Optimal transfer block size. */\n" - "-\tsfs->f_bsize = PAGE_CACHE_SIZE;\n" - "+\tsfs->f_bsize = PAGE_SIZE;\n" - " \t/*\n" - " \t * Total data blocks in filesystem in units of f_bsize and since\n" - " \t * inodes are also stored in data blocs ($MFT is a file) this is just\n" - " \t * the total clusters.\n" - " \t */\n" - " \tsfs->f_blocks = vol->nr_clusters << vol->cluster_size_bits >>\n" - "-\t\t\t\tPAGE_CACHE_SHIFT;\n" - "+\t\t\t\tPAGE_SHIFT;\n" - " \t/* Free data blocks in filesystem in units of f_bsize. */\n" - " \tsize\t = get_nr_free_clusters(vol) << vol->cluster_size_bits >>\n" - "-\t\t\t\tPAGE_CACHE_SHIFT;\n" - "+\t\t\t\tPAGE_SHIFT;\n" - " \tif (size < 0LL)\n" - " \t\tsize = 0LL;\n" - " \t/* Free blocks avail to non-superuser, same as above on NTFS. */\n" - "@@ -2639,11 +2639,11 @@ static int ntfs_statfs(struct dentry *dentry, struct kstatfs *sfs)\n" - " \tsize = i_size_read(vol->mft_ino) >> vol->mft_record_size_bits;\n" - " \t/*\n" - " \t * Convert the maximum number of set bits into bytes rounded up, then\n" - "-\t * convert into multiples of PAGE_CACHE_SIZE, rounding up so that if we\n" - "+\t * convert into multiples of PAGE_SIZE, rounding up so that if we\n" - " \t * have one full and one partial page max_index = 2.\n" - " \t */\n" - " \tmax_index = ((((mft_ni->initialized_size >> vol->mft_record_size_bits)\n" - "-\t\t\t+ 7) >> 3) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "+\t\t\t+ 7) >> 3) + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \tread_unlock_irqrestore(&mft_ni->size_lock, flags);\n" - " \t/* Number of inodes in filesystem (at this point in time). */\n" - " \tsfs->f_files = size;\n" - "@@ -2765,15 +2765,15 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent)\n" - " \tif (!parse_options(vol, (char*)opt))\n" - " \t\tgoto err_out_now;\n" - " \n" - "-\t/* We support sector sizes up to the PAGE_CACHE_SIZE. */\n" - "-\tif (bdev_logical_block_size(sb->s_bdev) > PAGE_CACHE_SIZE) {\n" - "+\t/* We support sector sizes up to the PAGE_SIZE. */\n" - "+\tif (bdev_logical_block_size(sb->s_bdev) > PAGE_SIZE) {\n" - " \t\tif (!silent)\n" - " \t\t\tntfs_error(sb, \"Device has unsupported sector size \"\n" - " \t\t\t\t\t\"(%i). The maximum supported sector \"\n" - " \t\t\t\t\t\"size on this architecture is %lu \"\n" - " \t\t\t\t\t\"bytes.\",\n" - " \t\t\t\t\tbdev_logical_block_size(sb->s_bdev),\n" - "-\t\t\t\t\tPAGE_CACHE_SIZE);\n" - "+\t\t\t\t\tPAGE_SIZE);\n" - " \t\tgoto err_out_now;\n" - " \t}\n" - " \t/*\n" - "diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c\n" - "index d002579c6f2b..7b45d061096e 100644\n" - "--- a/fs/ocfs2/alloc.c\n" - "+++ b/fs/ocfs2/alloc.c\n" - "@@ -6648,7 +6648,7 @@ static void ocfs2_zero_cluster_pages(struct inode *inode, loff_t start,\n" - " {\n" - " \tint i;\n" - " \tstruct page *page;\n" - "-\tunsigned int from, to = PAGE_CACHE_SIZE;\n" - "+\tunsigned int from, to = PAGE_SIZE;\n" - " \tstruct super_block *sb = inode->i_sb;\n" - " \n" - " \tBUG_ON(!ocfs2_sparse_alloc(OCFS2_SB(sb)));\n" - "@@ -6656,21 +6656,21 @@ static void ocfs2_zero_cluster_pages(struct inode *inode, loff_t start,\n" - " \tif (numpages == 0)\n" - " \t\tgoto out;\n" - " \n" - "-\tto = PAGE_CACHE_SIZE;\n" - "+\tto = PAGE_SIZE;\n" - " \tfor(i = 0; i < numpages; i++) {\n" - " \t\tpage = pages[i];\n" - " \n" - "-\t\tfrom = start & (PAGE_CACHE_SIZE - 1);\n" - "-\t\tif ((end >> PAGE_CACHE_SHIFT) == page->index)\n" - "-\t\t\tto = end & (PAGE_CACHE_SIZE - 1);\n" - "+\t\tfrom = start & (PAGE_SIZE - 1);\n" - "+\t\tif ((end >> PAGE_SHIFT) == page->index)\n" - "+\t\t\tto = end & (PAGE_SIZE - 1);\n" - " \n" - "-\t\tBUG_ON(from > PAGE_CACHE_SIZE);\n" - "-\t\tBUG_ON(to > PAGE_CACHE_SIZE);\n" - "+\t\tBUG_ON(from > PAGE_SIZE);\n" - "+\t\tBUG_ON(to > PAGE_SIZE);\n" - " \n" - " \t\tocfs2_map_and_dirty_page(inode, handle, from, to, page, 1,\n" - " \t\t\t\t\t &phys);\n" - " \n" - "-\t\tstart = (page->index + 1) << PAGE_CACHE_SHIFT;\n" - "+\t\tstart = (page->index + 1) << PAGE_SHIFT;\n" - " \t}\n" - " out:\n" - " \tif (pages)\n" - "@@ -6689,7 +6689,7 @@ int ocfs2_grab_pages(struct inode *inode, loff_t start, loff_t end,\n" - " \n" - " \tnumpages = 0;\n" - " \tlast_page_bytes = PAGE_ALIGN(end);\n" - "-\tindex = start >> PAGE_CACHE_SHIFT;\n" - "+\tindex = start >> PAGE_SHIFT;\n" - " \tdo {\n" - " \t\tpages[numpages] = find_or_create_page(mapping, index, GFP_NOFS);\n" - " \t\tif (!pages[numpages]) {\n" - "@@ -6700,7 +6700,7 @@ int ocfs2_grab_pages(struct inode *inode, loff_t start, loff_t end,\n" - " \n" - " \t\tnumpages++;\n" - " \t\tindex++;\n" - "-\t} while (index < (last_page_bytes >> PAGE_CACHE_SHIFT));\n" - "+\t} while (index < (last_page_bytes >> PAGE_SHIFT));\n" - " \n" - " out:\n" - " \tif (ret != 0) {\n" - "@@ -6927,8 +6927,8 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,\n" - " \t\t * to do that now.\n" - " \t\t */\n" - " \t\tif (!ocfs2_sparse_alloc(osb) &&\n" - "-\t\t PAGE_CACHE_SIZE < osb->s_clustersize)\n" - "-\t\t\tend = PAGE_CACHE_SIZE;\n" - "+\t\t PAGE_SIZE < osb->s_clustersize)\n" - "+\t\t\tend = PAGE_SIZE;\n" - " \n" - " \t\tret = ocfs2_grab_eof_pages(inode, 0, end, pages, &num_pages);\n" - " \t\tif (ret) {\n" - "@@ -6948,8 +6948,8 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,\n" - " \t\t\tgoto out_unlock;\n" - " \t\t}\n" - " \n" - "-\t\tpage_end = PAGE_CACHE_SIZE;\n" - "-\t\tif (PAGE_CACHE_SIZE > osb->s_clustersize)\n" - "+\t\tpage_end = PAGE_SIZE;\n" - "+\t\tif (PAGE_SIZE > osb->s_clustersize)\n" - " \t\t\tpage_end = osb->s_clustersize;\n" - " \n" - " \t\tfor (i = 0; i < num_pages; i++)\n" - "diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c\n" - "index cda0361e95a4..af9298370d98 100644\n" - "--- a/fs/ocfs2/aops.c\n" - "+++ b/fs/ocfs2/aops.c\n" - "@@ -234,7 +234,7 @@ int ocfs2_read_inline_data(struct inode *inode, struct page *page,\n" - " \n" - " \tsize = i_size_read(inode);\n" - " \n" - "-\tif (size > PAGE_CACHE_SIZE ||\n" - "+\tif (size > PAGE_SIZE ||\n" - " \t size > ocfs2_max_inline_data_with_xattr(inode->i_sb, di)) {\n" - " \t\tocfs2_error(inode->i_sb,\n" - " \t\t\t \"Inode %llu has with inline data has bad size: %Lu\\n\",\n" - "@@ -247,7 +247,7 @@ int ocfs2_read_inline_data(struct inode *inode, struct page *page,\n" - " \tif (size)\n" - " \t\tmemcpy(kaddr, di->id2.i_data.id_data, size);\n" - " \t/* Clear the remaining part of the page */\n" - "-\tmemset(kaddr + size, 0, PAGE_CACHE_SIZE - size);\n" - "+\tmemset(kaddr + size, 0, PAGE_SIZE - size);\n" - " \tflush_dcache_page(page);\n" - " \tkunmap_atomic(kaddr);\n" - " \n" - "@@ -282,7 +282,7 @@ static int ocfs2_readpage(struct file *file, struct page *page)\n" - " {\n" - " \tstruct inode *inode = page->mapping->host;\n" - " \tstruct ocfs2_inode_info *oi = OCFS2_I(inode);\n" - "-\tloff_t start = (loff_t)page->index << PAGE_CACHE_SHIFT;\n" - "+\tloff_t start = (loff_t)page->index << PAGE_SHIFT;\n" - " \tint ret, unlock = 1;\n" - " \n" - " \ttrace_ocfs2_readpage((unsigned long long)oi->ip_blkno,\n" - "@@ -385,7 +385,7 @@ static int ocfs2_readpages(struct file *filp, struct address_space *mapping,\n" - " \t * drop out in that case as it's not worth handling here.\n" - " \t */\n" - " \tlast = list_entry(pages->prev, struct page, lru);\n" - "-\tstart = (loff_t)last->index << PAGE_CACHE_SHIFT;\n" - "+\tstart = (loff_t)last->index << PAGE_SHIFT;\n" - " \tif (start >= i_size_read(inode))\n" - " \t\tgoto out_unlock;\n" - " \n" - "@@ -1015,12 +1015,12 @@ static void ocfs2_figure_cluster_boundaries(struct ocfs2_super *osb,\n" - " \t\t\t\t\t unsigned int *start,\n" - " \t\t\t\t\t unsigned int *end)\n" - " {\n" - "-\tunsigned int cluster_start = 0, cluster_end = PAGE_CACHE_SIZE;\n" - "+\tunsigned int cluster_start = 0, cluster_end = PAGE_SIZE;\n" - " \n" - "-\tif (unlikely(PAGE_CACHE_SHIFT > osb->s_clustersize_bits)) {\n" - "+\tif (unlikely(PAGE_SHIFT > osb->s_clustersize_bits)) {\n" - " \t\tunsigned int cpp;\n" - " \n" - "-\t\tcpp = 1 << (PAGE_CACHE_SHIFT - osb->s_clustersize_bits);\n" - "+\t\tcpp = 1 << (PAGE_SHIFT - osb->s_clustersize_bits);\n" - " \n" - " \t\tcluster_start = cpos % cpp;\n" - " \t\tcluster_start = cluster_start << osb->s_clustersize_bits;\n" - "@@ -1188,13 +1188,13 @@ next_bh:\n" - " \treturn ret;\n" - " }\n" - " \n" - "-#if (PAGE_CACHE_SIZE >= OCFS2_MAX_CLUSTERSIZE)\n" - "+#if (PAGE_SIZE >= OCFS2_MAX_CLUSTERSIZE)\n" - " #define OCFS2_MAX_CTXT_PAGES\t1\n" - " #else\n" - "-#define OCFS2_MAX_CTXT_PAGES\t(OCFS2_MAX_CLUSTERSIZE / PAGE_CACHE_SIZE)\n" - "+#define OCFS2_MAX_CTXT_PAGES\t(OCFS2_MAX_CLUSTERSIZE / PAGE_SIZE)\n" - " #endif\n" - " \n" - "-#define OCFS2_MAX_CLUSTERS_PER_PAGE\t(PAGE_CACHE_SIZE / OCFS2_MIN_CLUSTERSIZE)\n" - "+#define OCFS2_MAX_CLUSTERS_PER_PAGE\t(PAGE_SIZE / OCFS2_MIN_CLUSTERSIZE)\n" - " \n" - " /*\n" - " * Describe the state of a single cluster to be written to.\n" - "@@ -1277,7 +1277,7 @@ void ocfs2_unlock_and_free_pages(struct page **pages, int num_pages)\n" - " \t\tif (pages[i]) {\n" - " \t\t\tunlock_page(pages[i]);\n" - " \t\t\tmark_page_accessed(pages[i]);\n" - "-\t\t\tpage_cache_release(pages[i]);\n" - "+\t\t\tput_page(pages[i]);\n" - " \t\t}\n" - " \t}\n" - " }\n" - "@@ -1300,7 +1300,7 @@ static void ocfs2_unlock_pages(struct ocfs2_write_ctxt *wc)\n" - " \t\t\t}\n" - " \t\t}\n" - " \t\tmark_page_accessed(wc->w_target_page);\n" - "-\t\tpage_cache_release(wc->w_target_page);\n" - "+\t\tput_page(wc->w_target_page);\n" - " \t}\n" - " \tocfs2_unlock_and_free_pages(wc->w_pages, wc->w_num_pages);\n" - " }\n" - "@@ -1330,7 +1330,7 @@ static int ocfs2_alloc_write_ctxt(struct ocfs2_write_ctxt **wcp,\n" - " \tget_bh(di_bh);\n" - " \twc->w_di_bh = di_bh;\n" - " \n" - "-\tif (unlikely(PAGE_CACHE_SHIFT > osb->s_clustersize_bits))\n" - "+\tif (unlikely(PAGE_SHIFT > osb->s_clustersize_bits))\n" - " \t\twc->w_large_pages = 1;\n" - " \telse\n" - " \t\twc->w_large_pages = 0;\n" - "@@ -1392,7 +1392,7 @@ static void ocfs2_write_failure(struct inode *inode,\n" - " \t\t\t\tloff_t user_pos, unsigned user_len)\n" - " {\n" - " \tint i;\n" - "-\tunsigned from = user_pos & (PAGE_CACHE_SIZE - 1),\n" - "+\tunsigned from = user_pos & (PAGE_SIZE - 1),\n" - " \t\tto = user_pos + user_len;\n" - " \tstruct page *tmppage;\n" - " \n" - "@@ -1431,7 +1431,7 @@ static int ocfs2_prepare_page_for_write(struct inode *inode, u64 *p_blkno,\n" - " \t\t\t(page_offset(page) <= user_pos));\n" - " \n" - " \tif (page == wc->w_target_page) {\n" - "-\t\tmap_from = user_pos & (PAGE_CACHE_SIZE - 1);\n" - "+\t\tmap_from = user_pos & (PAGE_SIZE - 1);\n" - " \t\tmap_to = map_from + user_len;\n" - " \n" - " \t\tif (new)\n" - "@@ -1505,7 +1505,7 @@ static int ocfs2_grab_pages_for_write(struct address_space *mapping,\n" - " \tstruct inode *inode = mapping->host;\n" - " \tloff_t last_byte;\n" - " \n" - "-\ttarget_index = user_pos >> PAGE_CACHE_SHIFT;\n" - "+\ttarget_index = user_pos >> PAGE_SHIFT;\n" - " \n" - " \t/*\n" - " \t * Figure out how many pages we'll be manipulating here. For\n" - "@@ -1524,7 +1524,7 @@ static int ocfs2_grab_pages_for_write(struct address_space *mapping,\n" - " \t\t */\n" - " \t\tlast_byte = max(user_pos + user_len, i_size_read(inode));\n" - " \t\tBUG_ON(last_byte < 1);\n" - "-\t\tend_index = ((last_byte - 1) >> PAGE_CACHE_SHIFT) + 1;\n" - "+\t\tend_index = ((last_byte - 1) >> PAGE_SHIFT) + 1;\n" - " \t\tif ((start + wc->w_num_pages) > end_index)\n" - " \t\t\twc->w_num_pages = end_index - start;\n" - " \t} else {\n" - "@@ -1551,7 +1551,7 @@ static int ocfs2_grab_pages_for_write(struct address_space *mapping,\n" - " \t\t\t\tgoto out;\n" - " \t\t\t}\n" - " \n" - "-\t\t\tpage_cache_get(mmap_page);\n" - "+\t\t\tget_page(mmap_page);\n" - " \t\t\twc->w_pages[i] = mmap_page;\n" - " \t\t\twc->w_target_locked = true;\n" - " \t\t} else {\n" - "@@ -1731,7 +1731,7 @@ static void ocfs2_set_target_boundaries(struct ocfs2_super *osb,\n" - " {\n" - " \tstruct ocfs2_write_cluster_desc *desc;\n" - " \n" - "-\twc->w_target_from = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\twc->w_target_from = pos & (PAGE_SIZE - 1);\n" - " \twc->w_target_to = wc->w_target_from + len;\n" - " \n" - " \tif (alloc == 0)\n" - "@@ -1768,7 +1768,7 @@ static void ocfs2_set_target_boundaries(struct ocfs2_super *osb,\n" - " \t\t\t\t\t\t\t&wc->w_target_to);\n" - " \t} else {\n" - " \t\twc->w_target_from = 0;\n" - "-\t\twc->w_target_to = PAGE_CACHE_SIZE;\n" - "+\t\twc->w_target_to = PAGE_SIZE;\n" - " \t}\n" - " }\n" - " \n" - "@@ -2368,7 +2368,7 @@ int ocfs2_write_end_nolock(struct address_space *mapping,\n" - " \t\t\t struct page *page, void *fsdata)\n" - " {\n" - " \tint i, ret;\n" - "-\tunsigned from, to, start = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tunsigned from, to, start = pos & (PAGE_SIZE - 1);\n" - " \tstruct inode *inode = mapping->host;\n" - " \tstruct ocfs2_super *osb = OCFS2_SB(inode->i_sb);\n" - " \tstruct ocfs2_write_ctxt *wc = fsdata;\n" - "@@ -2405,8 +2405,8 @@ int ocfs2_write_end_nolock(struct address_space *mapping,\n" - " \t\t\tfrom = wc->w_target_from;\n" - " \t\t\tto = wc->w_target_to;\n" - " \n" - "-\t\t\tBUG_ON(from > PAGE_CACHE_SIZE ||\n" - "-\t\t\t to > PAGE_CACHE_SIZE ||\n" - "+\t\t\tBUG_ON(from > PAGE_SIZE ||\n" - "+\t\t\t to > PAGE_SIZE ||\n" - " \t\t\t to < from);\n" - " \t\t} else {\n" - " \t\t\t/*\n" - "@@ -2415,7 +2415,7 @@ int ocfs2_write_end_nolock(struct address_space *mapping,\n" - " \t\t\t * to flush their entire range.\n" - " \t\t\t */\n" - " \t\t\tfrom = 0;\n" - "-\t\t\tto = PAGE_CACHE_SIZE;\n" - "+\t\t\tto = PAGE_SIZE;\n" - " \t\t}\n" - " \n" - " \t\tif (page_has_buffers(tmppage)) {\n" - "diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c\n" - "index ef6a2ec494de..2c85f5330e12 100644\n" - "--- a/fs/ocfs2/cluster/heartbeat.c\n" - "+++ b/fs/ocfs2/cluster/heartbeat.c\n" - "@@ -417,13 +417,13 @@ static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg,\n" - " \tbio->bi_private = wc;\n" - " \tbio->bi_end_io = o2hb_bio_end_io;\n" - " \n" - "-\tvec_start = (cs << bits) % PAGE_CACHE_SIZE;\n" - "+\tvec_start = (cs << bits) % PAGE_SIZE;\n" - " \twhile(cs < max_slots) {\n" - " \t\tcurrent_page = cs / spp;\n" - " \t\tpage = reg->hr_slot_data[current_page];\n" - " \n" - "-\t\tvec_len = min(PAGE_CACHE_SIZE - vec_start,\n" - "-\t\t\t (max_slots-cs) * (PAGE_CACHE_SIZE/spp) );\n" - "+\t\tvec_len = min(PAGE_SIZE - vec_start,\n" - "+\t\t\t (max_slots-cs) * (PAGE_SIZE/spp) );\n" - " \n" - " \t\tmlog(ML_HB_BIO, \"page %d, vec_len = %u, vec_start = %u\\n\",\n" - " \t\t current_page, vec_len, vec_start);\n" - "@@ -431,7 +431,7 @@ static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg,\n" - " \t\tlen = bio_add_page(bio, page, vec_len, vec_start);\n" - " \t\tif (len != vec_len) break;\n" - " \n" - "-\t\tcs += vec_len / (PAGE_CACHE_SIZE/spp);\n" - "+\t\tcs += vec_len / (PAGE_SIZE/spp);\n" - " \t\tvec_start = 0;\n" - " \t}\n" - " \n" - "@@ -1576,7 +1576,7 @@ static ssize_t o2hb_region_dev_show(struct config_item *item, char *page)\n" - " \n" - " static void o2hb_init_region_params(struct o2hb_region *reg)\n" - " {\n" - "-\treg->hr_slots_per_page = PAGE_CACHE_SIZE >> reg->hr_block_bits;\n" - "+\treg->hr_slots_per_page = PAGE_SIZE >> reg->hr_block_bits;\n" - " \treg->hr_timeout_ms = O2HB_REGION_TIMEOUT_MS;\n" - " \n" - " \tmlog(ML_HEARTBEAT, \"hr_start_block = %llu, hr_blocks = %u\\n\",\n" - "diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c\n" - "index 03768bb3aab1..47b3b2d4e775 100644\n" - "--- a/fs/ocfs2/dlmfs/dlmfs.c\n" - "+++ b/fs/ocfs2/dlmfs/dlmfs.c\n" - "@@ -571,8 +571,8 @@ static int dlmfs_fill_super(struct super_block * sb,\n" - " \t\t\t int silent)\n" - " {\n" - " \tsb->s_maxbytes = MAX_LFS_FILESIZE;\n" - "-\tsb->s_blocksize = PAGE_CACHE_SIZE;\n" - "-\tsb->s_blocksize_bits = PAGE_CACHE_SHIFT;\n" - "+\tsb->s_blocksize = PAGE_SIZE;\n" - "+\tsb->s_blocksize_bits = PAGE_SHIFT;\n" - " \tsb->s_magic = DLMFS_MAGIC;\n" - " \tsb->s_op = &dlmfs_ops;\n" - " \tsb->s_root = d_make_root(dlmfs_get_root_inode(sb));\n" - "diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c\n" - "index 7cb38fdca229..32e19a63a4fa 100644\n" - "--- a/fs/ocfs2/file.c\n" - "+++ b/fs/ocfs2/file.c\n" - "@@ -770,14 +770,14 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,\n" - " {\n" - " \tstruct address_space *mapping = inode->i_mapping;\n" - " \tstruct page *page;\n" - "-\tunsigned long index = abs_from >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long index = abs_from >> PAGE_SHIFT;\n" - " \thandle_t *handle;\n" - " \tint ret = 0;\n" - " \tunsigned zero_from, zero_to, block_start, block_end;\n" - " \tstruct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;\n" - " \n" - " \tBUG_ON(abs_from >= abs_to);\n" - "-\tBUG_ON(abs_to > (((u64)index + 1) << PAGE_CACHE_SHIFT));\n" - "+\tBUG_ON(abs_to > (((u64)index + 1) << PAGE_SHIFT));\n" - " \tBUG_ON(abs_from & (inode->i_blkbits - 1));\n" - " \n" - " \thandle = ocfs2_zero_start_ordered_transaction(inode, di_bh);\n" - "@@ -794,10 +794,10 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,\n" - " \t}\n" - " \n" - " \t/* Get the offsets within the page that we want to zero */\n" - "-\tzero_from = abs_from & (PAGE_CACHE_SIZE - 1);\n" - "-\tzero_to = abs_to & (PAGE_CACHE_SIZE - 1);\n" - "+\tzero_from = abs_from & (PAGE_SIZE - 1);\n" - "+\tzero_to = abs_to & (PAGE_SIZE - 1);\n" - " \tif (!zero_to)\n" - "-\t\tzero_to = PAGE_CACHE_SIZE;\n" - "+\t\tzero_to = PAGE_SIZE;\n" - " \n" - " \ttrace_ocfs2_write_zero_page(\n" - " \t\t\t(unsigned long long)OCFS2_I(inode)->ip_blkno,\n" - "@@ -851,7 +851,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,\n" - " \n" - " out_unlock:\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " out_commit_trans:\n" - " \tif (handle)\n" - " \t\tocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);\n" - "@@ -959,7 +959,7 @@ static int ocfs2_zero_extend_range(struct inode *inode, u64 range_start,\n" - " \tBUG_ON(range_start >= range_end);\n" - " \n" - " \twhile (zero_pos < range_end) {\n" - "-\t\tnext_pos = (zero_pos & PAGE_CACHE_MASK) + PAGE_CACHE_SIZE;\n" - "+\t\tnext_pos = (zero_pos & PAGE_MASK) + PAGE_SIZE;\n" - " \t\tif (next_pos > range_end)\n" - " \t\t\tnext_pos = range_end;\n" - " \t\trc = ocfs2_write_zero_page(inode, zero_pos, next_pos, di_bh);\n" - "diff --git a/fs/ocfs2/mmap.c b/fs/ocfs2/mmap.c\n" - "index 77ebc2bc1cca..872e6800267f 100644\n" - "--- a/fs/ocfs2/mmap.c\n" - "+++ b/fs/ocfs2/mmap.c\n" - "@@ -65,13 +65,13 @@ static int __ocfs2_page_mkwrite(struct file *file, struct buffer_head *di_bh,\n" - " \tstruct inode *inode = file_inode(file);\n" - " \tstruct address_space *mapping = inode->i_mapping;\n" - " \tloff_t pos = page_offset(page);\n" - "-\tunsigned int len = PAGE_CACHE_SIZE;\n" - "+\tunsigned int len = PAGE_SIZE;\n" - " \tpgoff_t last_index;\n" - " \tstruct page *locked_page = NULL;\n" - " \tvoid *fsdata;\n" - " \tloff_t size = i_size_read(inode);\n" - " \n" - "-\tlast_index = (size - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tlast_index = (size - 1) >> PAGE_SHIFT;\n" - " \n" - " \t/*\n" - " \t * There are cases that lead to the page no longer bebongs to the\n" - "@@ -102,7 +102,7 @@ static int __ocfs2_page_mkwrite(struct file *file, struct buffer_head *di_bh,\n" - " \t * because the \"write\" would invalidate their data.\n" - " \t */\n" - " \tif (page->index == last_index)\n" - "-\t\tlen = ((size - 1) & ~PAGE_CACHE_MASK) + 1;\n" - "+\t\tlen = ((size - 1) & ~PAGE_MASK) + 1;\n" - " \n" - " \tret = ocfs2_write_begin_nolock(file, mapping, pos, len, 0, &locked_page,\n" - " \t\t\t\t &fsdata, di_bh, page);\n" - "diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h\n" - "index 7a0126267847..7a592877c33b 100644\n" - "--- a/fs/ocfs2/ocfs2.h\n" - "+++ b/fs/ocfs2/ocfs2.h\n" - "@@ -814,10 +814,10 @@ static inline unsigned int ocfs2_page_index_to_clusters(struct super_block *sb,\n" - " \tu32 clusters = pg_index;\n" - " \tunsigned int cbits = OCFS2_SB(sb)->s_clustersize_bits;\n" - " \n" - "-\tif (unlikely(PAGE_CACHE_SHIFT > cbits))\n" - "-\t\tclusters = pg_index << (PAGE_CACHE_SHIFT - cbits);\n" - "-\telse if (PAGE_CACHE_SHIFT < cbits)\n" - "-\t\tclusters = pg_index >> (cbits - PAGE_CACHE_SHIFT);\n" - "+\tif (unlikely(PAGE_SHIFT > cbits))\n" - "+\t\tclusters = pg_index << (PAGE_SHIFT - cbits);\n" - "+\telse if (PAGE_SHIFT < cbits)\n" - "+\t\tclusters = pg_index >> (cbits - PAGE_SHIFT);\n" - " \n" - " \treturn clusters;\n" - " }\n" - "@@ -831,10 +831,10 @@ static inline pgoff_t ocfs2_align_clusters_to_page_index(struct super_block *sb,\n" - " \tunsigned int cbits = OCFS2_SB(sb)->s_clustersize_bits;\n" - " pgoff_t index = clusters;\n" - " \n" - "-\tif (PAGE_CACHE_SHIFT > cbits) {\n" - "-\t\tindex = (pgoff_t)clusters >> (PAGE_CACHE_SHIFT - cbits);\n" - "-\t} else if (PAGE_CACHE_SHIFT < cbits) {\n" - "-\t\tindex = (pgoff_t)clusters << (cbits - PAGE_CACHE_SHIFT);\n" - "+\tif (PAGE_SHIFT > cbits) {\n" - "+\t\tindex = (pgoff_t)clusters >> (PAGE_SHIFT - cbits);\n" - "+\t} else if (PAGE_SHIFT < cbits) {\n" - "+\t\tindex = (pgoff_t)clusters << (cbits - PAGE_SHIFT);\n" - " \t}\n" - " \n" - " \treturn index;\n" - "@@ -845,8 +845,8 @@ static inline unsigned int ocfs2_pages_per_cluster(struct super_block *sb)\n" - " \tunsigned int cbits = OCFS2_SB(sb)->s_clustersize_bits;\n" - " \tunsigned int pages_per_cluster = 1;\n" - " \n" - "-\tif (PAGE_CACHE_SHIFT < cbits)\n" - "-\t\tpages_per_cluster = 1 << (cbits - PAGE_CACHE_SHIFT);\n" - "+\tif (PAGE_SHIFT < cbits)\n" - "+\t\tpages_per_cluster = 1 << (cbits - PAGE_SHIFT);\n" - " \n" - " \treturn pages_per_cluster;\n" - " }\n" - "diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c\n" - "index 3eff031aaf26..744d5d90c363 100644\n" - "--- a/fs/ocfs2/refcounttree.c\n" - "+++ b/fs/ocfs2/refcounttree.c\n" - "@@ -2937,16 +2937,16 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle,\n" - " \t\tend = i_size_read(inode);\n" - " \n" - " \twhile (offset < end) {\n" - "-\t\tpage_index = offset >> PAGE_CACHE_SHIFT;\n" - "-\t\tmap_end = ((loff_t)page_index + 1) << PAGE_CACHE_SHIFT;\n" - "+\t\tpage_index = offset >> PAGE_SHIFT;\n" - "+\t\tmap_end = ((loff_t)page_index + 1) << PAGE_SHIFT;\n" - " \t\tif (map_end > end)\n" - " \t\t\tmap_end = end;\n" - " \n" - " \t\t/* from, to is the offset within the page. */\n" - "-\t\tfrom = offset & (PAGE_CACHE_SIZE - 1);\n" - "-\t\tto = PAGE_CACHE_SIZE;\n" - "-\t\tif (map_end & (PAGE_CACHE_SIZE - 1))\n" - "-\t\t\tto = map_end & (PAGE_CACHE_SIZE - 1);\n" - "+\t\tfrom = offset & (PAGE_SIZE - 1);\n" - "+\t\tto = PAGE_SIZE;\n" - "+\t\tif (map_end & (PAGE_SIZE - 1))\n" - "+\t\t\tto = map_end & (PAGE_SIZE - 1);\n" - " \n" - " \t\tpage = find_or_create_page(mapping, page_index, GFP_NOFS);\n" - " \t\tif (!page) {\n" - "@@ -2956,10 +2956,10 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle,\n" - " \t\t}\n" - " \n" - " \t\t/*\n" - "-\t\t * In case PAGE_CACHE_SIZE <= CLUSTER_SIZE, This page\n" - "+\t\t * In case PAGE_SIZE <= CLUSTER_SIZE, This page\n" - " \t\t * can't be dirtied before we CoW it out.\n" - " \t\t */\n" - "-\t\tif (PAGE_CACHE_SIZE <= OCFS2_SB(sb)->s_clustersize)\n" - "+\t\tif (PAGE_SIZE <= OCFS2_SB(sb)->s_clustersize)\n" - " \t\t\tBUG_ON(PageDirty(page));\n" - " \n" - " \t\tif (!PageUptodate(page)) {\n" - "@@ -2987,7 +2987,7 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle,\n" - " \t\tmark_page_accessed(page);\n" - " unlock:\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tpage = NULL;\n" - " \t\toffset = map_end;\n" - " \t\tif (ret)\n" - "@@ -3165,8 +3165,8 @@ int ocfs2_cow_sync_writeback(struct super_block *sb,\n" - " \t}\n" - " \n" - " \twhile (offset < end) {\n" - "-\t\tpage_index = offset >> PAGE_CACHE_SHIFT;\n" - "-\t\tmap_end = ((loff_t)page_index + 1) << PAGE_CACHE_SHIFT;\n" - "+\t\tpage_index = offset >> PAGE_SHIFT;\n" - "+\t\tmap_end = ((loff_t)page_index + 1) << PAGE_SHIFT;\n" - " \t\tif (map_end > end)\n" - " \t\t\tmap_end = end;\n" - " \n" - "@@ -3182,7 +3182,7 @@ int ocfs2_cow_sync_writeback(struct super_block *sb,\n" - " \t\t\tmark_page_accessed(page);\n" - " \n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tpage = NULL;\n" - " \t\toffset = map_end;\n" - " \t\tif (ret)\n" - "diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c\n" - "index 302854ee0985..455155ca742e 100644\n" - "--- a/fs/ocfs2/super.c\n" - "+++ b/fs/ocfs2/super.c\n" - "@@ -610,8 +610,8 @@ static unsigned long long ocfs2_max_file_offset(unsigned int bbits,\n" - " \t/*\n" - " \t * We might be limited by page cache size.\n" - " \t */\n" - "-\tif (bytes > PAGE_CACHE_SIZE) {\n" - "-\t\tbytes = PAGE_CACHE_SIZE;\n" - "+\tif (bytes > PAGE_SIZE) {\n" - "+\t\tbytes = PAGE_SIZE;\n" - " \t\ttrim = 1;\n" - " \t\t/*\n" - " \t\t * Shift by 31 here so that we don't get larger than\n" - "diff --git a/fs/pipe.c b/fs/pipe.c\n" - "index ab8dad3ccb6a..0d3f5165cb0b 100644\n" - "--- a/fs/pipe.c\n" - "+++ b/fs/pipe.c\n" - "@@ -134,7 +134,7 @@ static void anon_pipe_buf_release(struct pipe_inode_info *pipe,\n" - " \tif (page_count(page) == 1 && !pipe->tmp_page)\n" - " \t\tpipe->tmp_page = page;\n" - " \telse\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " }\n" - " \n" - " /**\n" - "@@ -180,7 +180,7 @@ EXPORT_SYMBOL(generic_pipe_buf_steal);\n" - " */\n" - " void generic_pipe_buf_get(struct pipe_inode_info *pipe, struct pipe_buffer *buf)\n" - " {\n" - "-\tpage_cache_get(buf->page);\n" - "+\tget_page(buf->page);\n" - " }\n" - " EXPORT_SYMBOL(generic_pipe_buf_get);\n" - " \n" - "@@ -211,7 +211,7 @@ EXPORT_SYMBOL(generic_pipe_buf_confirm);\n" - " void generic_pipe_buf_release(struct pipe_inode_info *pipe,\n" - " \t\t\t struct pipe_buffer *buf)\n" - " {\n" - "-\tpage_cache_release(buf->page);\n" - "+\tput_page(buf->page);\n" - " }\n" - " EXPORT_SYMBOL(generic_pipe_buf_release);\n" - " \n" - "diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c\n" - "index fa95ab2d3674..31ebd7a0f8b8 100644\n" - "--- a/fs/proc/task_mmu.c\n" - "+++ b/fs/proc/task_mmu.c\n" - "@@ -553,7 +553,7 @@ static void smaps_pte_entry(pte_t *pte, unsigned long addr,\n" - " \t\tif (radix_tree_exceptional_entry(page))\n" - " \t\t\tmss->swap += PAGE_SIZE;\n" - " \t\telse\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \n" - " \t\treturn;\n" - " \t}\n" - "diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c\n" - "index 55bb57e6a30d..8afe10cf7df8 100644\n" - "--- a/fs/proc/vmcore.c\n" - "+++ b/fs/proc/vmcore.c\n" - "@@ -279,12 +279,12 @@ static int mmap_vmcore_fault(struct vm_area_struct *vma, struct vm_fault *vmf)\n" - " \tif (!page)\n" - " \t\treturn VM_FAULT_OOM;\n" - " \tif (!PageUptodate(page)) {\n" - "-\t\toffset = (loff_t) index << PAGE_CACHE_SHIFT;\n" - "+\t\toffset = (loff_t) index << PAGE_SHIFT;\n" - " \t\tbuf = __va((page_to_pfn(page) << PAGE_SHIFT));\n" - " \t\trc = __read_vmcore(buf, PAGE_SIZE, &offset, 0);\n" - " \t\tif (rc < 0) {\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\treturn (rc == -ENOMEM) ? VM_FAULT_OOM : VM_FAULT_SIGBUS;\n" - " \t\t}\n" - " \t\tSetPageUptodate(page);\n" - "diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c\n" - "index dc645b66cd79..45d6110744cb 100644\n" - "--- a/fs/pstore/inode.c\n" - "+++ b/fs/pstore/inode.c\n" - "@@ -420,8 +420,8 @@ static int pstore_fill_super(struct super_block *sb, void *data, int silent)\n" - " \tpstore_sb = sb;\n" - " \n" - " \tsb->s_maxbytes\t\t= MAX_LFS_FILESIZE;\n" - "-\tsb->s_blocksize\t\t= PAGE_CACHE_SIZE;\n" - "-\tsb->s_blocksize_bits\t= PAGE_CACHE_SHIFT;\n" - "+\tsb->s_blocksize\t\t= PAGE_SIZE;\n" - "+\tsb->s_blocksize_bits\t= PAGE_SHIFT;\n" - " \tsb->s_magic\t\t= PSTOREFS_MAGIC;\n" - " \tsb->s_op\t\t= &pstore_ops;\n" - " \tsb->s_time_gran\t\t= 1;\n" - "diff --git a/fs/qnx6/dir.c b/fs/qnx6/dir.c\n" - "index e1f37278cf97..144ceda4948e 100644\n" - "--- a/fs/qnx6/dir.c\n" - "+++ b/fs/qnx6/dir.c\n" - "@@ -35,9 +35,9 @@ static struct page *qnx6_get_page(struct inode *dir, unsigned long n)\n" - " static unsigned last_entry(struct inode *inode, unsigned long page_nr)\n" - " {\n" - " \tunsigned long last_byte = inode->i_size;\n" - "-\tlast_byte -= page_nr << PAGE_CACHE_SHIFT;\n" - "-\tif (last_byte > PAGE_CACHE_SIZE)\n" - "-\t\tlast_byte = PAGE_CACHE_SIZE;\n" - "+\tlast_byte -= page_nr << PAGE_SHIFT;\n" - "+\tif (last_byte > PAGE_SIZE)\n" - "+\t\tlast_byte = PAGE_SIZE;\n" - " \treturn last_byte / QNX6_DIR_ENTRY_SIZE;\n" - " }\n" - " \n" - "@@ -47,9 +47,9 @@ static struct qnx6_long_filename *qnx6_longname(struct super_block *sb,\n" - " {\n" - " \tstruct qnx6_sb_info *sbi = QNX6_SB(sb);\n" - " \tu32 s = fs32_to_cpu(sbi, de->de_long_inode); /* in block units */\n" - "-\tu32 n = s >> (PAGE_CACHE_SHIFT - sb->s_blocksize_bits); /* in pages */\n" - "+\tu32 n = s >> (PAGE_SHIFT - sb->s_blocksize_bits); /* in pages */\n" - " \t/* within page */\n" - "-\tu32 offs = (s << sb->s_blocksize_bits) & ~PAGE_CACHE_MASK;\n" - "+\tu32 offs = (s << sb->s_blocksize_bits) & ~PAGE_MASK;\n" - " \tstruct address_space *mapping = sbi->longfile->i_mapping;\n" - " \tstruct page *page = read_mapping_page(mapping, n, NULL);\n" - " \tif (IS_ERR(page))\n" - "@@ -115,8 +115,8 @@ static int qnx6_readdir(struct file *file, struct dir_context *ctx)\n" - " \tstruct qnx6_sb_info *sbi = QNX6_SB(s);\n" - " \tloff_t pos = ctx->pos & ~(QNX6_DIR_ENTRY_SIZE - 1);\n" - " \tunsigned long npages = dir_pages(inode);\n" - "-\tunsigned long n = pos >> PAGE_CACHE_SHIFT;\n" - "-\tunsigned start = (pos & ~PAGE_CACHE_MASK) / QNX6_DIR_ENTRY_SIZE;\n" - "+\tunsigned long n = pos >> PAGE_SHIFT;\n" - "+\tunsigned start = (pos & ~PAGE_MASK) / QNX6_DIR_ENTRY_SIZE;\n" - " \tbool done = false;\n" - " \n" - " \tctx->pos = pos;\n" - "@@ -131,7 +131,7 @@ static int qnx6_readdir(struct file *file, struct dir_context *ctx)\n" - " \n" - " \t\tif (IS_ERR(page)) {\n" - " \t\t\tpr_err(\"%s(): read failed\\n\", __func__);\n" - "-\t\t\tctx->pos = (n + 1) << PAGE_CACHE_SHIFT;\n" - "+\t\t\tctx->pos = (n + 1) << PAGE_SHIFT;\n" - " \t\t\treturn PTR_ERR(page);\n" - " \t\t}\n" - " \t\tde = ((struct qnx6_dir_entry *)page_address(page)) + start;\n" - "diff --git a/fs/qnx6/inode.c b/fs/qnx6/inode.c\n" - "index 47bb1de07155..1192422a1c56 100644\n" - "--- a/fs/qnx6/inode.c\n" - "+++ b/fs/qnx6/inode.c\n" - "@@ -542,8 +542,8 @@ struct inode *qnx6_iget(struct super_block *sb, unsigned ino)\n" - " \t\tiget_failed(inode);\n" - " \t\treturn ERR_PTR(-EIO);\n" - " \t}\n" - "-\tn = (ino - 1) >> (PAGE_CACHE_SHIFT - QNX6_INODE_SIZE_BITS);\n" - "-\toffs = (ino - 1) & (~PAGE_CACHE_MASK >> QNX6_INODE_SIZE_BITS);\n" - "+\tn = (ino - 1) >> (PAGE_SHIFT - QNX6_INODE_SIZE_BITS);\n" - "+\toffs = (ino - 1) & (~PAGE_MASK >> QNX6_INODE_SIZE_BITS);\n" - " \tmapping = sbi->inodes->i_mapping;\n" - " \tpage = read_mapping_page(mapping, n, NULL);\n" - " \tif (IS_ERR(page)) {\n" - "diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h\n" - "index d3fb2b698800..f23b5c4a66ad 100644\n" - "--- a/fs/qnx6/qnx6.h\n" - "+++ b/fs/qnx6/qnx6.h\n" - "@@ -128,7 +128,7 @@ extern struct qnx6_super_block *qnx6_mmi_fill_super(struct super_block *s,\n" - " static inline void qnx6_put_page(struct page *page)\n" - " {\n" - " \tkunmap(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " extern unsigned qnx6_find_entry(int len, struct inode *dir, const char *name,\n" - "diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c\n" - "index 38981b037524..1ab6e6c2e60e 100644\n" - "--- a/fs/ramfs/inode.c\n" - "+++ b/fs/ramfs/inode.c\n" - "@@ -223,8 +223,8 @@ int ramfs_fill_super(struct super_block *sb, void *data, int silent)\n" - " \t\treturn err;\n" - " \n" - " \tsb->s_maxbytes\t\t= MAX_LFS_FILESIZE;\n" - "-\tsb->s_blocksize\t\t= PAGE_CACHE_SIZE;\n" - "-\tsb->s_blocksize_bits\t= PAGE_CACHE_SHIFT;\n" - "+\tsb->s_blocksize\t\t= PAGE_SIZE;\n" - "+\tsb->s_blocksize_bits\t= PAGE_SHIFT;\n" - " \tsb->s_magic\t\t= RAMFS_MAGIC;\n" - " \tsb->s_op\t\t= &ramfs_ops;\n" - " \tsb->s_time_gran\t\t= 1;\n" - "diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c\n" - "index 9424a4ba93a9..389773711de4 100644\n" - "--- a/fs/reiserfs/file.c\n" - "+++ b/fs/reiserfs/file.c\n" - "@@ -180,11 +180,11 @@ int reiserfs_commit_page(struct inode *inode, struct page *page,\n" - " \tint partial = 0;\n" - " \tunsigned blocksize;\n" - " \tstruct buffer_head *bh, *head;\n" - "-\tunsigned long i_size_index = inode->i_size >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long i_size_index = inode->i_size >> PAGE_SHIFT;\n" - " \tint new;\n" - " \tint logit = reiserfs_file_data_log(inode);\n" - " \tstruct super_block *s = inode->i_sb;\n" - "-\tint bh_per_page = PAGE_CACHE_SIZE / s->s_blocksize;\n" - "+\tint bh_per_page = PAGE_SIZE / s->s_blocksize;\n" - " \tstruct reiserfs_transaction_handle th;\n" - " \tint ret = 0;\n" - " \n" - "diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c\n" - "index ae9e5b308cf9..d5c2e9c865de 100644\n" - "--- a/fs/reiserfs/inode.c\n" - "+++ b/fs/reiserfs/inode.c\n" - "@@ -386,7 +386,7 @@ static int _get_block_create_0(struct inode *inode, sector_t block,\n" - " \t\tgoto finished;\n" - " \t}\n" - " \t/* read file tail into part of page */\n" - "-\toffset = (cpu_key_k_offset(&key) - 1) & (PAGE_CACHE_SIZE - 1);\n" - "+\toffset = (cpu_key_k_offset(&key) - 1) & (PAGE_SIZE - 1);\n" - " \tcopy_item_head(&tmp_ih, ih);\n" - " \n" - " \t/*\n" - "@@ -587,10 +587,10 @@ static int convert_tail_for_hole(struct inode *inode,\n" - " \t\treturn -EIO;\n" - " \n" - " \t/* always try to read until the end of the block */\n" - "-\ttail_start = tail_offset & (PAGE_CACHE_SIZE - 1);\n" - "+\ttail_start = tail_offset & (PAGE_SIZE - 1);\n" - " \ttail_end = (tail_start | (bh_result->b_size - 1)) + 1;\n" - " \n" - "-\tindex = tail_offset >> PAGE_CACHE_SHIFT;\n" - "+\tindex = tail_offset >> PAGE_SHIFT;\n" - " \t/*\n" - " \t * hole_page can be zero in case of direct_io, we are sure\n" - " \t * that we cannot get here if we write with O_DIRECT into tail page\n" - "@@ -629,7 +629,7 @@ static int convert_tail_for_hole(struct inode *inode,\n" - " unlock:\n" - " \tif (tail_page != hole_page) {\n" - " \t\tunlock_page(tail_page);\n" - "-\t\tpage_cache_release(tail_page);\n" - "+\t\tput_page(tail_page);\n" - " \t}\n" - " out:\n" - " \treturn retval;\n" - "@@ -2189,11 +2189,11 @@ static int grab_tail_page(struct inode *inode,\n" - " \t * we want the page with the last byte in the file,\n" - " \t * not the page that will hold the next byte for appending\n" - " \t */\n" - "-\tunsigned long index = (inode->i_size - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long index = (inode->i_size - 1) >> PAGE_SHIFT;\n" - " \tunsigned long pos = 0;\n" - " \tunsigned long start = 0;\n" - " \tunsigned long blocksize = inode->i_sb->s_blocksize;\n" - "-\tunsigned long offset = (inode->i_size) & (PAGE_CACHE_SIZE - 1);\n" - "+\tunsigned long offset = (inode->i_size) & (PAGE_SIZE - 1);\n" - " \tstruct buffer_head *bh;\n" - " \tstruct buffer_head *head;\n" - " \tstruct page *page;\n" - "@@ -2251,7 +2251,7 @@ out:\n" - " \n" - " unlock:\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn error;\n" - " }\n" - " \n" - "@@ -2265,7 +2265,7 @@ int reiserfs_truncate_file(struct inode *inode, int update_timestamps)\n" - " {\n" - " \tstruct reiserfs_transaction_handle th;\n" - " \t/* we want the offset for the first byte after the end of the file */\n" - "-\tunsigned long offset = inode->i_size & (PAGE_CACHE_SIZE - 1);\n" - "+\tunsigned long offset = inode->i_size & (PAGE_SIZE - 1);\n" - " \tunsigned blocksize = inode->i_sb->s_blocksize;\n" - " \tunsigned length;\n" - " \tstruct page *page = NULL;\n" - "@@ -2345,7 +2345,7 @@ int reiserfs_truncate_file(struct inode *inode, int update_timestamps)\n" - " \t\t\t}\n" - " \t\t}\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \n" - " \treiserfs_write_unlock(inode->i_sb);\n" - "@@ -2354,7 +2354,7 @@ int reiserfs_truncate_file(struct inode *inode, int update_timestamps)\n" - " out:\n" - " \tif (page) {\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \n" - " \treiserfs_write_unlock(inode->i_sb);\n" - "@@ -2426,7 +2426,7 @@ research:\n" - " \t} else if (is_direct_le_ih(ih)) {\n" - " \t\tchar *p;\n" - " \t\tp = page_address(bh_result->b_page);\n" - "-\t\tp += (byte_offset - 1) & (PAGE_CACHE_SIZE - 1);\n" - "+\t\tp += (byte_offset - 1) & (PAGE_SIZE - 1);\n" - " \t\tcopy_size = ih_item_len(ih) - pos_in_item;\n" - " \n" - " \t\tfs_gen = get_generation(inode->i_sb);\n" - "@@ -2525,7 +2525,7 @@ static int reiserfs_write_full_page(struct page *page,\n" - " \t\t\t\t struct writeback_control *wbc)\n" - " {\n" - " \tstruct inode *inode = page->mapping->host;\n" - "-\tunsigned long end_index = inode->i_size >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned long end_index = inode->i_size >> PAGE_SHIFT;\n" - " \tint error = 0;\n" - " \tunsigned long block;\n" - " \tsector_t last_block;\n" - "@@ -2535,7 +2535,7 @@ static int reiserfs_write_full_page(struct page *page,\n" - " \tint checked = PageChecked(page);\n" - " \tstruct reiserfs_transaction_handle th;\n" - " \tstruct super_block *s = inode->i_sb;\n" - "-\tint bh_per_page = PAGE_CACHE_SIZE / s->s_blocksize;\n" - "+\tint bh_per_page = PAGE_SIZE / s->s_blocksize;\n" - " \tth.t_trans_id = 0;\n" - " \n" - " \t/* no logging allowed when nonblocking or from PF_MEMALLOC */\n" - "@@ -2564,16 +2564,16 @@ static int reiserfs_write_full_page(struct page *page,\n" - " \tif (page->index >= end_index) {\n" - " \t\tunsigned last_offset;\n" - " \n" - "-\t\tlast_offset = inode->i_size & (PAGE_CACHE_SIZE - 1);\n" - "+\t\tlast_offset = inode->i_size & (PAGE_SIZE - 1);\n" - " \t\t/* no file contents in this page */\n" - " \t\tif (page->index >= end_index + 1 || !last_offset) {\n" - " \t\t\tunlock_page(page);\n" - " \t\t\treturn 0;\n" - " \t\t}\n" - "-\t\tzero_user_segment(page, last_offset, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user_segment(page, last_offset, PAGE_SIZE);\n" - " \t}\n" - " \tbh = head;\n" - "-\tblock = page->index << (PAGE_CACHE_SHIFT - s->s_blocksize_bits);\n" - "+\tblock = page->index << (PAGE_SHIFT - s->s_blocksize_bits);\n" - " \tlast_block = (i_size_read(inode) - 1) >> inode->i_blkbits;\n" - " \t/* first map all the buffers, logging any direct items we find */\n" - " \tdo {\n" - "@@ -2774,7 +2774,7 @@ static int reiserfs_write_begin(struct file *file,\n" - " \t\t*fsdata = (void *)(unsigned long)flags;\n" - " \t}\n" - " \n" - "-\tindex = pos >> PAGE_CACHE_SHIFT;\n" - "+\tindex = pos >> PAGE_SHIFT;\n" - " \tpage = grab_cache_page_write_begin(mapping, index, flags);\n" - " \tif (!page)\n" - " \t\treturn -ENOMEM;\n" - "@@ -2822,7 +2822,7 @@ static int reiserfs_write_begin(struct file *file,\n" - " \t}\n" - " \tif (ret) {\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\t/* Truncate allocated blocks */\n" - " \t\treiserfs_truncate_failed_write(inode);\n" - " \t}\n" - "@@ -2909,7 +2909,7 @@ static int reiserfs_write_end(struct file *file, struct address_space *mapping,\n" - " \telse\n" - " \t\tth = NULL;\n" - " \n" - "-\tstart = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tstart = pos & (PAGE_SIZE - 1);\n" - " \tif (unlikely(copied < len)) {\n" - " \t\tif (!PageUptodate(page))\n" - " \t\t\tcopied = 0;\n" - "@@ -2974,7 +2974,7 @@ out:\n" - " \tif (locked)\n" - " \t\treiserfs_write_unlock(inode->i_sb);\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \tif (pos + len > inode->i_size)\n" - " \t\treiserfs_truncate_failed_write(inode);\n" - "@@ -2996,7 +2996,7 @@ int reiserfs_commit_write(struct file *f, struct page *page,\n" - " \t\t\t unsigned from, unsigned to)\n" - " {\n" - " \tstruct inode *inode = page->mapping->host;\n" - "-\tloff_t pos = ((loff_t) page->index << PAGE_CACHE_SHIFT) + to;\n" - "+\tloff_t pos = ((loff_t) page->index << PAGE_SHIFT) + to;\n" - " \tint ret = 0;\n" - " \tint update_sd = 0;\n" - " \tstruct reiserfs_transaction_handle *th = NULL;\n" - "@@ -3181,7 +3181,7 @@ static void reiserfs_invalidatepage(struct page *page, unsigned int offset,\n" - " \tstruct inode *inode = page->mapping->host;\n" - " \tunsigned int curr_off = 0;\n" - " \tunsigned int stop = offset + length;\n" - "-\tint partial_page = (offset || length < PAGE_CACHE_SIZE);\n" - "+\tint partial_page = (offset || length < PAGE_SIZE);\n" - " \tint ret = 1;\n" - " \n" - " \tBUG_ON(!PageLocked(page));\n" - "diff --git a/fs/reiserfs/ioctl.c b/fs/reiserfs/ioctl.c\n" - "index 036a1fc0a8c3..57045f423893 100644\n" - "--- a/fs/reiserfs/ioctl.c\n" - "+++ b/fs/reiserfs/ioctl.c\n" - "@@ -203,7 +203,7 @@ int reiserfs_unpack(struct inode *inode, struct file *filp)\n" - " \t * __reiserfs_write_begin on that page. This will force a\n" - " \t * reiserfs_get_block to unpack the tail for us.\n" - " \t */\n" - "-\tindex = inode->i_size >> PAGE_CACHE_SHIFT;\n" - "+\tindex = inode->i_size >> PAGE_SHIFT;\n" - " \tmapping = inode->i_mapping;\n" - " \tpage = grab_cache_page(mapping, index);\n" - " \tretval = -ENOMEM;\n" - "@@ -221,7 +221,7 @@ int reiserfs_unpack(struct inode *inode, struct file *filp)\n" - " \n" - " out_unlock:\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " out:\n" - " \tinode_unlock(inode);\n" - "diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c\n" - "index 44c2bdced1c8..2ace90e981f0 100644\n" - "--- a/fs/reiserfs/journal.c\n" - "+++ b/fs/reiserfs/journal.c\n" - "@@ -599,18 +599,18 @@ static int journal_list_still_alive(struct super_block *s,\n" - " * This does a check to see if the buffer belongs to one of these\n" - " * lost pages before doing the final put_bh. If page->mapping was\n" - " * null, it tries to free buffers on the page, which should make the\n" - "- * final page_cache_release drop the page from the lru.\n" - "+ * final put_page drop the page from the lru.\n" - " */\n" - " static void release_buffer_page(struct buffer_head *bh)\n" - " {\n" - " \tstruct page *page = bh->b_page;\n" - " \tif (!page->mapping && trylock_page(page)) {\n" - "-\t\tpage_cache_get(page);\n" - "+\t\tget_page(page);\n" - " \t\tput_bh(bh);\n" - " \t\tif (!page->mapping)\n" - " \t\t\ttry_to_free_buffers(page);\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t} else {\n" - " \t\tput_bh(bh);\n" - " \t}\n" - "diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c\n" - "index 24cbe013240f..5feacd689241 100644\n" - "--- a/fs/reiserfs/stree.c\n" - "+++ b/fs/reiserfs/stree.c\n" - "@@ -1342,7 +1342,7 @@ int reiserfs_delete_item(struct reiserfs_transaction_handle *th,\n" - " \t\t */\n" - " \n" - " \t\tdata = kmap_atomic(un_bh->b_page);\n" - "-\t\toff = ((le_ih_k_offset(&s_ih) - 1) & (PAGE_CACHE_SIZE - 1));\n" - "+\t\toff = ((le_ih_k_offset(&s_ih) - 1) & (PAGE_SIZE - 1));\n" - " \t\tmemcpy(data + off,\n" - " \t\t ih_item_body(PATH_PLAST_BUFFER(path), &s_ih),\n" - " \t\t ret_value);\n" - "@@ -1511,7 +1511,7 @@ static void unmap_buffers(struct page *page, loff_t pos)\n" - " \n" - " \tif (page) {\n" - " \t\tif (page_has_buffers(page)) {\n" - "-\t\t\ttail_index = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\t\t\ttail_index = pos & (PAGE_SIZE - 1);\n" - " \t\t\tcur_index = 0;\n" - " \t\t\thead = page_buffers(page);\n" - " \t\t\tbh = head;\n" - "diff --git a/fs/reiserfs/tail_conversion.c b/fs/reiserfs/tail_conversion.c\n" - "index f41e19b4bb42..2d5489b0a269 100644\n" - "--- a/fs/reiserfs/tail_conversion.c\n" - "+++ b/fs/reiserfs/tail_conversion.c\n" - "@@ -151,7 +151,7 @@ int direct2indirect(struct reiserfs_transaction_handle *th, struct inode *inode,\n" - " \t */\n" - " \tif (up_to_date_bh) {\n" - " \t\tunsigned pgoff =\n" - "-\t\t (tail_offset + total_tail - 1) & (PAGE_CACHE_SIZE - 1);\n" - "+\t\t (tail_offset + total_tail - 1) & (PAGE_SIZE - 1);\n" - " \t\tchar *kaddr = kmap_atomic(up_to_date_bh->b_page);\n" - " \t\tmemset(kaddr + pgoff, 0, blk_size - total_tail);\n" - " \t\tkunmap_atomic(kaddr);\n" - "@@ -271,7 +271,7 @@ int indirect2direct(struct reiserfs_transaction_handle *th,\n" - " \t * the page was locked and this part of the page was up to date when\n" - " \t * indirect2direct was called, so we know the bytes are still valid\n" - " \t */\n" - "-\ttail = tail + (pos & (PAGE_CACHE_SIZE - 1));\n" - "+\ttail = tail + (pos & (PAGE_SIZE - 1));\n" - " \n" - " \tPATH_LAST_POSITION(path)++;\n" - " \n" - "diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c\n" - "index 57e0b2310532..28f5f8b11370 100644\n" - "--- a/fs/reiserfs/xattr.c\n" - "+++ b/fs/reiserfs/xattr.c\n" - "@@ -415,7 +415,7 @@ out:\n" - " static inline void reiserfs_put_page(struct page *page)\n" - " {\n" - " \tkunmap(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " static struct page *reiserfs_get_page(struct inode *dir, size_t n)\n" - "@@ -427,7 +427,7 @@ static struct page *reiserfs_get_page(struct inode *dir, size_t n)\n" - " \t * and an unlink/rmdir has just occurred - GFP_NOFS avoids this\n" - " \t */\n" - " \tmapping_set_gfp_mask(mapping, GFP_NOFS);\n" - "-\tpage = read_mapping_page(mapping, n >> PAGE_CACHE_SHIFT, NULL);\n" - "+\tpage = read_mapping_page(mapping, n >> PAGE_SHIFT, NULL);\n" - " \tif (!IS_ERR(page)) {\n" - " \t\tkmap(page);\n" - " \t\tif (PageError(page))\n" - "@@ -526,10 +526,10 @@ reiserfs_xattr_set_handle(struct reiserfs_transaction_handle *th,\n" - " \twhile (buffer_pos < buffer_size || buffer_pos == 0) {\n" - " \t\tsize_t chunk;\n" - " \t\tsize_t skip = 0;\n" - "-\t\tsize_t page_offset = (file_pos & (PAGE_CACHE_SIZE - 1));\n" - "+\t\tsize_t page_offset = (file_pos & (PAGE_SIZE - 1));\n" - " \n" - "-\t\tif (buffer_size - buffer_pos > PAGE_CACHE_SIZE)\n" - "-\t\t\tchunk = PAGE_CACHE_SIZE;\n" - "+\t\tif (buffer_size - buffer_pos > PAGE_SIZE)\n" - "+\t\t\tchunk = PAGE_SIZE;\n" - " \t\telse\n" - " \t\t\tchunk = buffer_size - buffer_pos;\n" - " \n" - "@@ -546,8 +546,8 @@ reiserfs_xattr_set_handle(struct reiserfs_transaction_handle *th,\n" - " \t\t\tstruct reiserfs_xattr_header *rxh;\n" - " \n" - " \t\t\tskip = file_pos = sizeof(struct reiserfs_xattr_header);\n" - "-\t\t\tif (chunk + skip > PAGE_CACHE_SIZE)\n" - "-\t\t\t\tchunk = PAGE_CACHE_SIZE - skip;\n" - "+\t\t\tif (chunk + skip > PAGE_SIZE)\n" - "+\t\t\t\tchunk = PAGE_SIZE - skip;\n" - " \t\t\trxh = (struct reiserfs_xattr_header *)data;\n" - " \t\t\trxh->h_magic = cpu_to_le32(REISERFS_XATTR_MAGIC);\n" - " \t\t\trxh->h_hash = cpu_to_le32(xahash);\n" - "@@ -675,8 +675,8 @@ reiserfs_xattr_get(struct inode *inode, const char *name, void *buffer,\n" - " \t\tchar *data;\n" - " \t\tsize_t skip = 0;\n" - " \n" - "-\t\tif (isize - file_pos > PAGE_CACHE_SIZE)\n" - "-\t\t\tchunk = PAGE_CACHE_SIZE;\n" - "+\t\tif (isize - file_pos > PAGE_SIZE)\n" - "+\t\t\tchunk = PAGE_SIZE;\n" - " \t\telse\n" - " \t\t\tchunk = isize - file_pos;\n" - " \n" - "diff --git a/fs/splice.c b/fs/splice.c\n" - "index 9947b5c69664..b018eb485019 100644\n" - "--- a/fs/splice.c\n" - "+++ b/fs/splice.c\n" - "@@ -88,7 +88,7 @@ out_unlock:\n" - " static void page_cache_pipe_buf_release(struct pipe_inode_info *pipe,\n" - " \t\t\t\t\tstruct pipe_buffer *buf)\n" - " {\n" - "-\tpage_cache_release(buf->page);\n" - "+\tput_page(buf->page);\n" - " \tbuf->flags &= ~PIPE_BUF_FLAG_LRU;\n" - " }\n" - " \n" - "@@ -268,7 +268,7 @@ EXPORT_SYMBOL_GPL(splice_to_pipe);\n" - " \n" - " void spd_release_page(struct splice_pipe_desc *spd, unsigned int i)\n" - " {\n" - "-\tpage_cache_release(spd->pages[i]);\n" - "+\tput_page(spd->pages[i]);\n" - " }\n" - " \n" - " /*\n" - "@@ -328,9 +328,9 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,\n" - " \tif (splice_grow_spd(pipe, &spd))\n" - " \t\treturn -ENOMEM;\n" - " \n" - "-\tindex = *ppos >> PAGE_CACHE_SHIFT;\n" - "-\tloff = *ppos & ~PAGE_CACHE_MASK;\n" - "-\treq_pages = (len + loff + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tindex = *ppos >> PAGE_SHIFT;\n" - "+\tloff = *ppos & ~PAGE_MASK;\n" - "+\treq_pages = (len + loff + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \tnr_pages = min(req_pages, spd.nr_pages_max);\n" - " \n" - " \t/*\n" - "@@ -365,7 +365,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,\n" - " \t\t\terror = add_to_page_cache_lru(page, mapping, index,\n" - " \t\t\t\t mapping_gfp_constraint(mapping, GFP_KERNEL));\n" - " \t\t\tif (unlikely(error)) {\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t\tif (error == -EEXIST)\n" - " \t\t\t\t\tcontinue;\n" - " \t\t\t\tbreak;\n" - "@@ -385,7 +385,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,\n" - " \t * Now loop over the map and see if we need to start IO on any\n" - " \t * pages, fill in the partial map, etc.\n" - " \t */\n" - "-\tindex = *ppos >> PAGE_CACHE_SHIFT;\n" - "+\tindex = *ppos >> PAGE_SHIFT;\n" - " \tnr_pages = spd.nr_pages;\n" - " \tspd.nr_pages = 0;\n" - " \tfor (page_nr = 0; page_nr < nr_pages; page_nr++) {\n" - "@@ -397,7 +397,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,\n" - " \t\t/*\n" - " \t\t * this_len is the max we'll use from this page\n" - " \t\t */\n" - "-\t\tthis_len = min_t(unsigned long, len, PAGE_CACHE_SIZE - loff);\n" - "+\t\tthis_len = min_t(unsigned long, len, PAGE_SIZE - loff);\n" - " \t\tpage = spd.pages[page_nr];\n" - " \n" - " \t\tif (PageReadahead(page))\n" - "@@ -426,7 +426,7 @@ retry_lookup:\n" - " \t\t\t\t\terror = -ENOMEM;\n" - " \t\t\t\t\tbreak;\n" - " \t\t\t\t}\n" - "-\t\t\t\tpage_cache_release(spd.pages[page_nr]);\n" - "+\t\t\t\tput_page(spd.pages[page_nr]);\n" - " \t\t\t\tspd.pages[page_nr] = page;\n" - " \t\t\t}\n" - " \t\t\t/*\n" - "@@ -456,7 +456,7 @@ fill_it:\n" - " \t\t * i_size must be checked after PageUptodate.\n" - " \t\t */\n" - " \t\tisize = i_size_read(mapping->host);\n" - "-\t\tend_index = (isize - 1) >> PAGE_CACHE_SHIFT;\n" - "+\t\tend_index = (isize - 1) >> PAGE_SHIFT;\n" - " \t\tif (unlikely(!isize || index > end_index))\n" - " \t\t\tbreak;\n" - " \n" - "@@ -470,7 +470,7 @@ fill_it:\n" - " \t\t\t/*\n" - " \t\t\t * max good bytes in this page\n" - " \t\t\t */\n" - "-\t\t\tplen = ((isize - 1) & ~PAGE_CACHE_MASK) + 1;\n" - "+\t\t\tplen = ((isize - 1) & ~PAGE_MASK) + 1;\n" - " \t\t\tif (plen <= loff)\n" - " \t\t\t\tbreak;\n" - " \n" - "@@ -494,8 +494,8 @@ fill_it:\n" - " \t * we got, 'nr_pages' is how many pages are in the map.\n" - " \t */\n" - " \twhile (page_nr < nr_pages)\n" - "-\t\tpage_cache_release(spd.pages[page_nr++]);\n" - "-\tin->f_ra.prev_pos = (loff_t)index << PAGE_CACHE_SHIFT;\n" - "+\t\tput_page(spd.pages[page_nr++]);\n" - "+\tin->f_ra.prev_pos = (loff_t)index << PAGE_SHIFT;\n" - " \n" - " \tif (spd.nr_pages)\n" - " \t\terror = splice_to_pipe(pipe, &spd);\n" - "@@ -636,8 +636,8 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,\n" - " \t\t\tgoto shrink_ret;\n" - " \t}\n" - " \n" - "-\toffset = *ppos & ~PAGE_CACHE_MASK;\n" - "-\tnr_pages = (len + offset + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "+\toffset = *ppos & ~PAGE_MASK;\n" - "+\tnr_pages = (len + offset + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \n" - " \tfor (i = 0; i < nr_pages && i < spd.nr_pages_max && len; i++) {\n" - " \t\tstruct page *page;\n" - "@@ -647,7 +647,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,\n" - " \t\tif (!page)\n" - " \t\t\tgoto err;\n" - " \n" - "-\t\tthis_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);\n" - "+\t\tthis_len = min_t(size_t, len, PAGE_SIZE - offset);\n" - " \t\tvec[i].iov_base = (void __user *) page_address(page);\n" - " \t\tvec[i].iov_len = this_len;\n" - " \t\tspd.pages[i] = page;\n" - "diff --git a/fs/squashfs/block.c b/fs/squashfs/block.c\n" - "index 0cea9b9236d0..2c2618410d51 100644\n" - "--- a/fs/squashfs/block.c\n" - "+++ b/fs/squashfs/block.c\n" - "@@ -181,11 +181,11 @@ int squashfs_read_data(struct super_block *sb, u64 index, int length,\n" - " \t\t\tin = min(bytes, msblk->devblksize - offset);\n" - " \t\t\tbytes -= in;\n" - " \t\t\twhile (in) {\n" - "-\t\t\t\tif (pg_offset == PAGE_CACHE_SIZE) {\n" - "+\t\t\t\tif (pg_offset == PAGE_SIZE) {\n" - " \t\t\t\t\tdata = squashfs_next_page(output);\n" - " \t\t\t\t\tpg_offset = 0;\n" - " \t\t\t\t}\n" - "-\t\t\t\tavail = min_t(int, in, PAGE_CACHE_SIZE -\n" - "+\t\t\t\tavail = min_t(int, in, PAGE_SIZE -\n" - " \t\t\t\t\t\tpg_offset);\n" - " \t\t\t\tmemcpy(data + pg_offset, bh[k]->b_data + offset,\n" - " \t\t\t\t\t\tavail);\n" - "diff --git a/fs/squashfs/cache.c b/fs/squashfs/cache.c\n" - "index 1cb70a0b2168..23813c078cc9 100644\n" - "--- a/fs/squashfs/cache.c\n" - "+++ b/fs/squashfs/cache.c\n" - "@@ -30,7 +30,7 @@\n" - " * access the metadata and fragment caches.\n" - " *\n" - " * To avoid out of memory and fragmentation issues with vmalloc the cache\n" - "- * uses sequences of kmalloced PAGE_CACHE_SIZE buffers.\n" - "+ * uses sequences of kmalloced PAGE_SIZE buffers.\n" - " *\n" - " * It should be noted that the cache is not used for file datablocks, these\n" - " * are decompressed and cached in the page-cache in the normal way. The\n" - "@@ -231,7 +231,7 @@ void squashfs_cache_delete(struct squashfs_cache *cache)\n" - " /*\n" - " * Initialise cache allocating the specified number of entries, each of\n" - " * size block_size. To avoid vmalloc fragmentation issues each entry\n" - "- * is allocated as a sequence of kmalloced PAGE_CACHE_SIZE buffers.\n" - "+ * is allocated as a sequence of kmalloced PAGE_SIZE buffers.\n" - " */\n" - " struct squashfs_cache *squashfs_cache_init(char *name, int entries,\n" - " \tint block_size)\n" - "@@ -255,7 +255,7 @@ struct squashfs_cache *squashfs_cache_init(char *name, int entries,\n" - " \tcache->unused = entries;\n" - " \tcache->entries = entries;\n" - " \tcache->block_size = block_size;\n" - "-\tcache->pages = block_size >> PAGE_CACHE_SHIFT;\n" - "+\tcache->pages = block_size >> PAGE_SHIFT;\n" - " \tcache->pages = cache->pages ? cache->pages : 1;\n" - " \tcache->name = name;\n" - " \tcache->num_waiters = 0;\n" - "@@ -275,7 +275,7 @@ struct squashfs_cache *squashfs_cache_init(char *name, int entries,\n" - " \t\t}\n" - " \n" - " \t\tfor (j = 0; j < cache->pages; j++) {\n" - "-\t\t\tentry->data[j] = kmalloc(PAGE_CACHE_SIZE, GFP_KERNEL);\n" - "+\t\t\tentry->data[j] = kmalloc(PAGE_SIZE, GFP_KERNEL);\n" - " \t\t\tif (entry->data[j] == NULL) {\n" - " \t\t\t\tERROR(\"Failed to allocate %s buffer\\n\", name);\n" - " \t\t\t\tgoto cleanup;\n" - "@@ -314,10 +314,10 @@ int squashfs_copy_data(void *buffer, struct squashfs_cache_entry *entry,\n" - " \t\treturn min(length, entry->length - offset);\n" - " \n" - " \twhile (offset < entry->length) {\n" - "-\t\tvoid *buff = entry->data[offset / PAGE_CACHE_SIZE]\n" - "-\t\t\t\t+ (offset % PAGE_CACHE_SIZE);\n" - "+\t\tvoid *buff = entry->data[offset / PAGE_SIZE]\n" - "+\t\t\t\t+ (offset % PAGE_SIZE);\n" - " \t\tint bytes = min_t(int, entry->length - offset,\n" - "-\t\t\t\tPAGE_CACHE_SIZE - (offset % PAGE_CACHE_SIZE));\n" - "+\t\t\t\tPAGE_SIZE - (offset % PAGE_SIZE));\n" - " \n" - " \t\tif (bytes >= remaining) {\n" - " \t\t\tmemcpy(buffer, buff, remaining);\n" - "@@ -415,7 +415,7 @@ struct squashfs_cache_entry *squashfs_get_datablock(struct super_block *sb,\n" - " */\n" - " void *squashfs_read_table(struct super_block *sb, u64 block, int length)\n" - " {\n" - "-\tint pages = (length + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tint pages = (length + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \tint i, res;\n" - " \tvoid *table, *buffer, **data;\n" - " \tstruct squashfs_page_actor *actor;\n" - "@@ -436,7 +436,7 @@ void *squashfs_read_table(struct super_block *sb, u64 block, int length)\n" - " \t\tgoto failed2;\n" - " \t}\n" - " \n" - "-\tfor (i = 0; i < pages; i++, buffer += PAGE_CACHE_SIZE)\n" - "+\tfor (i = 0; i < pages; i++, buffer += PAGE_SIZE)\n" - " \t\tdata[i] = buffer;\n" - " \n" - " \tres = squashfs_read_data(sb, block, length |\n" - "diff --git a/fs/squashfs/decompressor.c b/fs/squashfs/decompressor.c\n" - "index e9034bf6e5ae..d2bc13636f79 100644\n" - "--- a/fs/squashfs/decompressor.c\n" - "+++ b/fs/squashfs/decompressor.c\n" - "@@ -102,7 +102,7 @@ static void *get_comp_opts(struct super_block *sb, unsigned short flags)\n" - " \t * Read decompressor specific options from file system if present\n" - " \t */\n" - " \tif (SQUASHFS_COMP_OPTS(flags)) {\n" - "-\t\tbuffer = kmalloc(PAGE_CACHE_SIZE, GFP_KERNEL);\n" - "+\t\tbuffer = kmalloc(PAGE_SIZE, GFP_KERNEL);\n" - " \t\tif (buffer == NULL) {\n" - " \t\t\tcomp_opts = ERR_PTR(-ENOMEM);\n" - " \t\t\tgoto out;\n" - "diff --git a/fs/squashfs/file.c b/fs/squashfs/file.c\n" - "index e5c9689062ba..13d80947bf9e 100644\n" - "--- a/fs/squashfs/file.c\n" - "+++ b/fs/squashfs/file.c\n" - "@@ -175,7 +175,7 @@ static long long read_indexes(struct super_block *sb, int n,\n" - " {\n" - " \tint err, i;\n" - " \tlong long block = 0;\n" - "-\t__le32 *blist = kmalloc(PAGE_CACHE_SIZE, GFP_KERNEL);\n" - "+\t__le32 *blist = kmalloc(PAGE_SIZE, GFP_KERNEL);\n" - " \n" - " \tif (blist == NULL) {\n" - " \t\tERROR(\"read_indexes: Failed to allocate block_list\\n\");\n" - "@@ -183,7 +183,7 @@ static long long read_indexes(struct super_block *sb, int n,\n" - " \t}\n" - " \n" - " \twhile (n) {\n" - "-\t\tint blocks = min_t(int, n, PAGE_CACHE_SIZE >> 2);\n" - "+\t\tint blocks = min_t(int, n, PAGE_SIZE >> 2);\n" - " \n" - " \t\terr = squashfs_read_metadata(sb, blist, start_block,\n" - " \t\t\t\toffset, blocks << 2);\n" - "@@ -377,19 +377,19 @@ void squashfs_copy_cache(struct page *page, struct squashfs_cache_entry *buffer,\n" - " \tstruct inode *inode = page->mapping->host;\n" - " \tstruct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;\n" - " \tvoid *pageaddr;\n" - "-\tint i, mask = (1 << (msblk->block_log - PAGE_CACHE_SHIFT)) - 1;\n" - "+\tint i, mask = (1 << (msblk->block_log - PAGE_SHIFT)) - 1;\n" - " \tint start_index = page->index & ~mask, end_index = start_index | mask;\n" - " \n" - " \t/*\n" - " \t * Loop copying datablock into pages. As the datablock likely covers\n" - "-\t * many PAGE_CACHE_SIZE pages (default block size is 128 KiB) explicitly\n" - "+\t * many PAGE_SIZE pages (default block size is 128 KiB) explicitly\n" - " \t * grab the pages from the page cache, except for the page that we've\n" - " \t * been called to fill.\n" - " \t */\n" - " \tfor (i = start_index; i <= end_index && bytes > 0; i++,\n" - "-\t\t\tbytes -= PAGE_CACHE_SIZE, offset += PAGE_CACHE_SIZE) {\n" - "+\t\t\tbytes -= PAGE_SIZE, offset += PAGE_SIZE) {\n" - " \t\tstruct page *push_page;\n" - "-\t\tint avail = buffer ? min_t(int, bytes, PAGE_CACHE_SIZE) : 0;\n" - "+\t\tint avail = buffer ? min_t(int, bytes, PAGE_SIZE) : 0;\n" - " \n" - " \t\tTRACE(\"bytes %d, i %d, available_bytes %d\\n\", bytes, i, avail);\n" - " \n" - "@@ -404,14 +404,14 @@ void squashfs_copy_cache(struct page *page, struct squashfs_cache_entry *buffer,\n" - " \n" - " \t\tpageaddr = kmap_atomic(push_page);\n" - " \t\tsquashfs_copy_data(pageaddr, buffer, offset, avail);\n" - "-\t\tmemset(pageaddr + avail, 0, PAGE_CACHE_SIZE - avail);\n" - "+\t\tmemset(pageaddr + avail, 0, PAGE_SIZE - avail);\n" - " \t\tkunmap_atomic(pageaddr);\n" - " \t\tflush_dcache_page(push_page);\n" - " \t\tSetPageUptodate(push_page);\n" - " skip_page:\n" - " \t\tunlock_page(push_page);\n" - " \t\tif (i != page->index)\n" - "-\t\t\tpage_cache_release(push_page);\n" - "+\t\t\tput_page(push_page);\n" - " \t}\n" - " }\n" - " \n" - "@@ -454,7 +454,7 @@ static int squashfs_readpage(struct file *file, struct page *page)\n" - " {\n" - " \tstruct inode *inode = page->mapping->host;\n" - " \tstruct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;\n" - "-\tint index = page->index >> (msblk->block_log - PAGE_CACHE_SHIFT);\n" - "+\tint index = page->index >> (msblk->block_log - PAGE_SHIFT);\n" - " \tint file_end = i_size_read(inode) >> msblk->block_log;\n" - " \tint res;\n" - " \tvoid *pageaddr;\n" - "@@ -462,8 +462,8 @@ static int squashfs_readpage(struct file *file, struct page *page)\n" - " \tTRACE(\"Entered squashfs_readpage, page index %lx, start block %llx\\n\",\n" - " \t\t\t\tpage->index, squashfs_i(inode)->start);\n" - " \n" - "-\tif (page->index >= ((i_size_read(inode) + PAGE_CACHE_SIZE - 1) >>\n" - "-\t\t\t\t\tPAGE_CACHE_SHIFT))\n" - "+\tif (page->index >= ((i_size_read(inode) + PAGE_SIZE - 1) >>\n" - "+\t\t\t\t\tPAGE_SHIFT))\n" - " \t\tgoto out;\n" - " \n" - " \tif (index < file_end || squashfs_i(inode)->fragment_block ==\n" - "@@ -487,7 +487,7 @@ error_out:\n" - " \tSetPageError(page);\n" - " out:\n" - " \tpageaddr = kmap_atomic(page);\n" - "-\tmemset(pageaddr, 0, PAGE_CACHE_SIZE);\n" - "+\tmemset(pageaddr, 0, PAGE_SIZE);\n" - " \tkunmap_atomic(pageaddr);\n" - " \tflush_dcache_page(page);\n" - " \tif (!PageError(page))\n" - "diff --git a/fs/squashfs/file_direct.c b/fs/squashfs/file_direct.c\n" - "index 43e7a7eddac0..cb485d8e0e91 100644\n" - "--- a/fs/squashfs/file_direct.c\n" - "+++ b/fs/squashfs/file_direct.c\n" - "@@ -30,8 +30,8 @@ int squashfs_readpage_block(struct page *target_page, u64 block, int bsize)\n" - " \tstruct inode *inode = target_page->mapping->host;\n" - " \tstruct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;\n" - " \n" - "-\tint file_end = (i_size_read(inode) - 1) >> PAGE_CACHE_SHIFT;\n" - "-\tint mask = (1 << (msblk->block_log - PAGE_CACHE_SHIFT)) - 1;\n" - "+\tint file_end = (i_size_read(inode) - 1) >> PAGE_SHIFT;\n" - "+\tint mask = (1 << (msblk->block_log - PAGE_SHIFT)) - 1;\n" - " \tint start_index = target_page->index & ~mask;\n" - " \tint end_index = start_index | mask;\n" - " \tint i, n, pages, missing_pages, bytes, res = -ENOMEM;\n" - "@@ -68,7 +68,7 @@ int squashfs_readpage_block(struct page *target_page, u64 block, int bsize)\n" - " \n" - " \t\tif (PageUptodate(page[i])) {\n" - " \t\t\tunlock_page(page[i]);\n" - "-\t\t\tpage_cache_release(page[i]);\n" - "+\t\t\tput_page(page[i]);\n" - " \t\t\tpage[i] = NULL;\n" - " \t\t\tmissing_pages++;\n" - " \t\t}\n" - "@@ -96,10 +96,10 @@ int squashfs_readpage_block(struct page *target_page, u64 block, int bsize)\n" - " \t\tgoto mark_errored;\n" - " \n" - " \t/* Last page may have trailing bytes not filled */\n" - "-\tbytes = res % PAGE_CACHE_SIZE;\n" - "+\tbytes = res % PAGE_SIZE;\n" - " \tif (bytes) {\n" - " \t\tpageaddr = kmap_atomic(page[pages - 1]);\n" - "-\t\tmemset(pageaddr + bytes, 0, PAGE_CACHE_SIZE - bytes);\n" - "+\t\tmemset(pageaddr + bytes, 0, PAGE_SIZE - bytes);\n" - " \t\tkunmap_atomic(pageaddr);\n" - " \t}\n" - " \n" - "@@ -109,7 +109,7 @@ int squashfs_readpage_block(struct page *target_page, u64 block, int bsize)\n" - " \t\tSetPageUptodate(page[i]);\n" - " \t\tunlock_page(page[i]);\n" - " \t\tif (page[i] != target_page)\n" - "-\t\t\tpage_cache_release(page[i]);\n" - "+\t\t\tput_page(page[i]);\n" - " \t}\n" - " \n" - " \tkfree(actor);\n" - "@@ -127,7 +127,7 @@ mark_errored:\n" - " \t\tflush_dcache_page(page[i]);\n" - " \t\tSetPageError(page[i]);\n" - " \t\tunlock_page(page[i]);\n" - "-\t\tpage_cache_release(page[i]);\n" - "+\t\tput_page(page[i]);\n" - " \t}\n" - " \n" - " out:\n" - "@@ -153,21 +153,21 @@ static int squashfs_read_cache(struct page *target_page, u64 block, int bsize,\n" - " \t}\n" - " \n" - " \tfor (n = 0; n < pages && bytes > 0; n++,\n" - "-\t\t\tbytes -= PAGE_CACHE_SIZE, offset += PAGE_CACHE_SIZE) {\n" - "-\t\tint avail = min_t(int, bytes, PAGE_CACHE_SIZE);\n" - "+\t\t\tbytes -= PAGE_SIZE, offset += PAGE_SIZE) {\n" - "+\t\tint avail = min_t(int, bytes, PAGE_SIZE);\n" - " \n" - " \t\tif (page[n] == NULL)\n" - " \t\t\tcontinue;\n" - " \n" - " \t\tpageaddr = kmap_atomic(page[n]);\n" - " \t\tsquashfs_copy_data(pageaddr, buffer, offset, avail);\n" - "-\t\tmemset(pageaddr + avail, 0, PAGE_CACHE_SIZE - avail);\n" - "+\t\tmemset(pageaddr + avail, 0, PAGE_SIZE - avail);\n" - " \t\tkunmap_atomic(pageaddr);\n" - " \t\tflush_dcache_page(page[n]);\n" - " \t\tSetPageUptodate(page[n]);\n" - " \t\tunlock_page(page[n]);\n" - " \t\tif (page[n] != target_page)\n" - "-\t\t\tpage_cache_release(page[n]);\n" - "+\t\t\tput_page(page[n]);\n" - " \t}\n" - " \n" - " out:\n" - "diff --git a/fs/squashfs/lz4_wrapper.c b/fs/squashfs/lz4_wrapper.c\n" - "index c31e2bc9c081..ff4468bd18b0 100644\n" - "--- a/fs/squashfs/lz4_wrapper.c\n" - "+++ b/fs/squashfs/lz4_wrapper.c\n" - "@@ -117,13 +117,13 @@ static int lz4_uncompress(struct squashfs_sb_info *msblk, void *strm,\n" - " \tdata = squashfs_first_page(output);\n" - " \tbuff = stream->output;\n" - " \twhile (data) {\n" - "-\t\tif (bytes <= PAGE_CACHE_SIZE) {\n" - "+\t\tif (bytes <= PAGE_SIZE) {\n" - " \t\t\tmemcpy(data, buff, bytes);\n" - " \t\t\tbreak;\n" - " \t\t}\n" - "-\t\tmemcpy(data, buff, PAGE_CACHE_SIZE);\n" - "-\t\tbuff += PAGE_CACHE_SIZE;\n" - "-\t\tbytes -= PAGE_CACHE_SIZE;\n" - "+\t\tmemcpy(data, buff, PAGE_SIZE);\n" - "+\t\tbuff += PAGE_SIZE;\n" - "+\t\tbytes -= PAGE_SIZE;\n" - " \t\tdata = squashfs_next_page(output);\n" - " \t}\n" - " \tsquashfs_finish_page(output);\n" - "diff --git a/fs/squashfs/lzo_wrapper.c b/fs/squashfs/lzo_wrapper.c\n" - "index 244b9fbfff7b..934c17e96590 100644\n" - "--- a/fs/squashfs/lzo_wrapper.c\n" - "+++ b/fs/squashfs/lzo_wrapper.c\n" - "@@ -102,13 +102,13 @@ static int lzo_uncompress(struct squashfs_sb_info *msblk, void *strm,\n" - " \tdata = squashfs_first_page(output);\n" - " \tbuff = stream->output;\n" - " \twhile (data) {\n" - "-\t\tif (bytes <= PAGE_CACHE_SIZE) {\n" - "+\t\tif (bytes <= PAGE_SIZE) {\n" - " \t\t\tmemcpy(data, buff, bytes);\n" - " \t\t\tbreak;\n" - " \t\t} else {\n" - "-\t\t\tmemcpy(data, buff, PAGE_CACHE_SIZE);\n" - "-\t\t\tbuff += PAGE_CACHE_SIZE;\n" - "-\t\t\tbytes -= PAGE_CACHE_SIZE;\n" - "+\t\t\tmemcpy(data, buff, PAGE_SIZE);\n" - "+\t\t\tbuff += PAGE_SIZE;\n" - "+\t\t\tbytes -= PAGE_SIZE;\n" - " \t\t\tdata = squashfs_next_page(output);\n" - " \t\t}\n" - " \t}\n" - "diff --git a/fs/squashfs/page_actor.c b/fs/squashfs/page_actor.c\n" - "index 5a1c11f56441..9b7b1b6a7892 100644\n" - "--- a/fs/squashfs/page_actor.c\n" - "+++ b/fs/squashfs/page_actor.c\n" - "@@ -48,7 +48,7 @@ struct squashfs_page_actor *squashfs_page_actor_init(void **buffer,\n" - " \tif (actor == NULL)\n" - " \t\treturn NULL;\n" - " \n" - "-\tactor->length = length ? : pages * PAGE_CACHE_SIZE;\n" - "+\tactor->length = length ? : pages * PAGE_SIZE;\n" - " \tactor->buffer = buffer;\n" - " \tactor->pages = pages;\n" - " \tactor->next_page = 0;\n" - "@@ -88,7 +88,7 @@ struct squashfs_page_actor *squashfs_page_actor_init_special(struct page **page,\n" - " \tif (actor == NULL)\n" - " \t\treturn NULL;\n" - " \n" - "-\tactor->length = length ? : pages * PAGE_CACHE_SIZE;\n" - "+\tactor->length = length ? : pages * PAGE_SIZE;\n" - " \tactor->page = page;\n" - " \tactor->pages = pages;\n" - " \tactor->next_page = 0;\n" - "diff --git a/fs/squashfs/page_actor.h b/fs/squashfs/page_actor.h\n" - "index 26dd82008b82..98537eab27e2 100644\n" - "--- a/fs/squashfs/page_actor.h\n" - "+++ b/fs/squashfs/page_actor.h\n" - "@@ -24,7 +24,7 @@ static inline struct squashfs_page_actor *squashfs_page_actor_init(void **page,\n" - " \tif (actor == NULL)\n" - " \t\treturn NULL;\n" - " \n" - "-\tactor->length = length ? : pages * PAGE_CACHE_SIZE;\n" - "+\tactor->length = length ? : pages * PAGE_SIZE;\n" - " \tactor->page = page;\n" - " \tactor->pages = pages;\n" - " \tactor->next_page = 0;\n" - "diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c\n" - "index 5e79bfa4f260..cf01e15a7b16 100644\n" - "--- a/fs/squashfs/super.c\n" - "+++ b/fs/squashfs/super.c\n" - "@@ -152,7 +152,7 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent)\n" - " \t * Check the system page size is not larger than the filesystem\n" - " \t * block size (by default 128K). This is currently not supported.\n" - " \t */\n" - "-\tif (PAGE_CACHE_SIZE > msblk->block_size) {\n" - "+\tif (PAGE_SIZE > msblk->block_size) {\n" - " \t\tERROR(\"Page size > filesystem block size (%d). This is \"\n" - " \t\t\t\"currently not supported!\\n\", msblk->block_size);\n" - " \t\tgoto failed_mount;\n" - "diff --git a/fs/squashfs/symlink.c b/fs/squashfs/symlink.c\n" - "index dbcc2f54bad4..d688ef42a6a1 100644\n" - "--- a/fs/squashfs/symlink.c\n" - "+++ b/fs/squashfs/symlink.c\n" - "@@ -48,10 +48,10 @@ static int squashfs_symlink_readpage(struct file *file, struct page *page)\n" - " \tstruct inode *inode = page->mapping->host;\n" - " \tstruct super_block *sb = inode->i_sb;\n" - " \tstruct squashfs_sb_info *msblk = sb->s_fs_info;\n" - "-\tint index = page->index << PAGE_CACHE_SHIFT;\n" - "+\tint index = page->index << PAGE_SHIFT;\n" - " \tu64 block = squashfs_i(inode)->start;\n" - " \tint offset = squashfs_i(inode)->offset;\n" - "-\tint length = min_t(int, i_size_read(inode) - index, PAGE_CACHE_SIZE);\n" - "+\tint length = min_t(int, i_size_read(inode) - index, PAGE_SIZE);\n" - " \tint bytes, copied;\n" - " \tvoid *pageaddr;\n" - " \tstruct squashfs_cache_entry *entry;\n" - "@@ -94,7 +94,7 @@ static int squashfs_symlink_readpage(struct file *file, struct page *page)\n" - " \t\tcopied = squashfs_copy_data(pageaddr + bytes, entry, offset,\n" - " \t\t\t\t\t\t\t\tlength - bytes);\n" - " \t\tif (copied == length - bytes)\n" - "-\t\t\tmemset(pageaddr + length, 0, PAGE_CACHE_SIZE - length);\n" - "+\t\t\tmemset(pageaddr + length, 0, PAGE_SIZE - length);\n" - " \t\telse\n" - " \t\t\tblock = entry->next_index;\n" - " \t\tkunmap_atomic(pageaddr);\n" - "diff --git a/fs/squashfs/xz_wrapper.c b/fs/squashfs/xz_wrapper.c\n" - "index c609624e4b8a..6bfaef73d065 100644\n" - "--- a/fs/squashfs/xz_wrapper.c\n" - "+++ b/fs/squashfs/xz_wrapper.c\n" - "@@ -141,7 +141,7 @@ static int squashfs_xz_uncompress(struct squashfs_sb_info *msblk, void *strm,\n" - " \tstream->buf.in_pos = 0;\n" - " \tstream->buf.in_size = 0;\n" - " \tstream->buf.out_pos = 0;\n" - "-\tstream->buf.out_size = PAGE_CACHE_SIZE;\n" - "+\tstream->buf.out_size = PAGE_SIZE;\n" - " \tstream->buf.out = squashfs_first_page(output);\n" - " \n" - " \tdo {\n" - "@@ -158,7 +158,7 @@ static int squashfs_xz_uncompress(struct squashfs_sb_info *msblk, void *strm,\n" - " \t\t\tstream->buf.out = squashfs_next_page(output);\n" - " \t\t\tif (stream->buf.out != NULL) {\n" - " \t\t\t\tstream->buf.out_pos = 0;\n" - "-\t\t\t\ttotal += PAGE_CACHE_SIZE;\n" - "+\t\t\t\ttotal += PAGE_SIZE;\n" - " \t\t\t}\n" - " \t\t}\n" - " \n" - "diff --git a/fs/squashfs/zlib_wrapper.c b/fs/squashfs/zlib_wrapper.c\n" - "index 8727caba6882..2ec24d128bce 100644\n" - "--- a/fs/squashfs/zlib_wrapper.c\n" - "+++ b/fs/squashfs/zlib_wrapper.c\n" - "@@ -69,7 +69,7 @@ static int zlib_uncompress(struct squashfs_sb_info *msblk, void *strm,\n" - " \tint zlib_err, zlib_init = 0, k = 0;\n" - " \tz_stream *stream = strm;\n" - " \n" - "-\tstream->avail_out = PAGE_CACHE_SIZE;\n" - "+\tstream->avail_out = PAGE_SIZE;\n" - " \tstream->next_out = squashfs_first_page(output);\n" - " \tstream->avail_in = 0;\n" - " \n" - "@@ -85,7 +85,7 @@ static int zlib_uncompress(struct squashfs_sb_info *msblk, void *strm,\n" - " \t\tif (stream->avail_out == 0) {\n" - " \t\t\tstream->next_out = squashfs_next_page(output);\n" - " \t\t\tif (stream->next_out != NULL)\n" - "-\t\t\t\tstream->avail_out = PAGE_CACHE_SIZE;\n" - "+\t\t\t\tstream->avail_out = PAGE_SIZE;\n" - " \t\t}\n" - " \n" - " \t\tif (!zlib_init) {\n" - "diff --git a/fs/sync.c b/fs/sync.c\n" - "index dd5d1711c7ac..2a54c1f22035 100644\n" - "--- a/fs/sync.c\n" - "+++ b/fs/sync.c\n" - "@@ -302,7 +302,7 @@ SYSCALL_DEFINE4(sync_file_range, int, fd, loff_t, offset, loff_t, nbytes,\n" - " \t\tgoto out;\n" - " \n" - " \tif (sizeof(pgoff_t) == 4) {\n" - "-\t\tif (offset >= (0x100000000ULL << PAGE_CACHE_SHIFT)) {\n" - "+\t\tif (offset >= (0x100000000ULL << PAGE_SHIFT)) {\n" - " \t\t\t/*\n" - " \t\t\t * The range starts outside a 32 bit machine's\n" - " \t\t\t * pagecache addressing capabilities. Let it \"succeed\"\n" - "@@ -310,7 +310,7 @@ SYSCALL_DEFINE4(sync_file_range, int, fd, loff_t, offset, loff_t, nbytes,\n" - " \t\t\tret = 0;\n" - " \t\t\tgoto out;\n" - " \t\t}\n" - "-\t\tif (endbyte >= (0x100000000ULL << PAGE_CACHE_SHIFT)) {\n" - "+\t\tif (endbyte >= (0x100000000ULL << PAGE_SHIFT)) {\n" - " \t\t\t/*\n" - " \t\t\t * Out to EOF\n" - " \t\t\t */\n" - "diff --git a/fs/sysv/dir.c b/fs/sysv/dir.c\n" - "index 63c1bcb224ee..c0f0a3e643eb 100644\n" - "--- a/fs/sysv/dir.c\n" - "+++ b/fs/sysv/dir.c\n" - "@@ -30,7 +30,7 @@ const struct file_operations sysv_dir_operations = {\n" - " static inline void dir_put_page(struct page *page)\n" - " {\n" - " \tkunmap(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " static int dir_commit_chunk(struct page *page, loff_t pos, unsigned len)\n" - "@@ -73,8 +73,8 @@ static int sysv_readdir(struct file *file, struct dir_context *ctx)\n" - " \tif (pos >= inode->i_size)\n" - " \t\treturn 0;\n" - " \n" - "-\toffset = pos & ~PAGE_CACHE_MASK;\n" - "-\tn = pos >> PAGE_CACHE_SHIFT;\n" - "+\toffset = pos & ~PAGE_MASK;\n" - "+\tn = pos >> PAGE_SHIFT;\n" - " \n" - " \tfor ( ; n < npages; n++, offset = 0) {\n" - " \t\tchar *kaddr, *limit;\n" - "@@ -85,7 +85,7 @@ static int sysv_readdir(struct file *file, struct dir_context *ctx)\n" - " \t\t\tcontinue;\n" - " \t\tkaddr = (char *)page_address(page);\n" - " \t\tde = (struct sysv_dir_entry *)(kaddr+offset);\n" - "-\t\tlimit = kaddr + PAGE_CACHE_SIZE - SYSV_DIRSIZE;\n" - "+\t\tlimit = kaddr + PAGE_SIZE - SYSV_DIRSIZE;\n" - " \t\tfor ( ;(char*)de <= limit; de++, ctx->pos += sizeof(*de)) {\n" - " \t\t\tchar *name = de->name;\n" - " \n" - "@@ -146,7 +146,7 @@ struct sysv_dir_entry *sysv_find_entry(struct dentry *dentry, struct page **res_\n" - " \t\tif (!IS_ERR(page)) {\n" - " \t\t\tkaddr = (char*)page_address(page);\n" - " \t\t\tde = (struct sysv_dir_entry *) kaddr;\n" - "-\t\t\tkaddr += PAGE_CACHE_SIZE - SYSV_DIRSIZE;\n" - "+\t\t\tkaddr += PAGE_SIZE - SYSV_DIRSIZE;\n" - " \t\t\tfor ( ; (char *) de <= kaddr ; de++) {\n" - " \t\t\t\tif (!de->inode)\n" - " \t\t\t\t\tcontinue;\n" - "@@ -190,7 +190,7 @@ int sysv_add_link(struct dentry *dentry, struct inode *inode)\n" - " \t\t\tgoto out;\n" - " \t\tkaddr = (char*)page_address(page);\n" - " \t\tde = (struct sysv_dir_entry *)kaddr;\n" - "-\t\tkaddr += PAGE_CACHE_SIZE - SYSV_DIRSIZE;\n" - "+\t\tkaddr += PAGE_SIZE - SYSV_DIRSIZE;\n" - " \t\twhile ((char *)de <= kaddr) {\n" - " \t\t\tif (!de->inode)\n" - " \t\t\t\tgoto got_it;\n" - "@@ -261,7 +261,7 @@ int sysv_make_empty(struct inode *inode, struct inode *dir)\n" - " \tkmap(page);\n" - " \n" - " \tbase = (char*)page_address(page);\n" - "-\tmemset(base, 0, PAGE_CACHE_SIZE);\n" - "+\tmemset(base, 0, PAGE_SIZE);\n" - " \n" - " \tde = (struct sysv_dir_entry *) base;\n" - " \tde->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), inode->i_ino);\n" - "@@ -273,7 +273,7 @@ int sysv_make_empty(struct inode *inode, struct inode *dir)\n" - " \tkunmap(page);\n" - " \terr = dir_commit_chunk(page, 0, 2 * SYSV_DIRSIZE);\n" - " fail:\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn err;\n" - " }\n" - " \n" - "@@ -296,7 +296,7 @@ int sysv_empty_dir(struct inode * inode)\n" - " \n" - " \t\tkaddr = (char *)page_address(page);\n" - " \t\tde = (struct sysv_dir_entry *)kaddr;\n" - "-\t\tkaddr += PAGE_CACHE_SIZE-SYSV_DIRSIZE;\n" - "+\t\tkaddr += PAGE_SIZE-SYSV_DIRSIZE;\n" - " \n" - " \t\tfor ( ;(char *)de <= kaddr; de++) {\n" - " \t\t\tif (!de->inode)\n" - "diff --git a/fs/sysv/namei.c b/fs/sysv/namei.c\n" - "index 11e83ed0b4bf..90b60c03b588 100644\n" - "--- a/fs/sysv/namei.c\n" - "+++ b/fs/sysv/namei.c\n" - "@@ -264,11 +264,11 @@ static int sysv_rename(struct inode * old_dir, struct dentry * old_dentry,\n" - " out_dir:\n" - " \tif (dir_de) {\n" - " \t\tkunmap(dir_page);\n" - "-\t\tpage_cache_release(dir_page);\n" - "+\t\tput_page(dir_page);\n" - " \t}\n" - " out_old:\n" - " \tkunmap(old_page);\n" - "-\tpage_cache_release(old_page);\n" - "+\tput_page(old_page);\n" - " out:\n" - " \treturn err;\n" - " }\n" - "diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c\n" - "index 065c88f8e4b8..446753d8ac34 100644\n" - "--- a/fs/ubifs/file.c\n" - "+++ b/fs/ubifs/file.c\n" - "@@ -121,7 +121,7 @@ static int do_readpage(struct page *page)\n" - " \tif (block >= beyond) {\n" - " \t\t/* Reading beyond inode */\n" - " \t\tSetPageChecked(page);\n" - "-\t\tmemset(addr, 0, PAGE_CACHE_SIZE);\n" - "+\t\tmemset(addr, 0, PAGE_SIZE);\n" - " \t\tgoto out;\n" - " \t}\n" - " \n" - "@@ -223,7 +223,7 @@ static int write_begin_slow(struct address_space *mapping,\n" - " {\n" - " \tstruct inode *inode = mapping->host;\n" - " \tstruct ubifs_info *c = inode->i_sb->s_fs_info;\n" - "-\tpgoff_t index = pos >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = pos >> PAGE_SHIFT;\n" - " \tstruct ubifs_budget_req req = { .new_page = 1 };\n" - " \tint uninitialized_var(err), appending = !!(pos + len > inode->i_size);\n" - " \tstruct page *page;\n" - "@@ -254,13 +254,13 @@ static int write_begin_slow(struct address_space *mapping,\n" - " \t}\n" - " \n" - " \tif (!PageUptodate(page)) {\n" - "-\t\tif (!(pos & ~PAGE_CACHE_MASK) && len == PAGE_CACHE_SIZE)\n" - "+\t\tif (!(pos & ~PAGE_MASK) && len == PAGE_SIZE)\n" - " \t\t\tSetPageChecked(page);\n" - " \t\telse {\n" - " \t\t\terr = do_readpage(page);\n" - " \t\t\tif (err) {\n" - " \t\t\t\tunlock_page(page);\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t\tubifs_release_budget(c, &req);\n" - " \t\t\t\treturn err;\n" - " \t\t\t}\n" - "@@ -428,7 +428,7 @@ static int ubifs_write_begin(struct file *file, struct address_space *mapping,\n" - " \tstruct inode *inode = mapping->host;\n" - " \tstruct ubifs_info *c = inode->i_sb->s_fs_info;\n" - " \tstruct ubifs_inode *ui = ubifs_inode(inode);\n" - "-\tpgoff_t index = pos >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = pos >> PAGE_SHIFT;\n" - " \tint uninitialized_var(err), appending = !!(pos + len > inode->i_size);\n" - " \tint skipped_read = 0;\n" - " \tstruct page *page;\n" - "@@ -446,7 +446,7 @@ static int ubifs_write_begin(struct file *file, struct address_space *mapping,\n" - " \n" - " \tif (!PageUptodate(page)) {\n" - " \t\t/* The page is not loaded from the flash */\n" - "-\t\tif (!(pos & ~PAGE_CACHE_MASK) && len == PAGE_CACHE_SIZE) {\n" - "+\t\tif (!(pos & ~PAGE_MASK) && len == PAGE_SIZE) {\n" - " \t\t\t/*\n" - " \t\t\t * We change whole page so no need to load it. But we\n" - " \t\t\t * do not know whether this page exists on the media or\n" - "@@ -462,7 +462,7 @@ static int ubifs_write_begin(struct file *file, struct address_space *mapping,\n" - " \t\t\terr = do_readpage(page);\n" - " \t\t\tif (err) {\n" - " \t\t\t\tunlock_page(page);\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t\treturn err;\n" - " \t\t\t}\n" - " \t\t}\n" - "@@ -494,7 +494,7 @@ static int ubifs_write_begin(struct file *file, struct address_space *mapping,\n" - " \t\t\tmutex_unlock(&ui->ui_mutex);\n" - " \t\t}\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \n" - " \t\treturn write_begin_slow(mapping, pos, len, pagep, flags);\n" - " \t}\n" - "@@ -549,12 +549,12 @@ static int ubifs_write_end(struct file *file, struct address_space *mapping,\n" - " \tdbg_gen(\"ino %lu, pos %llu, pg %lu, len %u, copied %d, i_size %lld\",\n" - " \t\tinode->i_ino, pos, page->index, len, copied, inode->i_size);\n" - " \n" - "-\tif (unlikely(copied < len && len == PAGE_CACHE_SIZE)) {\n" - "+\tif (unlikely(copied < len && len == PAGE_SIZE)) {\n" - " \t\t/*\n" - " \t\t * VFS copied less data to the page that it intended and\n" - " \t\t * declared in its '->write_begin()' call via the @len\n" - " \t\t * argument. If the page was not up-to-date, and @len was\n" - "-\t\t * @PAGE_CACHE_SIZE, the 'ubifs_write_begin()' function did\n" - "+\t\t * @PAGE_SIZE, the 'ubifs_write_begin()' function did\n" - " \t\t * not load it from the media (for optimization reasons). This\n" - " \t\t * means that part of the page contains garbage. So read the\n" - " \t\t * page now.\n" - "@@ -593,7 +593,7 @@ static int ubifs_write_end(struct file *file, struct address_space *mapping,\n" - " \n" - " out:\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn copied;\n" - " }\n" - " \n" - "@@ -621,10 +621,10 @@ static int populate_page(struct ubifs_info *c, struct page *page,\n" - " \n" - " \taddr = zaddr = kmap(page);\n" - " \n" - "-\tend_index = (i_size - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tend_index = (i_size - 1) >> PAGE_SHIFT;\n" - " \tif (!i_size || page->index > end_index) {\n" - " \t\thole = 1;\n" - "-\t\tmemset(addr, 0, PAGE_CACHE_SIZE);\n" - "+\t\tmemset(addr, 0, PAGE_SIZE);\n" - " \t\tgoto out_hole;\n" - " \t}\n" - " \n" - "@@ -673,7 +673,7 @@ static int populate_page(struct ubifs_info *c, struct page *page,\n" - " \t}\n" - " \n" - " \tif (end_index == page->index) {\n" - "-\t\tint len = i_size & (PAGE_CACHE_SIZE - 1);\n" - "+\t\tint len = i_size & (PAGE_SIZE - 1);\n" - " \n" - " \t\tif (len && len < read)\n" - " \t\t\tmemset(zaddr + len, 0, read - len);\n" - "@@ -773,7 +773,7 @@ static int ubifs_do_bulk_read(struct ubifs_info *c, struct bu_info *bu,\n" - " \tisize = i_size_read(inode);\n" - " \tif (isize == 0)\n" - " \t\tgoto out_free;\n" - "-\tend_index = ((isize - 1) >> PAGE_CACHE_SHIFT);\n" - "+\tend_index = ((isize - 1) >> PAGE_SHIFT);\n" - " \n" - " \tfor (page_idx = 1; page_idx < page_cnt; page_idx++) {\n" - " \t\tpgoff_t page_offset = offset + page_idx;\n" - "@@ -788,7 +788,7 @@ static int ubifs_do_bulk_read(struct ubifs_info *c, struct bu_info *bu,\n" - " \t\tif (!PageUptodate(page))\n" - " \t\t\terr = populate_page(c, page, bu, &n);\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tif (err)\n" - " \t\t\tbreak;\n" - " \t}\n" - "@@ -905,7 +905,7 @@ static int do_writepage(struct page *page, int len)\n" - " #ifdef UBIFS_DEBUG\n" - " \tstruct ubifs_inode *ui = ubifs_inode(inode);\n" - " \tspin_lock(&ui->ui_lock);\n" - "-\tubifs_assert(page->index <= ui->synced_i_size >> PAGE_CACHE_SHIFT);\n" - "+\tubifs_assert(page->index <= ui->synced_i_size >> PAGE_SHIFT);\n" - " \tspin_unlock(&ui->ui_lock);\n" - " #endif\n" - " \n" - "@@ -1001,8 +1001,8 @@ static int ubifs_writepage(struct page *page, struct writeback_control *wbc)\n" - " \tstruct inode *inode = page->mapping->host;\n" - " \tstruct ubifs_inode *ui = ubifs_inode(inode);\n" - " \tloff_t i_size = i_size_read(inode), synced_i_size;\n" - "-\tpgoff_t end_index = i_size >> PAGE_CACHE_SHIFT;\n" - "-\tint err, len = i_size & (PAGE_CACHE_SIZE - 1);\n" - "+\tpgoff_t end_index = i_size >> PAGE_SHIFT;\n" - "+\tint err, len = i_size & (PAGE_SIZE - 1);\n" - " \tvoid *kaddr;\n" - " \n" - " \tdbg_gen(\"ino %lu, pg %lu, pg flags %#lx\",\n" - "@@ -1021,7 +1021,7 @@ static int ubifs_writepage(struct page *page, struct writeback_control *wbc)\n" - " \n" - " \t/* Is the page fully inside @i_size? */\n" - " \tif (page->index < end_index) {\n" - "-\t\tif (page->index >= synced_i_size >> PAGE_CACHE_SHIFT) {\n" - "+\t\tif (page->index >= synced_i_size >> PAGE_SHIFT) {\n" - " \t\t\terr = inode->i_sb->s_op->write_inode(inode, NULL);\n" - " \t\t\tif (err)\n" - " \t\t\t\tgoto out_unlock;\n" - "@@ -1034,7 +1034,7 @@ static int ubifs_writepage(struct page *page, struct writeback_control *wbc)\n" - " \t\t\t * with this.\n" - " \t\t\t */\n" - " \t\t}\n" - "-\t\treturn do_writepage(page, PAGE_CACHE_SIZE);\n" - "+\t\treturn do_writepage(page, PAGE_SIZE);\n" - " \t}\n" - " \n" - " \t/*\n" - "@@ -1045,7 +1045,7 @@ static int ubifs_writepage(struct page *page, struct writeback_control *wbc)\n" - " \t * writes to that region are not written out to the file.\"\n" - " \t */\n" - " \tkaddr = kmap_atomic(page);\n" - "-\tmemset(kaddr + len, 0, PAGE_CACHE_SIZE - len);\n" - "+\tmemset(kaddr + len, 0, PAGE_SIZE - len);\n" - " \tflush_dcache_page(page);\n" - " \tkunmap_atomic(kaddr);\n" - " \n" - "@@ -1138,7 +1138,7 @@ static int do_truncation(struct ubifs_info *c, struct inode *inode,\n" - " \ttruncate_setsize(inode, new_size);\n" - " \n" - " \tif (offset) {\n" - "-\t\tpgoff_t index = new_size >> PAGE_CACHE_SHIFT;\n" - "+\t\tpgoff_t index = new_size >> PAGE_SHIFT;\n" - " \t\tstruct page *page;\n" - " \n" - " \t\tpage = find_lock_page(inode->i_mapping, index);\n" - "@@ -1157,9 +1157,9 @@ static int do_truncation(struct ubifs_info *c, struct inode *inode,\n" - " \t\t\t\tclear_page_dirty_for_io(page);\n" - " \t\t\t\tif (UBIFS_BLOCKS_PER_PAGE_SHIFT)\n" - " \t\t\t\t\toffset = new_size &\n" - "-\t\t\t\t\t\t (PAGE_CACHE_SIZE - 1);\n" - "+\t\t\t\t\t\t (PAGE_SIZE - 1);\n" - " \t\t\t\terr = do_writepage(page, offset);\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t\tif (err)\n" - " \t\t\t\t\tgoto out_budg;\n" - " \t\t\t\t/*\n" - "@@ -1173,7 +1173,7 @@ static int do_truncation(struct ubifs_info *c, struct inode *inode,\n" - " \t\t\t\t * having to read it.\n" - " \t\t\t\t */\n" - " \t\t\t\tunlock_page(page);\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t}\n" - " \t\t}\n" - " \t}\n" - "@@ -1285,7 +1285,7 @@ static void ubifs_invalidatepage(struct page *page, unsigned int offset,\n" - " \tstruct ubifs_info *c = inode->i_sb->s_fs_info;\n" - " \n" - " \tubifs_assert(PagePrivate(page));\n" - "-\tif (offset || length < PAGE_CACHE_SIZE)\n" - "+\tif (offset || length < PAGE_SIZE)\n" - " \t\t/* Partial page remains dirty */\n" - " \t\treturn;\n" - " \n" - "diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c\n" - "index a233ba913be4..e98c24ee25a1 100644\n" - "--- a/fs/ubifs/super.c\n" - "+++ b/fs/ubifs/super.c\n" - "@@ -2237,12 +2237,12 @@ static int __init ubifs_init(void)\n" - " \tBUILD_BUG_ON(UBIFS_COMPR_TYPES_CNT > 4);\n" - " \n" - " \t/*\n" - "-\t * We require that PAGE_CACHE_SIZE is greater-than-or-equal-to\n" - "+\t * We require that PAGE_SIZE is greater-than-or-equal-to\n" - " \t * UBIFS_BLOCK_SIZE. It is assumed that both are powers of 2.\n" - " \t */\n" - "-\tif (PAGE_CACHE_SIZE < UBIFS_BLOCK_SIZE) {\n" - "+\tif (PAGE_SIZE < UBIFS_BLOCK_SIZE) {\n" - " \t\tpr_err(\"UBIFS error (pid %d): VFS page cache size is %u bytes, but UBIFS requires at least 4096 bytes\",\n" - "-\t\t current->pid, (unsigned int)PAGE_CACHE_SIZE);\n" - "+\t\t current->pid, (unsigned int)PAGE_SIZE);\n" - " \t\treturn -EINVAL;\n" - " \t}\n" - " \n" - "diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h\n" - "index a5697de763f5..425e6a36637f 100644\n" - "--- a/fs/ubifs/ubifs.h\n" - "+++ b/fs/ubifs/ubifs.h\n" - "@@ -70,8 +70,8 @@\n" - " #define UBIFS_SUPER_MAGIC 0x24051905\n" - " \n" - " /* Number of UBIFS blocks per VFS page */\n" - "-#define UBIFS_BLOCKS_PER_PAGE (PAGE_CACHE_SIZE / UBIFS_BLOCK_SIZE)\n" - "-#define UBIFS_BLOCKS_PER_PAGE_SHIFT (PAGE_CACHE_SHIFT - UBIFS_BLOCK_SHIFT)\n" - "+#define UBIFS_BLOCKS_PER_PAGE (PAGE_SIZE / UBIFS_BLOCK_SIZE)\n" - "+#define UBIFS_BLOCKS_PER_PAGE_SHIFT (PAGE_SHIFT - UBIFS_BLOCK_SHIFT)\n" - " \n" - " /* \"File system end of life\" sequence number watermark */\n" - " #define SQNUM_WARN_WATERMARK 0xFFFFFFFF00000000ULL\n" - "diff --git a/fs/udf/file.c b/fs/udf/file.c\n" - "index 1af98963d860..877ba1c9b461 100644\n" - "--- a/fs/udf/file.c\n" - "+++ b/fs/udf/file.c\n" - "@@ -46,7 +46,7 @@ static void __udf_adinicb_readpage(struct page *page)\n" - " \n" - " \tkaddr = kmap(page);\n" - " \tmemcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr, inode->i_size);\n" - "-\tmemset(kaddr + inode->i_size, 0, PAGE_CACHE_SIZE - inode->i_size);\n" - "+\tmemset(kaddr + inode->i_size, 0, PAGE_SIZE - inode->i_size);\n" - " \tflush_dcache_page(page);\n" - " \tSetPageUptodate(page);\n" - " \tkunmap(page);\n" - "@@ -87,14 +87,14 @@ static int udf_adinicb_write_begin(struct file *file,\n" - " {\n" - " \tstruct page *page;\n" - " \n" - "-\tif (WARN_ON_ONCE(pos >= PAGE_CACHE_SIZE))\n" - "+\tif (WARN_ON_ONCE(pos >= PAGE_SIZE))\n" - " \t\treturn -EIO;\n" - " \tpage = grab_cache_page_write_begin(mapping, 0, flags);\n" - " \tif (!page)\n" - " \t\treturn -ENOMEM;\n" - " \t*pagep = page;\n" - " \n" - "-\tif (!PageUptodate(page) && len != PAGE_CACHE_SIZE)\n" - "+\tif (!PageUptodate(page) && len != PAGE_SIZE)\n" - " \t\t__udf_adinicb_readpage(page);\n" - " \treturn 0;\n" - " }\n" - "diff --git a/fs/udf/inode.c b/fs/udf/inode.c\n" - "index 166d3ed32c39..2dc461eeb415 100644\n" - "--- a/fs/udf/inode.c\n" - "+++ b/fs/udf/inode.c\n" - "@@ -287,7 +287,7 @@ int udf_expand_file_adinicb(struct inode *inode)\n" - " \tif (!PageUptodate(page)) {\n" - " \t\tkaddr = kmap(page);\n" - " \t\tmemset(kaddr + iinfo->i_lenAlloc, 0x00,\n" - "-\t\t PAGE_CACHE_SIZE - iinfo->i_lenAlloc);\n" - "+\t\t PAGE_SIZE - iinfo->i_lenAlloc);\n" - " \t\tmemcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr,\n" - " \t\t\tiinfo->i_lenAlloc);\n" - " \t\tflush_dcache_page(page);\n" - "@@ -319,7 +319,7 @@ int udf_expand_file_adinicb(struct inode *inode)\n" - " \t\tinode->i_data.a_ops = &udf_adinicb_aops;\n" - " \t\tup_write(&iinfo->i_data_sem);\n" - " \t}\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \tmark_inode_dirty(inode);\n" - " \n" - " \treturn err;\n" - "diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c\n" - "index dc5fae601c24..0447b949c7f5 100644\n" - "--- a/fs/ufs/balloc.c\n" - "+++ b/fs/ufs/balloc.c\n" - "@@ -237,7 +237,7 @@ static void ufs_change_blocknr(struct inode *inode, sector_t beg,\n" - " \t\t\t sector_t newb, struct page *locked_page)\n" - " {\n" - " \tconst unsigned blks_per_page =\n" - "-\t\t1 << (PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "+\t\t1 << (PAGE_SHIFT - inode->i_blkbits);\n" - " \tconst unsigned mask = blks_per_page - 1;\n" - " \tstruct address_space * const mapping = inode->i_mapping;\n" - " \tpgoff_t index, cur_index, last_index;\n" - "@@ -255,9 +255,9 @@ static void ufs_change_blocknr(struct inode *inode, sector_t beg,\n" - " \n" - " \tcur_index = locked_page->index;\n" - " \tend = count + beg;\n" - "-\tlast_index = end >> (PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "+\tlast_index = end >> (PAGE_SHIFT - inode->i_blkbits);\n" - " \tfor (i = beg; i < end; i = (i | mask) + 1) {\n" - "-\t\tindex = i >> (PAGE_CACHE_SHIFT - inode->i_blkbits);\n" - "+\t\tindex = i >> (PAGE_SHIFT - inode->i_blkbits);\n" - " \n" - " \t\tif (likely(cur_index != index)) {\n" - " \t\t\tpage = ufs_get_locked_page(mapping, index);\n" - "diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c\n" - "index 74f2e80288bf..0b1457292734 100644\n" - "--- a/fs/ufs/dir.c\n" - "+++ b/fs/ufs/dir.c\n" - "@@ -62,7 +62,7 @@ static int ufs_commit_chunk(struct page *page, loff_t pos, unsigned len)\n" - " static inline void ufs_put_page(struct page *page)\n" - " {\n" - " \tkunmap(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " ino_t ufs_inode_by_name(struct inode *dir, const struct qstr *qstr)\n" - "@@ -111,13 +111,13 @@ static void ufs_check_page(struct page *page)\n" - " \tstruct super_block *sb = dir->i_sb;\n" - " \tchar *kaddr = page_address(page);\n" - " \tunsigned offs, rec_len;\n" - "-\tunsigned limit = PAGE_CACHE_SIZE;\n" - "+\tunsigned limit = PAGE_SIZE;\n" - " \tconst unsigned chunk_mask = UFS_SB(sb)->s_uspi->s_dirblksize - 1;\n" - " \tstruct ufs_dir_entry *p;\n" - " \tchar *error;\n" - " \n" - "-\tif ((dir->i_size >> PAGE_CACHE_SHIFT) == page->index) {\n" - "-\t\tlimit = dir->i_size & ~PAGE_CACHE_MASK;\n" - "+\tif ((dir->i_size >> PAGE_SHIFT) == page->index) {\n" - "+\t\tlimit = dir->i_size & ~PAGE_MASK;\n" - " \t\tif (limit & chunk_mask)\n" - " \t\t\tgoto Ebadsize;\n" - " \t\tif (!limit)\n" - "@@ -170,7 +170,7 @@ Einumber:\n" - " bad_entry:\n" - " \tufs_error (sb, \"ufs_check_page\", \"bad entry in directory #%lu: %s - \"\n" - " \t\t \"offset=%lu, rec_len=%d, name_len=%d\",\n" - "-\t\t dir->i_ino, error, (page->index<<PAGE_CACHE_SHIFT)+offs,\n" - "+\t\t dir->i_ino, error, (page->index<<PAGE_SHIFT)+offs,\n" - " \t\t rec_len, ufs_get_de_namlen(sb, p));\n" - " \tgoto fail;\n" - " Eend:\n" - "@@ -178,7 +178,7 @@ Eend:\n" - " \tufs_error(sb, __func__,\n" - " \t\t \"entry in directory #%lu spans the page boundary\"\n" - " \t\t \"offset=%lu\",\n" - "-\t\t dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs);\n" - "+\t\t dir->i_ino, (page->index<<PAGE_SHIFT)+offs);\n" - " fail:\n" - " \tSetPageChecked(page);\n" - " \tSetPageError(page);\n" - "@@ -211,9 +211,9 @@ ufs_last_byte(struct inode *inode, unsigned long page_nr)\n" - " {\n" - " \tunsigned last_byte = inode->i_size;\n" - " \n" - "-\tlast_byte -= page_nr << PAGE_CACHE_SHIFT;\n" - "-\tif (last_byte > PAGE_CACHE_SIZE)\n" - "-\t\tlast_byte = PAGE_CACHE_SIZE;\n" - "+\tlast_byte -= page_nr << PAGE_SHIFT;\n" - "+\tif (last_byte > PAGE_SIZE)\n" - "+\t\tlast_byte = PAGE_SIZE;\n" - " \treturn last_byte;\n" - " }\n" - " \n" - "@@ -341,7 +341,7 @@ int ufs_add_link(struct dentry *dentry, struct inode *inode)\n" - " \t\tkaddr = page_address(page);\n" - " \t\tdir_end = kaddr + ufs_last_byte(dir, n);\n" - " \t\tde = (struct ufs_dir_entry *)kaddr;\n" - "-\t\tkaddr += PAGE_CACHE_SIZE - reclen;\n" - "+\t\tkaddr += PAGE_SIZE - reclen;\n" - " \t\twhile ((char *)de <= kaddr) {\n" - " \t\t\tif ((char *)de == dir_end) {\n" - " \t\t\t\t/* We hit i_size */\n" - "@@ -432,8 +432,8 @@ ufs_readdir(struct file *file, struct dir_context *ctx)\n" - " \tloff_t pos = ctx->pos;\n" - " \tstruct inode *inode = file_inode(file);\n" - " \tstruct super_block *sb = inode->i_sb;\n" - "-\tunsigned int offset = pos & ~PAGE_CACHE_MASK;\n" - "-\tunsigned long n = pos >> PAGE_CACHE_SHIFT;\n" - "+\tunsigned int offset = pos & ~PAGE_MASK;\n" - "+\tunsigned long n = pos >> PAGE_SHIFT;\n" - " \tunsigned long npages = dir_pages(inode);\n" - " \tunsigned chunk_mask = ~(UFS_SB(sb)->s_uspi->s_dirblksize - 1);\n" - " \tint need_revalidate = file->f_version != inode->i_version;\n" - "@@ -454,14 +454,14 @@ ufs_readdir(struct file *file, struct dir_context *ctx)\n" - " \t\t\tufs_error(sb, __func__,\n" - " \t\t\t\t \"bad page in #%lu\",\n" - " \t\t\t\t inode->i_ino);\n" - "-\t\t\tctx->pos += PAGE_CACHE_SIZE - offset;\n" - "+\t\t\tctx->pos += PAGE_SIZE - offset;\n" - " \t\t\treturn -EIO;\n" - " \t\t}\n" - " \t\tkaddr = page_address(page);\n" - " \t\tif (unlikely(need_revalidate)) {\n" - " \t\t\tif (offset) {\n" - " \t\t\t\toffset = ufs_validate_entry(sb, kaddr, offset, chunk_mask);\n" - "-\t\t\t\tctx->pos = (n<<PAGE_CACHE_SHIFT) + offset;\n" - "+\t\t\t\tctx->pos = (n<<PAGE_SHIFT) + offset;\n" - " \t\t\t}\n" - " \t\t\tfile->f_version = inode->i_version;\n" - " \t\t\tneed_revalidate = 0;\n" - "@@ -574,7 +574,7 @@ int ufs_make_empty(struct inode * inode, struct inode *dir)\n" - " \n" - " \tkmap(page);\n" - " \tbase = (char*)page_address(page);\n" - "-\tmemset(base, 0, PAGE_CACHE_SIZE);\n" - "+\tmemset(base, 0, PAGE_SIZE);\n" - " \n" - " \tde = (struct ufs_dir_entry *) base;\n" - " \n" - "@@ -594,7 +594,7 @@ int ufs_make_empty(struct inode * inode, struct inode *dir)\n" - " \n" - " \terr = ufs_commit_chunk(page, 0, chunk_size);\n" - " fail:\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn err;\n" - " }\n" - " \n" - "diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c\n" - "index d897e169ab9c..9f49431e798d 100644\n" - "--- a/fs/ufs/inode.c\n" - "+++ b/fs/ufs/inode.c\n" - "@@ -1051,13 +1051,13 @@ static int ufs_alloc_lastblock(struct inode *inode, loff_t size)\n" - " \tlastfrag--;\n" - " \n" - " \tlastpage = ufs_get_locked_page(mapping, lastfrag >>\n" - "-\t\t\t\t (PAGE_CACHE_SHIFT - inode->i_blkbits));\n" - "+\t\t\t\t (PAGE_SHIFT - inode->i_blkbits));\n" - " if (IS_ERR(lastpage)) {\n" - " err = -EIO;\n" - " goto out;\n" - " }\n" - " \n" - "- end = lastfrag & ((1 << (PAGE_CACHE_SHIFT - inode->i_blkbits)) - 1);\n" - "+ end = lastfrag & ((1 << (PAGE_SHIFT - inode->i_blkbits)) - 1);\n" - " bh = page_buffers(lastpage);\n" - " for (i = 0; i < end; ++i)\n" - " bh = bh->b_this_page;\n" - "diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c\n" - "index acf4a3b61b81..a1559f762805 100644\n" - "--- a/fs/ufs/namei.c\n" - "+++ b/fs/ufs/namei.c\n" - "@@ -305,7 +305,7 @@ static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry,\n" - " \t\t\tufs_set_link(old_inode, dir_de, dir_page, new_dir, 0);\n" - " \t\telse {\n" - " \t\t\tkunmap(dir_page);\n" - "-\t\t\tpage_cache_release(dir_page);\n" - "+\t\t\tput_page(dir_page);\n" - " \t\t}\n" - " \t\tinode_dec_link_count(old_dir);\n" - " \t}\n" - "@@ -315,11 +315,11 @@ static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry,\n" - " out_dir:\n" - " \tif (dir_de) {\n" - " \t\tkunmap(dir_page);\n" - "-\t\tpage_cache_release(dir_page);\n" - "+\t\tput_page(dir_page);\n" - " \t}\n" - " out_old:\n" - " \tkunmap(old_page);\n" - "-\tpage_cache_release(old_page);\n" - "+\tput_page(old_page);\n" - " out:\n" - " \treturn err;\n" - " }\n" - "diff --git a/fs/ufs/util.c b/fs/ufs/util.c\n" - "index b6c2f94e041e..a409e3e7827a 100644\n" - "--- a/fs/ufs/util.c\n" - "+++ b/fs/ufs/util.c\n" - "@@ -261,14 +261,14 @@ struct page *ufs_get_locked_page(struct address_space *mapping,\n" - " \t\tif (unlikely(page->mapping == NULL)) {\n" - " \t\t\t/* Truncate got there first */\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tpage = NULL;\n" - " \t\t\tgoto out;\n" - " \t\t}\n" - " \n" - " \t\tif (!PageUptodate(page) || PageError(page)) {\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \n" - " \t\t\tprintk(KERN_ERR \"ufs_change_blocknr: \"\n" - " \t\t\t \"can not read page: ino %lu, index: %lu\\n\",\n" - "diff --git a/fs/ufs/util.h b/fs/ufs/util.h\n" - "index 954175928240..b7fbf53dbc81 100644\n" - "--- a/fs/ufs/util.h\n" - "+++ b/fs/ufs/util.h\n" - "@@ -283,7 +283,7 @@ extern struct page *ufs_get_locked_page(struct address_space *mapping,\n" - " static inline void ufs_put_locked_page(struct page *page)\n" - " {\n" - " unlock_page(page);\n" - "- page_cache_release(page);\n" - "+ put_page(page);\n" - " }\n" - " \n" - " \n" - "diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c\n" - "index ef00156f4f96..aafecc12a8e2 100644\n" - "--- a/fs/xfs/libxfs/xfs_bmap.c\n" - "+++ b/fs/xfs/libxfs/xfs_bmap.c\n" - "@@ -3745,11 +3745,11 @@ xfs_bmap_btalloc(\n" - " \t\targs.prod = align;\n" - " \t\tif ((args.mod = (xfs_extlen_t)do_mod(ap->offset, args.prod)))\n" - " \t\t\targs.mod = (xfs_extlen_t)(args.prod - args.mod);\n" - "-\t} else if (mp->m_sb.sb_blocksize >= PAGE_CACHE_SIZE) {\n" - "+\t} else if (mp->m_sb.sb_blocksize >= PAGE_SIZE) {\n" - " \t\targs.prod = 1;\n" - " \t\targs.mod = 0;\n" - " \t} else {\n" - "-\t\targs.prod = PAGE_CACHE_SIZE >> mp->m_sb.sb_blocklog;\n" - "+\t\targs.prod = PAGE_SIZE >> mp->m_sb.sb_blocklog;\n" - " \t\tif ((args.mod = (xfs_extlen_t)(do_mod(ap->offset, args.prod))))\n" - " \t\t\targs.mod = (xfs_extlen_t)(args.prod - args.mod);\n" - " \t}\n" - "diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c\n" - "index 5c57b7b40728..d12dfcfd0cc8 100644\n" - "--- a/fs/xfs/xfs_aops.c\n" - "+++ b/fs/xfs/xfs_aops.c\n" - "@@ -719,14 +719,14 @@ xfs_convert_page(\n" - " \t * Derivation:\n" - " \t *\n" - " \t * End offset is the highest offset that this page should represent.\n" - "-\t * If we are on the last page, (end_offset & (PAGE_CACHE_SIZE - 1))\n" - "-\t * will evaluate non-zero and be less than PAGE_CACHE_SIZE and\n" - "+\t * If we are on the last page, (end_offset & (PAGE_SIZE - 1))\n" - "+\t * will evaluate non-zero and be less than PAGE_SIZE and\n" - " \t * hence give us the correct page_dirty count. On any other page,\n" - " \t * it will be zero and in that case we need page_dirty to be the\n" - " \t * count of buffers on the page.\n" - " \t */\n" - " \tend_offset = min_t(unsigned long long,\n" - "-\t\t\t(xfs_off_t)(page->index + 1) << PAGE_CACHE_SHIFT,\n" - "+\t\t\t(xfs_off_t)(page->index + 1) << PAGE_SHIFT,\n" - " \t\t\ti_size_read(inode));\n" - " \n" - " \t/*\n" - "@@ -749,9 +749,9 @@ xfs_convert_page(\n" - " \t\tgoto fail_unlock_page;\n" - " \n" - " \tlen = 1 << inode->i_blkbits;\n" - "-\tp_offset = min_t(unsigned long, end_offset & (PAGE_CACHE_SIZE - 1),\n" - "-\t\t\t\t\tPAGE_CACHE_SIZE);\n" - "-\tp_offset = p_offset ? roundup(p_offset, len) : PAGE_CACHE_SIZE;\n" - "+\tp_offset = min_t(unsigned long, end_offset & (PAGE_SIZE - 1),\n" - "+\t\t\t\t\tPAGE_SIZE);\n" - "+\tp_offset = p_offset ? roundup(p_offset, len) : PAGE_SIZE;\n" - " \tpage_dirty = p_offset / len;\n" - " \n" - " \t/*\n" - "@@ -927,7 +927,7 @@ next_buffer:\n" - " \n" - " \txfs_iunlock(ip, XFS_ILOCK_EXCL);\n" - " out_invalidate:\n" - "-\txfs_vm_invalidatepage(page, 0, PAGE_CACHE_SIZE);\n" - "+\txfs_vm_invalidatepage(page, 0, PAGE_SIZE);\n" - " \treturn;\n" - " }\n" - " \n" - "@@ -984,8 +984,8 @@ xfs_vm_writepage(\n" - " \n" - " \t/* Is this page beyond the end of the file? */\n" - " \toffset = i_size_read(inode);\n" - "-\tend_index = offset >> PAGE_CACHE_SHIFT;\n" - "-\tlast_index = (offset - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tend_index = offset >> PAGE_SHIFT;\n" - "+\tlast_index = (offset - 1) >> PAGE_SHIFT;\n" - " \n" - " \t/*\n" - " \t * The page index is less than the end_index, adjust the end_offset\n" - "@@ -999,7 +999,7 @@ xfs_vm_writepage(\n" - " \t * ---------------------------------^------------------|\n" - " \t */\n" - " \tif (page->index < end_index)\n" - "-\t\tend_offset = (xfs_off_t)(page->index + 1) << PAGE_CACHE_SHIFT;\n" - "+\t\tend_offset = (xfs_off_t)(page->index + 1) << PAGE_SHIFT;\n" - " \telse {\n" - " \t\t/*\n" - " \t\t * Check whether the page to write out is beyond or straddles\n" - "@@ -1012,7 +1012,7 @@ xfs_vm_writepage(\n" - " \t\t * |\t\t\t\t | Straddles |\n" - " \t\t * ---------------------------------^-----------|--------|\n" - " \t\t */\n" - "-\t\tunsigned offset_into_page = offset & (PAGE_CACHE_SIZE - 1);\n" - "+\t\tunsigned offset_into_page = offset & (PAGE_SIZE - 1);\n" - " \n" - " \t\t/*\n" - " \t\t * Skip the page if it is fully outside i_size, e.g. due to a\n" - "@@ -1043,7 +1043,7 @@ xfs_vm_writepage(\n" - " \t\t * memory is zeroed when mapped, and writes to that region are\n" - " \t\t * not written out to the file.\"\n" - " \t\t */\n" - "-\t\tzero_user_segment(page, offset_into_page, PAGE_CACHE_SIZE);\n" - "+\t\tzero_user_segment(page, offset_into_page, PAGE_SIZE);\n" - " \n" - " \t\t/* Adjust the end_offset to the end of file */\n" - " \t\tend_offset = offset;\n" - "@@ -1162,7 +1162,7 @@ xfs_vm_writepage(\n" - " \t\tend_index <<= inode->i_blkbits;\n" - " \n" - " \t\t/* to pages */\n" - "-\t\tend_index = (end_index - 1) >> PAGE_CACHE_SHIFT;\n" - "+\t\tend_index = (end_index - 1) >> PAGE_SHIFT;\n" - " \n" - " \t\t/* check against file size */\n" - " \t\tif (end_index > last_index)\n" - "@@ -1753,7 +1753,7 @@ xfs_vm_write_failed(\n" - " \tloff_t\t\t\tblock_offset;\n" - " \tloff_t\t\t\tblock_start;\n" - " \tloff_t\t\t\tblock_end;\n" - "-\tloff_t\t\t\tfrom = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\tloff_t\t\t\tfrom = pos & (PAGE_SIZE - 1);\n" - " \tloff_t\t\t\tto = from + len;\n" - " \tstruct buffer_head\t*bh, *head;\n" - " \n" - "@@ -1768,7 +1768,7 @@ xfs_vm_write_failed(\n" - " \t * start of the page by using shifts rather than masks the mismatch\n" - " \t * problem.\n" - " \t */\n" - "-\tblock_offset = (pos >> PAGE_CACHE_SHIFT) << PAGE_CACHE_SHIFT;\n" - "+\tblock_offset = (pos >> PAGE_SHIFT) << PAGE_SHIFT;\n" - " \n" - " \tASSERT(block_offset + from == pos);\n" - " \n" - "@@ -1825,11 +1825,11 @@ xfs_vm_write_begin(\n" - " \tstruct page\t\t**pagep,\n" - " \tvoid\t\t\t**fsdata)\n" - " {\n" - "-\tpgoff_t\t\t\tindex = pos >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t\t\t\tindex = pos >> PAGE_SHIFT;\n" - " \tstruct page\t\t*page;\n" - " \tint\t\t\tstatus;\n" - " \n" - "-\tASSERT(len <= PAGE_CACHE_SIZE);\n" - "+\tASSERT(len <= PAGE_SIZE);\n" - " \n" - " \tpage = grab_cache_page_write_begin(mapping, index, flags);\n" - " \tif (!page)\n" - "@@ -1854,7 +1854,7 @@ xfs_vm_write_begin(\n" - " \t\t\ttruncate_pagecache_range(inode, start, pos + len);\n" - " \t\t}\n" - " \n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tpage = NULL;\n" - " \t}\n" - " \n" - "@@ -1882,7 +1882,7 @@ xfs_vm_write_end(\n" - " {\n" - " \tint\t\t\tret;\n" - " \n" - "-\tASSERT(len <= PAGE_CACHE_SIZE);\n" - "+\tASSERT(len <= PAGE_SIZE);\n" - " \n" - " \tret = generic_write_end(file, mapping, pos, len, copied, page, fsdata);\n" - " \tif (unlikely(ret < len)) {\n" - "diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c\n" - "index 6c876012b2e5..d788858da5e1 100644\n" - "--- a/fs/xfs/xfs_bmap_util.c\n" - "+++ b/fs/xfs/xfs_bmap_util.c\n" - "@@ -1235,7 +1235,7 @@ xfs_free_file_space(\n" - " \t/* wait for the completion of any pending DIOs */\n" - " \tinode_dio_wait(VFS_I(ip));\n" - " \n" - "-\trounding = max_t(xfs_off_t, 1 << mp->m_sb.sb_blocklog, PAGE_CACHE_SIZE);\n" - "+\trounding = max_t(xfs_off_t, 1 << mp->m_sb.sb_blocklog, PAGE_SIZE);\n" - " \tioffset = round_down(offset, rounding);\n" - " \tiendoffset = round_up(offset + len, rounding) - 1;\n" - " \terror = filemap_write_and_wait_range(VFS_I(ip)->i_mapping, ioffset,\n" - "@@ -1464,7 +1464,7 @@ xfs_shift_file_space(\n" - " \tif (error)\n" - " \t\treturn error;\n" - " \terror = invalidate_inode_pages2_range(VFS_I(ip)->i_mapping,\n" - "-\t\t\t\t\toffset >> PAGE_CACHE_SHIFT, -1);\n" - "+\t\t\t\t\toffset >> PAGE_SHIFT, -1);\n" - " \tif (error)\n" - " \t\treturn error;\n" - " \n" - "diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c\n" - "index 52883ac3cf84..aab748adf273 100644\n" - "--- a/fs/xfs/xfs_file.c\n" - "+++ b/fs/xfs/xfs_file.c\n" - "@@ -106,8 +106,8 @@ xfs_iozero(\n" - " \t\tunsigned offset, bytes;\n" - " \t\tvoid *fsdata;\n" - " \n" - "-\t\toffset = (pos & (PAGE_CACHE_SIZE -1)); /* Within page */\n" - "-\t\tbytes = PAGE_CACHE_SIZE - offset;\n" - "+\t\toffset = (pos & (PAGE_SIZE -1)); /* Within page */\n" - "+\t\tbytes = PAGE_SIZE - offset;\n" - " \t\tif (bytes > count)\n" - " \t\t\tbytes = count;\n" - " \n" - "@@ -799,8 +799,8 @@ xfs_file_dio_aio_write(\n" - " \t/* see generic_file_direct_write() for why this is necessary */\n" - " \tif (mapping->nrpages) {\n" - " \t\tinvalidate_inode_pages2_range(mapping,\n" - "-\t\t\t\t\t pos >> PAGE_CACHE_SHIFT,\n" - "-\t\t\t\t\t end >> PAGE_CACHE_SHIFT);\n" - "+\t\t\t\t\t pos >> PAGE_SHIFT,\n" - "+\t\t\t\t\t end >> PAGE_SHIFT);\n" - " \t}\n" - " \n" - " \tif (ret > 0) {\n" - "@@ -1207,9 +1207,9 @@ xfs_find_get_desired_pgoff(\n" - " \n" - " \tpagevec_init(&pvec, 0);\n" - " \n" - "-\tindex = startoff >> PAGE_CACHE_SHIFT;\n" - "+\tindex = startoff >> PAGE_SHIFT;\n" - " \tendoff = XFS_FSB_TO_B(mp, map->br_startoff + map->br_blockcount);\n" - "-\tend = endoff >> PAGE_CACHE_SHIFT;\n" - "+\tend = endoff >> PAGE_SHIFT;\n" - " \tdo {\n" - " \t\tint\t\twant;\n" - " \t\tunsigned\tnr_pages;\n" - "diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h\n" - "index ec0e239a0fa9..a8192dc797dc 100644\n" - "--- a/fs/xfs/xfs_linux.h\n" - "+++ b/fs/xfs/xfs_linux.h\n" - "@@ -135,7 +135,7 @@ typedef __u32\t\t\txfs_nlink_t;\n" - " * Size of block device i/o is parameterized here.\n" - " * Currently the system supports page-sized i/o.\n" - " */\n" - "-#define\tBLKDEV_IOSHIFT\t\tPAGE_CACHE_SHIFT\n" - "+#define\tBLKDEV_IOSHIFT\t\tPAGE_SHIFT\n" - " #define\tBLKDEV_IOSIZE\t\t(1<<BLKDEV_IOSHIFT)\n" - " /* number of BB's per block device block */\n" - " #define\tBLKDEV_BB\t\tBTOBB(BLKDEV_IOSIZE)\n" - "diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c\n" - "index bb753b359bee..9091e2fe1e0c 100644\n" - "--- a/fs/xfs/xfs_mount.c\n" - "+++ b/fs/xfs/xfs_mount.c\n" - "@@ -171,7 +171,7 @@ xfs_sb_validate_fsb_count(\n" - " \tASSERT(sbp->sb_blocklog >= BBSHIFT);\n" - " \n" - " \t/* Limited by ULONG_MAX of page cache index */\n" - "-\tif (nblocks >> (PAGE_CACHE_SHIFT - sbp->sb_blocklog) > ULONG_MAX)\n" - "+\tif (nblocks >> (PAGE_SHIFT - sbp->sb_blocklog) > ULONG_MAX)\n" - " \t\treturn -EFBIG;\n" - " \treturn 0;\n" - " }\n" - "diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h\n" - "index b57098481c10..cd2cb5ef4c08 100644\n" - "--- a/fs/xfs/xfs_mount.h\n" - "+++ b/fs/xfs/xfs_mount.h\n" - "@@ -221,12 +221,12 @@ static inline unsigned long\n" - " xfs_preferred_iosize(xfs_mount_t *mp)\n" - " {\n" - " \tif (mp->m_flags & XFS_MOUNT_COMPAT_IOSIZE)\n" - "-\t\treturn PAGE_CACHE_SIZE;\n" - "+\t\treturn PAGE_SIZE;\n" - " \treturn (mp->m_swidth ?\n" - " \t\t(mp->m_swidth << mp->m_sb.sb_blocklog) :\n" - " \t\t((mp->m_flags & XFS_MOUNT_DFLT_IOSIZE) ?\n" - " \t\t\t(1 << (int)MAX(mp->m_readio_log, mp->m_writeio_log)) :\n" - "-\t\t\tPAGE_CACHE_SIZE));\n" - "+\t\t\tPAGE_SIZE));\n" - " }\n" - " \n" - " #define XFS_LAST_UNMOUNT_WAS_CLEAN(mp)\t\\\n" - "diff --git a/fs/xfs/xfs_pnfs.c b/fs/xfs/xfs_pnfs.c\n" - "index ade236e90bb3..51ddaf2c2b8c 100644\n" - "--- a/fs/xfs/xfs_pnfs.c\n" - "+++ b/fs/xfs/xfs_pnfs.c\n" - "@@ -293,8 +293,8 @@ xfs_fs_commit_blocks(\n" - " \t\t * Make sure reads through the pagecache see the new data.\n" - " \t\t */\n" - " \t\terror = invalidate_inode_pages2_range(inode->i_mapping,\n" - "-\t\t\t\t\tstart >> PAGE_CACHE_SHIFT,\n" - "-\t\t\t\t\t(end - 1) >> PAGE_CACHE_SHIFT);\n" - "+\t\t\t\t\tstart >> PAGE_SHIFT,\n" - "+\t\t\t\t\t(end - 1) >> PAGE_SHIFT);\n" - " \t\tWARN_ON_ONCE(error);\n" - " \n" - " \t\terror = xfs_iomap_write_unwritten(ip, start, length);\n" - "diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c\n" - "index 59c9b7bd958d..89f1d5e064a9 100644\n" - "--- a/fs/xfs/xfs_super.c\n" - "+++ b/fs/xfs/xfs_super.c\n" - "@@ -547,10 +547,10 @@ xfs_max_file_offset(\n" - " \t/* Figure out maximum filesize, on Linux this can depend on\n" - " \t * the filesystem blocksize (on 32 bit platforms).\n" - " \t * __block_write_begin does this in an [unsigned] long...\n" - "-\t * page->index << (PAGE_CACHE_SHIFT - bbits)\n" - "+\t * page->index << (PAGE_SHIFT - bbits)\n" - " \t * So, for page sized blocks (4K on 32 bit platforms),\n" - " \t * this wraps at around 8Tb (hence MAX_LFS_FILESIZE which is\n" - "-\t * (((u64)PAGE_CACHE_SIZE << (BITS_PER_LONG-1))-1)\n" - "+\t * (((u64)PAGE_SIZE << (BITS_PER_LONG-1))-1)\n" - " \t * but for smaller blocksizes it is less (bbits = log2 bsize).\n" - " \t * Note1: get_block_t takes a long (implicit cast from above)\n" - " \t * Note2: The Large Block Device (LBD and HAVE_SECTOR_T) patch\n" - "@@ -561,10 +561,10 @@ xfs_max_file_offset(\n" - " #if BITS_PER_LONG == 32\n" - " # if defined(CONFIG_LBDAF)\n" - " \tASSERT(sizeof(sector_t) == 8);\n" - "-\tpagefactor = PAGE_CACHE_SIZE;\n" - "+\tpagefactor = PAGE_SIZE;\n" - " \tbitshift = BITS_PER_LONG;\n" - " # else\n" - "-\tpagefactor = PAGE_CACHE_SIZE >> (PAGE_CACHE_SHIFT - blockshift);\n" - "+\tpagefactor = PAGE_SIZE >> (PAGE_SHIFT - blockshift);\n" - " # endif\n" - " #endif\n" - " \n" - "diff --git a/include/linux/backing-dev-defs.h b/include/linux/backing-dev-defs.h\n" - "index 1b4d69f68c33..3f103076d0bf 100644\n" - "--- a/include/linux/backing-dev-defs.h\n" - "+++ b/include/linux/backing-dev-defs.h\n" - "@@ -135,7 +135,7 @@ struct bdi_writeback {\n" - " \n" - " struct backing_dev_info {\n" - " \tstruct list_head bdi_list;\n" - "-\tunsigned long ra_pages;\t/* max readahead in PAGE_CACHE_SIZE units */\n" - "+\tunsigned long ra_pages;\t/* max readahead in PAGE_SIZE units */\n" - " \tunsigned int capabilities; /* Device capabilities */\n" - " \tcongested_fn *congested_fn; /* Function pointer if device is md/dm */\n" - " \tvoid *congested_data;\t/* Pointer to aux data for congested func */\n" - "diff --git a/include/linux/bio.h b/include/linux/bio.h\n" - "index 88bc64f00bb5..6b7481f62218 100644\n" - "--- a/include/linux/bio.h\n" - "+++ b/include/linux/bio.h\n" - "@@ -41,7 +41,7 @@\n" - " #endif\n" - " \n" - " #define BIO_MAX_PAGES\t\t256\n" - "-#define BIO_MAX_SIZE\t\t(BIO_MAX_PAGES << PAGE_CACHE_SHIFT)\n" - "+#define BIO_MAX_SIZE\t\t(BIO_MAX_PAGES << PAGE_SHIFT)\n" - " #define BIO_MAX_SECTORS\t\t(BIO_MAX_SIZE >> 9)\n" - " \n" - " /*\n" - "diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h\n" - "index 7e5d7e018bea..669e419d6234 100644\n" - "--- a/include/linux/blkdev.h\n" - "+++ b/include/linux/blkdev.h\n" - "@@ -1372,7 +1372,7 @@ unsigned char *read_dev_sector(struct block_device *, sector_t, Sector *);\n" - " \n" - " static inline void put_dev_sector(Sector p)\n" - " {\n" - "-\tpage_cache_release(p.v);\n" - "+\tput_page(p.v);\n" - " }\n" - " \n" - " static inline bool __bvec_gap_to_prev(struct request_queue *q,\n" - "diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h\n" - "index c67f052cc5e5..d48daa3f6f20 100644\n" - "--- a/include/linux/buffer_head.h\n" - "+++ b/include/linux/buffer_head.h\n" - "@@ -43,7 +43,7 @@ enum bh_state_bits {\n" - " \t\t\t */\n" - " };\n" - " \n" - "-#define MAX_BUF_PER_PAGE (PAGE_CACHE_SIZE / 512)\n" - "+#define MAX_BUF_PER_PAGE (PAGE_SIZE / 512)\n" - " \n" - " struct page;\n" - " struct buffer_head;\n" - "@@ -263,7 +263,7 @@ void buffer_init(void);\n" - " static inline void attach_page_buffers(struct page *page,\n" - " \t\tstruct buffer_head *head)\n" - " {\n" - "-\tpage_cache_get(page);\n" - "+\tget_page(page);\n" - " \tSetPagePrivate(page);\n" - " \tset_page_private(page, (unsigned long)head);\n" - " }\n" - "diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h\n" - "index 3e3799cdc6e6..9092a92400ac 100644\n" - "--- a/include/linux/ceph/libceph.h\n" - "+++ b/include/linux/ceph/libceph.h\n" - "@@ -172,8 +172,8 @@ extern void ceph_put_snap_context(struct ceph_snap_context *sc);\n" - " */\n" - " static inline int calc_pages_for(u64 off, u64 len)\n" - " {\n" - "-\treturn ((off+len+PAGE_CACHE_SIZE-1) >> PAGE_CACHE_SHIFT) -\n" - "-\t\t(off >> PAGE_CACHE_SHIFT);\n" - "+\treturn ((off+len+PAGE_SIZE-1) >> PAGE_SHIFT) -\n" - "+\t\t(off >> PAGE_SHIFT);\n" - " }\n" - " \n" - " extern struct kmem_cache *ceph_inode_cachep;\n" - "diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h\n" - "index e59c3be92106..4a793b045efa 100644\n" - "--- a/include/linux/f2fs_fs.h\n" - "+++ b/include/linux/f2fs_fs.h\n" - "@@ -262,7 +262,7 @@ struct f2fs_node {\n" - " /*\n" - " * For NAT entries\n" - " */\n" - "-#define NAT_ENTRY_PER_BLOCK (PAGE_CACHE_SIZE / sizeof(struct f2fs_nat_entry))\n" - "+#define NAT_ENTRY_PER_BLOCK (PAGE_SIZE / sizeof(struct f2fs_nat_entry))\n" - " \n" - " struct f2fs_nat_entry {\n" - " \t__u8 version;\t\t/* latest version of cached nat entry */\n" - "@@ -282,7 +282,7 @@ struct f2fs_nat_block {\n" - " * Not allow to change this.\n" - " */\n" - " #define SIT_VBLOCK_MAP_SIZE 64\n" - "-#define SIT_ENTRY_PER_BLOCK (PAGE_CACHE_SIZE / sizeof(struct f2fs_sit_entry))\n" - "+#define SIT_ENTRY_PER_BLOCK (PAGE_SIZE / sizeof(struct f2fs_sit_entry))\n" - " \n" - " /*\n" - " * Note that f2fs_sit_entry->vblocks has the following bit-field information.\n" - "diff --git a/include/linux/fs.h b/include/linux/fs.h\n" - "index bb703ef728d1..8f30e69a8501 100644\n" - "--- a/include/linux/fs.h\n" - "+++ b/include/linux/fs.h\n" - "@@ -923,7 +923,7 @@ static inline struct file *get_file(struct file *f)\n" - " /* Page cache limit. The filesystems should put that into their s_maxbytes \n" - " limits, otherwise bad things can happen in VM. */ \n" - " #if BITS_PER_LONG==32\n" - "-#define MAX_LFS_FILESIZE\t(((loff_t)PAGE_CACHE_SIZE << (BITS_PER_LONG-1))-1) \n" - "+#define MAX_LFS_FILESIZE\t(((loff_t)PAGE_SIZE << (BITS_PER_LONG-1))-1) \n" - " #elif BITS_PER_LONG==64\n" - " #define MAX_LFS_FILESIZE \t((loff_t)0x7fffffffffffffffLL)\n" - " #endif\n" - "@@ -2059,7 +2059,7 @@ extern int generic_update_time(struct inode *, struct timespec *, int);\n" - " /* /sys/fs */\n" - " extern struct kobject *fs_kobj;\n" - " \n" - "-#define MAX_RW_COUNT (INT_MAX & PAGE_CACHE_MASK)\n" - "+#define MAX_RW_COUNT (INT_MAX & PAGE_MASK)\n" - " \n" - " #ifdef CONFIG_MANDATORY_FILE_LOCKING\n" - " extern int locks_mandatory_locked(struct file *);\n" - "diff --git a/include/linux/mm.h b/include/linux/mm.h\n" - "index 7d42501c8bb4..20effd32d5f3 100644\n" - "--- a/include/linux/mm.h\n" - "+++ b/include/linux/mm.h\n" - "@@ -603,7 +603,7 @@ void do_set_pte(struct vm_area_struct *vma, unsigned long address,\n" - " *\n" - " * A page may belong to an inode's memory mapping. In this case, page->mapping\n" - " * is the pointer to the inode, and page->index is the file offset of the page,\n" - "- * in units of PAGE_CACHE_SIZE.\n" - "+ * in units of PAGE_SIZE.\n" - " *\n" - " * If pagecache pages are not associated with an inode, they are said to be\n" - " * anonymous pages. These may become associated with the swapcache, and in that\n" - "diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h\n" - "index 944b2b37313b..c2d75b4fa86c 100644\n" - "--- a/include/linux/mm_types.h\n" - "+++ b/include/linux/mm_types.h\n" - "@@ -341,7 +341,7 @@ struct vm_area_struct {\n" - " \n" - " \t/* Information about our backing store: */\n" - " \tunsigned long vm_pgoff;\t\t/* Offset (within vm_file) in PAGE_SIZE\n" - "-\t\t\t\t\t units, *not* PAGE_CACHE_SIZE */\n" - "+\t\t\t\t\t units */\n" - " \tstruct file * vm_file;\t\t/* File we map to (can be NULL). */\n" - " \tvoid * vm_private_data;\t\t/* was vm_pte (shared mem) */\n" - " \n" - "diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h\n" - "index f2f650f136ee..957049f72290 100644\n" - "--- a/include/linux/nfs_page.h\n" - "+++ b/include/linux/nfs_page.h\n" - "@@ -41,8 +41,8 @@ struct nfs_page {\n" - " \tstruct page\t\t*wb_page;\t/* page to read in/write out */\n" - " \tstruct nfs_open_context\t*wb_context;\t/* File state context info */\n" - " \tstruct nfs_lock_context\t*wb_lock_context;\t/* lock context info */\n" - "-\tpgoff_t\t\t\twb_index;\t/* Offset >> PAGE_CACHE_SHIFT */\n" - "-\tunsigned int\t\twb_offset,\t/* Offset & ~PAGE_CACHE_MASK */\n" - "+\tpgoff_t\t\t\twb_index;\t/* Offset >> PAGE_SHIFT */\n" - "+\tunsigned int\t\twb_offset,\t/* Offset & ~PAGE_MASK */\n" - " \t\t\t\twb_pgbase,\t/* Start of page data */\n" - " \t\t\t\twb_bytes;\t/* Length of request */\n" - " \tstruct kref\t\twb_kref;\t/* reference count */\n" - "@@ -184,7 +184,7 @@ nfs_list_entry(struct list_head *head)\n" - " static inline\n" - " loff_t req_offset(struct nfs_page *req)\n" - " {\n" - "-\treturn (((loff_t)req->wb_index) << PAGE_CACHE_SHIFT) + req->wb_offset;\n" - "+\treturn (((loff_t)req->wb_index) << PAGE_SHIFT) + req->wb_offset;\n" - " }\n" - " \n" - " #endif /* _LINUX_NFS_PAGE_H */\n" - "diff --git a/include/linux/nilfs2_fs.h b/include/linux/nilfs2_fs.h\n" - "index 9abb763e4b86..e9fcf90b270d 100644\n" - "--- a/include/linux/nilfs2_fs.h\n" - "+++ b/include/linux/nilfs2_fs.h\n" - "@@ -331,7 +331,7 @@ static inline unsigned nilfs_rec_len_from_disk(__le16 dlen)\n" - " {\n" - " \tunsigned len = le16_to_cpu(dlen);\n" - " \n" - "-#if !defined(__KERNEL__) || (PAGE_CACHE_SIZE >= 65536)\n" - "+#if !defined(__KERNEL__) || (PAGE_SIZE >= 65536)\n" - " \tif (len == NILFS_MAX_REC_LEN)\n" - " \t\treturn 1 << 16;\n" - " #endif\n" - "@@ -340,7 +340,7 @@ static inline unsigned nilfs_rec_len_from_disk(__le16 dlen)\n" - " \n" - " static inline __le16 nilfs_rec_len_to_disk(unsigned len)\n" - " {\n" - "-#if !defined(__KERNEL__) || (PAGE_CACHE_SIZE >= 65536)\n" - "+#if !defined(__KERNEL__) || (PAGE_SIZE >= 65536)\n" - " \tif (len == (1 << 16))\n" - " \t\treturn cpu_to_le16(NILFS_MAX_REC_LEN);\n" - " \telse if (len > (1 << 16))\n" - "diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h\n" - "index 1ebd65c91422..5372488c5da0 100644\n" - "--- a/include/linux/pagemap.h\n" - "+++ b/include/linux/pagemap.h\n" - "@@ -86,21 +86,6 @@ static inline void mapping_set_gfp_mask(struct address_space *m, gfp_t mask)\n" - " \t\t\t\t(__force unsigned long)mask;\n" - " }\n" - " \n" - "-/*\n" - "- * The page cache can be done in larger chunks than\n" - "- * one page, because it allows for more efficient\n" - "- * throughput (it can then be mapped into user\n" - "- * space in smaller chunks for same flexibility).\n" - "- *\n" - "- * Or rather, it _will_ be done in larger chunks.\n" - "- */\n" - "-#define PAGE_CACHE_SHIFT\tPAGE_SHIFT\n" - "-#define PAGE_CACHE_SIZE\t\tPAGE_SIZE\n" - "-#define PAGE_CACHE_MASK\t\tPAGE_MASK\n" - "-#define PAGE_CACHE_ALIGN(addr)\t(((addr)+PAGE_CACHE_SIZE-1)&PAGE_CACHE_MASK)\n" - "-\n" - "-#define page_cache_get(page)\t\tget_page(page)\n" - "-#define page_cache_release(page)\tput_page(page)\n" - " void release_pages(struct page **pages, int nr, bool cold);\n" - " \n" - " /*\n" - "@@ -390,13 +375,13 @@ static inline pgoff_t page_to_pgoff(struct page *page)\n" - " \t\treturn page->index << compound_order(page);\n" - " \n" - " \tif (likely(!PageTransTail(page)))\n" - "-\t\treturn page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);\n" - "+\t\treturn page->index;\n" - " \n" - " \t/*\n" - " \t * We don't initialize ->index for tail pages: calculate based on\n" - " \t * head page\n" - " \t */\n" - "-\tpgoff = compound_head(page)->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);\n" - "+\tpgoff = compound_head(page)->index;\n" - " \tpgoff += page - compound_head(page);\n" - " \treturn pgoff;\n" - " }\n" - "@@ -406,12 +391,12 @@ static inline pgoff_t page_to_pgoff(struct page *page)\n" - " */\n" - " static inline loff_t page_offset(struct page *page)\n" - " {\n" - "-\treturn ((loff_t)page->index) << PAGE_CACHE_SHIFT;\n" - "+\treturn ((loff_t)page->index) << PAGE_SHIFT;\n" - " }\n" - " \n" - " static inline loff_t page_file_offset(struct page *page)\n" - " {\n" - "-\treturn ((loff_t)page_file_index(page)) << PAGE_CACHE_SHIFT;\n" - "+\treturn ((loff_t)page_file_index(page)) << PAGE_SHIFT;\n" - " }\n" - " \n" - " extern pgoff_t linear_hugepage_index(struct vm_area_struct *vma,\n" - "@@ -425,7 +410,7 @@ static inline pgoff_t linear_page_index(struct vm_area_struct *vma,\n" - " \t\treturn linear_hugepage_index(vma, address);\n" - " \tpgoff = (address - vma->vm_start) >> PAGE_SHIFT;\n" - " \tpgoff += vma->vm_pgoff;\n" - "-\treturn pgoff >> (PAGE_CACHE_SHIFT - PAGE_SHIFT);\n" - "+\treturn pgoff >> (PAGE_SHIFT - PAGE_SHIFT);\n" - " }\n" - " \n" - " extern void __lock_page(struct page *page);\n" - "@@ -535,8 +520,7 @@ extern void add_page_wait_queue(struct page *page, wait_queue_t *waiter);\n" - " /*\n" - " * Fault a userspace page into pagetables. Return non-zero on a fault.\n" - " *\n" - "- * This assumes that two userspace pages are always sufficient. That's\n" - "- * not true if PAGE_CACHE_SIZE > PAGE_SIZE.\n" - "+ * This assumes that two userspace pages are always sufficient. \n" - " */\n" - " static inline int fault_in_pages_writeable(char __user *uaddr, int size)\n" - " {\n" - "@@ -671,8 +655,7 @@ static inline int add_to_page_cache(struct page *page,\n" - " \n" - " static inline unsigned long dir_pages(struct inode *inode)\n" - " {\n" - "-\treturn (unsigned long)(inode->i_size + PAGE_CACHE_SIZE - 1) >>\n" - "-\t\t\t PAGE_CACHE_SHIFT;\n" - "+\treturn (unsigned long)(inode->i_size + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " }\n" - " \n" - " #endif /* _LINUX_PAGEMAP_H */\n" - "diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h\n" - "index cc0fc712bb82..7ca44fb5b675 100644\n" - "--- a/include/linux/sunrpc/svc.h\n" - "+++ b/include/linux/sunrpc/svc.h\n" - "@@ -129,7 +129,7 @@ static inline void svc_get(struct svc_serv *serv)\n" - " *\n" - " * These happen to all be powers of 2, which is not strictly\n" - " * necessary but helps enforce the real limitation, which is\n" - "- * that they should be multiples of PAGE_CACHE_SIZE.\n" - "+ * that they should be multiples of PAGE_SIZE.\n" - " *\n" - " * For UDP transports, a block plus NFS,RPC, and UDP headers\n" - " * has to fit into the IP datagram limit of 64K. The largest\n" - "diff --git a/include/linux/swap.h b/include/linux/swap.h\n" - "index d18b65c53dbb..fc22c3fcb6ea 100644\n" - "--- a/include/linux/swap.h\n" - "+++ b/include/linux/swap.h\n" - "@@ -433,9 +433,9 @@ struct backing_dev_info;\n" - " #define si_swapinfo(val) \\\n" - " \tdo { (val)->freeswap = (val)->totalswap = 0; } while (0)\n" - " /* only sparc can not include linux/pagemap.h in this file\n" - "- * so leave page_cache_release and release_pages undeclared... */\n" - "+ * so leave release_pages undeclared... */\n" - " #define free_page_and_swap_cache(page) \\\n" - "-\tpage_cache_release(page)\n" - "+\tput_page(page)\n" - " #define free_pages_and_swap_cache(pages, nr) \\\n" - " \trelease_pages((pages), (nr), false);\n" - " \n" - "diff --git a/ipc/mqueue.c b/ipc/mqueue.c\n" - "index 781c1399c6a3..ade739f67f1d 100644\n" - "--- a/ipc/mqueue.c\n" - "+++ b/ipc/mqueue.c\n" - "@@ -307,8 +307,8 @@ static int mqueue_fill_super(struct super_block *sb, void *data, int silent)\n" - " \tstruct inode *inode;\n" - " \tstruct ipc_namespace *ns = data;\n" - " \n" - "-\tsb->s_blocksize = PAGE_CACHE_SIZE;\n" - "-\tsb->s_blocksize_bits = PAGE_CACHE_SHIFT;\n" - "+\tsb->s_blocksize = PAGE_SIZE;\n" - "+\tsb->s_blocksize_bits = PAGE_SHIFT;\n" - " \tsb->s_magic = MQUEUE_MAGIC;\n" - " \tsb->s_op = &mqueue_super_ops;\n" - " \n" - "diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c\n" - "index 5f6ce931f1ea..9be1cba0eb11 100644\n" - "--- a/kernel/events/uprobes.c\n" - "+++ b/kernel/events/uprobes.c\n" - "@@ -321,7 +321,7 @@ retry:\n" - " \tcopy_to_page(new_page, vaddr, &opcode, UPROBE_SWBP_INSN_SIZE);\n" - " \n" - " \tret = __replace_page(vma, vaddr, old_page, new_page);\n" - "-\tpage_cache_release(new_page);\n" - "+\tput_page(new_page);\n" - " put_old:\n" - " \tput_page(old_page);\n" - " \n" - "@@ -539,14 +539,14 @@ static int __copy_insn(struct address_space *mapping, struct file *filp,\n" - " \t * see uprobe_register().\n" - " \t */\n" - " \tif (mapping->a_ops->readpage)\n" - "-\t\tpage = read_mapping_page(mapping, offset >> PAGE_CACHE_SHIFT, filp);\n" - "+\t\tpage = read_mapping_page(mapping, offset >> PAGE_SHIFT, filp);\n" - " \telse\n" - "-\t\tpage = shmem_read_mapping_page(mapping, offset >> PAGE_CACHE_SHIFT);\n" - "+\t\tpage = shmem_read_mapping_page(mapping, offset >> PAGE_SHIFT);\n" - " \tif (IS_ERR(page))\n" - " \t\treturn PTR_ERR(page);\n" - " \n" - " \tcopy_from_page(page, offset, insn, nbytes);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \treturn 0;\n" - " }\n" - "diff --git a/mm/fadvise.c b/mm/fadvise.c\n" - "index b8a5bc66b0c0..b8024fa7101d 100644\n" - "--- a/mm/fadvise.c\n" - "+++ b/mm/fadvise.c\n" - "@@ -97,8 +97,8 @@ SYSCALL_DEFINE4(fadvise64_64, int, fd, loff_t, offset, loff_t, len, int, advice)\n" - " \t\tbreak;\n" - " \tcase POSIX_FADV_WILLNEED:\n" - " \t\t/* First and last PARTIAL page! */\n" - "-\t\tstart_index = offset >> PAGE_CACHE_SHIFT;\n" - "-\t\tend_index = endbyte >> PAGE_CACHE_SHIFT;\n" - "+\t\tstart_index = offset >> PAGE_SHIFT;\n" - "+\t\tend_index = endbyte >> PAGE_SHIFT;\n" - " \n" - " \t\t/* Careful about overflow on the \"+1\" */\n" - " \t\tnrpages = end_index - start_index + 1;\n" - "@@ -124,8 +124,8 @@ SYSCALL_DEFINE4(fadvise64_64, int, fd, loff_t, offset, loff_t, len, int, advice)\n" - " \t\t * preserved on the expectation that it is better to preserve\n" - " \t\t * needed memory than to discard unneeded memory.\n" - " \t\t */\n" - "-\t\tstart_index = (offset+(PAGE_CACHE_SIZE-1)) >> PAGE_CACHE_SHIFT;\n" - "-\t\tend_index = (endbyte >> PAGE_CACHE_SHIFT);\n" - "+\t\tstart_index = (offset+(PAGE_SIZE-1)) >> PAGE_SHIFT;\n" - "+\t\tend_index = (endbyte >> PAGE_SHIFT);\n" - " \n" - " \t\tif (end_index >= start_index) {\n" - " \t\t\tunsigned long count = invalidate_mapping_pages(mapping,\n" - "diff --git a/mm/filemap.c b/mm/filemap.c\n" - "index 7c00f105845e..96f3b0322652 100644\n" - "--- a/mm/filemap.c\n" - "+++ b/mm/filemap.c\n" - "@@ -265,7 +265,7 @@ void delete_from_page_cache(struct page *page)\n" - " \n" - " \tif (freepage)\n" - " \t\tfreepage(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " EXPORT_SYMBOL(delete_from_page_cache);\n" - " \n" - "@@ -352,8 +352,8 @@ EXPORT_SYMBOL(filemap_flush);\n" - " static int __filemap_fdatawait_range(struct address_space *mapping,\n" - " \t\t\t\t loff_t start_byte, loff_t end_byte)\n" - " {\n" - "-\tpgoff_t index = start_byte >> PAGE_CACHE_SHIFT;\n" - "-\tpgoff_t end = end_byte >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = start_byte >> PAGE_SHIFT;\n" - "+\tpgoff_t end = end_byte >> PAGE_SHIFT;\n" - " \tstruct pagevec pvec;\n" - " \tint nr_pages;\n" - " \tint ret = 0;\n" - "@@ -550,7 +550,7 @@ int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask)\n" - " \t\tpgoff_t offset = old->index;\n" - " \t\tfreepage = mapping->a_ops->freepage;\n" - " \n" - "-\t\tpage_cache_get(new);\n" - "+\t\tget_page(new);\n" - " \t\tnew->mapping = mapping;\n" - " \t\tnew->index = offset;\n" - " \n" - "@@ -572,7 +572,7 @@ int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask)\n" - " \t\tradix_tree_preload_end();\n" - " \t\tif (freepage)\n" - " \t\t\tfreepage(old);\n" - "-\t\tpage_cache_release(old);\n" - "+\t\tput_page(old);\n" - " \t}\n" - " \n" - " \treturn error;\n" - "@@ -651,7 +651,7 @@ static int __add_to_page_cache_locked(struct page *page,\n" - " \t\treturn error;\n" - " \t}\n" - " \n" - "-\tpage_cache_get(page);\n" - "+\tget_page(page);\n" - " \tpage->mapping = mapping;\n" - " \tpage->index = offset;\n" - " \n" - "@@ -675,7 +675,7 @@ err_insert:\n" - " \tspin_unlock_irq(&mapping->tree_lock);\n" - " \tif (!huge)\n" - " \t\tmem_cgroup_cancel_charge(page, memcg, false);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn error;\n" - " }\n" - " \n" - "@@ -1083,7 +1083,7 @@ repeat:\n" - " \t\t * include/linux/pagemap.h for details.\n" - " \t\t */\n" - " \t\tif (unlikely(page != *pagep)) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tgoto repeat;\n" - " \t\t}\n" - " \t}\n" - "@@ -1121,7 +1121,7 @@ repeat:\n" - " \t\t/* Has the page been truncated? */\n" - " \t\tif (unlikely(page->mapping != mapping)) {\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tgoto repeat;\n" - " \t\t}\n" - " \t\tVM_BUG_ON_PAGE(page->index != offset, page);\n" - "@@ -1168,7 +1168,7 @@ repeat:\n" - " \tif (fgp_flags & FGP_LOCK) {\n" - " \t\tif (fgp_flags & FGP_NOWAIT) {\n" - " \t\t\tif (!trylock_page(page)) {\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t\treturn NULL;\n" - " \t\t\t}\n" - " \t\t} else {\n" - "@@ -1178,7 +1178,7 @@ repeat:\n" - " \t\t/* Has the page been truncated? */\n" - " \t\tif (unlikely(page->mapping != mapping)) {\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tgoto repeat;\n" - " \t\t}\n" - " \t\tVM_BUG_ON_PAGE(page->index != offset, page);\n" - "@@ -1209,7 +1209,7 @@ no_page:\n" - " \t\terr = add_to_page_cache_lru(page, mapping, offset,\n" - " \t\t\t\tgfp_mask & GFP_RECLAIM_MASK);\n" - " \t\tif (unlikely(err)) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tpage = NULL;\n" - " \t\t\tif (err == -EEXIST)\n" - " \t\t\t\tgoto repeat;\n" - "@@ -1278,7 +1278,7 @@ repeat:\n" - " \n" - " \t\t/* Has the page moved? */\n" - " \t\tif (unlikely(page != *slot)) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tgoto repeat;\n" - " \t\t}\n" - " export:\n" - "@@ -1343,7 +1343,7 @@ repeat:\n" - " \n" - " \t\t/* Has the page moved? */\n" - " \t\tif (unlikely(page != *slot)) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tgoto repeat;\n" - " \t\t}\n" - " \n" - "@@ -1405,7 +1405,7 @@ repeat:\n" - " \n" - " \t\t/* Has the page moved? */\n" - " \t\tif (unlikely(page != *slot)) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tgoto repeat;\n" - " \t\t}\n" - " \n" - "@@ -1415,7 +1415,7 @@ repeat:\n" - " \t\t * negatives, which is just confusing to the caller.\n" - " \t\t */\n" - " \t\tif (page->mapping == NULL || page->index != iter.index) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tbreak;\n" - " \t\t}\n" - " \n" - "@@ -1482,7 +1482,7 @@ repeat:\n" - " \n" - " \t\t/* Has the page moved? */\n" - " \t\tif (unlikely(page != *slot)) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tgoto repeat;\n" - " \t\t}\n" - " \n" - "@@ -1549,7 +1549,7 @@ repeat:\n" - " \n" - " \t\t/* Has the page moved? */\n" - " \t\tif (unlikely(page != *slot)) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tgoto repeat;\n" - " \t\t}\n" - " export:\n" - "@@ -1610,11 +1610,11 @@ static ssize_t do_generic_file_read(struct file *filp, loff_t *ppos,\n" - " \tunsigned int prev_offset;\n" - " \tint error = 0;\n" - " \n" - "-\tindex = *ppos >> PAGE_CACHE_SHIFT;\n" - "-\tprev_index = ra->prev_pos >> PAGE_CACHE_SHIFT;\n" - "-\tprev_offset = ra->prev_pos & (PAGE_CACHE_SIZE-1);\n" - "-\tlast_index = (*ppos + iter->count + PAGE_CACHE_SIZE-1) >> PAGE_CACHE_SHIFT;\n" - "-\toffset = *ppos & ~PAGE_CACHE_MASK;\n" - "+\tindex = *ppos >> PAGE_SHIFT;\n" - "+\tprev_index = ra->prev_pos >> PAGE_SHIFT;\n" - "+\tprev_offset = ra->prev_pos & (PAGE_SIZE-1);\n" - "+\tlast_index = (*ppos + iter->count + PAGE_SIZE-1) >> PAGE_SHIFT;\n" - "+\toffset = *ppos & ~PAGE_MASK;\n" - " \n" - " \tfor (;;) {\n" - " \t\tstruct page *page;\n" - "@@ -1648,7 +1648,7 @@ find_page:\n" - " \t\t\tif (PageUptodate(page))\n" - " \t\t\t\tgoto page_ok;\n" - " \n" - "-\t\t\tif (inode->i_blkbits == PAGE_CACHE_SHIFT ||\n" - "+\t\t\tif (inode->i_blkbits == PAGE_SHIFT ||\n" - " \t\t\t\t\t!mapping->a_ops->is_partially_uptodate)\n" - " \t\t\t\tgoto page_not_up_to_date;\n" - " \t\t\tif (!trylock_page(page))\n" - "@@ -1672,18 +1672,18 @@ page_ok:\n" - " \t\t */\n" - " \n" - " \t\tisize = i_size_read(inode);\n" - "-\t\tend_index = (isize - 1) >> PAGE_CACHE_SHIFT;\n" - "+\t\tend_index = (isize - 1) >> PAGE_SHIFT;\n" - " \t\tif (unlikely(!isize || index > end_index)) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tgoto out;\n" - " \t\t}\n" - " \n" - " \t\t/* nr is the maximum number of bytes to copy from this page */\n" - "-\t\tnr = PAGE_CACHE_SIZE;\n" - "+\t\tnr = PAGE_SIZE;\n" - " \t\tif (index == end_index) {\n" - "-\t\t\tnr = ((isize - 1) & ~PAGE_CACHE_MASK) + 1;\n" - "+\t\t\tnr = ((isize - 1) & ~PAGE_MASK) + 1;\n" - " \t\t\tif (nr <= offset) {\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t\tgoto out;\n" - " \t\t\t}\n" - " \t\t}\n" - "@@ -1711,11 +1711,11 @@ page_ok:\n" - " \n" - " \t\tret = copy_page_to_iter(page, offset, nr, iter);\n" - " \t\toffset += ret;\n" - "-\t\tindex += offset >> PAGE_CACHE_SHIFT;\n" - "-\t\toffset &= ~PAGE_CACHE_MASK;\n" - "+\t\tindex += offset >> PAGE_SHIFT;\n" - "+\t\toffset &= ~PAGE_MASK;\n" - " \t\tprev_offset = offset;\n" - " \n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\twritten += ret;\n" - " \t\tif (!iov_iter_count(iter))\n" - " \t\t\tgoto out;\n" - "@@ -1735,7 +1735,7 @@ page_not_up_to_date_locked:\n" - " \t\t/* Did it get truncated before we got the lock? */\n" - " \t\tif (!page->mapping) {\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tcontinue;\n" - " \t\t}\n" - " \n" - "@@ -1757,7 +1757,7 @@ readpage:\n" - " \n" - " \t\tif (unlikely(error)) {\n" - " \t\t\tif (error == AOP_TRUNCATED_PAGE) {\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t\terror = 0;\n" - " \t\t\t\tgoto find_page;\n" - " \t\t\t}\n" - "@@ -1774,7 +1774,7 @@ readpage:\n" - " \t\t\t\t\t * invalidate_mapping_pages got it\n" - " \t\t\t\t\t */\n" - " \t\t\t\t\tunlock_page(page);\n" - "-\t\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\t\tput_page(page);\n" - " \t\t\t\t\tgoto find_page;\n" - " \t\t\t\t}\n" - " \t\t\t\tunlock_page(page);\n" - "@@ -1789,7 +1789,7 @@ readpage:\n" - " \n" - " readpage_error:\n" - " \t\t/* UHHUH! A synchronous read error occurred. Report it */\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tgoto out;\n" - " \n" - " no_cached_page:\n" - "@@ -1805,7 +1805,7 @@ no_cached_page:\n" - " \t\terror = add_to_page_cache_lru(page, mapping, index,\n" - " \t\t\t\tmapping_gfp_constraint(mapping, GFP_KERNEL));\n" - " \t\tif (error) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tif (error == -EEXIST) {\n" - " \t\t\t\terror = 0;\n" - " \t\t\t\tgoto find_page;\n" - "@@ -1817,10 +1817,10 @@ no_cached_page:\n" - " \n" - " out:\n" - " \tra->prev_pos = prev_index;\n" - "-\tra->prev_pos <<= PAGE_CACHE_SHIFT;\n" - "+\tra->prev_pos <<= PAGE_SHIFT;\n" - " \tra->prev_pos |= prev_offset;\n" - " \n" - "-\t*ppos = ((loff_t)index << PAGE_CACHE_SHIFT) + offset;\n" - "+\t*ppos = ((loff_t)index << PAGE_SHIFT) + offset;\n" - " \tfile_accessed(filp);\n" - " \treturn written ? written : error;\n" - " }\n" - "@@ -1911,7 +1911,7 @@ static int page_cache_read(struct file *file, pgoff_t offset, gfp_t gfp_mask)\n" - " \t\telse if (ret == -EEXIST)\n" - " \t\t\tret = 0; /* losing race to add is OK */\n" - " \n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \n" - " \t} while (ret == AOP_TRUNCATED_PAGE);\n" - " \n" - "@@ -2021,8 +2021,8 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)\n" - " \tloff_t size;\n" - " \tint ret = 0;\n" - " \n" - "-\tsize = round_up(i_size_read(inode), PAGE_CACHE_SIZE);\n" - "-\tif (offset >= size >> PAGE_CACHE_SHIFT)\n" - "+\tsize = round_up(i_size_read(inode), PAGE_SIZE);\n" - "+\tif (offset >= size >> PAGE_SHIFT)\n" - " \t\treturn VM_FAULT_SIGBUS;\n" - " \n" - " \t/*\n" - "@@ -2048,7 +2048,7 @@ retry_find:\n" - " \t}\n" - " \n" - " \tif (!lock_page_or_retry(page, vma->vm_mm, vmf->flags)) {\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\treturn ret | VM_FAULT_RETRY;\n" - " \t}\n" - " \n" - "@@ -2071,10 +2071,10 @@ retry_find:\n" - " \t * Found the page and have a reference on it.\n" - " \t * We must recheck i_size under page lock.\n" - " \t */\n" - "-\tsize = round_up(i_size_read(inode), PAGE_CACHE_SIZE);\n" - "-\tif (unlikely(offset >= size >> PAGE_CACHE_SHIFT)) {\n" - "+\tsize = round_up(i_size_read(inode), PAGE_SIZE);\n" - "+\tif (unlikely(offset >= size >> PAGE_SHIFT)) {\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\treturn VM_FAULT_SIGBUS;\n" - " \t}\n" - " \n" - "@@ -2119,7 +2119,7 @@ page_not_uptodate:\n" - " \t\tif (!PageUptodate(page))\n" - " \t\t\terror = -EIO;\n" - " \t}\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \tif (!error || error == AOP_TRUNCATED_PAGE)\n" - " \t\tgoto retry_find;\n" - "@@ -2163,7 +2163,7 @@ repeat:\n" - " \n" - " \t\t/* Has the page moved? */\n" - " \t\tif (unlikely(page != *slot)) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tgoto repeat;\n" - " \t\t}\n" - " \n" - "@@ -2177,8 +2177,8 @@ repeat:\n" - " \t\tif (page->mapping != mapping || !PageUptodate(page))\n" - " \t\t\tgoto unlock;\n" - " \n" - "-\t\tsize = round_up(i_size_read(mapping->host), PAGE_CACHE_SIZE);\n" - "-\t\tif (page->index >= size >> PAGE_CACHE_SHIFT)\n" - "+\t\tsize = round_up(i_size_read(mapping->host), PAGE_SIZE);\n" - "+\t\tif (page->index >= size >> PAGE_SHIFT)\n" - " \t\t\tgoto unlock;\n" - " \n" - " \t\tpte = vmf->pte + page->index - vmf->pgoff;\n" - "@@ -2194,7 +2194,7 @@ repeat:\n" - " unlock:\n" - " \t\tunlock_page(page);\n" - " skip:\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " next:\n" - " \t\tif (iter.index == vmf->max_pgoff)\n" - " \t\t\tbreak;\n" - "@@ -2277,7 +2277,7 @@ static struct page *wait_on_page_read(struct page *page)\n" - " \tif (!IS_ERR(page)) {\n" - " \t\twait_on_page_locked(page);\n" - " \t\tif (!PageUptodate(page)) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tpage = ERR_PTR(-EIO);\n" - " \t\t}\n" - " \t}\n" - "@@ -2300,7 +2300,7 @@ repeat:\n" - " \t\t\treturn ERR_PTR(-ENOMEM);\n" - " \t\terr = add_to_page_cache_lru(page, mapping, index, gfp);\n" - " \t\tif (unlikely(err)) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tif (err == -EEXIST)\n" - " \t\t\t\tgoto repeat;\n" - " \t\t\t/* Presumably ENOMEM for radix tree node */\n" - "@@ -2310,7 +2310,7 @@ repeat:\n" - " filler:\n" - " \t\terr = filler(data, page);\n" - " \t\tif (err < 0) {\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\treturn ERR_PTR(err);\n" - " \t\t}\n" - " \n" - "@@ -2363,7 +2363,7 @@ filler:\n" - " \t/* Case c or d, restart the operation */\n" - " \tif (!page->mapping) {\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tgoto repeat;\n" - " \t}\n" - " \n" - "@@ -2510,7 +2510,7 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos)\n" - " \tstruct iov_iter data;\n" - " \n" - " \twrite_len = iov_iter_count(from);\n" - "-\tend = (pos + write_len - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tend = (pos + write_len - 1) >> PAGE_SHIFT;\n" - " \n" - " \twritten = filemap_write_and_wait_range(mapping, pos, pos + write_len - 1);\n" - " \tif (written)\n" - "@@ -2524,7 +2524,7 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos)\n" - " \t */\n" - " \tif (mapping->nrpages) {\n" - " \t\twritten = invalidate_inode_pages2_range(mapping,\n" - "-\t\t\t\t\tpos >> PAGE_CACHE_SHIFT, end);\n" - "+\t\t\t\t\tpos >> PAGE_SHIFT, end);\n" - " \t\t/*\n" - " \t\t * If a page can not be invalidated, return 0 to fall back\n" - " \t\t * to buffered write.\n" - "@@ -2549,7 +2549,7 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos)\n" - " \t */\n" - " \tif (mapping->nrpages) {\n" - " \t\tinvalidate_inode_pages2_range(mapping,\n" - "-\t\t\t\t\t pos >> PAGE_CACHE_SHIFT, end);\n" - "+\t\t\t\t\t pos >> PAGE_SHIFT, end);\n" - " \t}\n" - " \n" - " \tif (written > 0) {\n" - "@@ -2610,8 +2610,8 @@ ssize_t generic_perform_write(struct file *file,\n" - " \t\tsize_t copied;\t\t/* Bytes copied from user */\n" - " \t\tvoid *fsdata;\n" - " \n" - "-\t\toffset = (pos & (PAGE_CACHE_SIZE - 1));\n" - "-\t\tbytes = min_t(unsigned long, PAGE_CACHE_SIZE - offset,\n" - "+\t\toffset = (pos & (PAGE_SIZE - 1));\n" - "+\t\tbytes = min_t(unsigned long, PAGE_SIZE - offset,\n" - " \t\t\t\t\t\tiov_iter_count(i));\n" - " \n" - " again:\n" - "@@ -2664,7 +2664,7 @@ again:\n" - " \t\t\t * because not all segments in the iov can be copied at\n" - " \t\t\t * once without a pagefault.\n" - " \t\t\t */\n" - "-\t\t\tbytes = min_t(unsigned long, PAGE_CACHE_SIZE - offset,\n" - "+\t\t\tbytes = min_t(unsigned long, PAGE_SIZE - offset,\n" - " \t\t\t\t\t\tiov_iter_single_seg_count(i));\n" - " \t\t\tgoto again;\n" - " \t\t}\n" - "@@ -2751,8 +2751,8 @@ ssize_t __generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from)\n" - " \t\t\tiocb->ki_pos = endbyte + 1;\n" - " \t\t\twritten += status;\n" - " \t\t\tinvalidate_mapping_pages(mapping,\n" - "-\t\t\t\t\t\t pos >> PAGE_CACHE_SHIFT,\n" - "-\t\t\t\t\t\t endbyte >> PAGE_CACHE_SHIFT);\n" - "+\t\t\t\t\t\t pos >> PAGE_SHIFT,\n" - "+\t\t\t\t\t\t endbyte >> PAGE_SHIFT);\n" - " \t\t} else {\n" - " \t\t\t/*\n" - " \t\t\t * We don't know how much we wrote, so just return\n" - "diff --git a/mm/gup.c b/mm/gup.c\n" - "index 7bf19ffa2199..8c050724e498 100644\n" - "--- a/mm/gup.c\n" - "+++ b/mm/gup.c\n" - "@@ -1058,7 +1058,7 @@ int __mm_populate(unsigned long start, unsigned long len, int ignore_errors)\n" - " * @addr: user address\n" - " *\n" - " * Returns struct page pointer of user page pinned for dump,\n" - "- * to be freed afterwards by page_cache_release() or put_page().\n" - "+ * to be freed afterwards by put_page().\n" - " *\n" - " * Returns NULL on any kind of failure - a hole must then be inserted into\n" - " * the corefile, to preserve alignment with its headers; and also returns\n" - "diff --git a/mm/hugetlb.c b/mm/hugetlb.c\n" - "index 06058eaa173b..19d0d08b396f 100644\n" - "--- a/mm/hugetlb.c\n" - "+++ b/mm/hugetlb.c\n" - "@@ -3346,7 +3346,7 @@ retry_avoidcopy:\n" - " \t\t\told_page != pagecache_page)\n" - " \t\toutside_reserve = 1;\n" - " \n" - "-\tpage_cache_get(old_page);\n" - "+\tget_page(old_page);\n" - " \n" - " \t/*\n" - " \t * Drop page table lock as buddy allocator may be called. It will\n" - "@@ -3364,7 +3364,7 @@ retry_avoidcopy:\n" - " \t\t * may get SIGKILLed if it later faults.\n" - " \t\t */\n" - " \t\tif (outside_reserve) {\n" - "-\t\t\tpage_cache_release(old_page);\n" - "+\t\t\tput_page(old_page);\n" - " \t\t\tBUG_ON(huge_pte_none(pte));\n" - " \t\t\tunmap_ref_private(mm, vma, old_page, address);\n" - " \t\t\tBUG_ON(huge_pte_none(pte));\n" - "@@ -3425,9 +3425,9 @@ retry_avoidcopy:\n" - " \tspin_unlock(ptl);\n" - " \tmmu_notifier_invalidate_range_end(mm, mmun_start, mmun_end);\n" - " out_release_all:\n" - "-\tpage_cache_release(new_page);\n" - "+\tput_page(new_page);\n" - " out_release_old:\n" - "-\tpage_cache_release(old_page);\n" - "+\tput_page(old_page);\n" - " \n" - " \tspin_lock(ptl); /* Caller expects lock to be held */\n" - " \treturn ret;\n" - "diff --git a/mm/madvise.c b/mm/madvise.c\n" - "index a01147359f3b..07427d3fcead 100644\n" - "--- a/mm/madvise.c\n" - "+++ b/mm/madvise.c\n" - "@@ -170,7 +170,7 @@ static int swapin_walk_pmd_entry(pmd_t *pmd, unsigned long start,\n" - " \t\tpage = read_swap_cache_async(entry, GFP_HIGHUSER_MOVABLE,\n" - " \t\t\t\t\t\t\t\tvma, index);\n" - " \t\tif (page)\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t}\n" - " \n" - " \treturn 0;\n" - "@@ -204,14 +204,14 @@ static void force_shm_swapin_readahead(struct vm_area_struct *vma,\n" - " \t\tpage = find_get_entry(mapping, index);\n" - " \t\tif (!radix_tree_exceptional_entry(page)) {\n" - " \t\t\tif (page)\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\tcontinue;\n" - " \t\t}\n" - " \t\tswap = radix_to_swp_entry(page);\n" - " \t\tpage = read_swap_cache_async(swap, GFP_HIGHUSER_MOVABLE,\n" - " \t\t\t\t\t\t\t\tNULL, 0);\n" - " \t\tif (page)\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t}\n" - " \n" - " \tlru_add_drain();\t/* Push any new pages onto the LRU now */\n" - "diff --git a/mm/memory-failure.c b/mm/memory-failure.c\n" - "index 5a544c6c0717..78f5f2641b91 100644\n" - "--- a/mm/memory-failure.c\n" - "+++ b/mm/memory-failure.c\n" - "@@ -538,7 +538,7 @@ static int delete_from_lru_cache(struct page *p)\n" - " \t\t/*\n" - " \t\t * drop the page count elevated by isolate_lru_page()\n" - " \t\t */\n" - "-\t\tpage_cache_release(p);\n" - "+\t\tput_page(p);\n" - " \t\treturn 0;\n" - " \t}\n" - " \treturn -EIO;\n" - "diff --git a/mm/memory.c b/mm/memory.c\n" - "index ac6bc15c19be..847e24cab5bb 100644\n" - "--- a/mm/memory.c\n" - "+++ b/mm/memory.c\n" - "@@ -2050,7 +2050,7 @@ static inline int wp_page_reuse(struct mm_struct *mm,\n" - " \t\tVM_BUG_ON_PAGE(PageAnon(page), page);\n" - " \t\tmapping = page->mapping;\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \n" - " \t\tif ((dirtied || page_mkwrite) && mapping) {\n" - " \t\t\t/*\n" - "@@ -2184,7 +2184,7 @@ static int wp_page_copy(struct mm_struct *mm, struct vm_area_struct *vma,\n" - " \t}\n" - " \n" - " \tif (new_page)\n" - "-\t\tpage_cache_release(new_page);\n" - "+\t\tput_page(new_page);\n" - " \n" - " \tpte_unmap_unlock(page_table, ptl);\n" - " \tmmu_notifier_invalidate_range_end(mm, mmun_start, mmun_end);\n" - "@@ -2199,14 +2199,14 @@ static int wp_page_copy(struct mm_struct *mm, struct vm_area_struct *vma,\n" - " \t\t\t\tmunlock_vma_page(old_page);\n" - " \t\t\tunlock_page(old_page);\n" - " \t\t}\n" - "-\t\tpage_cache_release(old_page);\n" - "+\t\tput_page(old_page);\n" - " \t}\n" - " \treturn page_copied ? VM_FAULT_WRITE : 0;\n" - " oom_free_new:\n" - "-\tpage_cache_release(new_page);\n" - "+\tput_page(new_page);\n" - " oom:\n" - " \tif (old_page)\n" - "-\t\tpage_cache_release(old_page);\n" - "+\t\tput_page(old_page);\n" - " \treturn VM_FAULT_OOM;\n" - " }\n" - " \n" - "@@ -2254,7 +2254,7 @@ static int wp_page_shared(struct mm_struct *mm, struct vm_area_struct *vma,\n" - " {\n" - " \tint page_mkwrite = 0;\n" - " \n" - "-\tpage_cache_get(old_page);\n" - "+\tget_page(old_page);\n" - " \n" - " \tif (vma->vm_ops && vma->vm_ops->page_mkwrite) {\n" - " \t\tint tmp;\n" - "@@ -2263,7 +2263,7 @@ static int wp_page_shared(struct mm_struct *mm, struct vm_area_struct *vma,\n" - " \t\ttmp = do_page_mkwrite(vma, old_page, address);\n" - " \t\tif (unlikely(!tmp || (tmp &\n" - " \t\t\t\t (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))) {\n" - "-\t\t\tpage_cache_release(old_page);\n" - "+\t\t\tput_page(old_page);\n" - " \t\t\treturn tmp;\n" - " \t\t}\n" - " \t\t/*\n" - "@@ -2277,7 +2277,7 @@ static int wp_page_shared(struct mm_struct *mm, struct vm_area_struct *vma,\n" - " \t\tif (!pte_same(*page_table, orig_pte)) {\n" - " \t\t\tunlock_page(old_page);\n" - " \t\t\tpte_unmap_unlock(page_table, ptl);\n" - "-\t\t\tpage_cache_release(old_page);\n" - "+\t\t\tput_page(old_page);\n" - " \t\t\treturn 0;\n" - " \t\t}\n" - " \t\tpage_mkwrite = 1;\n" - "@@ -2337,7 +2337,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,\n" - " \t */\n" - " \tif (PageAnon(old_page) && !PageKsm(old_page)) {\n" - " \t\tif (!trylock_page(old_page)) {\n" - "-\t\t\tpage_cache_get(old_page);\n" - "+\t\t\tget_page(old_page);\n" - " \t\t\tpte_unmap_unlock(page_table, ptl);\n" - " \t\t\tlock_page(old_page);\n" - " \t\t\tpage_table = pte_offset_map_lock(mm, pmd, address,\n" - "@@ -2345,10 +2345,10 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,\n" - " \t\t\tif (!pte_same(*page_table, orig_pte)) {\n" - " \t\t\t\tunlock_page(old_page);\n" - " \t\t\t\tpte_unmap_unlock(page_table, ptl);\n" - "-\t\t\t\tpage_cache_release(old_page);\n" - "+\t\t\t\tput_page(old_page);\n" - " \t\t\t\treturn 0;\n" - " \t\t\t}\n" - "-\t\t\tpage_cache_release(old_page);\n" - "+\t\t\tput_page(old_page);\n" - " \t\t}\n" - " \t\tif (reuse_swap_page(old_page)) {\n" - " \t\t\t/*\n" - "@@ -2371,7 +2371,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,\n" - " \t/*\n" - " \t * Ok, we need to copy. Oh, well..\n" - " \t */\n" - "-\tpage_cache_get(old_page);\n" - "+\tget_page(old_page);\n" - " \n" - " \tpte_unmap_unlock(page_table, ptl);\n" - " \treturn wp_page_copy(mm, vma, address, page_table, pmd,\n" - "@@ -2396,7 +2396,6 @@ static inline void unmap_mapping_range_tree(struct rb_root *root,\n" - " \n" - " \t\tvba = vma->vm_pgoff;\n" - " \t\tvea = vba + vma_pages(vma) - 1;\n" - "-\t\t/* Assume for now that PAGE_CACHE_SHIFT == PAGE_SHIFT */\n" - " \t\tzba = details->first_index;\n" - " \t\tif (zba < vba)\n" - " \t\t\tzba = vba;\n" - "@@ -2615,7 +2614,7 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,\n" - " \t\t * parallel locked swapcache.\n" - " \t\t */\n" - " \t\tunlock_page(swapcache);\n" - "-\t\tpage_cache_release(swapcache);\n" - "+\t\tput_page(swapcache);\n" - " \t}\n" - " \n" - " \tif (flags & FAULT_FLAG_WRITE) {\n" - "@@ -2637,10 +2636,10 @@ out_nomap:\n" - " out_page:\n" - " \tunlock_page(page);\n" - " out_release:\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \tif (page != swapcache) {\n" - " \t\tunlock_page(swapcache);\n" - "-\t\tpage_cache_release(swapcache);\n" - "+\t\tput_page(swapcache);\n" - " \t}\n" - " \treturn ret;\n" - " }\n" - "@@ -2748,7 +2747,7 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,\n" - " \tif (userfaultfd_missing(vma)) {\n" - " \t\tpte_unmap_unlock(page_table, ptl);\n" - " \t\tmem_cgroup_cancel_charge(page, memcg, false);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\treturn handle_userfault(vma, address, flags,\n" - " \t\t\t\t\tVM_UFFD_MISSING);\n" - " \t}\n" - "@@ -2767,10 +2766,10 @@ unlock:\n" - " \treturn 0;\n" - " release:\n" - " \tmem_cgroup_cancel_charge(page, memcg, false);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \tgoto unlock;\n" - " oom_free_page:\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " oom:\n" - " \treturn VM_FAULT_OOM;\n" - " }\n" - "@@ -2803,7 +2802,7 @@ static int __do_fault(struct vm_area_struct *vma, unsigned long address,\n" - " \tif (unlikely(PageHWPoison(vmf.page))) {\n" - " \t\tif (ret & VM_FAULT_LOCKED)\n" - " \t\t\tunlock_page(vmf.page);\n" - "-\t\tpage_cache_release(vmf.page);\n" - "+\t\tput_page(vmf.page);\n" - " \t\treturn VM_FAULT_HWPOISON;\n" - " \t}\n" - " \n" - "@@ -2992,7 +2991,7 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,\n" - " \tif (unlikely(!pte_same(*pte, orig_pte))) {\n" - " \t\tpte_unmap_unlock(pte, ptl);\n" - " \t\tunlock_page(fault_page);\n" - "-\t\tpage_cache_release(fault_page);\n" - "+\t\tput_page(fault_page);\n" - " \t\treturn ret;\n" - " \t}\n" - " \tdo_set_pte(vma, address, fault_page, pte, false, false);\n" - "@@ -3020,7 +3019,7 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,\n" - " \t\treturn VM_FAULT_OOM;\n" - " \n" - " \tif (mem_cgroup_try_charge(new_page, mm, GFP_KERNEL, &memcg, false)) {\n" - "-\t\tpage_cache_release(new_page);\n" - "+\t\tput_page(new_page);\n" - " \t\treturn VM_FAULT_OOM;\n" - " \t}\n" - " \n" - "@@ -3037,7 +3036,7 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,\n" - " \t\tpte_unmap_unlock(pte, ptl);\n" - " \t\tif (fault_page) {\n" - " \t\t\tunlock_page(fault_page);\n" - "-\t\t\tpage_cache_release(fault_page);\n" - "+\t\t\tput_page(fault_page);\n" - " \t\t} else {\n" - " \t\t\t/*\n" - " \t\t\t * The fault handler has no page to lock, so it holds\n" - "@@ -3053,7 +3052,7 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,\n" - " \tpte_unmap_unlock(pte, ptl);\n" - " \tif (fault_page) {\n" - " \t\tunlock_page(fault_page);\n" - "-\t\tpage_cache_release(fault_page);\n" - "+\t\tput_page(fault_page);\n" - " \t} else {\n" - " \t\t/*\n" - " \t\t * The fault handler has no page to lock, so it holds\n" - "@@ -3064,7 +3063,7 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,\n" - " \treturn ret;\n" - " uncharge_out:\n" - " \tmem_cgroup_cancel_charge(new_page, memcg, false);\n" - "-\tpage_cache_release(new_page);\n" - "+\tput_page(new_page);\n" - " \treturn ret;\n" - " }\n" - " \n" - "@@ -3092,7 +3091,7 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,\n" - " \t\ttmp = do_page_mkwrite(vma, fault_page, address);\n" - " \t\tif (unlikely(!tmp ||\n" - " \t\t\t\t(tmp & (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))) {\n" - "-\t\t\tpage_cache_release(fault_page);\n" - "+\t\t\tput_page(fault_page);\n" - " \t\t\treturn tmp;\n" - " \t\t}\n" - " \t}\n" - "@@ -3101,7 +3100,7 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,\n" - " \tif (unlikely(!pte_same(*pte, orig_pte))) {\n" - " \t\tpte_unmap_unlock(pte, ptl);\n" - " \t\tunlock_page(fault_page);\n" - "-\t\tpage_cache_release(fault_page);\n" - "+\t\tput_page(fault_page);\n" - " \t\treturn ret;\n" - " \t}\n" - " \tdo_set_pte(vma, address, fault_page, pte, true, false);\n" - "@@ -3727,7 +3726,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,\n" - " \t\t\t\t\t\t buf, maddr + offset, bytes);\n" - " \t\t\t}\n" - " \t\t\tkunmap(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t}\n" - " \t\tlen -= bytes;\n" - " \t\tbuf += bytes;\n" - "diff --git a/mm/mincore.c b/mm/mincore.c\n" - "index 563f32045490..012a4659e273 100644\n" - "--- a/mm/mincore.c\n" - "+++ b/mm/mincore.c\n" - "@@ -75,7 +75,7 @@ static unsigned char mincore_page(struct address_space *mapping, pgoff_t pgoff)\n" - " #endif\n" - " \tif (page) {\n" - " \t\tpresent = PageUptodate(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \n" - " \treturn present;\n" - "@@ -211,7 +211,7 @@ static long do_mincore(unsigned long addr, unsigned long pages, unsigned char *v\n" - " * return values:\n" - " * zero - success\n" - " * -EFAULT - vec points to an illegal address\n" - "- * -EINVAL - addr is not a multiple of PAGE_CACHE_SIZE\n" - "+ * -EINVAL - addr is not a multiple of PAGE_SIZE\n" - " * -ENOMEM - Addresses in the range [addr, addr + len] are\n" - " *\t\tinvalid for the address space of this process, or\n" - " *\t\tspecify one or more pages which are not currently\n" - "@@ -226,14 +226,14 @@ SYSCALL_DEFINE3(mincore, unsigned long, start, size_t, len,\n" - " \tunsigned char *tmp;\n" - " \n" - " \t/* Check the start address: needs to be page-aligned.. */\n" - "- \tif (start & ~PAGE_CACHE_MASK)\n" - "+ \tif (start & ~PAGE_MASK)\n" - " \t\treturn -EINVAL;\n" - " \n" - " \t/* ..and we need to be passed a valid user-space range */\n" - " \tif (!access_ok(VERIFY_READ, (void __user *) start, len))\n" - " \t\treturn -ENOMEM;\n" - " \n" - "-\t/* This also avoids any overflows on PAGE_CACHE_ALIGN */\n" - "+\t/* This also avoids any overflows on PAGE_ALIGN */\n" - " \tpages = len >> PAGE_SHIFT;\n" - " \tpages += (offset_in_page(len)) != 0;\n" - " \n" - "diff --git a/mm/nommu.c b/mm/nommu.c\n" - "index 6402f2715d48..9e5d855472a3 100644\n" - "--- a/mm/nommu.c\n" - "+++ b/mm/nommu.c\n" - "@@ -139,7 +139,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,\n" - " \t\tif (pages) {\n" - " \t\t\tpages[i] = virt_to_page(start);\n" - " \t\t\tif (pages[i])\n" - "-\t\t\t\tpage_cache_get(pages[i]);\n" - "+\t\t\t\tget_page(pages[i]);\n" - " \t\t}\n" - " \t\tif (vmas)\n" - " \t\t\tvmas[i] = vma;\n" - "diff --git a/mm/page-writeback.c b/mm/page-writeback.c\n" - "index 11ff8f758631..999792d35ccc 100644\n" - "--- a/mm/page-writeback.c\n" - "+++ b/mm/page-writeback.c\n" - "@@ -2176,8 +2176,8 @@ int write_cache_pages(struct address_space *mapping,\n" - " \t\t\tcycled = 0;\n" - " \t\tend = -1;\n" - " \t} else {\n" - "-\t\tindex = wbc->range_start >> PAGE_CACHE_SHIFT;\n" - "-\t\tend = wbc->range_end >> PAGE_CACHE_SHIFT;\n" - "+\t\tindex = wbc->range_start >> PAGE_SHIFT;\n" - "+\t\tend = wbc->range_end >> PAGE_SHIFT;\n" - " \t\tif (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)\n" - " \t\t\trange_whole = 1;\n" - " \t\tcycled = 1; /* ignore range_cyclic tests */\n" - "@@ -2382,14 +2382,14 @@ int write_one_page(struct page *page, int wait)\n" - " \t\twait_on_page_writeback(page);\n" - " \n" - " \tif (clear_page_dirty_for_io(page)) {\n" - "-\t\tpage_cache_get(page);\n" - "+\t\tget_page(page);\n" - " \t\tret = mapping->a_ops->writepage(page, &wbc);\n" - " \t\tif (ret == 0 && wait) {\n" - " \t\t\twait_on_page_writeback(page);\n" - " \t\t\tif (PageError(page))\n" - " \t\t\t\tret = -EIO;\n" - " \t\t}\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t} else {\n" - " \t\tunlock_page(page);\n" - " \t}\n" - "@@ -2431,7 +2431,7 @@ void account_page_dirtied(struct page *page, struct address_space *mapping)\n" - " \t\t__inc_zone_page_state(page, NR_DIRTIED);\n" - " \t\t__inc_wb_stat(wb, WB_RECLAIMABLE);\n" - " \t\t__inc_wb_stat(wb, WB_DIRTIED);\n" - "-\t\ttask_io_account_write(PAGE_CACHE_SIZE);\n" - "+\t\ttask_io_account_write(PAGE_SIZE);\n" - " \t\tcurrent->nr_dirtied++;\n" - " \t\tthis_cpu_inc(bdp_ratelimits);\n" - " \t}\n" - "@@ -2450,7 +2450,7 @@ void account_page_cleaned(struct page *page, struct address_space *mapping,\n" - " \t\tmem_cgroup_dec_page_stat(page, MEM_CGROUP_STAT_DIRTY);\n" - " \t\tdec_zone_page_state(page, NR_FILE_DIRTY);\n" - " \t\tdec_wb_stat(wb, WB_RECLAIMABLE);\n" - "-\t\ttask_io_account_cancelled_write(PAGE_CACHE_SIZE);\n" - "+\t\ttask_io_account_cancelled_write(PAGE_SIZE);\n" - " \t}\n" - " }\n" - " \n" - "diff --git a/mm/page_io.c b/mm/page_io.c\n" - "index ff74e512f029..729cc6ee21a6 100644\n" - "--- a/mm/page_io.c\n" - "+++ b/mm/page_io.c\n" - "@@ -246,7 +246,7 @@ out:\n" - " \n" - " static sector_t swap_page_sector(struct page *page)\n" - " {\n" - "-\treturn (sector_t)__page_file_index(page) << (PAGE_CACHE_SHIFT - 9);\n" - "+\treturn (sector_t)__page_file_index(page) << (PAGE_SHIFT - 9);\n" - " }\n" - " \n" - " int __swap_writepage(struct page *page, struct writeback_control *wbc,\n" - "diff --git a/mm/readahead.c b/mm/readahead.c\n" - "index 20e58e820e44..40be3ae0afe3 100644\n" - "--- a/mm/readahead.c\n" - "+++ b/mm/readahead.c\n" - "@@ -47,11 +47,11 @@ static void read_cache_pages_invalidate_page(struct address_space *mapping,\n" - " \t\tif (!trylock_page(page))\n" - " \t\t\tBUG();\n" - " \t\tpage->mapping = mapping;\n" - "-\t\tdo_invalidatepage(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\tdo_invalidatepage(page, 0, PAGE_SIZE);\n" - " \t\tpage->mapping = NULL;\n" - " \t\tunlock_page(page);\n" - " \t}\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " /*\n" - "@@ -93,14 +93,14 @@ int read_cache_pages(struct address_space *mapping, struct list_head *pages,\n" - " \t\t\tread_cache_pages_invalidate_page(mapping, page);\n" - " \t\t\tcontinue;\n" - " \t\t}\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \n" - " \t\tret = filler(data, page);\n" - " \t\tif (unlikely(ret)) {\n" - " \t\t\tread_cache_pages_invalidate_pages(mapping, pages);\n" - " \t\t\tbreak;\n" - " \t\t}\n" - "-\t\ttask_io_account_read(PAGE_CACHE_SIZE);\n" - "+\t\ttask_io_account_read(PAGE_SIZE);\n" - " \t}\n" - " \treturn ret;\n" - " }\n" - "@@ -130,7 +130,7 @@ static int read_pages(struct address_space *mapping, struct file *filp,\n" - " \t\t\t\tmapping_gfp_constraint(mapping, GFP_KERNEL))) {\n" - " \t\t\tmapping->a_ops->readpage(filp, page);\n" - " \t\t}\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \tret = 0;\n" - " \n" - "@@ -163,7 +163,7 @@ int __do_page_cache_readahead(struct address_space *mapping, struct file *filp,\n" - " \tif (isize == 0)\n" - " \t\tgoto out;\n" - " \n" - "-\tend_index = ((isize - 1) >> PAGE_CACHE_SHIFT);\n" - "+\tend_index = ((isize - 1) >> PAGE_SHIFT);\n" - " \n" - " \t/*\n" - " \t * Preallocate as many pages as we will need.\n" - "@@ -216,7 +216,7 @@ int force_page_cache_readahead(struct address_space *mapping, struct file *filp,\n" - " \twhile (nr_to_read) {\n" - " \t\tint err;\n" - " \n" - "-\t\tunsigned long this_chunk = (2 * 1024 * 1024) / PAGE_CACHE_SIZE;\n" - "+\t\tunsigned long this_chunk = (2 * 1024 * 1024) / PAGE_SIZE;\n" - " \n" - " \t\tif (this_chunk > nr_to_read)\n" - " \t\t\tthis_chunk = nr_to_read;\n" - "@@ -425,7 +425,7 @@ ondemand_readahead(struct address_space *mapping,\n" - " \t * trivial case: (offset - prev_offset) == 1\n" - " \t * unaligned reads: (offset - prev_offset) == 0\n" - " \t */\n" - "-\tprev_offset = (unsigned long long)ra->prev_pos >> PAGE_CACHE_SHIFT;\n" - "+\tprev_offset = (unsigned long long)ra->prev_pos >> PAGE_SHIFT;\n" - " \tif (offset - prev_offset <= 1UL)\n" - " \t\tgoto initial_readahead;\n" - " \n" - "@@ -558,8 +558,8 @@ SYSCALL_DEFINE3(readahead, int, fd, loff_t, offset, size_t, count)\n" - " \tif (f.file) {\n" - " \t\tif (f.file->f_mode & FMODE_READ) {\n" - " \t\t\tstruct address_space *mapping = f.file->f_mapping;\n" - "-\t\t\tpgoff_t start = offset >> PAGE_CACHE_SHIFT;\n" - "-\t\t\tpgoff_t end = (offset + count - 1) >> PAGE_CACHE_SHIFT;\n" - "+\t\t\tpgoff_t start = offset >> PAGE_SHIFT;\n" - "+\t\t\tpgoff_t end = (offset + count - 1) >> PAGE_SHIFT;\n" - " \t\t\tunsigned long len = end - start + 1;\n" - " \t\t\tret = do_readahead(mapping, f.file, start, len);\n" - " \t\t}\n" - "diff --git a/mm/rmap.c b/mm/rmap.c\n" - "index c399a0d41b31..525b92f866a7 100644\n" - "--- a/mm/rmap.c\n" - "+++ b/mm/rmap.c\n" - "@@ -1555,7 +1555,7 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma,\n" - " \n" - " discard:\n" - " \tpage_remove_rmap(page, PageHuge(page));\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " out_unmap:\n" - " \tpte_unmap_unlock(pte, ptl);\n" - "diff --git a/mm/shmem.c b/mm/shmem.c\n" - "index 9428c51ab2d6..719bd6b88d98 100644\n" - "--- a/mm/shmem.c\n" - "+++ b/mm/shmem.c\n" - "@@ -75,8 +75,8 @@ static struct vfsmount *shm_mnt;\n" - " \n" - " #include \"internal.h\"\n" - " \n" - "-#define BLOCKS_PER_PAGE (PAGE_CACHE_SIZE/512)\n" - "-#define VM_ACCT(size) (PAGE_CACHE_ALIGN(size) >> PAGE_SHIFT)\n" - "+#define BLOCKS_PER_PAGE (PAGE_SIZE/512)\n" - "+#define VM_ACCT(size) (PAGE_ALIGN(size) >> PAGE_SHIFT)\n" - " \n" - " /* Pretend that each entry is of this size in directory's i_size */\n" - " #define BOGO_DIRENT_SIZE 20\n" - "@@ -176,13 +176,13 @@ static inline int shmem_reacct_size(unsigned long flags,\n" - " static inline int shmem_acct_block(unsigned long flags)\n" - " {\n" - " \treturn (flags & VM_NORESERVE) ?\n" - "-\t\tsecurity_vm_enough_memory_mm(current->mm, VM_ACCT(PAGE_CACHE_SIZE)) : 0;\n" - "+\t\tsecurity_vm_enough_memory_mm(current->mm, VM_ACCT(PAGE_SIZE)) : 0;\n" - " }\n" - " \n" - " static inline void shmem_unacct_blocks(unsigned long flags, long pages)\n" - " {\n" - " \tif (flags & VM_NORESERVE)\n" - "-\t\tvm_unacct_memory(pages * VM_ACCT(PAGE_CACHE_SIZE));\n" - "+\t\tvm_unacct_memory(pages * VM_ACCT(PAGE_SIZE));\n" - " }\n" - " \n" - " static const struct super_operations shmem_ops;\n" - "@@ -300,7 +300,7 @@ static int shmem_add_to_page_cache(struct page *page,\n" - " \tVM_BUG_ON_PAGE(!PageLocked(page), page);\n" - " \tVM_BUG_ON_PAGE(!PageSwapBacked(page), page);\n" - " \n" - "-\tpage_cache_get(page);\n" - "+\tget_page(page);\n" - " \tpage->mapping = mapping;\n" - " \tpage->index = index;\n" - " \n" - "@@ -318,7 +318,7 @@ static int shmem_add_to_page_cache(struct page *page,\n" - " \t} else {\n" - " \t\tpage->mapping = NULL;\n" - " \t\tspin_unlock_irq(&mapping->tree_lock);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \treturn error;\n" - " }\n" - "@@ -338,7 +338,7 @@ static void shmem_delete_from_page_cache(struct page *page, void *radswap)\n" - " \t__dec_zone_page_state(page, NR_FILE_PAGES);\n" - " \t__dec_zone_page_state(page, NR_SHMEM);\n" - " \tspin_unlock_irq(&mapping->tree_lock);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \tBUG_ON(error);\n" - " }\n" - " \n" - "@@ -474,10 +474,10 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend,\n" - " {\n" - " \tstruct address_space *mapping = inode->i_mapping;\n" - " \tstruct shmem_inode_info *info = SHMEM_I(inode);\n" - "-\tpgoff_t start = (lstart + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "-\tpgoff_t end = (lend + 1) >> PAGE_CACHE_SHIFT;\n" - "-\tunsigned int partial_start = lstart & (PAGE_CACHE_SIZE - 1);\n" - "-\tunsigned int partial_end = (lend + 1) & (PAGE_CACHE_SIZE - 1);\n" - "+\tpgoff_t start = (lstart + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - "+\tpgoff_t end = (lend + 1) >> PAGE_SHIFT;\n" - "+\tunsigned int partial_start = lstart & (PAGE_SIZE - 1);\n" - "+\tunsigned int partial_end = (lend + 1) & (PAGE_SIZE - 1);\n" - " \tstruct pagevec pvec;\n" - " \tpgoff_t indices[PAGEVEC_SIZE];\n" - " \tlong nr_swaps_freed = 0;\n" - "@@ -530,7 +530,7 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend,\n" - " \t\tstruct page *page = NULL;\n" - " \t\tshmem_getpage(inode, start - 1, &page, SGP_READ, NULL);\n" - " \t\tif (page) {\n" - "-\t\t\tunsigned int top = PAGE_CACHE_SIZE;\n" - "+\t\t\tunsigned int top = PAGE_SIZE;\n" - " \t\t\tif (start > end) {\n" - " \t\t\t\ttop = partial_end;\n" - " \t\t\t\tpartial_end = 0;\n" - "@@ -538,7 +538,7 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend,\n" - " \t\t\tzero_user_segment(page, partial_start, top);\n" - " \t\t\tset_page_dirty(page);\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t}\n" - " \t}\n" - " \tif (partial_end) {\n" - "@@ -548,7 +548,7 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend,\n" - " \t\t\tzero_user_segment(page, 0, partial_end);\n" - " \t\t\tset_page_dirty(page);\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t}\n" - " \t}\n" - " \tif (start >= end)\n" - "@@ -833,7 +833,7 @@ int shmem_unuse(swp_entry_t swap, struct page *page)\n" - " \t\tmem_cgroup_commit_charge(page, memcg, true, false);\n" - " out:\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn error;\n" - " }\n" - " \n" - "@@ -1080,7 +1080,7 @@ static int shmem_replace_page(struct page **pagep, gfp_t gfp,\n" - " \tif (!newpage)\n" - " \t\treturn -ENOMEM;\n" - " \n" - "-\tpage_cache_get(newpage);\n" - "+\tget_page(newpage);\n" - " \tcopy_highpage(newpage, oldpage);\n" - " \tflush_dcache_page(newpage);\n" - " \n" - "@@ -1120,8 +1120,8 @@ static int shmem_replace_page(struct page **pagep, gfp_t gfp,\n" - " \tset_page_private(oldpage, 0);\n" - " \n" - " \tunlock_page(oldpage);\n" - "-\tpage_cache_release(oldpage);\n" - "-\tpage_cache_release(oldpage);\n" - "+\tput_page(oldpage);\n" - "+\tput_page(oldpage);\n" - " \treturn error;\n" - " }\n" - " \n" - "@@ -1145,7 +1145,7 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,\n" - " \tint once = 0;\n" - " \tint alloced = 0;\n" - " \n" - "-\tif (index > (MAX_LFS_FILESIZE >> PAGE_CACHE_SHIFT))\n" - "+\tif (index > (MAX_LFS_FILESIZE >> PAGE_SHIFT))\n" - " \t\treturn -EFBIG;\n" - " repeat:\n" - " \tswap.val = 0;\n" - "@@ -1156,7 +1156,7 @@ repeat:\n" - " \t}\n" - " \n" - " \tif (sgp != SGP_WRITE && sgp != SGP_FALLOC &&\n" - "-\t ((loff_t)index << PAGE_CACHE_SHIFT) >= i_size_read(inode)) {\n" - "+\t ((loff_t)index << PAGE_SHIFT) >= i_size_read(inode)) {\n" - " \t\terror = -EINVAL;\n" - " \t\tgoto unlock;\n" - " \t}\n" - "@@ -1169,7 +1169,7 @@ repeat:\n" - " \t\tif (sgp != SGP_READ)\n" - " \t\t\tgoto clear;\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tpage = NULL;\n" - " \t}\n" - " \tif (page || (sgp == SGP_READ && !swap.val)) {\n" - "@@ -1327,7 +1327,7 @@ clear:\n" - " \n" - " \t/* Perhaps the file has been truncated since we checked */\n" - " \tif (sgp != SGP_WRITE && sgp != SGP_FALLOC &&\n" - "-\t ((loff_t)index << PAGE_CACHE_SHIFT) >= i_size_read(inode)) {\n" - "+\t ((loff_t)index << PAGE_SHIFT) >= i_size_read(inode)) {\n" - " \t\tif (alloced) {\n" - " \t\t\tClearPageDirty(page);\n" - " \t\t\tdelete_from_page_cache(page);\n" - "@@ -1355,7 +1355,7 @@ failed:\n" - " unlock:\n" - " \tif (page) {\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \tif (error == -ENOSPC && !once++) {\n" - " \t\tinfo = SHMEM_I(inode);\n" - "@@ -1577,7 +1577,7 @@ shmem_write_begin(struct file *file, struct address_space *mapping,\n" - " {\n" - " \tstruct inode *inode = mapping->host;\n" - " \tstruct shmem_inode_info *info = SHMEM_I(inode);\n" - "-\tpgoff_t index = pos >> PAGE_CACHE_SHIFT;\n" - "+\tpgoff_t index = pos >> PAGE_SHIFT;\n" - " \n" - " \t/* i_mutex is held by caller */\n" - " \tif (unlikely(info->seals)) {\n" - "@@ -1601,16 +1601,16 @@ shmem_write_end(struct file *file, struct address_space *mapping,\n" - " \t\ti_size_write(inode, pos + copied);\n" - " \n" - " \tif (!PageUptodate(page)) {\n" - "-\t\tif (copied < PAGE_CACHE_SIZE) {\n" - "-\t\t\tunsigned from = pos & (PAGE_CACHE_SIZE - 1);\n" - "+\t\tif (copied < PAGE_SIZE) {\n" - "+\t\t\tunsigned from = pos & (PAGE_SIZE - 1);\n" - " \t\t\tzero_user_segments(page, 0, from,\n" - "-\t\t\t\t\tfrom + copied, PAGE_CACHE_SIZE);\n" - "+\t\t\t\t\tfrom + copied, PAGE_SIZE);\n" - " \t\t}\n" - " \t\tSetPageUptodate(page);\n" - " \t}\n" - " \tset_page_dirty(page);\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \n" - " \treturn copied;\n" - " }\n" - "@@ -1635,8 +1635,8 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to)\n" - " \tif (!iter_is_iovec(to))\n" - " \t\tsgp = SGP_DIRTY;\n" - " \n" - "-\tindex = *ppos >> PAGE_CACHE_SHIFT;\n" - "-\toffset = *ppos & ~PAGE_CACHE_MASK;\n" - "+\tindex = *ppos >> PAGE_SHIFT;\n" - "+\toffset = *ppos & ~PAGE_MASK;\n" - " \n" - " \tfor (;;) {\n" - " \t\tstruct page *page = NULL;\n" - "@@ -1644,11 +1644,11 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to)\n" - " \t\tunsigned long nr, ret;\n" - " \t\tloff_t i_size = i_size_read(inode);\n" - " \n" - "-\t\tend_index = i_size >> PAGE_CACHE_SHIFT;\n" - "+\t\tend_index = i_size >> PAGE_SHIFT;\n" - " \t\tif (index > end_index)\n" - " \t\t\tbreak;\n" - " \t\tif (index == end_index) {\n" - "-\t\t\tnr = i_size & ~PAGE_CACHE_MASK;\n" - "+\t\t\tnr = i_size & ~PAGE_MASK;\n" - " \t\t\tif (nr <= offset)\n" - " \t\t\t\tbreak;\n" - " \t\t}\n" - "@@ -1666,14 +1666,14 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to)\n" - " \t\t * We must evaluate after, since reads (unlike writes)\n" - " \t\t * are called without i_mutex protection against truncate\n" - " \t\t */\n" - "-\t\tnr = PAGE_CACHE_SIZE;\n" - "+\t\tnr = PAGE_SIZE;\n" - " \t\ti_size = i_size_read(inode);\n" - "-\t\tend_index = i_size >> PAGE_CACHE_SHIFT;\n" - "+\t\tend_index = i_size >> PAGE_SHIFT;\n" - " \t\tif (index == end_index) {\n" - "-\t\t\tnr = i_size & ~PAGE_CACHE_MASK;\n" - "+\t\t\tnr = i_size & ~PAGE_MASK;\n" - " \t\t\tif (nr <= offset) {\n" - " \t\t\t\tif (page)\n" - "-\t\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\t\tput_page(page);\n" - " \t\t\t\tbreak;\n" - " \t\t\t}\n" - " \t\t}\n" - "@@ -1694,7 +1694,7 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to)\n" - " \t\t\t\tmark_page_accessed(page);\n" - " \t\t} else {\n" - " \t\t\tpage = ZERO_PAGE(0);\n" - "-\t\t\tpage_cache_get(page);\n" - "+\t\t\tget_page(page);\n" - " \t\t}\n" - " \n" - " \t\t/*\n" - "@@ -1704,10 +1704,10 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to)\n" - " \t\tret = copy_page_to_iter(page, offset, nr, to);\n" - " \t\tretval += ret;\n" - " \t\toffset += ret;\n" - "-\t\tindex += offset >> PAGE_CACHE_SHIFT;\n" - "-\t\toffset &= ~PAGE_CACHE_MASK;\n" - "+\t\tindex += offset >> PAGE_SHIFT;\n" - "+\t\toffset &= ~PAGE_MASK;\n" - " \n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tif (!iov_iter_count(to))\n" - " \t\t\tbreak;\n" - " \t\tif (ret < nr) {\n" - "@@ -1717,7 +1717,7 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to)\n" - " \t\tcond_resched();\n" - " \t}\n" - " \n" - "-\t*ppos = ((loff_t) index << PAGE_CACHE_SHIFT) + offset;\n" - "+\t*ppos = ((loff_t) index << PAGE_SHIFT) + offset;\n" - " \tfile_accessed(file);\n" - " \treturn retval ? retval : error;\n" - " }\n" - "@@ -1755,9 +1755,9 @@ static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos,\n" - " \tif (splice_grow_spd(pipe, &spd))\n" - " \t\treturn -ENOMEM;\n" - " \n" - "-\tindex = *ppos >> PAGE_CACHE_SHIFT;\n" - "-\tloff = *ppos & ~PAGE_CACHE_MASK;\n" - "-\treq_pages = (len + loff + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tindex = *ppos >> PAGE_SHIFT;\n" - "+\tloff = *ppos & ~PAGE_MASK;\n" - "+\treq_pages = (len + loff + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \tnr_pages = min(req_pages, spd.nr_pages_max);\n" - " \n" - " \tspd.nr_pages = find_get_pages_contig(mapping, index,\n" - "@@ -1774,7 +1774,7 @@ static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos,\n" - " \t\tindex++;\n" - " \t}\n" - " \n" - "-\tindex = *ppos >> PAGE_CACHE_SHIFT;\n" - "+\tindex = *ppos >> PAGE_SHIFT;\n" - " \tnr_pages = spd.nr_pages;\n" - " \tspd.nr_pages = 0;\n" - " \n" - "@@ -1784,7 +1784,7 @@ static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos,\n" - " \t\tif (!len)\n" - " \t\t\tbreak;\n" - " \n" - "-\t\tthis_len = min_t(unsigned long, len, PAGE_CACHE_SIZE - loff);\n" - "+\t\tthis_len = min_t(unsigned long, len, PAGE_SIZE - loff);\n" - " \t\tpage = spd.pages[page_nr];\n" - " \n" - " \t\tif (!PageUptodate(page) || page->mapping != mapping) {\n" - "@@ -1793,19 +1793,19 @@ static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos,\n" - " \t\t\tif (error)\n" - " \t\t\t\tbreak;\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(spd.pages[page_nr]);\n" - "+\t\t\tput_page(spd.pages[page_nr]);\n" - " \t\t\tspd.pages[page_nr] = page;\n" - " \t\t}\n" - " \n" - " \t\tisize = i_size_read(inode);\n" - "-\t\tend_index = (isize - 1) >> PAGE_CACHE_SHIFT;\n" - "+\t\tend_index = (isize - 1) >> PAGE_SHIFT;\n" - " \t\tif (unlikely(!isize || index > end_index))\n" - " \t\t\tbreak;\n" - " \n" - " \t\tif (end_index == index) {\n" - " \t\t\tunsigned int plen;\n" - " \n" - "-\t\t\tplen = ((isize - 1) & ~PAGE_CACHE_MASK) + 1;\n" - "+\t\t\tplen = ((isize - 1) & ~PAGE_MASK) + 1;\n" - " \t\t\tif (plen <= loff)\n" - " \t\t\t\tbreak;\n" - " \n" - "@@ -1822,7 +1822,7 @@ static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos,\n" - " \t}\n" - " \n" - " \twhile (page_nr < nr_pages)\n" - "-\t\tpage_cache_release(spd.pages[page_nr++]);\n" - "+\t\tput_page(spd.pages[page_nr++]);\n" - " \n" - " \tif (spd.nr_pages)\n" - " \t\terror = splice_to_pipe(pipe, &spd);\n" - "@@ -1904,10 +1904,10 @@ static loff_t shmem_file_llseek(struct file *file, loff_t offset, int whence)\n" - " \telse if (offset >= inode->i_size)\n" - " \t\toffset = -ENXIO;\n" - " \telse {\n" - "-\t\tstart = offset >> PAGE_CACHE_SHIFT;\n" - "-\t\tend = (inode->i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "+\t\tstart = offset >> PAGE_SHIFT;\n" - "+\t\tend = (inode->i_size + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \t\tnew_offset = shmem_seek_hole_data(mapping, start, end, whence);\n" - "-\t\tnew_offset <<= PAGE_CACHE_SHIFT;\n" - "+\t\tnew_offset <<= PAGE_SHIFT;\n" - " \t\tif (new_offset > offset) {\n" - " \t\t\tif (new_offset < inode->i_size)\n" - " \t\t\t\toffset = new_offset;\n" - "@@ -2203,8 +2203,8 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset,\n" - " \t\tgoto out;\n" - " \t}\n" - " \n" - "-\tstart = offset >> PAGE_CACHE_SHIFT;\n" - "-\tend = (offset + len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tstart = offset >> PAGE_SHIFT;\n" - "+\tend = (offset + len + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \t/* Try to avoid a swapstorm if len is impossible to satisfy */\n" - " \tif (sbinfo->max_blocks && end - start > sbinfo->max_blocks) {\n" - " \t\terror = -ENOSPC;\n" - "@@ -2237,8 +2237,8 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset,\n" - " \t\tif (error) {\n" - " \t\t\t/* Remove the !PageUptodate pages we added */\n" - " \t\t\tshmem_undo_range(inode,\n" - "-\t\t\t\t(loff_t)start << PAGE_CACHE_SHIFT,\n" - "-\t\t\t\t(loff_t)index << PAGE_CACHE_SHIFT, true);\n" - "+\t\t\t\t(loff_t)start << PAGE_SHIFT,\n" - "+\t\t\t\t(loff_t)index << PAGE_SHIFT, true);\n" - " \t\t\tgoto undone;\n" - " \t\t}\n" - " \n" - "@@ -2259,7 +2259,7 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset,\n" - " \t\t */\n" - " \t\tset_page_dirty(page);\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tcond_resched();\n" - " \t}\n" - " \n" - "@@ -2280,7 +2280,7 @@ static int shmem_statfs(struct dentry *dentry, struct kstatfs *buf)\n" - " \tstruct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);\n" - " \n" - " \tbuf->f_type = TMPFS_MAGIC;\n" - "-\tbuf->f_bsize = PAGE_CACHE_SIZE;\n" - "+\tbuf->f_bsize = PAGE_SIZE;\n" - " \tbuf->f_namelen = NAME_MAX;\n" - " \tif (sbinfo->max_blocks) {\n" - " \t\tbuf->f_blocks = sbinfo->max_blocks;\n" - "@@ -2523,7 +2523,7 @@ static int shmem_symlink(struct inode *dir, struct dentry *dentry, const char *s\n" - " \tstruct shmem_inode_info *info;\n" - " \n" - " \tlen = strlen(symname) + 1;\n" - "-\tif (len > PAGE_CACHE_SIZE)\n" - "+\tif (len > PAGE_SIZE)\n" - " \t\treturn -ENAMETOOLONG;\n" - " \n" - " \tinode = shmem_get_inode(dir->i_sb, dir, S_IFLNK|S_IRWXUGO, 0, VM_NORESERVE);\n" - "@@ -2562,7 +2562,7 @@ static int shmem_symlink(struct inode *dir, struct dentry *dentry, const char *s\n" - " \t\tSetPageUptodate(page);\n" - " \t\tset_page_dirty(page);\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \tdir->i_size += BOGO_DIRENT_SIZE;\n" - " \tdir->i_ctime = dir->i_mtime = CURRENT_TIME;\n" - "@@ -2835,7 +2835,7 @@ static int shmem_parse_options(char *options, struct shmem_sb_info *sbinfo,\n" - " \t\t\tif (*rest)\n" - " \t\t\t\tgoto bad_val;\n" - " \t\t\tsbinfo->max_blocks =\n" - "-\t\t\t\tDIV_ROUND_UP(size, PAGE_CACHE_SIZE);\n" - "+\t\t\t\tDIV_ROUND_UP(size, PAGE_SIZE);\n" - " \t\t} else if (!strcmp(this_char,\"nr_blocks\")) {\n" - " \t\t\tsbinfo->max_blocks = memparse(value, &rest);\n" - " \t\t\tif (*rest)\n" - "@@ -2940,7 +2940,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root)\n" - " \n" - " \tif (sbinfo->max_blocks != shmem_default_max_blocks())\n" - " \t\tseq_printf(seq, \",size=%luk\",\n" - "-\t\t\tsbinfo->max_blocks << (PAGE_CACHE_SHIFT - 10));\n" - "+\t\t\tsbinfo->max_blocks << (PAGE_SHIFT - 10));\n" - " \tif (sbinfo->max_inodes != shmem_default_max_inodes())\n" - " \t\tseq_printf(seq, \",nr_inodes=%lu\", sbinfo->max_inodes);\n" - " \tif (sbinfo->mode != (S_IRWXUGO | S_ISVTX))\n" - "@@ -3082,8 +3082,8 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)\n" - " \tsbinfo->free_inodes = sbinfo->max_inodes;\n" - " \n" - " \tsb->s_maxbytes = MAX_LFS_FILESIZE;\n" - "-\tsb->s_blocksize = PAGE_CACHE_SIZE;\n" - "-\tsb->s_blocksize_bits = PAGE_CACHE_SHIFT;\n" - "+\tsb->s_blocksize = PAGE_SIZE;\n" - "+\tsb->s_blocksize_bits = PAGE_SHIFT;\n" - " \tsb->s_magic = TMPFS_MAGIC;\n" - " \tsb->s_op = &shmem_ops;\n" - " \tsb->s_time_gran = 1;\n" - "diff --git a/mm/swap.c b/mm/swap.c\n" - "index 09fe5e97714a..a0bc206b4ac6 100644\n" - "--- a/mm/swap.c\n" - "+++ b/mm/swap.c\n" - "@@ -114,7 +114,7 @@ void put_pages_list(struct list_head *pages)\n" - " \n" - " \t\tvictim = list_entry(pages->prev, struct page, lru);\n" - " \t\tlist_del(&victim->lru);\n" - "-\t\tpage_cache_release(victim);\n" - "+\t\tput_page(victim);\n" - " \t}\n" - " }\n" - " EXPORT_SYMBOL(put_pages_list);\n" - "@@ -142,7 +142,7 @@ int get_kernel_pages(const struct kvec *kiov, int nr_segs, int write,\n" - " \t\t\treturn seg;\n" - " \n" - " \t\tpages[seg] = kmap_to_page(kiov[seg].iov_base);\n" - "-\t\tpage_cache_get(pages[seg]);\n" - "+\t\tget_page(pages[seg]);\n" - " \t}\n" - " \n" - " \treturn seg;\n" - "@@ -236,7 +236,7 @@ void rotate_reclaimable_page(struct page *page)\n" - " \t\tstruct pagevec *pvec;\n" - " \t\tunsigned long flags;\n" - " \n" - "-\t\tpage_cache_get(page);\n" - "+\t\tget_page(page);\n" - " \t\tlocal_irq_save(flags);\n" - " \t\tpvec = this_cpu_ptr(&lru_rotate_pvecs);\n" - " \t\tif (!pagevec_add(pvec, page))\n" - "@@ -294,7 +294,7 @@ void activate_page(struct page *page)\n" - " \tif (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) {\n" - " \t\tstruct pagevec *pvec = &get_cpu_var(activate_page_pvecs);\n" - " \n" - "-\t\tpage_cache_get(page);\n" - "+\t\tget_page(page);\n" - " \t\tif (!pagevec_add(pvec, page))\n" - " \t\t\tpagevec_lru_move_fn(pvec, __activate_page, NULL);\n" - " \t\tput_cpu_var(activate_page_pvecs);\n" - "@@ -389,7 +389,7 @@ static void __lru_cache_add(struct page *page)\n" - " {\n" - " \tstruct pagevec *pvec = &get_cpu_var(lru_add_pvec);\n" - " \n" - "-\tpage_cache_get(page);\n" - "+\tget_page(page);\n" - " \tif (!pagevec_space(pvec))\n" - " \t\t__pagevec_lru_add(pvec);\n" - " \tpagevec_add(pvec, page);\n" - "@@ -646,7 +646,7 @@ void deactivate_page(struct page *page)\n" - " \tif (PageLRU(page) && PageActive(page) && !PageUnevictable(page)) {\n" - " \t\tstruct pagevec *pvec = &get_cpu_var(lru_deactivate_pvecs);\n" - " \n" - "-\t\tpage_cache_get(page);\n" - "+\t\tget_page(page);\n" - " \t\tif (!pagevec_add(pvec, page))\n" - " \t\t\tpagevec_lru_move_fn(pvec, lru_deactivate_fn, NULL);\n" - " \t\tput_cpu_var(lru_deactivate_pvecs);\n" - "@@ -698,7 +698,7 @@ void lru_add_drain_all(void)\n" - " }\n" - " \n" - " /**\n" - "- * release_pages - batched page_cache_release()\n" - "+ * release_pages - batched put_page()\n" - " * @pages: array of pages to release\n" - " * @nr: number of pages\n" - " * @cold: whether the pages are cache cold\n" - "diff --git a/mm/swap_state.c b/mm/swap_state.c\n" - "index 69cb2464e7dc..366ce3518703 100644\n" - "--- a/mm/swap_state.c\n" - "+++ b/mm/swap_state.c\n" - "@@ -85,7 +85,7 @@ int __add_to_swap_cache(struct page *page, swp_entry_t entry)\n" - " \tVM_BUG_ON_PAGE(PageSwapCache(page), page);\n" - " \tVM_BUG_ON_PAGE(!PageSwapBacked(page), page);\n" - " \n" - "-\tpage_cache_get(page);\n" - "+\tget_page(page);\n" - " \tSetPageSwapCache(page);\n" - " \tset_page_private(page, entry.val);\n" - " \n" - "@@ -109,7 +109,7 @@ int __add_to_swap_cache(struct page *page, swp_entry_t entry)\n" - " \t\tVM_BUG_ON(error == -EEXIST);\n" - " \t\tset_page_private(page, 0UL);\n" - " \t\tClearPageSwapCache(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \n" - " \treturn error;\n" - "@@ -226,7 +226,7 @@ void delete_from_swap_cache(struct page *page)\n" - " \tspin_unlock_irq(&address_space->tree_lock);\n" - " \n" - " \tswapcache_free(entry);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " /* \n" - "@@ -252,7 +252,7 @@ static inline void free_swap_cache(struct page *page)\n" - " void free_page_and_swap_cache(struct page *page)\n" - " {\n" - " \tfree_swap_cache(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " \n" - " /*\n" - "@@ -380,7 +380,7 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,\n" - " \t} while (err != -ENOMEM);\n" - " \n" - " \tif (new_page)\n" - "-\t\tpage_cache_release(new_page);\n" - "+\t\tput_page(new_page);\n" - " \treturn found_page;\n" - " }\n" - " \n" - "@@ -495,7 +495,7 @@ struct page *swapin_readahead(swp_entry_t entry, gfp_t gfp_mask,\n" - " \t\t\tcontinue;\n" - " \t\tif (offset != entry_offset)\n" - " \t\t\tSetPageReadahead(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \tblk_finish_plug(&plug);\n" - " \n" - "diff --git a/mm/swapfile.c b/mm/swapfile.c\n" - "index b86cf26a586b..555069ca3eae 100644\n" - "--- a/mm/swapfile.c\n" - "+++ b/mm/swapfile.c\n" - "@@ -113,7 +113,7 @@ __try_to_reclaim_swap(struct swap_info_struct *si, unsigned long offset)\n" - " \t\tret = try_to_free_swap(page);\n" - " \t\tunlock_page(page);\n" - " \t}\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn ret;\n" - " }\n" - " \n" - "@@ -994,7 +994,7 @@ int free_swap_and_cache(swp_entry_t entry)\n" - " \t\t\tpage = find_get_page(swap_address_space(entry),\n" - " \t\t\t\t\t\tentry.val);\n" - " \t\t\tif (page && !trylock_page(page)) {\n" - "-\t\t\t\tpage_cache_release(page);\n" - "+\t\t\t\tput_page(page);\n" - " \t\t\t\tpage = NULL;\n" - " \t\t\t}\n" - " \t\t}\n" - "@@ -1011,7 +1011,7 @@ int free_swap_and_cache(swp_entry_t entry)\n" - " \t\t\tSetPageDirty(page);\n" - " \t\t}\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \treturn p != NULL;\n" - " }\n" - "@@ -1512,7 +1512,7 @@ int try_to_unuse(unsigned int type, bool frontswap,\n" - " \t\t}\n" - " \t\tif (retval) {\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t\tbreak;\n" - " \t\t}\n" - " \n" - "@@ -1564,7 +1564,7 @@ int try_to_unuse(unsigned int type, bool frontswap,\n" - " \t\t */\n" - " \t\tSetPageDirty(page);\n" - " \t\tunlock_page(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \n" - " \t\t/*\n" - " \t\t * Make sure that we aren't completely killing\n" - "@@ -2568,7 +2568,7 @@ bad_swap:\n" - " out:\n" - " \tif (page && !IS_ERR(page)) {\n" - " \t\tkunmap(page);\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t}\n" - " \tif (name)\n" - " \t\tputname(name);\n" - "diff --git a/mm/truncate.c b/mm/truncate.c\n" - "index 7598b552ae03..b00272810871 100644\n" - "--- a/mm/truncate.c\n" - "+++ b/mm/truncate.c\n" - "@@ -118,7 +118,7 @@ truncate_complete_page(struct address_space *mapping, struct page *page)\n" - " \t\treturn -EIO;\n" - " \n" - " \tif (page_has_private(page))\n" - "-\t\tdo_invalidatepage(page, 0, PAGE_CACHE_SIZE);\n" - "+\t\tdo_invalidatepage(page, 0, PAGE_SIZE);\n" - " \n" - " \t/*\n" - " \t * Some filesystems seem to re-dirty the page even after\n" - "@@ -159,8 +159,8 @@ int truncate_inode_page(struct address_space *mapping, struct page *page)\n" - " {\n" - " \tif (page_mapped(page)) {\n" - " \t\tunmap_mapping_range(mapping,\n" - "-\t\t\t\t (loff_t)page->index << PAGE_CACHE_SHIFT,\n" - "-\t\t\t\t PAGE_CACHE_SIZE, 0);\n" - "+\t\t\t\t (loff_t)page->index << PAGE_SHIFT,\n" - "+\t\t\t\t PAGE_SIZE, 0);\n" - " \t}\n" - " \treturn truncate_complete_page(mapping, page);\n" - " }\n" - "@@ -241,8 +241,8 @@ void truncate_inode_pages_range(struct address_space *mapping,\n" - " \t\treturn;\n" - " \n" - " \t/* Offsets within partial pages */\n" - "-\tpartial_start = lstart & (PAGE_CACHE_SIZE - 1);\n" - "-\tpartial_end = (lend + 1) & (PAGE_CACHE_SIZE - 1);\n" - "+\tpartial_start = lstart & (PAGE_SIZE - 1);\n" - "+\tpartial_end = (lend + 1) & (PAGE_SIZE - 1);\n" - " \n" - " \t/*\n" - " \t * 'start' and 'end' always covers the range of pages to be fully\n" - "@@ -250,7 +250,7 @@ void truncate_inode_pages_range(struct address_space *mapping,\n" - " \t * start of the range and 'partial_end' at the end of the range.\n" - " \t * Note that 'end' is exclusive while 'lend' is inclusive.\n" - " \t */\n" - "-\tstart = (lstart + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tstart = (lstart + PAGE_SIZE - 1) >> PAGE_SHIFT;\n" - " \tif (lend == -1)\n" - " \t\t/*\n" - " \t\t * lend == -1 indicates end-of-file so we have to set 'end'\n" - "@@ -259,7 +259,7 @@ void truncate_inode_pages_range(struct address_space *mapping,\n" - " \t\t */\n" - " \t\tend = -1;\n" - " \telse\n" - "-\t\tend = (lend + 1) >> PAGE_CACHE_SHIFT;\n" - "+\t\tend = (lend + 1) >> PAGE_SHIFT;\n" - " \n" - " \tpagevec_init(&pvec, 0);\n" - " \tindex = start;\n" - "@@ -298,7 +298,7 @@ void truncate_inode_pages_range(struct address_space *mapping,\n" - " \tif (partial_start) {\n" - " \t\tstruct page *page = find_lock_page(mapping, start - 1);\n" - " \t\tif (page) {\n" - "-\t\t\tunsigned int top = PAGE_CACHE_SIZE;\n" - "+\t\t\tunsigned int top = PAGE_SIZE;\n" - " \t\t\tif (start > end) {\n" - " \t\t\t\t/* Truncation within a single page */\n" - " \t\t\t\ttop = partial_end;\n" - "@@ -311,7 +311,7 @@ void truncate_inode_pages_range(struct address_space *mapping,\n" - " \t\t\t\tdo_invalidatepage(page, partial_start,\n" - " \t\t\t\t\t\t top - partial_start);\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t}\n" - " \t}\n" - " \tif (partial_end) {\n" - "@@ -324,7 +324,7 @@ void truncate_inode_pages_range(struct address_space *mapping,\n" - " \t\t\t\tdo_invalidatepage(page, 0,\n" - " \t\t\t\t\t\t partial_end);\n" - " \t\t\tunlock_page(page);\n" - "-\t\t\tpage_cache_release(page);\n" - "+\t\t\tput_page(page);\n" - " \t\t}\n" - " \t}\n" - " \t/*\n" - "@@ -538,7 +538,7 @@ invalidate_complete_page2(struct address_space *mapping, struct page *page)\n" - " \tif (mapping->a_ops->freepage)\n" - " \t\tmapping->a_ops->freepage(page);\n" - " \n" - "-\tpage_cache_release(page);\t/* pagecache ref */\n" - "+\tput_page(page);\t/* pagecache ref */\n" - " \treturn 1;\n" - " failed:\n" - " \tspin_unlock_irqrestore(&mapping->tree_lock, flags);\n" - "@@ -608,18 +608,18 @@ int invalidate_inode_pages2_range(struct address_space *mapping,\n" - " \t\t\t\t\t * Zap the rest of the file in one hit.\n" - " \t\t\t\t\t */\n" - " \t\t\t\t\tunmap_mapping_range(mapping,\n" - "-\t\t\t\t\t (loff_t)index << PAGE_CACHE_SHIFT,\n" - "+\t\t\t\t\t (loff_t)index << PAGE_SHIFT,\n" - " \t\t\t\t\t (loff_t)(1 + end - index)\n" - "-\t\t\t\t\t\t\t << PAGE_CACHE_SHIFT,\n" - "-\t\t\t\t\t 0);\n" - "+\t\t\t\t\t\t\t << PAGE_SHIFT,\n" - "+\t\t\t\t\t\t\t 0);\n" - " \t\t\t\t\tdid_range_unmap = 1;\n" - " \t\t\t\t} else {\n" - " \t\t\t\t\t/*\n" - " \t\t\t\t\t * Just zap this page\n" - " \t\t\t\t\t */\n" - " \t\t\t\t\tunmap_mapping_range(mapping,\n" - "-\t\t\t\t\t (loff_t)index << PAGE_CACHE_SHIFT,\n" - "-\t\t\t\t\t PAGE_CACHE_SIZE, 0);\n" - "+\t\t\t\t\t (loff_t)index << PAGE_SHIFT,\n" - "+\t\t\t\t\t PAGE_SIZE, 0);\n" - " \t\t\t\t}\n" - " \t\t\t}\n" - " \t\t\tBUG_ON(page_mapped(page));\n" - "@@ -744,14 +744,14 @@ void pagecache_isize_extended(struct inode *inode, loff_t from, loff_t to)\n" - " \n" - " \tWARN_ON(to > inode->i_size);\n" - " \n" - "-\tif (from >= to || bsize == PAGE_CACHE_SIZE)\n" - "+\tif (from >= to || bsize == PAGE_SIZE)\n" - " \t\treturn;\n" - " \t/* Page straddling @from will not have any hole block created? */\n" - " \trounded_from = round_up(from, bsize);\n" - "-\tif (to <= rounded_from || !(rounded_from & (PAGE_CACHE_SIZE - 1)))\n" - "+\tif (to <= rounded_from || !(rounded_from & (PAGE_SIZE - 1)))\n" - " \t\treturn;\n" - " \n" - "-\tindex = from >> PAGE_CACHE_SHIFT;\n" - "+\tindex = from >> PAGE_SHIFT;\n" - " \tpage = find_lock_page(inode->i_mapping, index);\n" - " \t/* Page not cached? Nothing to do */\n" - " \tif (!page)\n" - "@@ -763,7 +763,7 @@ void pagecache_isize_extended(struct inode *inode, loff_t from, loff_t to)\n" - " \tif (page_mkclean(page))\n" - " \t\tset_page_dirty(page);\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " }\n" - " EXPORT_SYMBOL(pagecache_isize_extended);\n" - " \n" - "diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c\n" - "index 9f3a0290b273..af817e5060fb 100644\n" - "--- a/mm/userfaultfd.c\n" - "+++ b/mm/userfaultfd.c\n" - "@@ -93,7 +93,7 @@ out_release_uncharge_unlock:\n" - " \tpte_unmap_unlock(dst_pte, ptl);\n" - " \tmem_cgroup_cancel_charge(page, memcg, false);\n" - " out_release:\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \tgoto out;\n" - " }\n" - " \n" - "@@ -287,7 +287,7 @@ out_unlock:\n" - " \tup_read(&dst_mm->mmap_sem);\n" - " out:\n" - " \tif (page)\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \tBUG_ON(copied < 0);\n" - " \tBUG_ON(err > 0);\n" - " \tBUG_ON(!copied && !err);\n" - "diff --git a/mm/zswap.c b/mm/zswap.c\n" - "index bf14508afd64..91dad80d068b 100644\n" - "--- a/mm/zswap.c\n" - "+++ b/mm/zswap.c\n" - "@@ -869,7 +869,7 @@ static int zswap_writeback_entry(struct zpool *pool, unsigned long handle)\n" - " \n" - " \tcase ZSWAP_SWAPCACHE_EXIST:\n" - " \t\t/* page is already in the swap cache, ignore for now */\n" - "-\t\tpage_cache_release(page);\n" - "+\t\tput_page(page);\n" - " \t\tret = -EEXIST;\n" - " \t\tgoto fail;\n" - " \n" - "@@ -897,7 +897,7 @@ static int zswap_writeback_entry(struct zpool *pool, unsigned long handle)\n" - " \n" - " \t/* start writeback */\n" - " \t__swap_writepage(page, &wbc, end_swap_bio_write);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \tzswap_written_back_pages++;\n" - " \n" - " \tspin_lock(&tree->lock);\n" - "diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c\n" - "index 9382619a405b..298770cf66e5 100644\n" - "--- a/net/ceph/messenger.c\n" - "+++ b/net/ceph/messenger.c\n" - "@@ -275,7 +275,7 @@ static void _ceph_msgr_exit(void)\n" - " \t}\n" - " \n" - " \tBUG_ON(zero_page == NULL);\n" - "-\tpage_cache_release(zero_page);\n" - "+\tput_page(zero_page);\n" - " \tzero_page = NULL;\n" - " \n" - " \tceph_msgr_slab_exit();\n" - "@@ -288,7 +288,7 @@ int ceph_msgr_init(void)\n" - " \n" - " \tBUG_ON(zero_page != NULL);\n" - " \tzero_page = ZERO_PAGE(0);\n" - "-\tpage_cache_get(zero_page);\n" - "+\tget_page(zero_page);\n" - " \n" - " \t/*\n" - " \t * The number of active work items is limited by the number of\n" - "@@ -1614,7 +1614,7 @@ static int write_partial_skip(struct ceph_connection *con)\n" - " \n" - " \tdout(\"%s %p %d left\\n\", __func__, con, con->out_skip);\n" - " \twhile (con->out_skip > 0) {\n" - "-\t\tsize_t size = min(con->out_skip, (int) PAGE_CACHE_SIZE);\n" - "+\t\tsize_t size = min(con->out_skip, (int) PAGE_SIZE);\n" - " \n" - " \t\tret = ceph_tcp_sendpage(con->sock, zero_page, 0, size, true);\n" - " \t\tif (ret <= 0)\n" - "diff --git a/net/ceph/pagelist.c b/net/ceph/pagelist.c\n" - "index c7c220a736e5..6864007e64fc 100644\n" - "--- a/net/ceph/pagelist.c\n" - "+++ b/net/ceph/pagelist.c\n" - "@@ -56,7 +56,7 @@ int ceph_pagelist_append(struct ceph_pagelist *pl, const void *buf, size_t len)\n" - " \t\tsize_t bit = pl->room;\n" - " \t\tint ret;\n" - " \n" - "-\t\tmemcpy(pl->mapped_tail + (pl->length & ~PAGE_CACHE_MASK),\n" - "+\t\tmemcpy(pl->mapped_tail + (pl->length & ~PAGE_MASK),\n" - " \t\t buf, bit);\n" - " \t\tpl->length += bit;\n" - " \t\tpl->room -= bit;\n" - "@@ -67,7 +67,7 @@ int ceph_pagelist_append(struct ceph_pagelist *pl, const void *buf, size_t len)\n" - " \t\t\treturn ret;\n" - " \t}\n" - " \n" - "-\tmemcpy(pl->mapped_tail + (pl->length & ~PAGE_CACHE_MASK), buf, len);\n" - "+\tmemcpy(pl->mapped_tail + (pl->length & ~PAGE_MASK), buf, len);\n" - " \tpl->length += len;\n" - " \tpl->room -= len;\n" - " \treturn 0;\n" - "diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c\n" - "index d4f5f220a8e5..72ca9651562a 100644\n" - "--- a/net/ceph/pagevec.c\n" - "+++ b/net/ceph/pagevec.c\n" - "@@ -95,19 +95,19 @@ int ceph_copy_user_to_page_vector(struct page **pages,\n" - " \t\t\t\t\t loff_t off, size_t len)\n" - " {\n" - " \tint i = 0;\n" - "-\tint po = off & ~PAGE_CACHE_MASK;\n" - "+\tint po = off & ~PAGE_MASK;\n" - " \tint left = len;\n" - " \tint l, bad;\n" - " \n" - " \twhile (left > 0) {\n" - "-\t\tl = min_t(int, PAGE_CACHE_SIZE-po, left);\n" - "+\t\tl = min_t(int, PAGE_SIZE-po, left);\n" - " \t\tbad = copy_from_user(page_address(pages[i]) + po, data, l);\n" - " \t\tif (bad == l)\n" - " \t\t\treturn -EFAULT;\n" - " \t\tdata += l - bad;\n" - " \t\tleft -= l - bad;\n" - " \t\tpo += l - bad;\n" - "-\t\tif (po == PAGE_CACHE_SIZE) {\n" - "+\t\tif (po == PAGE_SIZE) {\n" - " \t\t\tpo = 0;\n" - " \t\t\ti++;\n" - " \t\t}\n" - "@@ -121,17 +121,17 @@ void ceph_copy_to_page_vector(struct page **pages,\n" - " \t\t\t\t loff_t off, size_t len)\n" - " {\n" - " \tint i = 0;\n" - "-\tsize_t po = off & ~PAGE_CACHE_MASK;\n" - "+\tsize_t po = off & ~PAGE_MASK;\n" - " \tsize_t left = len;\n" - " \n" - " \twhile (left > 0) {\n" - "-\t\tsize_t l = min_t(size_t, PAGE_CACHE_SIZE-po, left);\n" - "+\t\tsize_t l = min_t(size_t, PAGE_SIZE-po, left);\n" - " \n" - " \t\tmemcpy(page_address(pages[i]) + po, data, l);\n" - " \t\tdata += l;\n" - " \t\tleft -= l;\n" - " \t\tpo += l;\n" - "-\t\tif (po == PAGE_CACHE_SIZE) {\n" - "+\t\tif (po == PAGE_SIZE) {\n" - " \t\t\tpo = 0;\n" - " \t\t\ti++;\n" - " \t\t}\n" - "@@ -144,17 +144,17 @@ void ceph_copy_from_page_vector(struct page **pages,\n" - " \t\t\t\t loff_t off, size_t len)\n" - " {\n" - " \tint i = 0;\n" - "-\tsize_t po = off & ~PAGE_CACHE_MASK;\n" - "+\tsize_t po = off & ~PAGE_MASK;\n" - " \tsize_t left = len;\n" - " \n" - " \twhile (left > 0) {\n" - "-\t\tsize_t l = min_t(size_t, PAGE_CACHE_SIZE-po, left);\n" - "+\t\tsize_t l = min_t(size_t, PAGE_SIZE-po, left);\n" - " \n" - " \t\tmemcpy(data, page_address(pages[i]) + po, l);\n" - " \t\tdata += l;\n" - " \t\tleft -= l;\n" - " \t\tpo += l;\n" - "-\t\tif (po == PAGE_CACHE_SIZE) {\n" - "+\t\tif (po == PAGE_SIZE) {\n" - " \t\t\tpo = 0;\n" - " \t\t\ti++;\n" - " \t\t}\n" - "@@ -168,25 +168,25 @@ EXPORT_SYMBOL(ceph_copy_from_page_vector);\n" - " */\n" - " void ceph_zero_page_vector_range(int off, int len, struct page **pages)\n" - " {\n" - "-\tint i = off >> PAGE_CACHE_SHIFT;\n" - "+\tint i = off >> PAGE_SHIFT;\n" - " \n" - "-\toff &= ~PAGE_CACHE_MASK;\n" - "+\toff &= ~PAGE_MASK;\n" - " \n" - " \tdout(\"zero_page_vector_page %u~%u\\n\", off, len);\n" - " \n" - " \t/* leading partial page? */\n" - " \tif (off) {\n" - "-\t\tint end = min((int)PAGE_CACHE_SIZE, off + len);\n" - "+\t\tint end = min((int)PAGE_SIZE, off + len);\n" - " \t\tdout(\"zeroing %d %p head from %d\\n\", i, pages[i],\n" - " \t\t (int)off);\n" - " \t\tzero_user_segment(pages[i], off, end);\n" - " \t\tlen -= (end - off);\n" - " \t\ti++;\n" - " \t}\n" - "-\twhile (len >= PAGE_CACHE_SIZE) {\n" - "+\twhile (len >= PAGE_SIZE) {\n" - " \t\tdout(\"zeroing %d %p len=%d\\n\", i, pages[i], len);\n" - "-\t\tzero_user_segment(pages[i], 0, PAGE_CACHE_SIZE);\n" - "-\t\tlen -= PAGE_CACHE_SIZE;\n" - "+\t\tzero_user_segment(pages[i], 0, PAGE_SIZE);\n" - "+\t\tlen -= PAGE_SIZE;\n" - " \t\ti++;\n" - " \t}\n" - " \t/* trailing partial page? */\n" - "diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c\n" - "index cabf586f47d7..a9fc819429ef 100644\n" - "--- a/net/sunrpc/auth_gss/auth_gss.c\n" - "+++ b/net/sunrpc/auth_gss/auth_gss.c\n" - "@@ -1728,8 +1728,8 @@ alloc_enc_pages(struct rpc_rqst *rqstp)\n" - " \t\treturn 0;\n" - " \t}\n" - " \n" - "-\tfirst = snd_buf->page_base >> PAGE_CACHE_SHIFT;\n" - "-\tlast = (snd_buf->page_base + snd_buf->page_len - 1) >> PAGE_CACHE_SHIFT;\n" - "+\tfirst = snd_buf->page_base >> PAGE_SHIFT;\n" - "+\tlast = (snd_buf->page_base + snd_buf->page_len - 1) >> PAGE_SHIFT;\n" - " \trqstp->rq_enc_pages_num = last - first + 1 + 1;\n" - " \trqstp->rq_enc_pages\n" - " \t\t= kmalloc(rqstp->rq_enc_pages_num * sizeof(struct page *),\n" - "@@ -1775,10 +1775,10 @@ gss_wrap_req_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx,\n" - " \tstatus = alloc_enc_pages(rqstp);\n" - " \tif (status)\n" - " \t\treturn status;\n" - "-\tfirst = snd_buf->page_base >> PAGE_CACHE_SHIFT;\n" - "+\tfirst = snd_buf->page_base >> PAGE_SHIFT;\n" - " \tinpages = snd_buf->pages + first;\n" - " \tsnd_buf->pages = rqstp->rq_enc_pages;\n" - "-\tsnd_buf->page_base -= first << PAGE_CACHE_SHIFT;\n" - "+\tsnd_buf->page_base -= first << PAGE_SHIFT;\n" - " \t/*\n" - " \t * Give the tail its own page, in case we need extra space in the\n" - " \t * head when wrapping:\n" - "diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c\n" - "index d94a8e1e9f05..045e11ecd332 100644\n" - "--- a/net/sunrpc/auth_gss/gss_krb5_crypto.c\n" - "+++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c\n" - "@@ -465,7 +465,7 @@ encryptor(struct scatterlist *sg, void *data)\n" - " \tpage_pos = desc->pos - outbuf->head[0].iov_len;\n" - " \tif (page_pos >= 0 && page_pos < outbuf->page_len) {\n" - " \t\t/* pages are not in place: */\n" - "-\t\tint i = (page_pos + outbuf->page_base) >> PAGE_CACHE_SHIFT;\n" - "+\t\tint i = (page_pos + outbuf->page_base) >> PAGE_SHIFT;\n" - " \t\tin_page = desc->pages[i];\n" - " \t} else {\n" - " \t\tin_page = sg_page(sg);\n" - "diff --git a/net/sunrpc/auth_gss/gss_krb5_wrap.c b/net/sunrpc/auth_gss/gss_krb5_wrap.c\n" - "index 765088e4ad84..a737c2da0837 100644\n" - "--- a/net/sunrpc/auth_gss/gss_krb5_wrap.c\n" - "+++ b/net/sunrpc/auth_gss/gss_krb5_wrap.c\n" - "@@ -79,9 +79,9 @@ gss_krb5_remove_padding(struct xdr_buf *buf, int blocksize)\n" - " \t\tlen -= buf->head[0].iov_len;\n" - " \tif (len <= buf->page_len) {\n" - " \t\tunsigned int last = (buf->page_base + len - 1)\n" - "-\t\t\t\t\t>>PAGE_CACHE_SHIFT;\n" - "+\t\t\t\t\t>>PAGE_SHIFT;\n" - " \t\tunsigned int offset = (buf->page_base + len - 1)\n" - "-\t\t\t\t\t& (PAGE_CACHE_SIZE - 1);\n" - "+\t\t\t\t\t& (PAGE_SIZE - 1);\n" - " \t\tptr = kmap_atomic(buf->pages[last]);\n" - " \t\tpad = *(ptr + offset);\n" - " \t\tkunmap_atomic(ptr);\n" - "diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c\n" - "index 273bc3a35425..e59a6d952b57 100644\n" - "--- a/net/sunrpc/cache.c\n" - "+++ b/net/sunrpc/cache.c\n" - "@@ -881,7 +881,7 @@ static ssize_t cache_downcall(struct address_space *mapping,\n" - " \tchar *kaddr;\n" - " \tssize_t ret = -ENOMEM;\n" - " \n" - "-\tif (count >= PAGE_CACHE_SIZE)\n" - "+\tif (count >= PAGE_SIZE)\n" - " \t\tgoto out_slow;\n" - " \n" - " \tpage = find_or_create_page(mapping, 0, GFP_KERNEL);\n" - "@@ -892,7 +892,7 @@ static ssize_t cache_downcall(struct address_space *mapping,\n" - " \tret = cache_do_downcall(kaddr, buf, count, cd);\n" - " \tkunmap(page);\n" - " \tunlock_page(page);\n" - "-\tpage_cache_release(page);\n" - "+\tput_page(page);\n" - " \treturn ret;\n" - " out_slow:\n" - " \treturn cache_slow_downcall(buf, count, cd);\n" - "diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c\n" - "index 31789ef3e614..fc48eca21fd2 100644\n" - "--- a/net/sunrpc/rpc_pipe.c\n" - "+++ b/net/sunrpc/rpc_pipe.c\n" - "@@ -1390,8 +1390,8 @@ rpc_fill_super(struct super_block *sb, void *data, int silent)\n" - " \tstruct sunrpc_net *sn = net_generic(net, sunrpc_net_id);\n" - " \tint err;\n" - " \n" - "-\tsb->s_blocksize = PAGE_CACHE_SIZE;\n" - "-\tsb->s_blocksize_bits = PAGE_CACHE_SHIFT;\n" - "+\tsb->s_blocksize = PAGE_SIZE;\n" - "+\tsb->s_blocksize_bits = PAGE_SHIFT;\n" - " \tsb->s_magic = RPCAUTH_GSSMAGIC;\n" - " \tsb->s_op = &s_ops;\n" - " \tsb->s_d_op = &simple_dentry_operations;\n" - "diff --git a/net/sunrpc/socklib.c b/net/sunrpc/socklib.c\n" - "index 2df87f78e518..de70c78025d7 100644\n" - "--- a/net/sunrpc/socklib.c\n" - "+++ b/net/sunrpc/socklib.c\n" - "@@ -96,8 +96,8 @@ ssize_t xdr_partial_copy_from_skb(struct xdr_buf *xdr, unsigned int base, struct\n" - " \tif (base || xdr->page_base) {\n" - " \t\tpglen -= base;\n" - " \t\tbase += xdr->page_base;\n" - "-\t\tppage += base >> PAGE_CACHE_SHIFT;\n" - "-\t\tbase &= ~PAGE_CACHE_MASK;\n" - "+\t\tppage += base >> PAGE_SHIFT;\n" - "+\t\tbase &= ~PAGE_MASK;\n" - " \t}\n" - " \tdo {\n" - " \t\tchar *kaddr;\n" - "@@ -113,7 +113,7 @@ ssize_t xdr_partial_copy_from_skb(struct xdr_buf *xdr, unsigned int base, struct\n" - " \t\t\t}\n" - " \t\t}\n" - " \n" - "-\t\tlen = PAGE_CACHE_SIZE;\n" - "+\t\tlen = PAGE_SIZE;\n" - " \t\tkaddr = kmap_atomic(*ppage);\n" - " \t\tif (base) {\n" - " \t\t\tlen -= base;\n" - "diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c\n" - "index 4439ac4c1b53..6bdb3865212d 100644\n" - "--- a/net/sunrpc/xdr.c\n" - "+++ b/net/sunrpc/xdr.c\n" - "@@ -164,7 +164,7 @@ EXPORT_SYMBOL_GPL(xdr_inline_pages);\n" - " * Note: the addresses pgto_base and pgfrom_base are both calculated in\n" - " * the same way:\n" - " * if a memory area starts at byte 'base' in page 'pages[i]',\n" - "- * then its address is given as (i << PAGE_CACHE_SHIFT) + base\n" - "+ * then its address is given as (i << PAGE_SHIFT) + base\n" - " * Also note: pgfrom_base must be < pgto_base, but the memory areas\n" - " * \tthey point to may overlap.\n" - " */\n" - "@@ -181,20 +181,20 @@ _shift_data_right_pages(struct page **pages, size_t pgto_base,\n" - " \tpgto_base += len;\n" - " \tpgfrom_base += len;\n" - " \n" - "-\tpgto = pages + (pgto_base >> PAGE_CACHE_SHIFT);\n" - "-\tpgfrom = pages + (pgfrom_base >> PAGE_CACHE_SHIFT);\n" - "+\tpgto = pages + (pgto_base >> PAGE_SHIFT);\n" - "+\tpgfrom = pages + (pgfrom_base >> PAGE_SHIFT);\n" - " \n" - "-\tpgto_base &= ~PAGE_CACHE_MASK;\n" - "-\tpgfrom_base &= ~PAGE_CACHE_MASK;\n" - "+\tpgto_base &= ~PAGE_MASK;\n" - "+\tpgfrom_base &= ~PAGE_MASK;\n" - " \n" - " \tdo {\n" - " \t\t/* Are any pointers crossing a page boundary? */\n" - " \t\tif (pgto_base == 0) {\n" - "-\t\t\tpgto_base = PAGE_CACHE_SIZE;\n" - "+\t\t\tpgto_base = PAGE_SIZE;\n" - " \t\t\tpgto--;\n" - " \t\t}\n" - " \t\tif (pgfrom_base == 0) {\n" - "-\t\t\tpgfrom_base = PAGE_CACHE_SIZE;\n" - "+\t\t\tpgfrom_base = PAGE_SIZE;\n" - " \t\t\tpgfrom--;\n" - " \t\t}\n" - " \n" - "@@ -236,11 +236,11 @@ _copy_to_pages(struct page **pages, size_t pgbase, const char *p, size_t len)\n" - " \tchar *vto;\n" - " \tsize_t copy;\n" - " \n" - "-\tpgto = pages + (pgbase >> PAGE_CACHE_SHIFT);\n" - "-\tpgbase &= ~PAGE_CACHE_MASK;\n" - "+\tpgto = pages + (pgbase >> PAGE_SHIFT);\n" - "+\tpgbase &= ~PAGE_MASK;\n" - " \n" - " \tfor (;;) {\n" - "-\t\tcopy = PAGE_CACHE_SIZE - pgbase;\n" - "+\t\tcopy = PAGE_SIZE - pgbase;\n" - " \t\tif (copy > len)\n" - " \t\t\tcopy = len;\n" - " \n" - "@@ -253,7 +253,7 @@ _copy_to_pages(struct page **pages, size_t pgbase, const char *p, size_t len)\n" - " \t\t\tbreak;\n" - " \n" - " \t\tpgbase += copy;\n" - "-\t\tif (pgbase == PAGE_CACHE_SIZE) {\n" - "+\t\tif (pgbase == PAGE_SIZE) {\n" - " \t\t\tflush_dcache_page(*pgto);\n" - " \t\t\tpgbase = 0;\n" - " \t\t\tpgto++;\n" - "@@ -280,11 +280,11 @@ _copy_from_pages(char *p, struct page **pages, size_t pgbase, size_t len)\n" - " \tchar *vfrom;\n" - " \tsize_t copy;\n" - " \n" - "-\tpgfrom = pages + (pgbase >> PAGE_CACHE_SHIFT);\n" - "-\tpgbase &= ~PAGE_CACHE_MASK;\n" - "+\tpgfrom = pages + (pgbase >> PAGE_SHIFT);\n" - "+\tpgbase &= ~PAGE_MASK;\n" - " \n" - " \tdo {\n" - "-\t\tcopy = PAGE_CACHE_SIZE - pgbase;\n" - "+\t\tcopy = PAGE_SIZE - pgbase;\n" - " \t\tif (copy > len)\n" - " \t\t\tcopy = len;\n" - " \n" - "@@ -293,7 +293,7 @@ _copy_from_pages(char *p, struct page **pages, size_t pgbase, size_t len)\n" - " \t\tkunmap_atomic(vfrom);\n" - " \n" - " \t\tpgbase += copy;\n" - "-\t\tif (pgbase == PAGE_CACHE_SIZE) {\n" - "+\t\tif (pgbase == PAGE_SIZE) {\n" - " \t\t\tpgbase = 0;\n" - " \t\t\tpgfrom++;\n" - " \t\t}\n" - "@@ -1038,8 +1038,8 @@ xdr_buf_subsegment(struct xdr_buf *buf, struct xdr_buf *subbuf,\n" - " \tif (base < buf->page_len) {\n" - " \t\tsubbuf->page_len = min(buf->page_len - base, len);\n" - " \t\tbase += buf->page_base;\n" - "-\t\tsubbuf->page_base = base & ~PAGE_CACHE_MASK;\n" - "-\t\tsubbuf->pages = &buf->pages[base >> PAGE_CACHE_SHIFT];\n" - "+\t\tsubbuf->page_base = base & ~PAGE_MASK;\n" - "+\t\tsubbuf->pages = &buf->pages[base >> PAGE_SHIFT];\n" - " \t\tlen -= subbuf->page_len;\n" - " \t\tbase = 0;\n" - " \t} else {\n" - "@@ -1297,9 +1297,9 @@ xdr_xcode_array2(struct xdr_buf *buf, unsigned int base,\n" - " \t\ttodo -= avail_here;\n" - " \n" - " \t\tbase += buf->page_base;\n" - "-\t\tppages = buf->pages + (base >> PAGE_CACHE_SHIFT);\n" - "-\t\tbase &= ~PAGE_CACHE_MASK;\n" - "-\t\tavail_page = min_t(unsigned int, PAGE_CACHE_SIZE - base,\n" - "+\t\tppages = buf->pages + (base >> PAGE_SHIFT);\n" - "+\t\tbase &= ~PAGE_MASK;\n" - "+\t\tavail_page = min_t(unsigned int, PAGE_SIZE - base,\n" - " \t\t\t\t\tavail_here);\n" - " \t\tc = kmap(*ppages) + base;\n" - " \n" - "@@ -1383,7 +1383,7 @@ xdr_xcode_array2(struct xdr_buf *buf, unsigned int base,\n" - " \t\t\t}\n" - " \n" - " \t\t\tavail_page = min(avail_here,\n" - "-\t\t\t\t (unsigned int) PAGE_CACHE_SIZE);\n" - "+\t\t\t\t (unsigned int) PAGE_SIZE);\n" - " \t\t}\n" - " \t\tbase = buf->page_len; /* align to start of tail */\n" - " \t}\n" - "@@ -1479,9 +1479,9 @@ xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len,\n" - " \t\tif (page_len > len)\n" - " \t\t\tpage_len = len;\n" - " \t\tlen -= page_len;\n" - "-\t\tpage_offset = (offset + buf->page_base) & (PAGE_CACHE_SIZE - 1);\n" - "-\t\ti = (offset + buf->page_base) >> PAGE_CACHE_SHIFT;\n" - "-\t\tthislen = PAGE_CACHE_SIZE - page_offset;\n" - "+\t\tpage_offset = (offset + buf->page_base) & (PAGE_SIZE - 1);\n" - "+\t\ti = (offset + buf->page_base) >> PAGE_SHIFT;\n" - "+\t\tthislen = PAGE_SIZE - page_offset;\n" - " \t\tdo {\n" - " \t\t\tif (thislen > page_len)\n" - " \t\t\t\tthislen = page_len;\n" - "@@ -1492,7 +1492,7 @@ xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len,\n" - " \t\t\tpage_len -= thislen;\n" - " \t\t\ti++;\n" - " \t\t\tpage_offset = 0;\n" - "-\t\t\tthislen = PAGE_CACHE_SIZE;\n" - "+\t\t\tthislen = PAGE_SIZE;\n" - " \t\t} while (page_len != 0);\n" - " \t\toffset = 0;\n" - " \t}\n" - "-- \n" - " Kirill A. Shutemov\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + Okay, here's folded version of the patchset. -16068fc791008a14cfda897525250c5a96f56cca24fa9395e00e1b7485877d71 +076a6bf8cb91236d57fe048d276c96c679654b77b9252ccea7b5c69a2abe008e
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.