953 files changed, 10594 insertions, 7176 deletions

diff --git a/.mailmap b/.mailmap
index 7e6c5334c337..90c0aefc276d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -33,6 +33,7 @@ Björn Steinbrink <B.Steinbrink@gmx.de>
 Brian Avery <b.avery@hp.com>
 Brian King <brking@us.ibm.com>
 Christoph Hellwig <hch@lst.de>
+Christophe Ricard <christophe.ricard@gmail.com>
 Corey Minyard <minyard@acm.org>
 Damian Hobson-Garcia <dhobsong@igel.co.jp>
 David Brownell <david-b@pacbell.net>
diff --git a/Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl b/Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl
index 7ac7d7262bb7..3c3514815cd5 100644
--- a/Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl
+++ b/Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl
@@ -1,23 +1,18 @@
-What:           /sys/devices/platform/<i2c-demux-name>/cur_master
+What:           /sys/devices/platform/<i2c-demux-name>/available_masters
 Date:           January 2016
 KernelVersion:  4.6
 Contact:        Wolfram Sang <wsa@the-dreams.de>
 Description:
+                Reading the file will give you a list of masters which can be
+                selected for a demultiplexed bus. The format is
+                "<index>:<name>". Example from a Renesas Lager board:
 
-This file selects the active I2C master for a demultiplexed bus.
+                0:/i2c@e6500000 1:/i2c@e6508000
 
-Write 0 there for the first master, 1 for the second etc. Reading the file will
-give you a list with the active master marked. Example from a Renesas Lager
-board:
-
-root@Lager:~# cat /sys/devices/platform/i2c@8/cur_master
-* 0 - /i2c@9
-  1 - /i2c@e6520000
-  2 - /i2c@e6530000
-
-root@Lager:~# echo 2 > /sys/devices/platform/i2c@8/cur_master
-
-root@Lager:~# cat /sys/devices/platform/i2c@8/cur_master
-  0 - /i2c@9
-  1 - /i2c@e6520000
-* 2 - /i2c@e6530000
+What:           /sys/devices/platform/<i2c-demux-name>/current_master
+Date:           January 2016
+KernelVersion:  4.6
+Contact:        Wolfram Sang <wsa@the-dreams.de>
+Description:
+                This file selects/shows the active I2C master for a demultiplexed
+                bus. It uses the <index> value from the file 'available_masters'.
diff --git a/Documentation/devicetree/bindings/clock/qca,ath79-pll.txt b/Documentation/devicetree/bindings/clock/qca,ath79-pll.txt
index e0fc2c11dd00..241fb0545b9e 100644
--- a/Documentation/devicetree/bindings/clock/qca,ath79-pll.txt
+++ b/Documentation/devicetree/bindings/clock/qca,ath79-pll.txt
@@ -3,7 +3,7 @@ Binding for Qualcomm Atheros AR7xxx/AR9XXX PLL controller
 The PPL controller provides the 3 main clocks of the SoC: CPU, DDR and AHB.
 
 Required Properties:
-- compatible: has to be "qca,<soctype>-cpu-intc" and one of the following
+- compatible: has to be "qca,<soctype>-pll" and one of the following
   fallbacks:
   - "qca,ar7100-pll"
   - "qca,ar7240-pll"
@@ -21,8 +21,8 @@ Optional properties:
 
 Example:
 
-        memory-controller@18050000 {
-                compatible = "qca,ar9132-ppl", "qca,ar9130-pll";
+        pll-controller@18050000 {
+                compatible = "qca,ar9132-pll", "qca,ar9130-pll";
                 reg = <0x18050000 0x20>;
 
                 clock-names = "ref";
diff --git a/Documentation/devicetree/bindings/pinctrl/img,pistachio-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/img,pistachio-pinctrl.txt
index 08a4a32c8eb0..0326154c7925 100644
--- a/Documentation/devicetree/bindings/pinctrl/img,pistachio-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/img,pistachio-pinctrl.txt
@@ -134,12 +134,12 @@ mfio80		ddr_debug, mips_trace_data, mips_debug
 mfio81          dreq0, mips_trace_data, eth_debug
 mfio82          dreq1, mips_trace_data, eth_debug
 mfio83          mips_pll_lock, mips_trace_data, usb_debug
-mfio84          sys_pll_lock, mips_trace_data, usb_debug
-mfio85          wifi_pll_lock, mips_trace_data, sdhost_debug
-mfio86          bt_pll_lock, mips_trace_data, sdhost_debug
-mfio87          rpu_v_pll_lock, dreq2, socif_debug
-mfio88          rpu_l_pll_lock, dreq3, socif_debug
-mfio89          audio_pll_lock, dreq4, dreq5
+mfio84          audio_pll_lock, mips_trace_data, usb_debug
+mfio85          rpu_v_pll_lock, mips_trace_data, sdhost_debug
+mfio86          rpu_l_pll_lock, mips_trace_data, sdhost_debug
+mfio87          sys_pll_lock, dreq2, socif_debug
+mfio88          wifi_pll_lock, dreq3, socif_debug
+mfio89          bt_pll_lock, dreq4, dreq5
 tck
 trstn
 tdi
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/Documentation/networking/switchdev.txt b/Documentation/networking/switchdev.txt
index fad63136ee3e..2f659129694b 100644
--- a/Documentation/networking/switchdev.txt
+++ b/Documentation/networking/switchdev.txt
@@ -386,7 +386,7 @@ used. First phase is to "prepare" anything needed, including various checks,
 memory allocation, etc. The goal is to handle the stuff that is not unlikely
 to fail here. The second phase is to "commit" the actual changes.
 
-Switchdev provides an inftrastructure for sharing items (for example memory
+Switchdev provides an infrastructure for sharing items (for example memory
 allocations) between the two phases.
 
 The object created by a driver in "prepare" phase and it is queued up by:
diff --git a/Documentation/power/runtime_pm.txt b/Documentation/power/runtime_pm.txt
index 7328cf85236c..1fd1fbe9ce95 100644
--- a/Documentation/power/runtime_pm.txt
+++ b/Documentation/power/runtime_pm.txt
@@ -586,6 +586,10 @@ drivers to make their ->remove() callbacks avoid races with runtime PM directly,
 but also it allows of more flexibility in the handling of devices during the
 removal of their drivers.
 
+Drivers in ->remove() callback should undo the runtime PM changes done
+in ->probe(). Usually this means calling pm_runtime_disable(),
+pm_runtime_dont_use_autosuspend() etc.
+
 The user space can effectively disallow the driver of the device to power manage
 it at run time by changing the value of its /sys/devices/.../power/control
 attribute to "on", which causes pm_runtime_forbid() to be called.  In principle,
diff --git a/Documentation/x86/topology.txt b/Documentation/x86/topology.txt
new file mode 100644
index 000000000000..06afac252f5b
--- /dev/null
+++ b/Documentation/x86/topology.txt
@@ -0,0 +1,208 @@
+x86 Topology
+============
+
+This documents and clarifies the main aspects of x86 topology modelling and
+representation in the kernel. Update/change when doing changes to the
+respective code.
+
+The architecture-agnostic topology definitions are in
+Documentation/cputopology.txt. This file holds x86-specific
+differences/specialities which must not necessarily apply to the generic
+definitions. Thus, the way to read up on Linux topology on x86 is to start
+with the generic one and look at this one in parallel for the x86 specifics.
+
+Needless to say, code should use the generic functions - this file is *only*
+here to *document* the inner workings of x86 topology.
+
+Started by Thomas Gleixner <tglx@linutronix.de> and Borislav Petkov <bp@alien8.de>.
+
+The main aim of the topology facilities is to present adequate interfaces to
+code which needs to know/query/use the structure of the running system wrt
+threads, cores, packages, etc.
+
+The kernel does not care about the concept of physical sockets because a
+socket has no relevance to software. It's an electromechanical component. In
+the past a socket always contained a single package (see below), but with the
+advent of Multi Chip Modules (MCM) a socket can hold more than one package. So
+there might be still references to sockets in the code, but they are of
+historical nature and should be cleaned up.
+
+The topology of a system is described in the units of:
+
+    - packages
+    - cores
+    - threads
+
+* Package:
+
+  Packages contain a number of cores plus shared resources, e.g. DRAM
+  controller, shared caches etc.
+
+  AMD nomenclature for package is 'Node'.
+
+  Package-related topology information in the kernel:
+
+  - cpuinfo_x86.x86_max_cores:
+
+    The number of cores in a package. This information is retrieved via CPUID.
+
+  - cpuinfo_x86.phys_proc_id:
+
+    The physical ID of the package. This information is retrieved via CPUID
+    and deduced from the APIC IDs of the cores in the package.
+
+  - cpuinfo_x86.logical_id:
+
+    The logical ID of the package. As we do not trust BIOSes to enumerate the
+    packages in a consistent way, we introduced the concept of logical package
+    ID so we can sanely calculate the number of maximum possible packages in
+    the system and have the packages enumerated linearly.
+
+  - topology_max_packages():
+
+    The maximum possible number of packages in the system. Helpful for per
+    package facilities to preallocate per package information.
+
+
+* Cores:
+
+  A core consists of 1 or more threads. It does not matter whether the threads
+  are SMT- or CMT-type threads.
+
+  AMDs nomenclature for a CMT core is "Compute Unit". The kernel always uses
+  "core".
+
+  Core-related topology information in the kernel:
+
+  - smp_num_siblings:
+
+    The number of threads in a core. The number of threads in a package can be
+    calculated by:
+
+        threads_per_package = cpuinfo_x86.x86_max_cores * smp_num_siblings
+
+
+* Threads:
+
+  A thread is a single scheduling unit. It's the equivalent to a logical Linux
+  CPU.
+
+  AMDs nomenclature for CMT threads is "Compute Unit Core". The kernel always
+  uses "thread".
+
+  Thread-related topology information in the kernel:
+
+  - topology_core_cpumask():
+
+    The cpumask contains all online threads in the package to which a thread
+    belongs.
+
+    The number of online threads is also printed in /proc/cpuinfo "siblings."
+
+  - topology_sibling_mask():
+
+    The cpumask contains all online threads in the core to which a thread
+    belongs.
+
+   - topology_logical_package_id():
+
+    The logical package ID to which a thread belongs.
+
+   - topology_physical_package_id():
+
+    The physical package ID to which a thread belongs.
+
+   - topology_core_id();
+
+    The ID of the core to which a thread belongs. It is also printed in /proc/cpuinfo
+    "core_id."
+
+
+
+System topology examples
+
+Note:
+
+The alternative Linux CPU enumeration depends on how the BIOS enumerates the
+threads. Many BIOSes enumerate all threads 0 first and then all threads 1.
+That has the "advantage" that the logical Linux CPU numbers of threads 0 stay
+the same whether threads are enabled or not. That's merely an implementation
+detail and has no practical impact.
+
+1) Single Package, Single Core
+
+   [package 0] -> [core 0] -> [thread 0] -> Linux CPU 0
+
+2) Single Package, Dual Core
+
+   a) One thread per core
+
+        [package 0] -> [core 0] -> [thread 0] -> Linux CPU 0
+                    -> [core 1] -> [thread 0] -> Linux CPU 1
+
+   b) Two threads per core
+
+        [package 0] -> [core 0] -> [thread 0] -> Linux CPU 0
+                                -> [thread 1] -> Linux CPU 1
+                    -> [core 1] -> [thread 0] -> Linux CPU 2
+                                -> [thread 1] -> Linux CPU 3
+
+      Alternative enumeration:
+
+        [package 0] -> [core 0] -> [thread 0] -> Linux CPU 0
+                                -> [thread 1] -> Linux CPU 2
+                    -> [core 1] -> [thread 0] -> Linux CPU 1
+                                -> [thread 1] -> Linux CPU 3
+
+      AMD nomenclature for CMT systems:
+
+        [node 0] -> [Compute Unit 0] -> [Compute Unit Core 0] -> Linux CPU 0
+                                     -> [Compute Unit Core 1] -> Linux CPU 1
+                 -> [Compute Unit 1] -> [Compute Unit Core 0] -> Linux CPU 2
+                                     -> [Compute Unit Core 1] -> Linux CPU 3
+
+4) Dual Package, Dual Core
+
+   a) One thread per core
+
+        [package 0] -> [core 0] -> [thread 0] -> Linux CPU 0
+                    -> [core 1] -> [thread 0] -> Linux CPU 1
+
+        [package 1] -> [core 0] -> [thread 0] -> Linux CPU 2
+                    -> [core 1] -> [thread 0] -> Linux CPU 3
+
+   b) Two threads per core
+
+        [package 0] -> [core 0] -> [thread 0] -> Linux CPU 0
+                                -> [thread 1] -> Linux CPU 1
+                    -> [core 1] -> [thread 0] -> Linux CPU 2
+                                -> [thread 1] -> Linux CPU 3
+
+        [package 1] -> [core 0] -> [thread 0] -> Linux CPU 4
+                                -> [thread 1] -> Linux CPU 5
+                    -> [core 1] -> [thread 0] -> Linux CPU 6
+                                -> [thread 1] -> Linux CPU 7
+
+      Alternative enumeration:
+
+        [package 0] -> [core 0] -> [thread 0] -> Linux CPU 0
+                                -> [thread 1] -> Linux CPU 4
+                    -> [core 1] -> [thread 0] -> Linux CPU 1
+                                -> [thread 1] -> Linux CPU 5
+
+        [package 1] -> [core 0] -> [thread 0] -> Linux CPU 2
+                                -> [thread 1] -> Linux CPU 6
+                    -> [core 1] -> [thread 0] -> Linux CPU 3
+                                -> [thread 1] -> Linux CPU 7
+
+      AMD nomenclature for CMT systems:
+
+        [node 0] -> [Compute Unit 0] -> [Compute Unit Core 0] -> Linux CPU 0
+                                     -> [Compute Unit Core 1] -> Linux CPU 1
+                 -> [Compute Unit 1] -> [Compute Unit Core 0] -> Linux CPU 2
+                                     -> [Compute Unit Core 1] -> Linux CPU 3
+
+        [node 1] -> [Compute Unit 0] -> [Compute Unit Core 0] -> Linux CPU 4
+                                     -> [Compute Unit Core 1] -> Linux CPU 5
+                 -> [Compute Unit 1] -> [Compute Unit Core 0] -> Linux CPU 6
+                                     -> [Compute Unit Core 1] -> Linux CPU 7
diff --git a/MAINTAINERS b/MAINTAINERS
index 1ace393e963c..c0df1e877153 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4302,7 +4302,7 @@ F:	drivers/net/ethernet/agere/
 
 ETHERNET BRIDGE
 M:      Stephen Hemminger <stephen@networkplumber.org>
-L:      bridge@lists.linux-foundation.org
+L:      bridge@lists.linux-foundation.org (moderated for non-subscribers)
 L:      netdev@vger.kernel.org
 W:      http://www.linuxfoundation.org/en/Net:Bridge
 S:      Maintained
@@ -5042,6 +5042,7 @@ F:	include/linux/hw_random.h
 HARDWARE SPINLOCK CORE
 M:      Ohad Ben-Cohen <ohad@wizery.com>
 M:      Bjorn Andersson <bjorn.andersson@linaro.org>
+L:      linux-remoteproc@vger.kernel.org
 S:      Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
 F:      Documentation/hwspinlock.txt
@@ -5750,7 +5751,7 @@ R:	Don Skidmore <donald.c.skidmore@intel.com>
 R:      Bruce Allan <bruce.w.allan@intel.com>
 R:      John Ronciak <john.ronciak@intel.com>
 R:      Mitch Williams <mitch.a.williams@intel.com>
-L:      intel-wired-lan@lists.osuosl.org
+L:      intel-wired-lan@lists.osuosl.org (moderated for non-subscribers)
 W:      http://www.intel.com/support/feedback.htm
 W:      http://e1000.sourceforge.net/
 Q:      http://patchwork.ozlabs.org/project/intel-wired-lan/list/
@@ -6402,7 +6403,7 @@ KPROBES
 M:      Ananth N Mavinakayanahalli <ananth@in.ibm.com>
 M:      Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
 M:      "David S. Miller" <davem@davemloft.net>
-M:      Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
+M:      Masami Hiramatsu <mhiramat@kernel.org>
 S:      Maintained
 F:      Documentation/kprobes.txt
 F:      include/linux/kprobes.h
@@ -7575,7 +7576,7 @@ F:	drivers/infiniband/hw/nes/
 
 NETEM NETWORK EMULATOR
 M:      Stephen Hemminger <stephen@networkplumber.org>
-L:      netem@lists.linux-foundation.org
+L:      netem@lists.linux-foundation.org (moderated for non-subscribers)
 S:      Maintained
 F:      net/sched/sch_netem.c
 
@@ -8253,7 +8254,7 @@ F:	Documentation/filesystems/overlayfs.txt
 
 ORANGEFS FILESYSTEM
 M:      Mike Marshall <hubcap@omnibond.com>
-L:      pvfs2-developers@beowulf-underground.org
+L:      pvfs2-developers@beowulf-underground.org (subscribers-only)
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
 S:      Supported
 F:      fs/orangefs/
@@ -8711,6 +8712,8 @@ F:	drivers/pinctrl/sh-pfc/
 
 PIN CONTROLLER - SAMSUNG
 M:      Tomasz Figa <tomasz.figa@gmail.com>
+M:      Krzysztof Kozlowski <k.kozlowski@samsung.com>
+M:      Sylwester Nawrocki <s.nawrocki@samsung.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:      linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 S:      Maintained
@@ -9139,6 +9142,13 @@ T:	git git://github.com/KrasnikovEugene/wcn36xx.git
 S:      Supported
 F:      drivers/net/wireless/ath/wcn36xx/
 
+QEMU MACHINE EMULATOR AND VIRTUALIZER SUPPORT
+M:      Gabriel Somlo <somlo@cmu.edu>
+M:      "Michael S. Tsirkin" <mst@redhat.com>
+L:      qemu-devel@nongnu.org
+S:      Maintained
+F:      drivers/firmware/qemu_fw_cfg.c
+
 RADOS BLOCK DEVICE (RBD)
 M:      Ilya Dryomov <idryomov@gmail.com>
 M:      Sage Weil <sage@redhat.com>
@@ -9314,6 +9324,7 @@ F:	include/linux/regmap.h
 REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
 M:      Ohad Ben-Cohen <ohad@wizery.com>
 M:      Bjorn Andersson <bjorn.andersson@linaro.org>
+L:      linux-remoteproc@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
 S:      Maintained
 F:      drivers/remoteproc/
@@ -9323,6 +9334,7 @@ F:	include/linux/remoteproc.h
 REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
 M:      Ohad Ben-Cohen <ohad@wizery.com>
 M:      Bjorn Andersson <bjorn.andersson@linaro.org>
+L:      linux-remoteproc@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git
 S:      Maintained
 F:      drivers/rpmsg/
@@ -10583,6 +10595,14 @@ L:	linux-tegra@vger.kernel.org
 S:      Maintained
 F:      drivers/staging/nvec/
 
+STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
+M:      Jens Frederich <jfrederich@gmail.com>
+M:      Daniel Drake <dsd@laptop.org>
+M:      Jon Nettleton <jon.nettleton@gmail.com>
+W:      http://wiki.laptop.org/go/DCON
+S:      Maintained
+F:      drivers/staging/olpc_dcon/
+
 STAGING - REALTEK RTL8712U DRIVERS
 M:      Larry Finger <Larry.Finger@lwfinger.net>
 M:      Florian Schilhabel <florian.c.schilhabel@googlemail.com>.
@@ -11137,8 +11157,8 @@ F:	include/uapi/linux/tipc*.h
 F:      net/tipc/
 
 TILE ARCHITECTURE
-M:      Chris Metcalf <cmetcalf@ezchip.com>
-W:      http://www.ezchip.com/scm/
+M:      Chris Metcalf <cmetcalf@mellanox.com>
+W:      http://www.mellanox.com/repository/solutions/tile-scm/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git
 S:      Supported
 F:      arch/tile/
@@ -12202,9 +12222,9 @@ S:	Maintained
 F:      drivers/media/tuners/tuner-xc2028.*
 
 XEN HYPERVISOR INTERFACE
-M:      Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 M:      Boris Ostrovsky <boris.ostrovsky@oracle.com>
 M:      David Vrabel <david.vrabel@citrix.com>
+M:      Juergen Gross <jgross@suse.com>
 L:      xen-devel@lists.xenproject.org (moderated for non-subscribers)
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
 S:      Supported
@@ -12216,16 +12236,16 @@ F:	include/xen/
 F:      include/uapi/xen/
 
 XEN HYPERVISOR ARM
-M:      Stefano Stabellini <stefano.stabellini@eu.citrix.com>
+M:      Stefano Stabellini <sstabellini@kernel.org>
 L:      xen-devel@lists.xenproject.org (moderated for non-subscribers)
-S:      Supported
+S:      Maintained
 F:      arch/arm/xen/
 F:      arch/arm/include/asm/xen/
 
 XEN HYPERVISOR ARM64
-M:      Stefano Stabellini <stefano.stabellini@eu.citrix.com>
+M:      Stefano Stabellini <sstabellini@kernel.org>
 L:      xen-devel@lists.xenproject.org (moderated for non-subscribers)
-S:      Supported
+S:      Maintained
 F:      arch/arm64/xen/
 F:      arch/arm64/include/asm/xen/
 
diff --git a/Makefile b/Makefile
index 916b26e999d8..1d0aef03eae7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 4
 PATCHLEVEL = 6
 SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc3
 NAME = Blurry Fish Butt
 
 # *DOCUMENTATION*
diff --git a/arch/arc/mm/cache.c b/arch/arc/mm/cache.c
index d7709e3930a3..9e5eddbb856f 100644
--- a/arch/arc/mm/cache.c
+++ b/arch/arc/mm/cache.c
@@ -628,7 +628,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/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index 7b84657fba35..194b69923389 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -19,7 +19,7 @@
  * This may need to be greater than __NR_last_syscall+1 in order to
  * account for the padding in the syscall table
  */
-#define __NR_syscalls  (392)
+#define __NR_syscalls  (396)
 
 #define __ARCH_WANT_STAT64
 #define __ARCH_WANT_SYS_GETHOSTNAME
diff --git a/arch/arm/include/uapi/asm/unistd.h b/arch/arm/include/uapi/asm/unistd.h
index 5dd2528e9e45..2cb9dc770e1d 100644
--- a/arch/arm/include/uapi/asm/unistd.h
+++ b/arch/arm/include/uapi/asm/unistd.h
@@ -418,6 +418,8 @@
 #define __NR_membarrier                 (__NR_SYSCALL_BASE+389)
 #define __NR_mlock2                     (__NR_SYSCALL_BASE+390)
 #define __NR_copy_file_range            (__NR_SYSCALL_BASE+391)
+#define __NR_preadv2                    (__NR_SYSCALL_BASE+392)
+#define __NR_pwritev2                   (__NR_SYSCALL_BASE+393)
 
 /*
  * The following SWIs are ARM private.
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index dfc7cd6851ad..703fa0f3cd8f 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -399,8 +399,10 @@
                 CALL(sys_execveat)
                 CALL(sys_userfaultfd)
                 CALL(sys_membarrier)
-                CALL(sys_mlock2)
+/* 390 */       CALL(sys_mlock2)
                 CALL(sys_copy_file_range)
+                CALL(sys_preadv2)
+                CALL(sys_pwritev2)
 #ifndef syscalls_counted
 .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
 #define syscalls_counted
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 139791ed473d..a28fce0bdbbe 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -430,11 +430,13 @@ static void __init patch_aeabi_idiv(void)
         pr_info("CPU: div instructions available: patching division code\n");
 
         fn_addr = ((uintptr_t)&__aeabi_uidiv) & ~1;
+        asm ("" : "+g" (fn_addr));
         ((u32 *)fn_addr)[0] = udiv_instruction();
         ((u32 *)fn_addr)[1] = bx_lr_instruction();
         flush_icache_range(fn_addr, fn_addr + 8);
 
         fn_addr = ((uintptr_t)&__aeabi_idiv) & ~1;
+        asm ("" : "+g" (fn_addr));
         ((u32 *)fn_addr)[0] = sdiv_instruction();
         ((u32 *)fn_addr)[1] = bx_lr_instruction();
         flush_icache_range(fn_addr, fn_addr + 8);
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 6accd66d26f0..b5384311dec4 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -1061,15 +1061,27 @@ static void cpu_init_hyp_mode(void *dummy)
         kvm_arm_init_debug();
 }
 
+static void cpu_hyp_reinit(void)
+{
+        if (is_kernel_in_hyp_mode()) {
+                /*
+                 * cpu_init_stage2() is safe to call even if the PM
+                 * event was cancelled before the CPU was reset.
+                 */
+                cpu_init_stage2(NULL);
+        } else {
+                if (__hyp_get_vectors() == hyp_default_vectors)
+                        cpu_init_hyp_mode(NULL);
+        }
+}
+
 static int hyp_init_cpu_notify(struct notifier_block *self,
                                unsigned long action, void *cpu)
 {
         switch (action) {
         case CPU_STARTING:
         case CPU_STARTING_FROZEN:
-                if (__hyp_get_vectors() == hyp_default_vectors)
-                        cpu_init_hyp_mode(NULL);
-                break;
+                cpu_hyp_reinit();
         }
 
         return NOTIFY_OK;
@@ -1084,9 +1096,8 @@ static int hyp_init_cpu_pm_notifier(struct notifier_block *self,
                                     unsigned long cmd,
                                     void *v)
 {
-        if (cmd == CPU_PM_EXIT &&
-            __hyp_get_vectors() == hyp_default_vectors) {
-                cpu_init_hyp_mode(NULL);
+        if (cmd == CPU_PM_EXIT) {
+                cpu_hyp_reinit();
                 return NOTIFY_OK;
         }
 
@@ -1128,6 +1139,22 @@ static int init_subsystems(void)
         int err;
 
         /*
+         * Register CPU Hotplug notifier
+         */
+        cpu_notifier_register_begin();
+        err = __register_cpu_notifier(&hyp_init_cpu_nb);
+        cpu_notifier_register_done();
+        if (err) {
+                kvm_err("Cannot register KVM init CPU notifier (%d)\n", err);
+                return err;
+        }
+
+        /*
+         * Register CPU lower-power notifier
+         */
+        hyp_cpu_pm_init();
+
+        /*
          * Init HYP view of VGIC
          */
         err = kvm_vgic_hyp_init();
@@ -1270,19 +1297,6 @@ static int init_hyp_mode(void)
         free_boot_hyp_pgd();
 #endif
 
-        cpu_notifier_register_begin();
-
-        err = __register_cpu_notifier(&hyp_init_cpu_nb);
-
-        cpu_notifier_register_done();
-
-        if (err) {
-                kvm_err("Cannot register HYP init CPU notifier (%d)\n", err);
-                goto out_err;
-        }
-
-        hyp_cpu_pm_init();
-
         /* set size of VMID supported by CPU */
         kvm_vmid_bits = kvm_get_vmid_bits();
         kvm_info("%d-bit VMID\n", kvm_vmid_bits);
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/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 0f8963a7e7d9..6fcaac8e200f 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -281,12 +281,12 @@ __v7_ca17mp_setup:
         bl      v7_invalidate_l1
         ldmia   r12, {r1-r6, lr}
 #ifdef CONFIG_SMP
+        orr     r10, r10, #(1 << 6)             @ Enable SMP/nAMP mode
         ALT_SMP(mrc     p15, 0, r0, c1, c0, 1)
-        ALT_UP(mov      r0, #(1 << 6))          @ fake it for UP
-        tst     r0, #(1 << 6)                   @ SMP/nAMP mode enabled?
-        orreq   r0, r0, #(1 << 6)               @ Enable SMP/nAMP mode
-        orreq   r0, r0, r10                     @ Enable CPU-specific SMP bits
-        mcreq   p15, 0, r0, c1, c0, 1
+        ALT_UP(mov      r0, r10)                @ fake it for UP
+        orr     r10, r10, r0                    @ Set required bits
+        teq     r10, r0                         @ Were they already set?
+        mcrne   p15, 0, r10, c1, c0, 1          @ No, update register
 #endif
         b       __v7_setup_cont
 
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index f70505186820..a44ef995d8ae 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -68,11 +68,13 @@ CONFIG_KSM=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_CMA=y
 CONFIG_XEN=y
-CONFIG_CMDLINE="console=ttyAMA0"
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_COMPAT=y
 CONFIG_CPU_IDLE=y
 CONFIG_ARM_CPUIDLE=y
+CONFIG_CPU_FREQ=y
+CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
+CONFIG_ARM_SCPI_CPUFREQ=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -80,7 +82,6 @@ CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_INET_LRO is not set
 # CONFIG_IPV6 is not set
 CONFIG_BPF_JIT=y
 # CONFIG_WIRELESS is not set
@@ -144,16 +145,18 @@ CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 CONFIG_SERIAL_MVEBU_UART=y
 CONFIG_VIRTIO_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_MV64XXX=y
 CONFIG_I2C_QUP=y
+CONFIG_I2C_TEGRA=y
 CONFIG_I2C_UNIPHIER_F=y
 CONFIG_I2C_RCAR=y
 CONFIG_SPI=y
 CONFIG_SPI_PL022=y
 CONFIG_SPI_QUP=y
 CONFIG_SPMI=y
+CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_MSM8916=y
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 CONFIG_GPIO_SYSFS=y
@@ -196,6 +199,7 @@ CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_DWC2=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
@@ -205,19 +209,20 @@ CONFIG_USB_MSM_OTG=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
 CONFIG_MMC=y
-CONFIG_MMC_BLOCK_MINORS=16
+CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_TEGRA=y
 CONFIG_MMC_SDHCI_MSM=y
 CONFIG_MMC_SPI=y
-CONFIG_MMC_SUNXI=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_EXYNOS=y
-CONFIG_MMC_BLOCK_MINORS=16
+CONFIG_MMC_DW_K3=y
+CONFIG_MMC_SUNXI=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_SYSCON=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
@@ -229,8 +234,8 @@ CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_SUN6I=y
 CONFIG_RTC_DRV_XGENE=y
 CONFIG_DMADEVICES=y
-CONFIG_QCOM_BAM_DMA=y
 CONFIG_TEGRA20_APB_DMA=y
+CONFIG_QCOM_BAM_DMA=y
 CONFIG_RCAR_DMAC=y
 CONFIG_VFIO=y
 CONFIG_VFIO_PCI=y
@@ -239,20 +244,26 @@ CONFIG_VIRTIO_BALLOON=y
 CONFIG_VIRTIO_MMIO=y
 CONFIG_XEN_GNTDEV=y
 CONFIG_XEN_GRANT_DEV_ALLOC=y
+CONFIG_COMMON_CLK_SCPI=y
 CONFIG_COMMON_CLK_CS2000_CP=y
 CONFIG_COMMON_CLK_QCOM=y
 CONFIG_MSM_GCC_8916=y
 CONFIG_HWSPINLOCK_QCOM=y
+CONFIG_MAILBOX=y
+CONFIG_ARM_MHU=y
+CONFIG_HI6220_MBOX=y
 CONFIG_ARM_SMMU=y
 CONFIG_QCOM_SMEM=y
 CONFIG_QCOM_SMD=y
 CONFIG_QCOM_SMD_RPM=y
 CONFIG_ARCH_TEGRA_132_SOC=y
 CONFIG_ARCH_TEGRA_210_SOC=y
-CONFIG_HISILICON_IRQ_MBIGEN=y
 CONFIG_EXTCON_USB_GPIO=y
+CONFIG_COMMON_RESET_HI6220=y
 CONFIG_PHY_RCAR_GEN3_USB2=y
+CONFIG_PHY_HI6220_USB=y
 CONFIG_PHY_XGENE=y
+CONFIG_ARM_SCPI_PROTOCOL=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 CONFIG_FANOTIFY=y
@@ -264,6 +275,7 @@ CONFIG_CUSE=y
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
 CONFIG_HUGETLBFS=y
+CONFIG_CONFIGFS_FS=y
 CONFIG_EFIVAR_FS=y
 CONFIG_SQUASHFS=y
 CONFIG_NFS_FS=y
diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h
index 0e391dbfc420..4150fd8bae01 100644
--- a/arch/arm64/include/asm/kvm_arm.h
+++ b/arch/arm64/include/asm/kvm_arm.h
@@ -124,7 +124,9 @@
 #define VTCR_EL2_SL0_LVL1       (1 << 6)
 #define VTCR_EL2_T0SZ_MASK      0x3f
 #define VTCR_EL2_T0SZ_40B       24
-#define VTCR_EL2_VS             19
+#define VTCR_EL2_VS_SHIFT       19
+#define VTCR_EL2_VS_8BIT        (0 << VTCR_EL2_VS_SHIFT)
+#define VTCR_EL2_VS_16BIT       (1 << VTCR_EL2_VS_SHIFT)
 
 /*
  * We configure the Stage-2 page tables to always restrict the IPA space to be
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 227ed475dbd3..b7e82a795ac9 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -27,7 +27,6 @@
 #include <asm/kvm.h>
 #include <asm/kvm_asm.h>
 #include <asm/kvm_mmio.h>
-#include <asm/kvm_perf_event.h>
 
 #define __KVM_HAVE_ARCH_INTC_INITIALIZED
 
diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_hyp.h
index a46b019ebcf5..44eaff70da6a 100644
--- a/arch/arm64/include/asm/kvm_hyp.h
+++ b/arch/arm64/include/asm/kvm_hyp.h
@@ -21,7 +21,6 @@
 #include <linux/compiler.h>
 #include <linux/kvm_host.h>
 #include <asm/kvm_mmu.h>
-#include <asm/kvm_perf_event.h>
 #include <asm/sysreg.h>
 
 #define __hyp_text __section(.hyp.text) notrace
diff --git a/arch/arm64/include/asm/kvm_perf_event.h b/arch/arm64/include/asm/kvm_perf_event.h
deleted file mode 100644
index c18fdebb8f66..000000000000
--- a/arch/arm64/include/asm/kvm_perf_event.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2012 ARM Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __ASM_KVM_PERF_EVENT_H
-#define __ASM_KVM_PERF_EVENT_H
-
-#define ARMV8_PMU_MAX_COUNTERS  32
-#define ARMV8_PMU_COUNTER_MASK  (ARMV8_PMU_MAX_COUNTERS - 1)
-
-/*
- * Per-CPU PMCR: config reg
- */
-#define ARMV8_PMU_PMCR_E        (1 << 0) /* Enable all counters */
-#define ARMV8_PMU_PMCR_P        (1 << 1) /* Reset all counters */
-#define ARMV8_PMU_PMCR_C        (1 << 2) /* Cycle counter reset */
-#define ARMV8_PMU_PMCR_D        (1 << 3) /* CCNT counts every 64th cpu cycle */
-#define ARMV8_PMU_PMCR_X        (1 << 4) /* Export to ETM */
-#define ARMV8_PMU_PMCR_DP       (1 << 5) /* Disable CCNT if non-invasive debug*/
-/* Determines which bit of PMCCNTR_EL0 generates an overflow */
-#define ARMV8_PMU_PMCR_LC       (1 << 6)
-#define ARMV8_PMU_PMCR_N_SHIFT  11       /* Number of counters supported */
-#define ARMV8_PMU_PMCR_N_MASK   0x1f
-#define ARMV8_PMU_PMCR_MASK     0x7f     /* Mask for writable bits */
-
-/*
- * PMOVSR: counters overflow flag status reg
- */
-#define ARMV8_PMU_OVSR_MASK             0xffffffff      /* Mask for writable bits */
-#define ARMV8_PMU_OVERFLOWED_MASK       ARMV8_PMU_OVSR_MASK
-
-/*
- * PMXEVTYPER: Event selection reg
- */
-#define ARMV8_PMU_EVTYPE_MASK   0xc80003ff      /* Mask for writable bits */
-#define ARMV8_PMU_EVTYPE_EVENT  0x3ff           /* Mask for EVENT bits */
-
-#define ARMV8_PMU_EVTYPE_EVENT_SW_INCR  0       /* Software increment event */
-
-/*
- * Event filters for PMUv3
- */
-#define ARMV8_PMU_EXCLUDE_EL1   (1 << 31)
-#define ARMV8_PMU_EXCLUDE_EL0   (1 << 30)
-#define ARMV8_PMU_INCLUDE_EL2   (1 << 27)
-
-/*
- * PMUSERENR: user enable reg
- */
-#define ARMV8_PMU_USERENR_MASK  0xf             /* Mask for writable bits */
-#define ARMV8_PMU_USERENR_EN    (1 << 0) /* PMU regs can be accessed at EL0 */
-#define ARMV8_PMU_USERENR_SW    (1 << 1) /* PMSWINC can be written at EL0 */
-#define ARMV8_PMU_USERENR_CR    (1 << 2) /* Cycle counter can be read at EL0 */
-#define ARMV8_PMU_USERENR_ER    (1 << 3) /* Event counter can be read at EL0 */
-
-#endif
diff --git a/arch/arm64/include/asm/opcodes.h b/arch/arm64/include/asm/opcodes.h
index 4e603ea36ad3..123f45d92cd1 100644
--- a/arch/arm64/include/asm/opcodes.h
+++ b/arch/arm64/include/asm/opcodes.h
@@ -1 +1,5 @@
+#ifdef CONFIG_CPU_BIG_ENDIAN
+#define CONFIG_CPU_ENDIAN_BE8 CONFIG_CPU_BIG_ENDIAN
+#endif
+
 #include <../../arm/include/asm/opcodes.h>
diff --git a/arch/arm64/include/asm/perf_event.h b/arch/arm64/include/asm/perf_event.h
index 7bd3cdb533ea..2065f46fa740 100644
--- a/arch/arm64/include/asm/perf_event.h
+++ b/arch/arm64/include/asm/perf_event.h
@@ -17,6 +17,53 @@
 #ifndef __ASM_PERF_EVENT_H
 #define __ASM_PERF_EVENT_H
 
+#define ARMV8_PMU_MAX_COUNTERS  32
+#define ARMV8_PMU_COUNTER_MASK  (ARMV8_PMU_MAX_COUNTERS - 1)
+
+/*
+ * Per-CPU PMCR: config reg
+ */
+#define ARMV8_PMU_PMCR_E        (1 << 0) /* Enable all counters */
+#define ARMV8_PMU_PMCR_P        (1 << 1) /* Reset all counters */
+#define ARMV8_PMU_PMCR_C        (1 << 2) /* Cycle counter reset */
+#define ARMV8_PMU_PMCR_D        (1 << 3) /* CCNT counts every 64th cpu cycle */
+#define ARMV8_PMU_PMCR_X        (1 << 4) /* Export to ETM */
+#define ARMV8_PMU_PMCR_DP       (1 << 5) /* Disable CCNT if non-invasive debug*/
+#define ARMV8_PMU_PMCR_LC       (1 << 6) /* Overflow on 64 bit cycle counter */
+#define ARMV8_PMU_PMCR_N_SHIFT  11       /* Number of counters supported */
+#define ARMV8_PMU_PMCR_N_MASK   0x1f
+#define ARMV8_PMU_PMCR_MASK     0x7f     /* Mask for writable bits */
+
+/*
+ * PMOVSR: counters overflow flag status reg
+ */
+#define ARMV8_PMU_OVSR_MASK             0xffffffff      /* Mask for writable bits */
+#define ARMV8_PMU_OVERFLOWED_MASK       ARMV8_PMU_OVSR_MASK
+
+/*
+ * PMXEVTYPER: Event selection reg
+ */
+#define ARMV8_PMU_EVTYPE_MASK   0xc800ffff      /* Mask for writable bits */
+#define ARMV8_PMU_EVTYPE_EVENT  0xffff          /* Mask for EVENT bits */
+
+#define ARMV8_PMU_EVTYPE_EVENT_SW_INCR  0       /* Software increment event */
+
+/*
+ * Event filters for PMUv3
+ */
+#define ARMV8_PMU_EXCLUDE_EL1   (1 << 31)
+#define ARMV8_PMU_EXCLUDE_EL0   (1 << 30)
+#define ARMV8_PMU_INCLUDE_EL2   (1 << 27)
+
+/*
+ * PMUSERENR: user enable reg
+ */
+#define ARMV8_PMU_USERENR_MASK  0xf             /* Mask for writable bits */
+#define ARMV8_PMU_USERENR_EN    (1 << 0) /* PMU regs can be accessed at EL0 */
+#define ARMV8_PMU_USERENR_SW    (1 << 1) /* PMSWINC can be written at EL0 */
+#define ARMV8_PMU_USERENR_CR    (1 << 2) /* Cycle counter can be read at EL0 */
+#define ARMV8_PMU_USERENR_ER    (1 << 3) /* Event counter can be read at EL0 */
+
 #ifdef CONFIG_PERF_EVENTS
 struct pt_regs;
 extern unsigned long perf_instruction_pointer(struct pt_regs *regs);
diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
index 1a78d6e2a78b..12874164b0ae 100644
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -141,6 +141,9 @@
 #define ID_AA64MMFR1_VMIDBITS_SHIFT     4
 #define ID_AA64MMFR1_HADBS_SHIFT        0
 
+#define ID_AA64MMFR1_VMIDBITS_8         0
+#define ID_AA64MMFR1_VMIDBITS_16        2
+
 /* id_aa64mmfr2 */
 #define ID_AA64MMFR2_UAO_SHIFT          4
 
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c
index 767c4f6e1f5b..f419a7c075a4 100644
--- a/arch/arm64/kernel/perf_event.c
+++ b/arch/arm64/kernel/perf_event.c
@@ -20,6 +20,7 @@
  */
 
 #include <asm/irq_regs.h>
+#include <asm/perf_event.h>
 #include <asm/virt.h>
 
 #include <linux/of.h>
@@ -384,9 +385,6 @@ static const struct attribute_group *armv8_pmuv3_attr_groups[] = {
 #define ARMV8_IDX_COUNTER_LAST(cpu_pmu) \
         (ARMV8_IDX_CYCLE_COUNTER + cpu_pmu->num_events - 1)
 
-#define ARMV8_MAX_COUNTERS      32
-#define ARMV8_COUNTER_MASK      (ARMV8_MAX_COUNTERS - 1)
-
 /*
  * ARMv8 low level PMU access
  */
@@ -395,40 +393,7 @@ static const struct attribute_group *armv8_pmuv3_attr_groups[] = {
  * Perf Event to low level counters mapping
  */
 #define ARMV8_IDX_TO_COUNTER(x) \
-        (((x) - ARMV8_IDX_COUNTER0) & ARMV8_COUNTER_MASK)
-
-/*
- * Per-CPU PMCR: config reg
- */
-#define ARMV8_PMCR_E            (1 << 0) /* Enable all counters */
-#define ARMV8_PMCR_P            (1 << 1) /* Reset all counters */
-#define ARMV8_PMCR_C            (1 << 2) /* Cycle counter reset */
-#define ARMV8_PMCR_D            (1 << 3) /* CCNT counts every 64th cpu cycle */
-#define ARMV8_PMCR_X            (1 << 4) /* Export to ETM */
-#define ARMV8_PMCR_DP           (1 << 5) /* Disable CCNT if non-invasive debug*/
-#define ARMV8_PMCR_LC           (1 << 6) /* Overflow on 64 bit cycle counter */
-#define ARMV8_PMCR_N_SHIFT      11       /* Number of counters supported */
-#define ARMV8_PMCR_N_MASK       0x1f
-#define ARMV8_PMCR_MASK         0x7f     /* Mask for writable bits */
-
-/*
- * PMOVSR: counters overflow flag status reg
- */
-#define ARMV8_OVSR_MASK         0xffffffff      /* Mask for writable bits */
-#define ARMV8_OVERFLOWED_MASK   ARMV8_OVSR_MASK
-
-/*
- * PMXEVTYPER: Event selection reg
- */
-#define ARMV8_EVTYPE_MASK       0xc800ffff      /* Mask for writable bits */
-#define ARMV8_EVTYPE_EVENT      0xffff          /* Mask for EVENT bits */
-
-/*
- * Event filters for PMUv3
- */
-#define ARMV8_EXCLUDE_EL1       (1 << 31)
-#define ARMV8_EXCLUDE_EL0       (1 << 30)
-#define ARMV8_INCLUDE_EL2       (1 << 27)
+        (((x) - ARMV8_IDX_COUNTER0) & ARMV8_PMU_COUNTER_MASK)
 
 static inline u32 armv8pmu_pmcr_read(void)
 {
@@ -439,14 +404,14 @@ static inline u32 armv8pmu_pmcr_read(void)
 
 static inline void armv8pmu_pmcr_write(u32 val)
 {
-        val &= ARMV8_PMCR_MASK;
+        val &= ARMV8_PMU_PMCR_MASK;
         isb();
         asm volatile("msr pmcr_el0, %0" :: "r" (val));
 }
 
 static inline int armv8pmu_has_overflowed(u32 pmovsr)
 {
-        return pmovsr & ARMV8_OVERFLOWED_MASK;
+        return pmovsr & ARMV8_PMU_OVERFLOWED_MASK;
 }
 
 static inline int armv8pmu_counter_valid(struct arm_pmu *cpu_pmu, int idx)
@@ -512,7 +477,7 @@ static inline void armv8pmu_write_counter(struct perf_event *event, u32 value)
 static inline void armv8pmu_write_evtype(int idx, u32 val)
 {
         if (armv8pmu_select_counter(idx) == idx) {
-                val &= ARMV8_EVTYPE_MASK;
+                val &= ARMV8_PMU_EVTYPE_MASK;
                 asm volatile("msr pmxevtyper_el0, %0" :: "r" (val));
         }
 }
@@ -558,7 +523,7 @@ static inline u32 armv8pmu_getreset_flags(void)
         asm volatile("mrs %0, pmovsclr_el0" : "=r" (value));
 
         /* Write to clear flags */
-        value &= ARMV8_OVSR_MASK;
+        value &= ARMV8_PMU_OVSR_MASK;
         asm volatile("msr pmovsclr_el0, %0" :: "r" (value));
 
         return value;
@@ -696,7 +661,7 @@ static void armv8pmu_start(struct arm_pmu *cpu_pmu)
 
         raw_spin_lock_irqsave(&events->pmu_lock, flags);
         /* Enable all counters */
-        armv8pmu_pmcr_write(armv8pmu_pmcr_read() | ARMV8_PMCR_E);
+        armv8pmu_pmcr_write(armv8pmu_pmcr_read() | ARMV8_PMU_PMCR_E);
         raw_spin_unlock_irqrestore(&events->pmu_lock, flags);
 }
 
@@ -707,7 +672,7 @@ static void armv8pmu_stop(struct arm_pmu *cpu_pmu)
 
         raw_spin_lock_irqsave(&events->pmu_lock, flags);
         /* Disable all counters */
-        armv8pmu_pmcr_write(armv8pmu_pmcr_read() & ~ARMV8_PMCR_E);
+        armv8pmu_pmcr_write(armv8pmu_pmcr_read() & ~ARMV8_PMU_PMCR_E);
         raw_spin_unlock_irqrestore(&events->pmu_lock, flags);
 }
 
@@ -717,7 +682,7 @@ static int armv8pmu_get_event_idx(struct pmu_hw_events *cpuc,
         int idx;
         struct arm_pmu *cpu_pmu = to_arm_pmu(event->pmu);
         struct hw_perf_event *hwc = &event->hw;
-        unsigned long evtype = hwc->config_base & ARMV8_EVTYPE_EVENT;
+        unsigned long evtype = hwc->config_base & ARMV8_PMU_EVTYPE_EVENT;
 
         /* Always place a cycle counter into the cycle counter. */
         if (evtype == ARMV8_PMUV3_PERFCTR_CLOCK_CYCLES) {
@@ -754,11 +719,11 @@ static int armv8pmu_set_event_filter(struct hw_perf_event *event,
             attr->exclude_kernel != attr->exclude_hv)
                 return -EINVAL;
         if (attr->exclude_user)
-                config_base |= ARMV8_EXCLUDE_EL0;
+                config_base |= ARMV8_PMU_EXCLUDE_EL0;
         if (!is_kernel_in_hyp_mode() && attr->exclude_kernel)
-                config_base |= ARMV8_EXCLUDE_EL1;
+                config_base |= ARMV8_PMU_EXCLUDE_EL1;
         if (!attr->exclude_hv)
-                config_base |= ARMV8_INCLUDE_EL2;
+                config_base |= ARMV8_PMU_INCLUDE_EL2;
 
         /*
          * Install the filter into config_base as this is used to
@@ -784,35 +749,36 @@ static void armv8pmu_reset(void *info)
          * Initialize & Reset PMNC. Request overflow interrupt for
          * 64 bit cycle counter but cheat in armv8pmu_write_counter().
          */
-        armv8pmu_pmcr_write(ARMV8_PMCR_P | ARMV8_PMCR_C | ARMV8_PMCR_LC);
+        armv8pmu_pmcr_write(ARMV8_PMU_PMCR_P | ARMV8_PMU_PMCR_C |
+                            ARMV8_PMU_PMCR_LC);
 }
 
 static int armv8_pmuv3_map_event(struct perf_event *event)
 {
         return armpmu_map_event(event, &armv8_pmuv3_perf_map,
                                 &armv8_pmuv3_perf_cache_map,
-                                ARMV8_EVTYPE_EVENT);
+                                ARMV8_PMU_EVTYPE_EVENT);
 }
 
 static int armv8_a53_map_event(struct perf_event *event)
 {
         return armpmu_map_event(event, &armv8_a53_perf_map,
                                 &armv8_a53_perf_cache_map,
-                                ARMV8_EVTYPE_EVENT);
+                                ARMV8_PMU_EVTYPE_EVENT);
 }
 
 static int armv8_a57_map_event(struct perf_event *event)
 {
         return armpmu_map_event(event, &armv8_a57_perf_map,
                                 &armv8_a57_perf_cache_map,
-                                ARMV8_EVTYPE_EVENT);
+                                ARMV8_PMU_EVTYPE_EVENT);
 }
 
 static int armv8_thunder_map_event(struct perf_event *event)
 {
         return armpmu_map_event(event, &armv8_thunder_perf_map,
                                 &armv8_thunder_perf_cache_map,
-                                ARMV8_EVTYPE_EVENT);
+                                ARMV8_PMU_EVTYPE_EVENT);
 }
 
 static void armv8pmu_read_num_pmnc_events(void *info)
@@ -820,7 +786,7 @@ static void armv8pmu_read_num_pmnc_events(void *info)
         int *nb_cnt = info;
 
         /* Read the nb of CNTx counters supported from PMNC */
-        *nb_cnt = (armv8pmu_pmcr_read() >> ARMV8_PMCR_N_SHIFT) & ARMV8_PMCR_N_MASK;
+        *nb_cnt = (armv8pmu_pmcr_read() >> ARMV8_PMU_PMCR_N_SHIFT) & ARMV8_PMU_PMCR_N_MASK;
 
         /* Add the CPU cycles counter */
         *nb_cnt += 1;
diff --git a/arch/arm64/kvm/hyp/s2-setup.c b/arch/arm64/kvm/hyp/s2-setup.c
index bfc54fd82797..5a9f3bf542b0 100644
--- a/arch/arm64/kvm/hyp/s2-setup.c
+++ b/arch/arm64/kvm/hyp/s2-setup.c
@@ -36,8 +36,10 @@ void __hyp_text __init_stage2_translation(void)
          * Read the VMIDBits bits from ID_AA64MMFR1_EL1 and set the VS
          * bit in VTCR_EL2.
          */
-        tmp = (read_sysreg(id_aa64mmfr1_el1) >> 4) & 0xf;
-        val |= (tmp == 2) ? VTCR_EL2_VS : 0;
+        tmp = (read_sysreg(id_aa64mmfr1_el1) >> ID_AA64MMFR1_VMIDBITS_SHIFT) & 0xf;
+        val |= (tmp == ID_AA64MMFR1_VMIDBITS_16) ?
+                        VTCR_EL2_VS_16BIT :
+                        VTCR_EL2_VS_8BIT;
 
         write_sysreg(val, vtcr_el2);
 }
diff --git a/arch/mips/alchemy/common/dbdma.c b/arch/mips/alchemy/common/dbdma.c
index 745695db5ba0..f2f264b5aafe 100644
--- a/arch/mips/alchemy/common/dbdma.c
+++ b/arch/mips/alchemy/common/dbdma.c
@@ -261,7 +261,7 @@ u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
         au1x_dma_chan_t *cp;
 
         /*
-         * We do the intialization on the first channel allocation.
+         * We do the initialization on the first channel allocation.
          * We have to wait because of the interrupt handler initialization
          * which can't be done successfully during board set up.
          */
@@ -964,7 +964,7 @@ u32 au1xxx_dbdma_put_dscr(u32 chanid, au1x_ddma_desc_t *dscr)
         dp->dscr_source1 = dscr->dscr_source1;
         dp->dscr_cmd1 = dscr->dscr_cmd1;
         nbytes = dscr->dscr_cmd1;
-        /* Allow the caller to specifiy if an interrupt is generated */
+        /* Allow the caller to specify if an interrupt is generated */
         dp->dscr_cmd0 &= ~DSCR_CMD0_IE;
         dp->dscr_cmd0 |= dscr->dscr_cmd0 | DSCR_CMD0_V;
         ctp->chan_ptr->ddma_dbell = 0;
diff --git a/arch/mips/alchemy/devboards/db1000.c b/arch/mips/alchemy/devboards/db1000.c
index bdeed9d13c6f..433c4b9a9f0a 100644
--- a/arch/mips/alchemy/devboards/db1000.c
+++ b/arch/mips/alchemy/devboards/db1000.c
@@ -503,15 +503,15 @@ int __init db1000_dev_setup(void)
         if (board == BCSR_WHOAMI_DB1500) {
                 c0 = AU1500_GPIO2_INT;
                 c1 = AU1500_GPIO5_INT;
-                d0 = AU1500_GPIO0_INT;
-                d1 = AU1500_GPIO3_INT;
+                d0 = 0; /* GPIO number, NOT irq! */
+                d1 = 3; /* GPIO number, NOT irq! */
                 s0 = AU1500_GPIO1_INT;
                 s1 = AU1500_GPIO4_INT;
         } else if (board == BCSR_WHOAMI_DB1100) {
                 c0 = AU1100_GPIO2_INT;
                 c1 = AU1100_GPIO5_INT;
-                d0 = AU1100_GPIO0_INT;
-                d1 = AU1100_GPIO3_INT;
+                d0 = 0; /* GPIO number, NOT irq! */
+                d1 = 3; /* GPIO number, NOT irq! */
                 s0 = AU1100_GPIO1_INT;
                 s1 = AU1100_GPIO4_INT;
 
@@ -545,15 +545,15 @@ int __init db1000_dev_setup(void)
         } else if (board == BCSR_WHOAMI_DB1000) {
                 c0 = AU1000_GPIO2_INT;
                 c1 = AU1000_GPIO5_INT;
-                d0 = AU1000_GPIO0_INT;
-                d1 = AU1000_GPIO3_INT;
+                d0 = 0; /* GPIO number, NOT irq! */
+                d1 = 3; /* GPIO number, NOT irq! */
                 s0 = AU1000_GPIO1_INT;
                 s1 = AU1000_GPIO4_INT;
                 platform_add_devices(db1000_devs, ARRAY_SIZE(db1000_devs));
         } else if ((board == BCSR_WHOAMI_PB1500) ||
                    (board == BCSR_WHOAMI_PB1500R2)) {
                 c0 = AU1500_GPIO203_INT;
-                d0 = AU1500_GPIO201_INT;
+                d0 = 1; /* GPIO number, NOT irq! */
                 s0 = AU1500_GPIO202_INT;
                 twosocks = 0;
                 flashsize = 64;
@@ -566,7 +566,7 @@ int __init db1000_dev_setup(void)
                  */
         } else if (board == BCSR_WHOAMI_PB1100) {
                 c0 = AU1100_GPIO11_INT;
-                d0 = AU1100_GPIO9_INT;
+                d0 = 9; /* GPIO number, NOT irq! */
                 s0 = AU1100_GPIO10_INT;
                 twosocks = 0;
                 flashsize = 64;
@@ -583,7 +583,6 @@ int __init db1000_dev_setup(void)
         } else
                 return 0; /* unknown board, no further dev setup to do */
 
-        irq_set_irq_type(d0, IRQ_TYPE_EDGE_BOTH);
         irq_set_irq_type(c0, IRQ_TYPE_LEVEL_LOW);
         irq_set_irq_type(s0, IRQ_TYPE_LEVEL_LOW);
 
@@ -597,7 +596,6 @@ int __init db1000_dev_setup(void)
                 c0, d0, /*s0*/0, 0, 0);
 
         if (twosocks) {
-                irq_set_irq_type(d1, IRQ_TYPE_EDGE_BOTH);
                 irq_set_irq_type(c1, IRQ_TYPE_LEVEL_LOW);
                 irq_set_irq_type(s1, IRQ_TYPE_LEVEL_LOW);
 
diff --git a/arch/mips/alchemy/devboards/db1550.c b/arch/mips/alchemy/devboards/db1550.c
index b518f029f5e7..1c01d6eadb08 100644
--- a/arch/mips/alchemy/devboards/db1550.c
+++ b/arch/mips/alchemy/devboards/db1550.c
@@ -514,7 +514,7 @@ static void __init db1550_devices(void)
                 AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,
                 AU1000_PCMCIA_IO_PHYS_ADDR,
                 AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,
-                AU1550_GPIO3_INT, AU1550_GPIO0_INT,
+                AU1550_GPIO3_INT, 0,
                 /*AU1550_GPIO21_INT*/0, 0, 0);
 
         db1x_register_pcmcia_socket(
@@ -524,7 +524,7 @@ static void __init db1550_devices(void)
                 AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004400000 - 1,
                 AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004000000,
                 AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004010000 - 1,
-                AU1550_GPIO5_INT, AU1550_GPIO1_INT,
+                AU1550_GPIO5_INT, 1,
                 /*AU1550_GPIO22_INT*/0, 0, 1);
 
         platform_device_register(&db1550_nand_dev);
diff --git a/arch/mips/ath79/clock.c b/arch/mips/ath79/clock.c
index eb5117ced95a..618dfd735eed 100644
--- a/arch/mips/ath79/clock.c
+++ b/arch/mips/ath79/clock.c
@@ -26,8 +26,7 @@
 #include "common.h"
 
 #define AR71XX_BASE_FREQ        40000000
-#define AR724X_BASE_FREQ        5000000
-#define AR913X_BASE_FREQ        5000000
+#define AR724X_BASE_FREQ        40000000
 
 static struct clk *clks[3];
 static struct clk_onecell_data clk_data = {
@@ -103,8 +102,8 @@ static void __init ar724x_clocks_init(void)
         div = ((pll >> AR724X_PLL_FB_SHIFT) & AR724X_PLL_FB_MASK);
         freq = div * ref_rate;
 
-        div = ((pll >> AR724X_PLL_REF_DIV_SHIFT) & AR724X_PLL_REF_DIV_MASK);
-        freq *= div;
+        div = ((pll >> AR724X_PLL_REF_DIV_SHIFT) & AR724X_PLL_REF_DIV_MASK) * 2;
+        freq /= div;
 
         cpu_rate = freq;
 
@@ -123,39 +122,6 @@ static void __init ar724x_clocks_init(void)
         clk_add_alias("uart", NULL, "ahb", NULL);
 }
 
-static void __init ar913x_clocks_init(void)
-{
-        unsigned long ref_rate;
-        unsigned long cpu_rate;
-        unsigned long ddr_rate;
-        unsigned long ahb_rate;
-        u32 pll;
-        u32 freq;
-        u32 div;
-
-        ref_rate = AR913X_BASE_FREQ;
-        pll = ath79_pll_rr(AR913X_PLL_REG_CPU_CONFIG);
-
-        div = ((pll >> AR913X_PLL_FB_SHIFT) & AR913X_PLL_FB_MASK);
-        freq = div * ref_rate;
-
-        cpu_rate = freq;
-
-        div = ((pll >> AR913X_DDR_DIV_SHIFT) & AR913X_DDR_DIV_MASK) + 1;
-        ddr_rate = freq / div;
-
-        div = (((pll >> AR913X_AHB_DIV_SHIFT) & AR913X_AHB_DIV_MASK) + 1) * 2;
-        ahb_rate = cpu_rate / div;
-
-        ath79_add_sys_clkdev("ref", ref_rate);
-        clks[0] = ath79_add_sys_clkdev("cpu", cpu_rate);
-        clks[1] = ath79_add_sys_clkdev("ddr", ddr_rate);
-        clks[2] = ath79_add_sys_clkdev("ahb", ahb_rate);
-
-        clk_add_alias("wdt", NULL, "ahb", NULL);
-        clk_add_alias("uart", NULL, "ahb", NULL);
-}
-
 static void __init ar933x_clocks_init(void)
 {
         unsigned long ref_rate;
@@ -443,10 +409,8 @@ void __init ath79_clocks_init(void)
 {
         if (soc_is_ar71xx())
                 ar71xx_clocks_init();
-        else if (soc_is_ar724x())
+        else if (soc_is_ar724x() || soc_is_ar913x())
                 ar724x_clocks_init();
-        else if (soc_is_ar913x())
-                ar913x_clocks_init();
         else if (soc_is_ar933x())
                 ar933x_clocks_init();
         else if (soc_is_ar934x())
diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
index 959c145a0a2c..ca7ad131d057 100644
--- a/arch/mips/bcm47xx/sprom.c
+++ b/arch/mips/bcm47xx/sprom.c
@@ -714,11 +714,11 @@ void bcm47xx_sprom_register_fallbacks(void)
 {
 #if defined(CONFIG_BCM47XX_SSB)
         if (ssb_arch_register_fallback_sprom(&bcm47xx_get_sprom_ssb))
-                pr_warn("Failed to registered ssb SPROM handler\n");
+                pr_warn("Failed to register ssb SPROM handler\n");
 #endif
 
 #if defined(CONFIG_BCM47XX_BCMA)
         if (bcma_arch_register_fallback_sprom(&bcm47xx_get_sprom_bcma))
-                pr_warn("Failed to registered bcma SPROM handler\n");
+                pr_warn("Failed to register bcma SPROM handler\n");
 #endif
 }
diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
index 4eff1ef02eff..309d2ad67e4d 100644
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
@@ -39,10 +39,11 @@ vmlinuzobjs-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART_PROM) += $(obj)/uart-prom.o
 vmlinuzobjs-$(CONFIG_MIPS_ALCHEMY)                 += $(obj)/uart-alchemy.o
 endif
 
-vmlinuzobjs-$(CONFIG_KERNEL_XZ) += $(obj)/ashldi3.o
+vmlinuzobjs-$(CONFIG_KERNEL_XZ) += $(obj)/ashldi3.o $(obj)/bswapsi.o
 
-$(obj)/ashldi3.o: KBUILD_CFLAGS += -I$(srctree)/arch/mips/lib
-$(obj)/ashldi3.c: $(srctree)/arch/mips/lib/ashldi3.c
+extra-y += ashldi3.c bswapsi.c
+$(obj)/ashldi3.o $(obj)/bswapsi.o: KBUILD_CFLAGS += -I$(srctree)/arch/mips/lib
+$(obj)/ashldi3.c $(obj)/bswapsi.c: $(obj)/%.c: $(srctree)/arch/mips/lib/%.c
         $(call cmd,shipped)
 
 targets := $(notdir $(vmlinuzobjs-y))
diff --git a/arch/mips/boot/dts/brcm/bcm7435.dtsi b/arch/mips/boot/dts/brcm/bcm7435.dtsi
index adb33e355043..56035e5b7008 100644
--- a/arch/mips/boot/dts/brcm/bcm7435.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm7435.dtsi
@@ -82,7 +82,7 @@
                 };
 
                 gisb-arb@400000 {
-                        compatible = "brcm,bcm7400-gisb-arb";
+                        compatible = "brcm,bcm7435-gisb-arb";
                         reg = <0x400000 0xdc>;
                         native-endian;
                         interrupt-parent = <&sun_l2_intc>;
diff --git a/arch/mips/boot/dts/qca/ar9132.dtsi b/arch/mips/boot/dts/qca/ar9132.dtsi
index 3ad4ba9b12fd..3c2ed9ee5b2f 100644
--- a/arch/mips/boot/dts/qca/ar9132.dtsi
+++ b/arch/mips/boot/dts/qca/ar9132.dtsi
@@ -83,7 +83,7 @@
                         };
 
                         pll: pll-controller@18050000 {
-                                compatible = "qca,ar9132-ppl",
+                                compatible = "qca,ar9132-pll",
                                                 "qca,ar9130-pll";
                                 reg = <0x18050000 0x20>;
 
diff --git a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
index e535ee3c26a4..4f1540e5f963 100644
--- a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
+++ b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
@@ -18,7 +18,7 @@
                 reg = <0x0 0x2000000>;
         };
 
-        extosc: oscillator {
+        extosc: ref {
                 compatible = "fixed-clock";
                 #clock-cells = <0>;
                 clock-frequency = <40000000>;
diff --git a/arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c b/arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c
index e59d1b79f24c..2f415d9d0f3c 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c
@@ -68,7 +68,7 @@ void __cvmx_interrupt_gmxx_rxx_int_en_enable(int index, int block)
                 gmx_rx_int_en.s.pause_drp = 1;
                 /* Skipping gmx_rx_int_en.s.reserved_16_18 */
                 /*gmx_rx_int_en.s.ifgerr = 1; */
-                /*gmx_rx_int_en.s.coldet = 1; // Collsion detect */
+                /*gmx_rx_int_en.s.coldet = 1; // Collision detect */
                 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */
                 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */
                 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */
@@ -89,7 +89,7 @@ void __cvmx_interrupt_gmxx_rxx_int_en_enable(int index, int block)
                 /*gmx_rx_int_en.s.phy_spd = 1; */
                 /*gmx_rx_int_en.s.phy_link = 1; */
                 /*gmx_rx_int_en.s.ifgerr = 1; */
-                /*gmx_rx_int_en.s.coldet = 1; // Collsion detect */
+                /*gmx_rx_int_en.s.coldet = 1; // Collision detect */
                 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */
                 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */
                 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */
@@ -112,7 +112,7 @@ void __cvmx_interrupt_gmxx_rxx_int_en_enable(int index, int block)
                 /*gmx_rx_int_en.s.phy_spd = 1; */
                 /*gmx_rx_int_en.s.phy_link = 1; */
                 /*gmx_rx_int_en.s.ifgerr = 1; */
-                /*gmx_rx_int_en.s.coldet = 1; // Collsion detect */
+                /*gmx_rx_int_en.s.coldet = 1; // Collision detect */
                 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */
                 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */
                 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */
@@ -134,7 +134,7 @@ void __cvmx_interrupt_gmxx_rxx_int_en_enable(int index, int block)
                 /*gmx_rx_int_en.s.phy_spd = 1; */
                 /*gmx_rx_int_en.s.phy_link = 1; */
                 /*gmx_rx_int_en.s.ifgerr = 1; */
-                /*gmx_rx_int_en.s.coldet = 1; // Collsion detect */
+                /*gmx_rx_int_en.s.coldet = 1; // Collision detect */
                 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */
                 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */
                 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */
@@ -156,7 +156,7 @@ void __cvmx_interrupt_gmxx_rxx_int_en_enable(int index, int block)
                 /*gmx_rx_int_en.s.phy_spd = 1; */
                 /*gmx_rx_int_en.s.phy_link = 1; */
                 /*gmx_rx_int_en.s.ifgerr = 1; */
-                /*gmx_rx_int_en.s.coldet = 1; // Collsion detect */
+                /*gmx_rx_int_en.s.coldet = 1; // Collision detect */
                 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */
                 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */
                 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */
@@ -179,7 +179,7 @@ void __cvmx_interrupt_gmxx_rxx_int_en_enable(int index, int block)
                 /*gmx_rx_int_en.s.phy_spd = 1; */
                 /*gmx_rx_int_en.s.phy_link = 1; */
                 /*gmx_rx_int_en.s.ifgerr = 1; */
-                /*gmx_rx_int_en.s.coldet = 1; // Collsion detect */
+                /*gmx_rx_int_en.s.coldet = 1; // Collision detect */
                 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */
                 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */
                 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */
@@ -209,7 +209,7 @@ void __cvmx_interrupt_gmxx_rxx_int_en_enable(int index, int block)
                 gmx_rx_int_en.s.pause_drp = 1;
                 /* Skipping gmx_rx_int_en.s.reserved_16_18 */
                 /*gmx_rx_int_en.s.ifgerr = 1; */
-                /*gmx_rx_int_en.s.coldet = 1; // Collsion detect */
+                /*gmx_rx_int_en.s.coldet = 1; // Collision detect */
                 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */
                 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */
                 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */
diff --git a/arch/mips/cavium-octeon/executive/cvmx-pko.c b/arch/mips/cavium-octeon/executive/cvmx-pko.c
index 87be167a7a6a..676fab50dd2b 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-pko.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-pko.c
@@ -189,7 +189,7 @@ void cvmx_pko_initialize_global(void)
         /*
          * Set the size of the PKO command buffers to an odd number of
          * 64bit words. This allows the normal two word send to stay
-         * aligned and never span a comamnd word buffer.
+         * aligned and never span a command word buffer.
          */
         config.u64 = 0;
         config.s.pool = CVMX_FPA_OUTPUT_BUFFER_POOL;
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
index b7fa9ae28c36..42412ba0f3bf 100644
--- a/arch/mips/cavium-octeon/smp.c
+++ b/arch/mips/cavium-octeon/smp.c
@@ -331,7 +331,7 @@ static int octeon_update_boot_vector(unsigned int cpu)
         }
 
         if (!(avail_coremask & (1 << coreid))) {
-                /* core not available, assume, that catched by simple-executive */
+                /* core not available, assume, that caught by simple-executive */
                 cvmx_write_csr(CVMX_CIU_PP_RST, 1 << coreid);
                 cvmx_write_csr(CVMX_CIU_PP_RST, 0);
         }
diff --git a/arch/mips/configs/ci20_defconfig b/arch/mips/configs/ci20_defconfig
index 4e36b6e1869c..43e0ba24470c 100644
--- a/arch/mips/configs/ci20_defconfig
+++ b/arch/mips/configs/ci20_defconfig
@@ -17,13 +17,12 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CGROUPS=y
+CONFIG_MEMCG=y
+CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
 CONFIG_CPUSETS=y
+CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_KMEM=y
-CONFIG_CGROUP_SCHED=y
 CONFIG_NAMESPACES=y
 CONFIG_USER_NS=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -52,6 +51,11 @@ CONFIG_DEVTMPFS=y
 # CONFIG_ALLOW_DEV_COREDUMP is not set
 CONFIG_DMA_CMA=y
 CONFIG_CMA_SIZE_MBYTES=32
+CONFIG_MTD=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_JZ4780=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_CADENCE is not set
@@ -103,7 +107,7 @@ CONFIG_PROC_KCORE=y
 # CONFIG_PROC_PAGE_MONITOR is not set
 CONFIG_TMPFS=y
 CONFIG_CONFIGFS_FS=y
-# CONFIG_MISC_FILESYSTEMS is not set
+CONFIG_UBIFS_FS=y
 # CONFIG_NETWORK_FILESYSTEMS is not set
 CONFIG_NLS=y
 CONFIG_NLS_CODEPAGE_437=y
diff --git a/arch/mips/dec/int-handler.S b/arch/mips/dec/int-handler.S
index 8c6f508e59de..d7b99180c6e1 100644
--- a/arch/mips/dec/int-handler.S
+++ b/arch/mips/dec/int-handler.S
@@ -5,7 +5,7 @@
  * Written by Ralf Baechle and Andreas Busse, modified for DECstation
  * support by Paul Antoine and Harald Koerfgen.
  *
- * completly rewritten:
+ * completely rewritten:
  * Copyright (C) 1998 Harald Koerfgen
  *
  * Rewritten extensively for controller-driven IRQ support
diff --git a/arch/mips/fw/arc/memory.c b/arch/mips/fw/arc/memory.c
index 5537b94572b2..0d75b5a0bad4 100644
--- a/arch/mips/fw/arc/memory.c
+++ b/arch/mips/fw/arc/memory.c
@@ -9,7 +9,7 @@
  * PROM library functions for acquiring/using memory descriptors given to us
  * from the ARCS firmware.  This is only used when CONFIG_ARC_MEMORY is set
  * because on some machines like SGI IP27 the ARC memory configuration data
- * completly bogus and alternate easier to use mechanisms are available.
+ * completely bogus and alternate easier to use mechanisms are available.
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/arch/mips/include/asm/cpu-info.h b/arch/mips/include/asm/cpu-info.h
index e7dc785a91ca..af12c1f9f1a8 100644
--- a/arch/mips/include/asm/cpu-info.h
+++ b/arch/mips/include/asm/cpu-info.h
@@ -102,7 +102,7 @@ extern void cpu_probe(void);
 extern void cpu_report(void);
 
 extern const char *__cpu_name[];
-#define cpu_name_string()       __cpu_name[smp_processor_id()]
+#define cpu_name_string()       __cpu_name[raw_smp_processor_id()]
 
 struct seq_file;
 struct notifier_block;
diff --git a/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h b/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h
index cf92fe733995..c4873e8594ef 100644
--- a/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h
+++ b/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h
@@ -141,7 +141,7 @@ octeon_main_processor:
 .endm
 
 /*
- * Do SMP slave processor setup necessary before we can savely execute C code.
+ * Do SMP slave processor setup necessary before we can safely execute C code.
  */
         .macro  smp_slave_setup
         .endm
diff --git a/arch/mips/include/asm/mach-generic/kernel-entry-init.h b/arch/mips/include/asm/mach-generic/kernel-entry-init.h
index 13b0751b010a..a229297c880b 100644
--- a/arch/mips/include/asm/mach-generic/kernel-entry-init.h
+++ b/arch/mips/include/asm/mach-generic/kernel-entry-init.h
@@ -16,7 +16,7 @@
         .endm
 
 /*
- * Do SMP slave processor setup necessary before we can savely execute C code.
+ * Do SMP slave processor setup necessary before we can safely execute C code.
  */
         .macro  smp_slave_setup
         .endm
diff --git a/arch/mips/include/asm/mach-ip27/irq.h b/arch/mips/include/asm/mach-ip27/irq.h
index cf4384bfa846..b0b7261ff3ad 100644
--- a/arch/mips/include/asm/mach-ip27/irq.h
+++ b/arch/mips/include/asm/mach-ip27/irq.h
@@ -11,7 +11,7 @@
 #define __ASM_MACH_IP27_IRQ_H
 
 /*
- * A hardwired interrupt number is completly stupid for this system - a
+ * A hardwired interrupt number is completely stupid for this system - a
  * large configuration might have thousands if not tenthousands of
  * interrupts.
  */
diff --git a/arch/mips/include/asm/mach-ip27/kernel-entry-init.h b/arch/mips/include/asm/mach-ip27/kernel-entry-init.h
index b087cb83da3a..f992c1db876b 100644
--- a/arch/mips/include/asm/mach-ip27/kernel-entry-init.h
+++ b/arch/mips/include/asm/mach-ip27/kernel-entry-init.h
@@ -81,7 +81,7 @@
         .endm
 
 /*
- * Do SMP slave processor setup necessary before we can savely execute C code.
+ * Do SMP slave processor setup necessary before we can safely execute C code.
  */
         .macro  smp_slave_setup
         GET_NASID_ASM   t1
diff --git a/arch/mips/include/asm/mach-jz4740/gpio.h b/arch/mips/include/asm/mach-jz4740/gpio.h
index bf8c3e1860e7..7c7708a23baa 100644
--- a/arch/mips/include/asm/mach-jz4740/gpio.h
+++ b/arch/mips/include/asm/mach-jz4740/gpio.h
@@ -27,7 +27,7 @@ enum jz_gpio_function {
 
 /*
  Usually a driver for a SoC component has to request several gpio pins and
- configure them as funcion pins.
+ configure them as function pins.
  jz_gpio_bulk_request can be used to ease this process.
  Usually one would do something like:
 
diff --git a/arch/mips/include/asm/mips-cm.h b/arch/mips/include/asm/mips-cm.h
index b196825a1de9..d4635391c36a 100644
--- a/arch/mips/include/asm/mips-cm.h
+++ b/arch/mips/include/asm/mips-cm.h
@@ -28,7 +28,7 @@ extern void __iomem *mips_cm_l2sync_base;
  * This function returns the physical base address of the Coherence Manager
  * global control block, or 0 if no Coherence Manager is present. It provides
  * a default implementation which reads the CMGCRBase register where available,
- * and may be overriden by platforms which determine this address in a
+ * and may be overridden by platforms which determine this address in a
  * different way by defining a function with the same prototype except for the
  * name mips_cm_phys_base (without underscores).
  */
diff --git a/arch/mips/include/asm/mips-r2-to-r6-emul.h b/arch/mips/include/asm/mips-r2-to-r6-emul.h
index 1f6ea8352ca9..20621e1ca238 100644
--- a/arch/mips/include/asm/mips-r2-to-r6-emul.h
+++ b/arch/mips/include/asm/mips-r2-to-r6-emul.h
@@ -79,7 +79,7 @@ struct r2_decoder_table {
 };
 
 
-extern void do_trap_or_bp(struct pt_regs *regs, unsigned int code,
+extern void do_trap_or_bp(struct pt_regs *regs, unsigned int code, int si_code,
                           const char *str);
 
 #ifndef CONFIG_MIPSR2_TO_R6_EMULATOR
diff --git a/arch/mips/include/asm/octeon/cvmx-config.h b/arch/mips/include/asm/octeon/cvmx-config.h
index f7dd17d0dc22..f4f1996e0fac 100644
--- a/arch/mips/include/asm/octeon/cvmx-config.h
+++ b/arch/mips/include/asm/octeon/cvmx-config.h
@@ -33,7 +33,7 @@
 /* Packet buffers */
 #define CVMX_FPA_PACKET_POOL                (0)
 #define CVMX_FPA_PACKET_POOL_SIZE           CVMX_FPA_POOL_0_SIZE
-/* Work queue entrys */
+/* Work queue entries */
 #define CVMX_FPA_WQE_POOL                   (1)
 #define CVMX_FPA_WQE_POOL_SIZE              CVMX_FPA_POOL_1_SIZE
 /* PKO queue command buffers */
diff --git a/arch/mips/include/asm/octeon/cvmx.h b/arch/mips/include/asm/octeon/cvmx.h
index 19e139c9f337..3e982e0c397e 100644
--- a/arch/mips/include/asm/octeon/cvmx.h
+++ b/arch/mips/include/asm/octeon/cvmx.h
@@ -189,7 +189,7 @@ static inline uint64_t cvmx_ptr_to_phys(void *ptr)
 static inline void *cvmx_phys_to_ptr(uint64_t physical_address)
 {
         if (sizeof(void *) == 8) {
-                /* Just set the top bit, avoiding any TLB uglyness */
+                /* Just set the top bit, avoiding any TLB ugliness */
                 return CASTPTR(void,
                                CVMX_ADD_SEG(CVMX_MIPS_SPACE_XKPHYS,
                                             physical_address));
diff --git a/arch/mips/include/asm/pci/bridge.h b/arch/mips/include/asm/pci/bridge.h
index 8d7a63b52ac7..3206245d1ed6 100644
--- a/arch/mips/include/asm/pci/bridge.h
+++ b/arch/mips/include/asm/pci/bridge.h
@@ -269,16 +269,16 @@ typedef struct bridge_err_cmdword_s {
         union {
                 u32             cmd_word;
                 struct {
-                        u32     didn:4,         /* Destination ID */
-                                sidn:4,         /* Source ID      */
-                                pactyp:4,       /* Packet type    */
-                                tnum:5,         /* Trans Number   */
-                                coh:1,          /* Coh Transacti  */
-                                ds:2,           /* Data size      */
-                                gbr:1,          /* GBR enable     */
-                                vbpm:1,         /* VBPM message   */
+                        u32     didn:4,         /* Destination ID  */
+                                sidn:4,         /* Source ID       */
+                                pactyp:4,       /* Packet type     */
+                                tnum:5,         /* Trans Number    */
+                                coh:1,          /* Coh Transaction */
+                                ds:2,           /* Data size       */
+                                gbr:1,          /* GBR enable      */
+                                vbpm:1,         /* VBPM message    */
                                 error:1,        /* Error occurred  */
-                                barr:1,         /* Barrier op     */
+                                barr:1,         /* Barrier op      */
                                 rsvd:8;
                 } berr_st;
         } berr_un;
diff --git a/arch/mips/include/asm/sgi/hpc3.h b/arch/mips/include/asm/sgi/hpc3.h
index 59920b345942..4a9c99050c13 100644
--- a/arch/mips/include/asm/sgi/hpc3.h
+++ b/arch/mips/include/asm/sgi/hpc3.h
@@ -147,7 +147,7 @@ struct hpc3_ethregs {
 #define HPC3_EPCFG_P1    0x000f /* Cycles to spend in P1 state for PIO */
 #define HPC3_EPCFG_P2    0x00f0 /* Cycles to spend in P2 state for PIO */
 #define HPC3_EPCFG_P3    0x0f00 /* Cycles to spend in P3 state for PIO */
-#define HPC3_EPCFG_TST   0x1000 /* Diagnistic ram test feature bit */
+#define HPC3_EPCFG_TST   0x1000 /* Diagnostic ram test feature bit */
 
         u32 _unused2[0x1000/4 - 8];     /* padding */
 
diff --git a/arch/mips/include/asm/sgiarcs.h b/arch/mips/include/asm/sgiarcs.h
index 26ddfff28c8e..105a9479ac5f 100644
--- a/arch/mips/include/asm/sgiarcs.h
+++ b/arch/mips/include/asm/sgiarcs.h
@@ -144,7 +144,7 @@ struct linux_tinfo {
 struct linux_vdirent {
         ULONG namelen;
         unsigned char attr;
-        char fname[32]; /* XXX imperical, should be a define */
+        char fname[32]; /* XXX empirical, should be a define */
 };
 
 /* Other stuff for files. */
@@ -179,7 +179,7 @@ struct linux_finfo {
         enum linux_devtypes   dtype;
         unsigned long         namelen;
         unsigned char         attr;
-        char                  name[32]; /* XXX imperical, should be define */
+        char                  name[32]; /* XXX empirical, should be define */
 };
 
 /* This describes the vector containing function pointers to the ARC
diff --git a/arch/mips/include/asm/sn/ioc3.h b/arch/mips/include/asm/sn/ioc3.h
index e33f0363235b..feb385180f87 100644
--- a/arch/mips/include/asm/sn/ioc3.h
+++ b/arch/mips/include/asm/sn/ioc3.h
@@ -355,7 +355,7 @@ struct ioc3_etxd {
 #define SSCR_PAUSE_STATE 0x40000000     /* sets when PAUSE takes effect */
 #define SSCR_RESET      0x80000000      /* reset DMA channels */
 
-/* all producer/comsumer pointers are the same bitfield */
+/* all producer/consumer pointers are the same bitfield */
 #define PROD_CONS_PTR_4K 0x00000ff8     /* for 4K buffers */
 #define PROD_CONS_PTR_1K 0x000003f8     /* for 1K buffers */
 #define PROD_CONS_PTR_OFF 3
diff --git a/arch/mips/include/asm/sn/sn0/hubio.h b/arch/mips/include/asm/sn/sn0/hubio.h
index 5998b13e9764..57ece90f8cf1 100644
--- a/arch/mips/include/asm/sn/sn0/hubio.h
+++ b/arch/mips/include/asm/sn/sn0/hubio.h
@@ -628,7 +628,7 @@ typedef union h1_icrbb_u {
 /*
  * Values for field imsgtype
  */
-#define IIO_ICRB_IMSGT_XTALK    0       /* Incoming Meessage from Xtalk */
+#define IIO_ICRB_IMSGT_XTALK    0       /* Incoming Message from Xtalk */
 #define IIO_ICRB_IMSGT_BTE      1       /* Incoming message from BTE    */
 #define IIO_ICRB_IMSGT_SN0NET   2       /* Incoming message from SN0 net */
 #define IIO_ICRB_IMSGT_CRB      3       /* Incoming message from CRB ???  */
diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
index 095ecafe6bd3..7f109d4f64a4 100644
--- a/arch/mips/include/asm/uaccess.h
+++ b/arch/mips/include/asm/uaccess.h
@@ -95,7 +95,7 @@ static inline bool eva_kernel_access(void)
 }
 
 /*
- * Is a address valid? This does a straighforward calculation rather
+ * Is a address valid? This does a straightforward calculation rather
  * than tests.
  *
  * Address valid if:
diff --git a/arch/mips/include/uapi/asm/unistd.h b/arch/mips/include/uapi/asm/unistd.h
index 3129795de940..24ad815c7f38 100644
--- a/arch/mips/include/uapi/asm/unistd.h
+++ b/arch/mips/include/uapi/asm/unistd.h
@@ -381,16 +381,18 @@
 #define __NR_membarrier                 (__NR_Linux + 358)
 #define __NR_mlock2                     (__NR_Linux + 359)
 #define __NR_copy_file_range            (__NR_Linux + 360)
+#define __NR_preadv2                    (__NR_Linux + 361)
+#define __NR_pwritev2                   (__NR_Linux + 362)
 
 /*
  * Offset of the last Linux o32 flavoured syscall
  */
-#define __NR_Linux_syscalls             360
+#define __NR_Linux_syscalls             362
 
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
 
 #define __NR_O32_Linux                  4000
-#define __NR_O32_Linux_syscalls         360
+#define __NR_O32_Linux_syscalls         362
 
 #if _MIPS_SIM == _MIPS_SIM_ABI64
 
@@ -719,16 +721,18 @@
 #define __NR_membarrier                 (__NR_Linux + 318)
 #define __NR_mlock2                     (__NR_Linux + 319)
 #define __NR_copy_file_range            (__NR_Linux + 320)
+#define __NR_preadv2                    (__NR_Linux + 321)
+#define __NR_pwritev2                   (__NR_Linux + 322)
 
 /*
  * Offset of the last Linux 64-bit flavoured syscall
  */
-#define __NR_Linux_syscalls             320
+#define __NR_Linux_syscalls             322
 
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
 
 #define __NR_64_Linux                   5000
-#define __NR_64_Linux_syscalls          320
+#define __NR_64_Linux_syscalls          322
 
 #if _MIPS_SIM == _MIPS_SIM_NABI32
 
@@ -1061,15 +1065,17 @@
 #define __NR_membarrier                 (__NR_Linux + 322)
 #define __NR_mlock2                     (__NR_Linux + 323)
 #define __NR_copy_file_range            (__NR_Linux + 324)
+#define __NR_preadv2                    (__NR_Linux + 325)
+#define __NR_pwritev2                   (__NR_Linux + 326)
 
 /*
  * Offset of the last N32 flavoured syscall
  */
-#define __NR_Linux_syscalls             324
+#define __NR_Linux_syscalls             326
 
 #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
 
 #define __NR_N32_Linux                  6000
-#define __NR_N32_Linux_syscalls         324
+#define __NR_N32_Linux_syscalls         326
 
 #endif /* _UAPI_ASM_UNISTD_H */
diff --git a/arch/mips/kernel/mips-cm.c b/arch/mips/kernel/mips-cm.c
index 1448c1f43d4e..760217bbb2fa 100644
--- a/arch/mips/kernel/mips-cm.c
+++ b/arch/mips/kernel/mips-cm.c
@@ -24,7 +24,7 @@ static char *cm2_tr[8] = {
         "0x04", "cpc", "0x06", "0x07"
 };
 
-/* CM3 Tag ECC transation type */
+/* CM3 Tag ECC transaction type */
 static char *cm3_tr[16] = {
         [0x0] = "ReqNoData",
         [0x1] = "0x1",
diff --git a/arch/mips/kernel/mips-r2-to-r6-emul.c b/arch/mips/kernel/mips-r2-to-r6-emul.c
index 1f5aac7f9ec3..3fff89ae760b 100644
--- a/arch/mips/kernel/mips-r2-to-r6-emul.c
+++ b/arch/mips/kernel/mips-r2-to-r6-emul.c
@@ -940,42 +940,42 @@ repeat:
                 switch (rt) {
                 case tgei_op:
                         if ((long)regs->regs[rs] >= MIPSInst_SIMM(inst))
-                                do_trap_or_bp(regs, 0, "TGEI");
+                                do_trap_or_bp(regs, 0, 0, "TGEI");
 
                         MIPS_R2_STATS(traps);
 
                         break;
                 case tgeiu_op:
                         if (regs->regs[rs] >= MIPSInst_UIMM(inst))
-                                do_trap_or_bp(regs, 0, "TGEIU");
+                                do_trap_or_bp(regs, 0, 0, "TGEIU");
 
                         MIPS_R2_STATS(traps);
 
                         break;
                 case tlti_op:
                         if ((long)regs->regs[rs] < MIPSInst_SIMM(inst))
-                                do_trap_or_bp(regs, 0, "TLTI");
+                                do_trap_or_bp(regs, 0, 0, "TLTI");
 
                         MIPS_R2_STATS(traps);
 
                         break;
                 case tltiu_op:
                         if (regs->regs[rs] < MIPSInst_UIMM(inst))
-                                do_trap_or_bp(regs, 0, "TLTIU");
+                                do_trap_or_bp(regs, 0, 0, "TLTIU");
 
                         MIPS_R2_STATS(traps);
 
                         break;
                 case teqi_op:
                         if (regs->regs[rs] == MIPSInst_SIMM(inst))
-                                do_trap_or_bp(regs, 0, "TEQI");
+                                do_trap_or_bp(regs, 0, 0, "TEQI");
 
                         MIPS_R2_STATS(traps);
 
                         break;
                 case tnei_op:
                         if (regs->regs[rs] != MIPSInst_SIMM(inst))
-                                do_trap_or_bp(regs, 0, "TNEI");
+                                do_trap_or_bp(regs, 0, 0, "TNEI");
 
                         MIPS_R2_STATS(traps);
 
diff --git a/arch/mips/kernel/module-rela.c b/arch/mips/kernel/module-rela.c
index 2b70723071c3..9083d63b765c 100644
--- a/arch/mips/kernel/module-rela.c
+++ b/arch/mips/kernel/module-rela.c
@@ -109,9 +109,10 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
                        struct module *me)
 {
         Elf_Mips_Rela *rel = (void *) sechdrs[relsec].sh_addr;
+        int (*handler)(struct module *me, u32 *location, Elf_Addr v);
         Elf_Sym *sym;
         u32 *location;
-        unsigned int i;
+        unsigned int i, type;
         Elf_Addr v;
         int res;
 
@@ -134,9 +135,21 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
                         return -ENOENT;
                 }
 
-                v = sym->st_value + rel[i].r_addend;
+                type = ELF_MIPS_R_TYPE(rel[i]);
+
+                if (type < ARRAY_SIZE(reloc_handlers_rela))
+                        handler = reloc_handlers_rela[type];
+                else
+                        handler = NULL;
 
-                res = reloc_handlers_rela[ELF_MIPS_R_TYPE(rel[i])](me, location, v);
+                if (!handler) {
+                        pr_err("%s: Unknown relocation type %u\n",
+                               me->name, type);
+                        return -EINVAL;
+                }
+
+                v = sym->st_value + rel[i].r_addend;
+                res = handler(me, location, v);
                 if (res)
                         return res;
         }
diff --git a/arch/mips/kernel/module.c b/arch/mips/kernel/module.c
index 1833f5171ccd..f9b2936d598d 100644
--- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c
@@ -197,9 +197,10 @@ int apply_relocate(Elf_Shdr *sechdrs, const char *strtab,
                    struct module *me)
 {
         Elf_Mips_Rel *rel = (void *) sechdrs[relsec].sh_addr;
+        int (*handler)(struct module *me, u32 *location, Elf_Addr v);
         Elf_Sym *sym;
         u32 *location;
-        unsigned int i;
+        unsigned int i, type;
         Elf_Addr v;
         int res;
 
@@ -223,9 +224,21 @@ int apply_relocate(Elf_Shdr *sechdrs, const char *strtab,
                         return -ENOENT;
                 }
 
-                v = sym->st_value;
+                type = ELF_MIPS_R_TYPE(rel[i]);
+
+                if (type < ARRAY_SIZE(reloc_handlers_rel))
+                        handler = reloc_handlers_rel[type];
+                else
+                        handler = NULL;
 
-                res = reloc_handlers_rel[ELF_MIPS_R_TYPE(rel[i])](me, location, v);
+                if (!handler) {
+                        pr_err("%s: Unknown relocation type %u\n",
+                               me->name, type);
+                        return -EINVAL;
+                }
+
+                v = sym->st_value;
+                res = handler(me, location, v);
                 if (res)
                         return res;
         }
diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c
index d7b8dd43147a..9bc1191b1ab0 100644
--- a/arch/mips/kernel/perf_event_mipsxx.c
+++ b/arch/mips/kernel/perf_event_mipsxx.c
@@ -530,7 +530,7 @@ static void mipspmu_enable(struct pmu *pmu)
 
 /*
  * MIPS performance counters can be per-TC. The control registers can
- * not be directly accessed accross CPUs. Hence if we want to do global
+ * not be directly accessed across CPUs. Hence if we want to do global
  * control, we need cross CPU calls. on_each_cpu() can help us, but we
  * can not make sure this function is called with interrupts enabled. So
  * here we pause local counters and then grab a rwlock and leave the
diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
index f63a289977cc..fa3f9ebad8f4 100644
--- a/arch/mips/kernel/pm-cps.c
+++ b/arch/mips/kernel/pm-cps.c
@@ -472,7 +472,7 @@ static void * __init cps_gen_entry_code(unsigned cpu, enum cps_pm_state state)
         /*
          * Disable all but self interventions. The load from COHCTL is defined
          * by the interAptiv & proAptiv SUMs as ensuring that the operation
-         * resulting from the preceeding store is complete.
+         * resulting from the preceding store is complete.
          */
         uasm_i_addiu(&p, t0, zero, 1 << cpu_data[cpu].core);
         uasm_i_sw(&p, t0, 0, r_pcohctl);
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index eddd5fd6fdfa..92880cee449e 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -615,7 +615,7 @@ int mips_set_process_fp_mode(struct task_struct *task, unsigned int value)
          * allows us to only worry about whether an FP mode switch is in
          * progress when FP is first used in a tasks time slice. Pretty much all
          * of the mode switch overhead can thus be confined to cases where mode
-         * switches are actually occuring. That is, to here. However for the
+         * switches are actually occurring. That is, to here. However for the
          * thread performing the mode switch it may take a while...
          */
         if (num_online_cpus() > 1) {
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index a56317444bda..d01fe53a6638 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -596,3 +596,5 @@ EXPORT(sys_call_table)
         PTR     sys_membarrier
         PTR     sys_mlock2
         PTR     sys_copy_file_range             /* 4360 */
+        PTR     sys_preadv2
+        PTR     sys_pwritev2
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
index 2b2dc14610d0..6b73ecc02597 100644
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -434,4 +434,6 @@ EXPORT(sys_call_table)
         PTR     sys_membarrier
         PTR     sys_mlock2
         PTR     sys_copy_file_range             /* 5320 */
+        PTR     sys_preadv2
+        PTR     sys_pwritev2
         .size   sys_call_table,.-sys_call_table
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 2bf5c8593d91..71f99d5f7a06 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -424,4 +424,6 @@ EXPORT(sysn32_call_table)
         PTR     sys_membarrier
         PTR     sys_mlock2
         PTR     sys_copy_file_range
+        PTR     compat_sys_preadv2              /* 6325 */
+        PTR     compat_sys_pwritev2
         .size   sysn32_call_table,.-sysn32_call_table
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index c5b759e584c7..91b43eea2d5a 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -579,4 +579,6 @@ EXPORT(sys32_call_table)
         PTR     sys_membarrier
         PTR     sys_mlock2
         PTR     sys_copy_file_range             /* 4360 */
+        PTR     compat_sys_preadv2
+        PTR     compat_sys_pwritev2
         .size   sys32_call_table,.-sys32_call_table
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 37708d9af638..27cb638f0824 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -243,6 +243,18 @@ static int __init mips_smp_ipi_init(void)
         struct irq_domain *ipidomain;
         struct device_node *node;
 
+        /*
+         * In some cases like qemu-malta, it is desired to try SMP with
+         * a single core. Qemu-malta has no GIC, so an attempt to set any IPIs
+         * would cause a BUG_ON() to be triggered since there's no ipidomain.
+         *
+         * Since for a single core system IPIs aren't required really, skip the
+         * initialisation which should generally keep any such configurations
+         * happy and only fail hard when trying to truely run SMP.
+         */
+        if (cpumask_weight(cpu_possible_mask) == 1)
+                return 0;
+
         node = of_irq_find_parent(of_root);
         ipidomain = irq_find_matching_host(node, DOMAIN_BUS_IPI);
 
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index bf14da9f3e33..ae0c89d23ad7 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -56,6 +56,7 @@
 #include <asm/pgtable.h>
 #include <asm/ptrace.h>
 #include <asm/sections.h>
+#include <asm/siginfo.h>
 #include <asm/tlbdebug.h>
 #include <asm/traps.h>
 #include <asm/uaccess.h>
@@ -871,7 +872,7 @@ out:
         exception_exit(prev_state);
 }
 
-void do_trap_or_bp(struct pt_regs *regs, unsigned int code,
+void do_trap_or_bp(struct pt_regs *regs, unsigned int code, int si_code,
         const char *str)
 {
         siginfo_t info = { 0 };
@@ -928,7 +929,13 @@ void do_trap_or_bp(struct pt_regs *regs, unsigned int code,
         default:
                 scnprintf(b, sizeof(b), "%s instruction in kernel code", str);
                 die_if_kernel(b, regs);
-                force_sig(SIGTRAP, current);
+                if (si_code) {
+                        info.si_signo = SIGTRAP;
+                        info.si_code = si_code;
+                        force_sig_info(SIGTRAP, &info, current);
+                } else {
+                        force_sig(SIGTRAP, current);
+                }
         }
 }
 
@@ -1012,7 +1019,7 @@ asmlinkage void do_bp(struct pt_regs *regs)
                 break;
         }
 
-        do_trap_or_bp(regs, bcode, "Break");
+        do_trap_or_bp(regs, bcode, TRAP_BRKPT, "Break");
 
 out:
         set_fs(seg);
@@ -1054,7 +1061,7 @@ asmlinkage void do_tr(struct pt_regs *regs)
                         tcode = (opcode >> 6) & ((1 << 10) - 1);
         }
 
-        do_trap_or_bp(regs, tcode, "Trap");
+        do_trap_or_bp(regs, tcode, 0, "Trap");
 
 out:
         set_fs(seg);
@@ -1115,19 +1122,7 @@ no_r2_instr:
         if (unlikely(compute_return_epc(regs) < 0))
                 goto out;
 
-        if (get_isa16_mode(regs->cp0_epc)) {
-                unsigned short mmop[2] = { 0 };
-
-                if (unlikely(get_user(mmop[0], (u16 __user *)epc + 0) < 0))
-                        status = SIGSEGV;
-                if (unlikely(get_user(mmop[1], (u16 __user *)epc + 1) < 0))
-                        status = SIGSEGV;
-                opcode = mmop[0];
-                opcode = (opcode << 16) | mmop[1];
-
-                if (status < 0)
-                        status = simulate_rdhwr_mm(regs, opcode);
-        } else {
+        if (!get_isa16_mode(regs->cp0_epc)) {
                 if (unlikely(get_user(opcode, epc) < 0))
                         status = SIGSEGV;
 
@@ -1142,6 +1137,18 @@ no_r2_instr:
 
                 if (status < 0)
                         status = simulate_fp(regs, opcode, old_epc, old31);
+        } else if (cpu_has_mmips) {
+                unsigned short mmop[2] = { 0 };
+
+                if (unlikely(get_user(mmop[0], (u16 __user *)epc + 0) < 0))
+                        status = SIGSEGV;
+                if (unlikely(get_user(mmop[1], (u16 __user *)epc + 1) < 0))
+                        status = SIGSEGV;
+                opcode = mmop[0];
+                opcode = (opcode << 16) | mmop[1];
+
+                if (status < 0)
+                        status = simulate_rdhwr_mm(regs, opcode);
         }
 
         if (status < 0)
@@ -1492,6 +1499,7 @@ asmlinkage void do_mdmx(struct pt_regs *regs)
  */
 asmlinkage void do_watch(struct pt_regs *regs)
 {
+        siginfo_t info = { .si_signo = SIGTRAP, .si_code = TRAP_HWBKPT };
         enum ctx_state prev_state;
         u32 cause;
 
@@ -1512,7 +1520,7 @@ asmlinkage void do_watch(struct pt_regs *regs)
         if (test_tsk_thread_flag(current, TIF_LOAD_WATCH)) {
                 mips_read_watch_registers();
                 local_irq_enable();
-                force_sig(SIGTRAP, current);
+                force_sig_info(SIGTRAP, &info, current);
         } else {
                 mips_clear_watch_registers();
                 local_irq_enable();
@@ -2214,7 +2222,7 @@ void __init trap_init(void)
 
         /*
          * Copy the generic exception handlers to their final destination.
-         * This will be overriden later as suitable for a particular
+         * This will be overridden later as suitable for a particular
          * configuration.
          */
         set_handler(0x180, &except_vec3_generic, 0x80);
diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
index 490cea569d57..5c62065cbf22 100644
--- a/arch/mips/kernel/unaligned.c
+++ b/arch/mips/kernel/unaligned.c
@@ -885,7 +885,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
 {
         union mips_instruction insn;
         unsigned long value;
-        unsigned int res;
+        unsigned int res, preempted;
         unsigned long origpc;
         unsigned long orig31;
         void __user *fault_addr = NULL;
@@ -1226,27 +1226,36 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                         if (!access_ok(VERIFY_READ, addr, sizeof(*fpr)))
                                 goto sigbus;
 
-                        /*
-                         * Disable preemption to avoid a race between copying
-                         * state from userland, migrating to another CPU and
-                         * updating the hardware vector register below.
-                         */
-                        preempt_disable();
-
-                        res = __copy_from_user_inatomic(fpr, addr,
-                                                        sizeof(*fpr));
-                        if (res)
-                                goto fault;
-
-                        /*
-                         * Update the hardware register if it is in use by the
-                         * task in this quantum, in order to avoid having to
-                         * save & restore the whole vector context.
-                         */
-                        if (test_thread_flag(TIF_USEDMSA))
-                                write_msa_wr(wd, fpr, df);
+                        do {
+                                /*
+                                 * If we have live MSA context keep track of
+                                 * whether we get preempted in order to avoid
+                                 * the register context we load being clobbered
+                                 * by the live context as it's saved during
+                                 * preemption. If we don't have live context
+                                 * then it can't be saved to clobber the value
+                                 * we load.
+                                 */
+                                preempted = test_thread_flag(TIF_USEDMSA);
+
+                                res = __copy_from_user_inatomic(fpr, addr,
+                                                                sizeof(*fpr));
+                                if (res)
+                                        goto fault;
 
-                        preempt_enable();
+                                /*
+                                 * Update the hardware register if it is in use
+                                 * by the task in this quantum, in order to
+                                 * avoid having to save & restore the whole
+                                 * vector context.
+                                 */
+                                preempt_disable();
+                                if (test_thread_flag(TIF_USEDMSA)) {
+                                        write_msa_wr(wd, fpr, df);
+                                        preempted = 0;
+                                }
+                                preempt_enable();
+                        } while (preempted);
                         break;
 
                 case msa_st_op:
diff --git a/arch/mips/kvm/tlb.c b/arch/mips/kvm/tlb.c
index a08c43946247..e0e1d0a611fc 100644
--- a/arch/mips/kvm/tlb.c
+++ b/arch/mips/kvm/tlb.c
@@ -632,7 +632,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
 
         kvm_debug("%s: vcpu %p, cpu: %d\n", __func__, vcpu, cpu);
 
-        /* Alocate new kernel and user ASIDs if needed */
+        /* Allocate new kernel and user ASIDs if needed */
 
         local_irq_save(flags);
 
diff --git a/arch/mips/kvm/trap_emul.c b/arch/mips/kvm/trap_emul.c
index ad988000563f..c4038d2a724c 100644
--- a/arch/mips/kvm/trap_emul.c
+++ b/arch/mips/kvm/trap_emul.c
@@ -500,7 +500,7 @@ static int kvm_trap_emul_vcpu_setup(struct kvm_vcpu *vcpu)
         kvm_write_c0_guest_config7(cop0, (MIPS_CONF7_WII) | (1 << 10));
 
         /*
-         * Setup IntCtl defaults, compatibilty mode for timer interrupts (HW5)
+         * Setup IntCtl defaults, compatibility mode for timer interrupts (HW5)
          */
         kvm_write_c0_guest_intctl(cop0, 0xFC000000);
 
diff --git a/arch/mips/math-emu/ieee754dp.c b/arch/mips/math-emu/ieee754dp.c
index ad3c73436777..47d26c805eac 100644
--- a/arch/mips/math-emu/ieee754dp.c
+++ b/arch/mips/math-emu/ieee754dp.c
@@ -97,7 +97,7 @@ union ieee754dp ieee754dp_format(int sn, int xe, u64 xm)
 {
         assert(xm);             /* we don't gen exact zeros (probably should) */
 
-        assert((xm >> (DP_FBITS + 1 + 3)) == 0);        /* no execess */
+        assert((xm >> (DP_FBITS + 1 + 3)) == 0);        /* no excess */
         assert(xm & (DP_HIDDEN_BIT << 3));
 
         if (xe < DP_EMIN) {
@@ -165,7 +165,7 @@ union ieee754dp ieee754dp_format(int sn, int xe, u64 xm)
         /* strip grs bits */
         xm >>= 3;
 
-        assert((xm >> (DP_FBITS + 1)) == 0);    /* no execess */
+        assert((xm >> (DP_FBITS + 1)) == 0);    /* no excess */
         assert(xe >= DP_EMIN);
 
         if (xe > DP_EMAX) {
@@ -198,7 +198,7 @@ union ieee754dp ieee754dp_format(int sn, int xe, u64 xm)
                         ieee754_setcx(IEEE754_UNDERFLOW);
                 return builddp(sn, DP_EMIN - 1 + DP_EBIAS, xm);
         } else {
-                assert((xm >> (DP_FBITS + 1)) == 0);    /* no execess */
+                assert((xm >> (DP_FBITS + 1)) == 0);    /* no excess */
                 assert(xm & DP_HIDDEN_BIT);
 
                 return builddp(sn, xe + DP_EBIAS, xm & ~DP_HIDDEN_BIT);
diff --git a/arch/mips/math-emu/ieee754sp.c b/arch/mips/math-emu/ieee754sp.c
index def00ffc50fc..e0b2c450b963 100644
--- a/arch/mips/math-emu/ieee754sp.c
+++ b/arch/mips/math-emu/ieee754sp.c
@@ -97,7 +97,7 @@ union ieee754sp ieee754sp_format(int sn, int xe, unsigned xm)
 {
         assert(xm);             /* we don't gen exact zeros (probably should) */
 
-        assert((xm >> (SP_FBITS + 1 + 3)) == 0);        /* no execess */
+        assert((xm >> (SP_FBITS + 1 + 3)) == 0);        /* no excess */
         assert(xm & (SP_HIDDEN_BIT << 3));
 
         if (xe < SP_EMIN) {
@@ -163,7 +163,7 @@ union ieee754sp ieee754sp_format(int sn, int xe, unsigned xm)
         /* strip grs bits */
         xm >>= 3;
 
-        assert((xm >> (SP_FBITS + 1)) == 0);    /* no execess */
+        assert((xm >> (SP_FBITS + 1)) == 0);    /* no excess */
         assert(xe >= SP_EMIN);
 
         if (xe > SP_EMAX) {
@@ -196,7 +196,7 @@ union ieee754sp ieee754sp_format(int sn, int xe, unsigned xm)
                         ieee754_setcx(IEEE754_UNDERFLOW);
                 return buildsp(sn, SP_EMIN - 1 + SP_EBIAS, xm);
         } else {
-                assert((xm >> (SP_FBITS + 1)) == 0);    /* no execess */
+                assert((xm >> (SP_FBITS + 1)) == 0);    /* no excess */
                 assert(xm & SP_HIDDEN_BIT);
 
                 return buildsp(sn, xe + SP_EBIAS, xm & ~SP_HIDDEN_BIT);
diff --git a/arch/mips/mm/sc-ip22.c b/arch/mips/mm/sc-ip22.c
index dc7c5a5214a9..026cb59a914d 100644
--- a/arch/mips/mm/sc-ip22.c
+++ b/arch/mips/mm/sc-ip22.c
@@ -158,7 +158,7 @@ static inline int __init indy_sc_probe(void)
         return 1;
 }
 
-/* XXX Check with wje if the Indy caches can differenciate between
+/* XXX Check with wje if the Indy caches can differentiate between
    writeback + invalidate and just invalidate.  */
 static struct bcache_ops indy_sc_ops = {
         .bc_enable = indy_sc_enable,
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
index 5037d5868cef..c17d7627f872 100644
--- a/arch/mips/mm/tlb-r4k.c
+++ b/arch/mips/mm/tlb-r4k.c
@@ -19,6 +19,7 @@
 #include <asm/cpu.h>
 #include <asm/cpu-type.h>
 #include <asm/bootinfo.h>
+#include <asm/hazards.h>
 #include <asm/mmu_context.h>
 #include <asm/pgtable.h>
 #include <asm/tlb.h>
@@ -486,6 +487,10 @@ static void r4k_tlb_configure(void)
          *     be set to fixed-size pages.
          */
         write_c0_pagemask(PM_DEFAULT_MASK);
+        back_to_back_c0_hazard();
+        if (read_c0_pagemask() != PM_DEFAULT_MASK)
+                panic("MMU doesn't support PAGE_SIZE=0x%lx", PAGE_SIZE);
+
         write_c0_wired(0);
         if (current_cpu_type() == CPU_R10000 ||
             current_cpu_type() == CPU_R12000 ||
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 5a04b6f5c6fb..84c6e3fda84a 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -12,7 +12,7 @@
  * Copyright (C) 2011  MIPS Technologies, Inc.
  *
  * ... and the days got worse and worse and now you see
- * I've gone completly out of my mind.
+ * I've gone completely out of my mind.
  *
  * They're coming to take me a away haha
  * they're coming to take me a away hoho hihi haha
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
index 8d0eb2643248..f1f88291451e 100644
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c
@@ -7,7 +7,7 @@
  * Copyright (C) 2000 by Silicon Graphics, Inc.
  * Copyright (C) 2004 by Christoph Hellwig
  *
- * On SGI IP27 the ARC memory configuration data is completly bogus but
+ * On SGI IP27 the ARC memory configuration data is completely bogus but
  * alternate easier to use mechanisms are available.
  */
 #include <linux/init.h>
diff --git a/arch/nios2/kernel/prom.c b/arch/nios2/kernel/prom.c
index 718dd197909f..367c5426157b 100644
--- a/arch/nios2/kernel/prom.c
+++ b/arch/nios2/kernel/prom.c
@@ -97,8 +97,7 @@ static int __init early_init_dt_scan_serial(unsigned long node,
                 return 0;
 #endif
 
-        *addr64 = fdt_translate_address((const void *)initial_boot_params,
-                node);
+        *addr64 = of_flat_dt_translate_address(node);
 
         return *addr64 == OF_BAD_ADDR ? 0 : 1;
 }
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 989fa14147a9..bd3c873951a1 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -30,6 +30,7 @@ config PARISC
         select TTY # Needed for pdc_cons.c
         select HAVE_DEBUG_STACKOVERFLOW
         select HAVE_ARCH_AUDITSYSCALL
+        select HAVE_ARCH_SECCOMP_FILTER
         select ARCH_NO_COHERENT_DMA_MMAP
 
         help
diff --git a/arch/parisc/include/asm/compat.h b/arch/parisc/include/asm/compat.h
index 0448a2c8eafb..3387307cc33e 100644
--- a/arch/parisc/include/asm/compat.h
+++ b/arch/parisc/include/asm/compat.h
@@ -183,6 +183,13 @@ typedef struct compat_siginfo {
                         int _band;      /* POLL_IN, POLL_OUT, POLL_MSG */
                         int _fd;
                 } _sigpoll;
+
+                /* SIGSYS */
+                struct {
+                        compat_uptr_t _call_addr; /* calling user insn */
+                        int _syscall;   /* triggering system call number */
+                        compat_uint_t _arch;    /* AUDIT_ARCH_* of syscall */
+                } _sigsys;
         } _sifields;
 } compat_siginfo_t;
 
diff --git a/arch/parisc/include/asm/syscall.h b/arch/parisc/include/asm/syscall.h
index a5eba95d87fe..637ce8d6f375 100644
--- a/arch/parisc/include/asm/syscall.h
+++ b/arch/parisc/include/asm/syscall.h
@@ -39,6 +39,19 @@ static inline void syscall_get_arguments(struct task_struct *tsk,
         }
 }
 
+static inline void syscall_set_return_value(struct task_struct *task,
+                                            struct pt_regs *regs,
+                                            int error, long val)
+{
+        regs->gr[28] = error ? error : val;
+}
+
+static inline void syscall_rollback(struct task_struct *task,
+                                    struct pt_regs *regs)
+{
+        /* do nothing */
+}
+
 static inline int syscall_get_arch(void)
 {
         int arch = AUDIT_ARCH_PARISC;
diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
index d4dd6e58682c..7955e43f3f3f 100644
--- a/arch/parisc/include/asm/uaccess.h
+++ b/arch/parisc/include/asm/uaccess.h
@@ -44,20 +44,18 @@ static inline long access_ok(int type, const void __user * addr,
 #define LDD_USER(ptr)           BUILD_BUG()
 #define STD_KERNEL(x, ptr)      __put_kernel_asm64(x, ptr)
 #define STD_USER(x, ptr)        __put_user_asm64(x, ptr)
-#define ASM_WORD_INSN           ".word\t"
 #else
 #define LDD_KERNEL(ptr)         __get_kernel_asm("ldd", ptr)
 #define LDD_USER(ptr)           __get_user_asm("ldd", ptr)
 #define STD_KERNEL(x, ptr)      __put_kernel_asm("std", x, ptr)
 #define STD_USER(x, ptr)        __put_user_asm("std", x, ptr)
-#define ASM_WORD_INSN           ".dword\t"
 #endif
 
 /*
- * The exception table contains two values: the first is an address
- * for an instruction that is allowed to fault, and the second is
- * the address to the fixup routine. Even on a 64bit kernel we could
- * use a 32bit (unsigned int) address here.
+ * The exception table contains two values: the first is the relative offset to
+ * the address of the instruction that is allowed to fault, and the second is
+ * the relative offset to the address of the fixup routine. Since relative
+ * addresses are used, 32bit values are sufficient even on 64bit kernel.
  */
 
 #define ARCH_HAS_RELATIVE_EXTABLE
@@ -77,6 +75,7 @@ struct exception_table_entry {
  */
 struct exception_data {
         unsigned long fault_ip;
+        unsigned long fault_gp;
         unsigned long fault_space;
         unsigned long fault_addr;
 };
diff --git a/arch/parisc/kernel/asm-offsets.c b/arch/parisc/kernel/asm-offsets.c
index d2f62570a7b1..78d30d2ea2d8 100644
--- a/arch/parisc/kernel/asm-offsets.c
+++ b/arch/parisc/kernel/asm-offsets.c
@@ -299,6 +299,7 @@ int main(void)
 #endif
         BLANK();
         DEFINE(EXCDATA_IP, offsetof(struct exception_data, fault_ip));
+        DEFINE(EXCDATA_GP, offsetof(struct exception_data, fault_gp));
         DEFINE(EXCDATA_SPACE, offsetof(struct exception_data, fault_space));
         DEFINE(EXCDATA_ADDR, offsetof(struct exception_data, fault_addr));
         BLANK();
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/kernel/module.c b/arch/parisc/kernel/module.c
index b9d75d9fa9ac..a0ecdb4abcc8 100644
--- a/arch/parisc/kernel/module.c
+++ b/arch/parisc/kernel/module.c
@@ -660,6 +660,10 @@ int apply_relocate_add(Elf_Shdr *sechdrs,
                         }
                         *loc = (*loc & ~0x3ff1ffd) | reassemble_22(val);
                         break;
+                case R_PARISC_PCREL32:
+                        /* 32-bit PC relative address */
+                        *loc = val - dot - 8 + addend;
+                        break;
 
                 default:
                         printk(KERN_ERR "module %s: Unknown relocation: %u\n",
@@ -788,6 +792,10 @@ int apply_relocate_add(Elf_Shdr *sechdrs,
                         CHECK_RELOC(val, 22);
                         *loc = (*loc & ~0x3ff1ffd) | reassemble_22(val);
                         break;
+                case R_PARISC_PCREL32:
+                        /* 32-bit PC relative address */
+                        *loc = val - dot - 8 + addend;
+                        break;
                 case R_PARISC_DIR64:
                         /* 64-bit effective address */
                         *loc64 = val + addend;
diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c
index 568b2c61ea02..3cad8aadc69e 100644
--- a/arch/parisc/kernel/parisc_ksyms.c
+++ b/arch/parisc/kernel/parisc_ksyms.c
@@ -47,11 +47,11 @@ EXPORT_SYMBOL(__cmpxchg_u64);
 EXPORT_SYMBOL(lclear_user);
 EXPORT_SYMBOL(lstrnlen_user);
 
-/* Global fixups */
-extern void fixup_get_user_skip_1(void);
-extern void fixup_get_user_skip_2(void);
-extern void fixup_put_user_skip_1(void);
-extern void fixup_put_user_skip_2(void);
+/* Global fixups - defined as int to avoid creation of function pointers */
+extern int fixup_get_user_skip_1;
+extern int fixup_get_user_skip_2;
+extern int fixup_put_user_skip_1;
+extern int fixup_put_user_skip_2;
 EXPORT_SYMBOL(fixup_get_user_skip_1);
 EXPORT_SYMBOL(fixup_get_user_skip_2);
 EXPORT_SYMBOL(fixup_put_user_skip_1);
diff --git a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c
index ce0b2b4075c7..8fb81a391599 100644
--- a/arch/parisc/kernel/ptrace.c
+++ b/arch/parisc/kernel/ptrace.c
@@ -270,7 +270,8 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
 long do_syscall_trace_enter(struct pt_regs *regs)
 {
         /* Do the secure computing check first. */
-        secure_computing_strict(regs->gr[20]);
+        if (secure_computing() == -1)
+                return -1;
 
         if (test_thread_flag(TIF_SYSCALL_TRACE) &&
             tracehook_report_syscall_entry(regs)) {
@@ -296,7 +297,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
                         regs->gr[23] & 0xffffffff);
 
 out:
-        return regs->gr[20];
+        /*
+         * Sign extend the syscall number to 64bit since it may have been
+         * modified by a compat ptrace call
+         */
+        return (int) ((u32) regs->gr[20]);
 }
 
 void do_syscall_trace_exit(struct pt_regs *regs)
diff --git a/arch/parisc/kernel/signal32.c b/arch/parisc/kernel/signal32.c
index 984abbee71ca..c342b2e17492 100644
--- a/arch/parisc/kernel/signal32.c
+++ b/arch/parisc/kernel/signal32.c
@@ -371,6 +371,11 @@ copy_siginfo_to_user32 (compat_siginfo_t __user *to, const siginfo_t *from)
                         val = (compat_int_t)from->si_int;
                         err |= __put_user(val, &to->si_int);
                         break;
+                case __SI_SYS >> 16:
+                        err |= __put_user(ptr_to_compat(from->si_call_addr), &to->si_call_addr);
+                        err |= __put_user(from->si_syscall, &to->si_syscall);
+                        err |= __put_user(from->si_arch, &to->si_arch);
+                        break;
                 }
         }
         return err;
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
index fbafa0d0e2bf..c976ebfe2269 100644
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
@@ -329,6 +329,7 @@ tracesys_next:
 
         ldo     -THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r1      /* get task ptr */
         LDREG   TI_TASK(%r1), %r1
+        LDREG   TASK_PT_GR28(%r1), %r28         /* Restore return value */
         LDREG   TASK_PT_GR26(%r1), %r26         /* Restore the users args */
         LDREG   TASK_PT_GR25(%r1), %r25
         LDREG   TASK_PT_GR24(%r1), %r24
@@ -342,6 +343,7 @@ tracesys_next:
         stw     %r21, -56(%r30)                 /* 6th argument */
 #endif
 
+        cmpib,COND(=),n -1,%r20,tracesys_exit /* seccomp may have returned -1 */
         comiclr,>>=     __NR_Linux_syscalls, %r20, %r0
         b,n     .Ltracesys_nosys
 
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index 16e0735e2f46..97d6b208e129 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -795,6 +795,9 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
 
             if (fault_space == 0 && !faulthandler_disabled())
             {
+                /* Clean up and return if in exception table. */
+                if (fixup_exception(regs))
+                        return;
                 pdc_chassis_send_status(PDC_CHASSIS_DIRECT_PANIC);
                 parisc_terminate("Kernel Fault", regs, code, fault_address);
             }
diff --git a/arch/parisc/lib/fixup.S b/arch/parisc/lib/fixup.S
index 536ef66bb94b..1052b747e011 100644
--- a/arch/parisc/lib/fixup.S
+++ b/arch/parisc/lib/fixup.S
@@ -26,6 +26,7 @@
 
 #ifdef CONFIG_SMP
         .macro  get_fault_ip t1 t2
+        loadgp
         addil LT%__per_cpu_offset,%r27
         LDREG RT%__per_cpu_offset(%r1),\t1
         /* t2 = smp_processor_id() */
@@ -40,14 +41,19 @@
         LDREG RT%exception_data(%r1),\t1
         /* t1 = this_cpu_ptr(&exception_data) */
         add,l \t1,\t2,\t1
+        /* %r27 = t1->fault_gp - restore gp */
+        LDREG EXCDATA_GP(\t1), %r27
         /* t1 = t1->fault_ip */
         LDREG EXCDATA_IP(\t1), \t1
         .endm
 #else
         .macro  get_fault_ip t1 t2
+        loadgp
         /* t1 = this_cpu_ptr(&exception_data) */
         addil LT%exception_data,%r27
         LDREG RT%exception_data(%r1),\t2
+        /* %r27 = t2->fault_gp - restore gp */
+        LDREG EXCDATA_GP(\t2), %r27
         /* t1 = t2->fault_ip */
         LDREG EXCDATA_IP(\t2), \t1
         .endm
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
index 26fac9c671c9..16dbe81c97c9 100644
--- a/arch/parisc/mm/fault.c
+++ b/arch/parisc/mm/fault.c
@@ -145,6 +145,7 @@ int fixup_exception(struct pt_regs *regs)
                 struct exception_data *d;
                 d = this_cpu_ptr(&exception_data);
                 d->fault_ip = regs->iaoq[0];
+                d->fault_gp = regs->gr[27];
                 d->fault_space = regs->isr;
                 d->fault_addr = regs->ior;
 
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/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index 8ab8a1a9610a..009fab130cd8 100644
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -246,7 +246,7 @@ struct thread_struct {
 #endif /* CONFIG_ALTIVEC */
 #ifdef CONFIG_VSX
         /* VSR status */
-        int             used_vsr;       /* set if process has used altivec */
+        int             used_vsr;       /* set if process has used VSX */
 #endif /* CONFIG_VSX */
 #ifdef CONFIG_SPE
         unsigned long   evr[32];        /* upper 32-bits of SPE regs */
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 612df305886b..b8500b4ac7fe 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -983,7 +983,7 @@ void restore_tm_state(struct pt_regs *regs)
 static inline void save_sprs(struct thread_struct *t)
 {
 #ifdef CONFIG_ALTIVEC
-        if (cpu_has_feature(cpu_has_feature(CPU_FTR_ALTIVEC)))
+        if (cpu_has_feature(CPU_FTR_ALTIVEC))
                 t->vrsave = mfspr(SPRN_VRSAVE);
 #endif
 #ifdef CONFIG_PPC_BOOK3S_64
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 6dd272b6196f..d991b9e80dbb 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -413,13 +413,13 @@ static void hugepd_free(struct mmu_gather *tlb, void *hugepte)
 {
         struct hugepd_freelist **batchp;
 
-        batchp = this_cpu_ptr(&hugepd_freelist_cur);
+        batchp = &get_cpu_var(hugepd_freelist_cur);
 
         if (atomic_read(&tlb->mm->mm_users) < 2 ||
             cpumask_equal(mm_cpumask(tlb->mm),
                           cpumask_of(smp_processor_id()))) {
                 kmem_cache_free(hugepte_cache, hugepte);
-        put_cpu_var(hugepd_freelist_cur);
+                put_cpu_var(hugepd_freelist_cur);
                 return;
         }
 
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/Kconfig b/arch/s390/Kconfig
index b9df8d11d7a9..aad23e3dff2c 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -59,6 +59,9 @@ config PCI_QUIRKS
 config ARCH_SUPPORTS_UPROBES
         def_bool y
 
+config DEBUG_RODATA
+        def_bool y
+
 config S390
         def_bool y
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c
index b8045b97f4fb..d750cc0dfe30 100644
--- a/arch/s390/crypto/prng.c
+++ b/arch/s390/crypto/prng.c
@@ -669,11 +669,13 @@ static const struct file_operations prng_tdes_fops = {
 static struct miscdevice prng_sha512_dev = {
         .name   = "prandom",
         .minor  = MISC_DYNAMIC_MINOR,
+        .mode   = 0644,
         .fops   = &prng_sha512_fops,
 };
 static struct miscdevice prng_tdes_dev = {
         .name   = "prandom",
         .minor  = MISC_DYNAMIC_MINOR,
+        .mode   = 0644,
         .fops   = &prng_tdes_fops,
 };
 
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/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
index 4d7ccac5fd1d..22da3b34c655 100644
--- a/arch/s390/include/asm/cache.h
+++ b/arch/s390/include/asm/cache.h
@@ -15,4 +15,7 @@
 
 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
 
+/* Read-only memory is marked before mark_rodata_ro() is called. */
+#define __ro_after_init __read_mostly
+
 #endif
diff --git a/arch/s390/include/uapi/asm/unistd.h b/arch/s390/include/uapi/asm/unistd.h
index ab3aa6875a59..4384bc797a54 100644
--- a/arch/s390/include/uapi/asm/unistd.h
+++ b/arch/s390/include/uapi/asm/unistd.h
@@ -311,7 +311,9 @@
 #define __NR_shutdown           373
 #define __NR_mlock2             374
 #define __NR_copy_file_range    375
-#define NR_syscalls 376
+#define __NR_preadv2            376
+#define __NR_pwritev2           377
+#define NR_syscalls 378
 
 /* 
  * There are some system calls that are not present on 64 bit, some
diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c
index 58bf4572d457..62f066b5259e 100644
--- a/arch/s390/kernel/perf_cpum_cf.c
+++ b/arch/s390/kernel/perf_cpum_cf.c
@@ -670,6 +670,7 @@ static int cpumf_pmu_notifier(struct notifier_block *self, unsigned long action,
 
         switch (action & ~CPU_TASKS_FROZEN) {
         case CPU_ONLINE:
+        case CPU_DOWN_FAILED:
                 flags = PMC_INIT;
                 smp_call_function_single(cpu, setup_pmc_cpu, &flags, 1);
                 break;
diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c
index 1a43474df541..eaab9a7cb3be 100644
--- a/arch/s390/kernel/perf_cpum_sf.c
+++ b/arch/s390/kernel/perf_cpum_sf.c
@@ -1521,7 +1521,7 @@ static int cpumf_pmu_notifier(struct notifier_block *self,
 
         switch (action & ~CPU_TASKS_FROZEN) {
         case CPU_ONLINE:
-        case CPU_ONLINE_FROZEN:
+        case CPU_DOWN_FAILED:
                 flags = PMC_INIT;
                 smp_call_function_single(cpu, setup_pmc_cpu, &flags, 1);
                 break;
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S
index 293d8b98fd52..9b59e6212d8f 100644
--- a/arch/s390/kernel/syscalls.S
+++ b/arch/s390/kernel/syscalls.S
@@ -384,3 +384,5 @@ SYSCALL(sys_recvmsg,compat_sys_recvmsg)
 SYSCALL(sys_shutdown,sys_shutdown)
 SYSCALL(sys_mlock2,compat_sys_mlock2)
 SYSCALL(sys_copy_file_range,compat_sys_copy_file_range) /* 375 */
+SYSCALL(sys_preadv2,compat_sys_preadv2)
+SYSCALL(sys_pwritev2,compat_sys_pwritev2)
diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c
index 69247b4dcc43..cace818d86eb 100644
--- a/arch/s390/mm/gmap.c
+++ b/arch/s390/mm/gmap.c
@@ -23,7 +23,7 @@
 /**
  * gmap_alloc - allocate a guest address space
  * @mm: pointer to the parent mm_struct
- * @limit: maximum size of the gmap address space
+ * @limit: maximum address of the gmap address space
  *
  * Returns a guest address space structure.
  */
@@ -292,7 +292,7 @@ int gmap_map_segment(struct gmap *gmap, unsigned long from,
         if ((from | to | len) & (PMD_SIZE - 1))
                 return -EINVAL;
         if (len == 0 || from + len < from || to + len < to ||
-            from + len > TASK_MAX_SIZE || to + len > gmap->asce_end)
+            from + len - 1 > TASK_MAX_SIZE || to + len - 1 > gmap->asce_end)
                 return -EINVAL;
 
         flush = 0;
diff --git a/arch/s390/mm/gup.c b/arch/s390/mm/gup.c
index 49a1c84ed266..a8a6765f1a51 100644
--- a/arch/s390/mm/gup.c
+++ b/arch/s390/mm/gup.c
@@ -20,9 +20,9 @@
 static inline int gup_pte_range(pmd_t *pmdp, pmd_t pmd, unsigned long addr,
                 unsigned long end, int write, struct page **pages, int *nr)
 {
+        struct page *head, *page;
         unsigned long mask;
         pte_t *ptep, pte;
-        struct page *page;
 
         mask = (write ? _PAGE_PROTECT : 0) | _PAGE_INVALID | _PAGE_SPECIAL;
 
@@ -37,12 +37,14 @@ static inline int gup_pte_range(pmd_t *pmdp, pmd_t pmd, unsigned long addr,
                         return 0;
                 VM_BUG_ON(!pfn_valid(pte_pfn(pte)));
                 page = pte_page(pte);
-                if (!page_cache_get_speculative(page))
+                head = compound_head(page);
+                if (!page_cache_get_speculative(head))
                         return 0;
                 if (unlikely(pte_val(pte) != pte_val(*ptep))) {
-                        put_page(page);
+                        put_page(head);
                         return 0;
                 }
+                VM_BUG_ON_PAGE(compound_head(page) != head, page);
                 pages[*nr] = page;
                 (*nr)++;
 
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 73e290337092..c7b0451397d6 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -108,6 +108,13 @@ void __init paging_init(void)
         free_area_init_nodes(max_zone_pfns);
 }
 
+void mark_rodata_ro(void)
+{
+        /* Text and rodata are already protected. Nothing to do here. */
+        pr_info("Write protecting the kernel read-only data: %luk\n",
+                ((unsigned long)&_eshared - (unsigned long)&_stext) >> 10);
+}
+
 void __init mem_init(void)
 {
         if (MACHINE_HAS_TLB_LC)
@@ -126,9 +133,6 @@ void __init mem_init(void)
         setup_zero_pages();     /* Setup zeroed pages. */
 
         mem_init_print_info(NULL);
-        printk("Write protected kernel read-only data: %#lx - %#lx\n",
-               (unsigned long)&_stext,
-               PFN_ALIGN((unsigned long)&_eshared) - 1);
 }
 
 void free_initmem(void)
diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c
index 21591ddb4c1f..1a4512c8544a 100644
--- a/arch/s390/pci/pci_clp.c
+++ b/arch/s390/pci/pci_clp.c
@@ -176,8 +176,7 @@ static int clp_query_pci_fn(struct zpci_dev *zdev, u32 fh)
                 rc = clp_store_query_pci_fn(zdev, &rrb->response);
                 if (rc)
                         goto out;
-                if (rrb->response.pfgid)
-                        rc = clp_query_pci_fngrp(zdev, rrb->response.pfgid);
+                rc = clp_query_pci_fngrp(zdev, rrb->response.pfgid);
         } else {
                 zpci_err("Q PCI FN:\n");
                 zpci_err_clp(rrb->response.hdr.rsp, rc);
diff --git a/arch/sparc/include/asm/compat_signal.h b/arch/sparc/include/asm/compat_signal.h
index 9ed1f128b4d1..4b027b1044fa 100644
--- a/arch/sparc/include/asm/compat_signal.h
+++ b/arch/sparc/include/asm/compat_signal.h
@@ -6,17 +6,17 @@
 
 #ifdef CONFIG_COMPAT
 struct __new_sigaction32 {
-        unsigned                sa_handler;
+        unsigned int            sa_handler;
         unsigned int            sa_flags;
-        unsigned                sa_restorer;     /* not used by Linux/SPARC yet */
+        unsigned int            sa_restorer;     /* not used by Linux/SPARC yet */
         compat_sigset_t         sa_mask;
 };
 
 struct __old_sigaction32 {
-        unsigned                sa_handler;
+        unsigned int            sa_handler;
         compat_old_sigset_t     sa_mask;
         unsigned int            sa_flags;
-        unsigned                sa_restorer;     /* not used by Linux/SPARC yet */
+        unsigned int            sa_restorer;     /* not used by Linux/SPARC yet */
 };
 #endif
 
diff --git a/arch/sparc/include/asm/obio.h b/arch/sparc/include/asm/obio.h
index 910c1d9af1f8..426ad75103fb 100644
--- a/arch/sparc/include/asm/obio.h
+++ b/arch/sparc/include/asm/obio.h
@@ -117,9 +117,9 @@ static inline void bw_clear_intr_mask(int sbus_level, int mask)
                               "i" (ASI_M_CTL));
 }
 
-static inline unsigned bw_get_prof_limit(int cpu)
+static inline unsigned int bw_get_prof_limit(int cpu)
 {
-        unsigned limit;
+        unsigned int limit;
         
         __asm__ __volatile__ ("lda [%1] %2, %0" :
                               "=r" (limit) :
@@ -128,7 +128,7 @@ static inline unsigned bw_get_prof_limit(int cpu)
         return limit;
 }
 
-static inline void bw_set_prof_limit(int cpu, unsigned limit)
+static inline void bw_set_prof_limit(int cpu, unsigned int limit)
 {
         __asm__ __volatile__ ("sta %0, [%1] %2" : :
                               "r" (limit),
@@ -136,9 +136,9 @@ static inline void bw_set_prof_limit(int cpu, unsigned limit)
                               "i" (ASI_M_CTL));
 }
 
-static inline unsigned bw_get_ctrl(int cpu)
+static inline unsigned int bw_get_ctrl(int cpu)
 {
-        unsigned ctrl;
+        unsigned int ctrl;
         
         __asm__ __volatile__ ("lda [%1] %2, %0" :
                               "=r" (ctrl) :
@@ -147,7 +147,7 @@ static inline unsigned bw_get_ctrl(int cpu)
         return ctrl;
 }
 
-static inline void bw_set_ctrl(int cpu, unsigned ctrl)
+static inline void bw_set_ctrl(int cpu, unsigned int ctrl)
 {
         __asm__ __volatile__ ("sta %0, [%1] %2" : :
                               "r" (ctrl),
@@ -155,9 +155,9 @@ static inline void bw_set_ctrl(int cpu, unsigned ctrl)
                               "i" (ASI_M_CTL));
 }
 
-static inline unsigned cc_get_ipen(void)
+static inline unsigned int cc_get_ipen(void)
 {
-        unsigned pending;
+        unsigned int pending;
         
         __asm__ __volatile__ ("lduha [%1] %2, %0" :
                               "=r" (pending) :
@@ -166,7 +166,7 @@ static inline unsigned cc_get_ipen(void)
         return pending;
 }
 
-static inline void cc_set_iclr(unsigned clear)
+static inline void cc_set_iclr(unsigned int clear)
 {
         __asm__ __volatile__ ("stha %0, [%1] %2" : :
                               "r" (clear),
@@ -174,9 +174,9 @@ static inline void cc_set_iclr(unsigned clear)
                               "i" (ASI_M_MXCC));
 }
 
-static inline unsigned cc_get_imsk(void)
+static inline unsigned int cc_get_imsk(void)
 {
-        unsigned mask;
+        unsigned int mask;
         
         __asm__ __volatile__ ("lduha [%1] %2, %0" :
                               "=r" (mask) :
@@ -185,7 +185,7 @@ static inline unsigned cc_get_imsk(void)
         return mask;
 }
 
-static inline void cc_set_imsk(unsigned mask)
+static inline void cc_set_imsk(unsigned int mask)
 {
         __asm__ __volatile__ ("stha %0, [%1] %2" : :
                               "r" (mask),
@@ -193,9 +193,9 @@ static inline void cc_set_imsk(unsigned mask)
                               "i" (ASI_M_MXCC));
 }
 
-static inline unsigned cc_get_imsk_other(int cpuid)
+static inline unsigned int cc_get_imsk_other(int cpuid)
 {
-        unsigned mask;
+        unsigned int mask;
         
         __asm__ __volatile__ ("lduha [%1] %2, %0" :
                               "=r" (mask) :
@@ -204,7 +204,7 @@ static inline unsigned cc_get_imsk_other(int cpuid)
         return mask;
 }
 
-static inline void cc_set_imsk_other(int cpuid, unsigned mask)
+static inline void cc_set_imsk_other(int cpuid, unsigned int mask)
 {
         __asm__ __volatile__ ("stha %0, [%1] %2" : :
                               "r" (mask),
@@ -212,7 +212,7 @@ static inline void cc_set_imsk_other(int cpuid, unsigned mask)
                               "i" (ASI_M_CTL));
 }
 
-static inline void cc_set_igen(unsigned gen)
+static inline void cc_set_igen(unsigned int gen)
 {
         __asm__ __volatile__ ("sta %0, [%1] %2" : :
                               "r" (gen),
diff --git a/arch/sparc/include/asm/openprom.h b/arch/sparc/include/asm/openprom.h
index 47eaafad15ce..63374c4413a8 100644
--- a/arch/sparc/include/asm/openprom.h
+++ b/arch/sparc/include/asm/openprom.h
@@ -29,12 +29,12 @@ struct linux_dev_v0_funcs {
 /* V2 and later prom device operations. */
 struct linux_dev_v2_funcs {
         phandle (*v2_inst2pkg)(int d);  /* Convert ihandle to phandle */
-        char * (*v2_dumb_mem_alloc)(char *va, unsigned sz);
-        void (*v2_dumb_mem_free)(char *va, unsigned sz);
+        char * (*v2_dumb_mem_alloc)(char *va, unsigned int sz);
+        void (*v2_dumb_mem_free)(char *va, unsigned int sz);
 
         /* To map devices into virtual I/O space. */
-        char * (*v2_dumb_mmap)(char *virta, int which_io, unsigned paddr, unsigned sz);
-        void (*v2_dumb_munmap)(char *virta, unsigned size);
+        char * (*v2_dumb_mmap)(char *virta, int which_io, unsigned int paddr, unsigned int sz);
+        void (*v2_dumb_munmap)(char *virta, unsigned int size);
 
         int (*v2_dev_open)(char *devpath);
         void (*v2_dev_close)(int d);
@@ -50,7 +50,7 @@ struct linux_dev_v2_funcs {
 struct linux_mlist_v0 {
         struct linux_mlist_v0 *theres_more;
         unsigned int start_adr;
-        unsigned num_bytes;
+        unsigned int num_bytes;
 };
 
 struct linux_mem_v0 {
diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h
index 7a38d6a576c5..f089cfa249f3 100644
--- a/arch/sparc/include/asm/pgtable_64.h
+++ b/arch/sparc/include/asm/pgtable_64.h
@@ -218,7 +218,7 @@ extern pgprot_t PAGE_KERNEL_LOCKED;
 extern pgprot_t PAGE_COPY;
 extern pgprot_t PAGE_SHARED;
 
-/* XXX This uglyness is for the atyfb driver's sparc mmap() support. XXX */
+/* XXX This ugliness is for the atyfb driver's sparc mmap() support. XXX */
 extern unsigned long _PAGE_IE;
 extern unsigned long _PAGE_E;
 extern unsigned long _PAGE_CACHE;
diff --git a/arch/sparc/include/asm/processor_64.h b/arch/sparc/include/asm/processor_64.h
index 6924bdefe148..ce2595c89471 100644
--- a/arch/sparc/include/asm/processor_64.h
+++ b/arch/sparc/include/asm/processor_64.h
@@ -201,7 +201,7 @@ unsigned long get_wchan(struct task_struct *task);
 #define KSTK_ESP(tsk)  (task_pt_regs(tsk)->u_regs[UREG_FP])
 
 /* Please see the commentary in asm/backoff.h for a description of
- * what these instructions are doing and how they have been choosen.
+ * what these instructions are doing and how they have been chosen.
  * To make a long story short, we are trying to yield the current cpu
  * strand during busy loops.
  */
diff --git a/arch/sparc/include/asm/sigcontext.h b/arch/sparc/include/asm/sigcontext.h
index fc2df1e892cb..f4eb630a58ed 100644
--- a/arch/sparc/include/asm/sigcontext.h
+++ b/arch/sparc/include/asm/sigcontext.h
@@ -25,7 +25,7 @@ struct sigcontext32 {
         int sigc_oswins;       /* outstanding windows */
 
         /* stack ptrs for each regwin buf */
-        unsigned sigc_spbuf[__SUNOS_MAXWIN];
+        unsigned int sigc_spbuf[__SUNOS_MAXWIN];
 
         /* Windows to restore after signal */
         struct reg_window32 sigc_wbuf[__SUNOS_MAXWIN];
diff --git a/arch/sparc/include/asm/tsb.h b/arch/sparc/include/asm/tsb.h
index ecb49cfa3be9..c6a155c3904e 100644
--- a/arch/sparc/include/asm/tsb.h
+++ b/arch/sparc/include/asm/tsb.h
@@ -149,7 +149,7 @@ extern struct tsb_phys_patch_entry __tsb_phys_patch, __tsb_phys_patch_end;
          * page size in question.  So for PMD mappings (which fall on
          * bit 23, for 8MB per PMD) we must propagate bit 22 for a
          * 4MB huge page.  For huge PUDs (which fall on bit 33, for
-         * 8GB per PUD), we have to accomodate 256MB and 2GB huge
+         * 8GB per PUD), we have to accommodate 256MB and 2GB huge
          * pages.  So for those we propagate bits 32 to 28.
          */
 #define KERN_PGTABLE_WALK(VADDR, REG1, REG2, FAIL_LABEL)        \
diff --git a/arch/sparc/include/uapi/asm/stat.h b/arch/sparc/include/uapi/asm/stat.h
index a232e9e1f4e5..2f0583a2c689 100644
--- a/arch/sparc/include/uapi/asm/stat.h
+++ b/arch/sparc/include/uapi/asm/stat.h
@@ -6,13 +6,13 @@
 #if defined(__sparc__) && defined(__arch64__)
 /* 64 bit sparc */
 struct stat {
-        unsigned   st_dev;
+        unsigned int st_dev;
         ino_t   st_ino;
         mode_t  st_mode;
         short   st_nlink;
         uid_t   st_uid;
         gid_t   st_gid;
-        unsigned   st_rdev;
+        unsigned int st_rdev;
         off_t   st_size;
         time_t  st_atime;
         time_t  st_mtime;
diff --git a/arch/sparc/kernel/audit.c b/arch/sparc/kernel/audit.c
index 24361b494a93..2585c1e14bcc 100644
--- a/arch/sparc/kernel/audit.c
+++ b/arch/sparc/kernel/audit.c
@@ -5,27 +5,27 @@
 
 #include "kernel.h"
 
-static unsigned dir_class[] = {
+static unsigned int dir_class[] = {
 #include <asm-generic/audit_dir_write.h>
 ~0U
 };
 
-static unsigned read_class[] = {
+static unsigned int read_class[] = {
 #include <asm-generic/audit_read.h>
 ~0U
 };
 
-static unsigned write_class[] = {
+static unsigned int write_class[] = {
 #include <asm-generic/audit_write.h>
 ~0U
 };
 
-static unsigned chattr_class[] = {
+static unsigned int chattr_class[] = {
 #include <asm-generic/audit_change_attr.h>
 ~0U
 };
 
-static unsigned signal_class[] = {
+static unsigned int signal_class[] = {
 #include <asm-generic/audit_signal.h>
 ~0U
 };
@@ -39,7 +39,7 @@ int audit_classify_arch(int arch)
         return 0;
 }
 
-int audit_classify_syscall(int abi, unsigned syscall)
+int audit_classify_syscall(int abi, unsigned int syscall)
 {
 #ifdef CONFIG_COMPAT
         if (abi == AUDIT_ARCH_SPARC)
diff --git a/arch/sparc/kernel/compat_audit.c b/arch/sparc/kernel/compat_audit.c
index 7062263d09c1..e5611cd428f1 100644
--- a/arch/sparc/kernel/compat_audit.c
+++ b/arch/sparc/kernel/compat_audit.c
@@ -2,32 +2,32 @@
 #include <asm/unistd.h>
 #include "kernel.h"
 
-unsigned sparc32_dir_class[] = {
+unsigned int sparc32_dir_class[] = {
 #include <asm-generic/audit_dir_write.h>
 ~0U
 };
 
-unsigned sparc32_chattr_class[] = {
+unsigned int sparc32_chattr_class[] = {
 #include <asm-generic/audit_change_attr.h>
 ~0U
 };
 
-unsigned sparc32_write_class[] = {
+unsigned int sparc32_write_class[] = {
 #include <asm-generic/audit_write.h>
 ~0U
 };
 
-unsigned sparc32_read_class[] = {
+unsigned int sparc32_read_class[] = {
 #include <asm-generic/audit_read.h>
 ~0U
 };
 
-unsigned sparc32_signal_class[] = {
+unsigned int sparc32_signal_class[] = {
 #include <asm-generic/audit_signal.h>
 ~0U
 };
 
-int sparc32_classify_syscall(unsigned syscall)
+int sparc32_classify_syscall(unsigned int syscall)
 {
         switch(syscall) {
         case __NR_open:
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index a83707c83be8..51aa6e86a5f8 100644
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -1255,7 +1255,7 @@ flush_patch_exception:
 kuw_patch1_7win:        sll     %o3, 6, %o3
 
         /* No matter how much overhead this routine has in the worst
-         * case scenerio, it is several times better than taking the
+         * case scenario, it is several times better than taking the
          * traps with the old method of just doing flush_user_windows().
          */
 kill_user_windows:
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 28fed53b13a0..ffd5ff4678cf 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -131,7 +131,7 @@ void __iomem *ioremap(unsigned long offset, unsigned long size)
 EXPORT_SYMBOL(ioremap);
 
 /*
- * Comlimentary to ioremap().
+ * Complementary to ioremap().
  */
 void iounmap(volatile void __iomem *virtual)
 {
@@ -233,7 +233,7 @@ _sparc_ioremap(struct resource *res, u32 bus, u32 pa, int sz)
 }
 
 /*
- * Comlimentary to _sparc_ioremap().
+ * Complementary to _sparc_ioremap().
  */
 static void _sparc_free_io(struct resource *res)
 {
@@ -532,7 +532,7 @@ static void pci32_unmap_page(struct device *dev, dma_addr_t ba, size_t size,
 }
 
 /* Map a set of buffers described by scatterlist in streaming
- * mode for DMA.  This is the scather-gather version of the
+ * mode for DMA.  This is the scatter-gather version of the
  * above pci_map_single interface.  Here the scatter gather list
  * elements are each tagged with the appropriate dma address
  * and length.  They are obtained via sg_dma_{address,length}(SG).
diff --git a/arch/sparc/kernel/kernel.h b/arch/sparc/kernel/kernel.h
index e7f652be9e61..5057ec2e4af6 100644
--- a/arch/sparc/kernel/kernel.h
+++ b/arch/sparc/kernel/kernel.h
@@ -54,12 +54,12 @@ void do_signal32(struct pt_regs * regs);
 asmlinkage int do_sys32_sigstack(u32 u_ssptr, u32 u_ossptr, unsigned long sp);
 
 /* compat_audit.c */
-extern unsigned sparc32_dir_class[];
-extern unsigned sparc32_chattr_class[];
-extern unsigned sparc32_write_class[];
-extern unsigned sparc32_read_class[];
-extern unsigned sparc32_signal_class[];
-int sparc32_classify_syscall(unsigned syscall);
+extern unsigned int sparc32_dir_class[];
+extern unsigned int sparc32_chattr_class[];
+extern unsigned int sparc32_write_class[];
+extern unsigned int sparc32_read_class[];
+extern unsigned int sparc32_signal_class[];
+int sparc32_classify_syscall(unsigned int syscall);
 #endif
 
 #ifdef CONFIG_SPARC32
diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c
index 42efcf85f721..33cd171d933e 100644
--- a/arch/sparc/kernel/leon_kernel.c
+++ b/arch/sparc/kernel/leon_kernel.c
@@ -203,7 +203,7 @@ static struct irq_chip leon_irq = {
 
 /*
  * Build a LEON IRQ for the edge triggered LEON IRQ controller:
- *  Edge (normal) IRQ           - handle_simple_irq, ack=DONT-CARE, never ack
+ *  Edge (normal) IRQ           - handle_simple_irq, ack=DON'T-CARE, never ack
  *  Level IRQ (PCI|Level-GPIO)  - handle_fasteoi_irq, ack=1, ack after ISR
  *  Per-CPU Edge                - handle_percpu_irq, ack=0
  */
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index 46a59643bb1c..c16ef1af1843 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -103,7 +103,7 @@ static void show_regwindow32(struct pt_regs *regs)
         mm_segment_t old_fs;
         
         __asm__ __volatile__ ("flushw");
-        rw = compat_ptr((unsigned)regs->u_regs[14]);
+        rw = compat_ptr((unsigned int)regs->u_regs[14]);
         old_fs = get_fs();
         set_fs (USER_DS);
         if (copy_from_user (&r_w, rw, sizeof(r_w))) {
diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c
index baef495c06bd..69d75ff1c25c 100644
--- a/arch/sparc/kernel/setup_32.c
+++ b/arch/sparc/kernel/setup_32.c
@@ -109,7 +109,7 @@ unsigned long cmdline_memory_size __initdata = 0;
 unsigned char boot_cpu_id = 0xff; /* 0xff will make it into DATA section... */
 
 static void
-prom_console_write(struct console *con, const char *s, unsigned n)
+prom_console_write(struct console *con, const char *s, unsigned int n)
 {
         prom_write(s, n);
 }
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index f3185e2b028b..26db95b54ee9 100644
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -77,7 +77,7 @@ struct screen_info screen_info = {
 };
 
 static void
-prom_console_write(struct console *con, const char *s, unsigned n)
+prom_console_write(struct console *con, const char *s, unsigned int n)
 {
         prom_write(s, n);
 }
diff --git a/arch/sparc/kernel/signal32.c b/arch/sparc/kernel/signal32.c
index 4eed773a7735..3c25241fa5cb 100644
--- a/arch/sparc/kernel/signal32.c
+++ b/arch/sparc/kernel/signal32.c
@@ -144,7 +144,7 @@ void do_sigreturn32(struct pt_regs *regs)
         compat_uptr_t fpu_save;
         compat_uptr_t rwin_save;
         unsigned int psr;
-        unsigned pc, npc;
+        unsigned int pc, npc;
         sigset_t set;
         compat_sigset_t seta;
         int err, i;
diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
index b489e9759518..fe8b8ee8e660 100644
--- a/arch/sparc/kernel/sys_sparc_64.c
+++ b/arch/sparc/kernel/sys_sparc_64.c
@@ -337,10 +337,10 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, second
                 switch (call) {
                 case SEMOP:
                         err = sys_semtimedop(first, ptr,
-                                             (unsigned)second, NULL);
+                                             (unsigned int)second, NULL);
                         goto out;
                 case SEMTIMEDOP:
-                        err = sys_semtimedop(first, ptr, (unsigned)second,
+                        err = sys_semtimedop(first, ptr, (unsigned int)second,
                                 (const struct timespec __user *)
                                              (unsigned long) fifth);
                         goto out;
diff --git a/arch/sparc/kernel/sysfs.c b/arch/sparc/kernel/sysfs.c
index 7f41d40b7e6e..fa8e21abb5e0 100644
--- a/arch/sparc/kernel/sysfs.c
+++ b/arch/sparc/kernel/sysfs.c
@@ -1,4 +1,4 @@
-/* sysfs.c: Toplogy sysfs support code for sparc64.
+/* sysfs.c: Topology sysfs support code for sparc64.
  *
  * Copyright (C) 2007 David S. Miller <davem@davemloft.net>
  */
diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
index d89e97b374cf..9aacb9159262 100644
--- a/arch/sparc/kernel/unaligned_64.c
+++ b/arch/sparc/kernel/unaligned_64.c
@@ -209,8 +209,8 @@ static inline int do_int_store(int reg_num, int size, unsigned long *dst_addr,
         if (size == 16) {
                 size = 8;
                 zero = (((long)(reg_num ?
-                        (unsigned)fetch_reg(reg_num, regs) : 0)) << 32) |
-                        (unsigned)fetch_reg(reg_num + 1, regs);
+                        (unsigned int)fetch_reg(reg_num, regs) : 0)) << 32) |
+                        (unsigned int)fetch_reg(reg_num + 1, regs);
         } else if (reg_num) {
                 src_val_p = fetch_reg_addr(reg_num, regs);
         }
diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
index c399e7b3b035..b6c559cbd64d 100644
--- a/arch/sparc/mm/fault_32.c
+++ b/arch/sparc/mm/fault_32.c
@@ -303,10 +303,10 @@ no_context:
                 fixup = search_extables_range(regs->pc, &g2);
                 /* Values below 10 are reserved for other things */
                 if (fixup > 10) {
-                        extern const unsigned __memset_start[];
-                        extern const unsigned __memset_end[];
-                        extern const unsigned __csum_partial_copy_start[];
-                        extern const unsigned __csum_partial_copy_end[];
+                        extern const unsigned int __memset_start[];
+                        extern const unsigned int __memset_end[];
+                        extern const unsigned int __csum_partial_copy_start[];
+                        extern const unsigned int __csum_partial_copy_end[];
 
 #ifdef DEBUG_EXCEPTIONS
                         printk("Exception: PC<%08lx> faddr<%08lx>\n",
diff --git a/arch/sparc/net/bpf_jit_comp.c b/arch/sparc/net/bpf_jit_comp.c
index 3e6e05a7c4c2..a6d9204a6a0b 100644
--- a/arch/sparc/net/bpf_jit_comp.c
+++ b/arch/sparc/net/bpf_jit_comp.c
@@ -351,7 +351,7 @@ do {	*prog++ = BR_OPC | WDISP22(OFF);		\
  *
  * Sometimes we need to emit a branch earlier in the code
  * sequence.  And in these situations we adjust "destination"
- * to accomodate this difference.  For example, if we needed
+ * to accommodate this difference.  For example, if we needed
  * to emit a branch (and it's delay slot) right before the
  * final instruction emitted for a BPF opcode, we'd use
  * "destination + 4" instead of just plain "destination" above.
diff --git a/arch/tile/include/hv/drv_mpipe_intf.h b/arch/tile/include/hv/drv_mpipe_intf.h
index c97e416dd963..ff7f50f970a5 100644
--- a/arch/tile/include/hv/drv_mpipe_intf.h
+++ b/arch/tile/include/hv/drv_mpipe_intf.h
@@ -211,7 +211,7 @@ _gxio_mpipe_link_mac_t;
  *  request shared data permission on the same link.
  *
  *  No more than one of ::GXIO_MPIPE_LINK_DATA, ::GXIO_MPIPE_LINK_NO_DATA,
- *  or ::GXIO_MPIPE_LINK_EXCL_DATA may be specifed in a gxio_mpipe_link_open()
+ *  or ::GXIO_MPIPE_LINK_EXCL_DATA may be specified in a gxio_mpipe_link_open()
  *  call.  If none are specified, ::GXIO_MPIPE_LINK_DATA is assumed.
  */
 #define GXIO_MPIPE_LINK_DATA               0x00000001UL
@@ -219,7 +219,7 @@ _gxio_mpipe_link_mac_t;
 /** Do not request data permission on the specified link.
  *
  *  No more than one of ::GXIO_MPIPE_LINK_DATA, ::GXIO_MPIPE_LINK_NO_DATA,
- *  or ::GXIO_MPIPE_LINK_EXCL_DATA may be specifed in a gxio_mpipe_link_open()
+ *  or ::GXIO_MPIPE_LINK_EXCL_DATA may be specified in a gxio_mpipe_link_open()
  *  call.  If none are specified, ::GXIO_MPIPE_LINK_DATA is assumed.
  */
 #define GXIO_MPIPE_LINK_NO_DATA            0x00000002UL
@@ -230,7 +230,7 @@ _gxio_mpipe_link_mac_t;
  *  data permission on it, this open will fail.
  *
  *  No more than one of ::GXIO_MPIPE_LINK_DATA, ::GXIO_MPIPE_LINK_NO_DATA,
- *  or ::GXIO_MPIPE_LINK_EXCL_DATA may be specifed in a gxio_mpipe_link_open()
+ *  or ::GXIO_MPIPE_LINK_EXCL_DATA may be specified in a gxio_mpipe_link_open()
  *  call.  If none are specified, ::GXIO_MPIPE_LINK_DATA is assumed.
  */
 #define GXIO_MPIPE_LINK_EXCL_DATA          0x00000004UL
@@ -241,7 +241,7 @@ _gxio_mpipe_link_mac_t;
  *  permission on the same link.
  *
  *  No more than one of ::GXIO_MPIPE_LINK_STATS, ::GXIO_MPIPE_LINK_NO_STATS,
- *  or ::GXIO_MPIPE_LINK_EXCL_STATS may be specifed in a gxio_mpipe_link_open()
+ *  or ::GXIO_MPIPE_LINK_EXCL_STATS may be specified in a gxio_mpipe_link_open()
  *  call.  If none are specified, ::GXIO_MPIPE_LINK_STATS is assumed.
  */
 #define GXIO_MPIPE_LINK_STATS              0x00000008UL
@@ -249,7 +249,7 @@ _gxio_mpipe_link_mac_t;
 /** Do not request stats permission on the specified link.
  *
  *  No more than one of ::GXIO_MPIPE_LINK_STATS, ::GXIO_MPIPE_LINK_NO_STATS,
- *  or ::GXIO_MPIPE_LINK_EXCL_STATS may be specifed in a gxio_mpipe_link_open()
+ *  or ::GXIO_MPIPE_LINK_EXCL_STATS may be specified in a gxio_mpipe_link_open()
  *  call.  If none are specified, ::GXIO_MPIPE_LINK_STATS is assumed.
  */
 #define GXIO_MPIPE_LINK_NO_STATS           0x00000010UL
@@ -267,7 +267,7 @@ _gxio_mpipe_link_mac_t;
  *  reset by other statistics programs.
  *
  *  No more than one of ::GXIO_MPIPE_LINK_STATS, ::GXIO_MPIPE_LINK_NO_STATS,
- *  or ::GXIO_MPIPE_LINK_EXCL_STATS may be specifed in a gxio_mpipe_link_open()
+ *  or ::GXIO_MPIPE_LINK_EXCL_STATS may be specified in a gxio_mpipe_link_open()
  *  call.  If none are specified, ::GXIO_MPIPE_LINK_STATS is assumed.
  */
 #define GXIO_MPIPE_LINK_EXCL_STATS         0x00000020UL
@@ -278,7 +278,7 @@ _gxio_mpipe_link_mac_t;
  *  permission on the same link.
  *
  *  No more than one of ::GXIO_MPIPE_LINK_CTL, ::GXIO_MPIPE_LINK_NO_CTL,
- *  or ::GXIO_MPIPE_LINK_EXCL_CTL may be specifed in a gxio_mpipe_link_open()
+ *  or ::GXIO_MPIPE_LINK_EXCL_CTL may be specified in a gxio_mpipe_link_open()
  *  call.  If none are specified, ::GXIO_MPIPE_LINK_CTL is assumed.
  */
 #define GXIO_MPIPE_LINK_CTL                0x00000040UL
@@ -286,7 +286,7 @@ _gxio_mpipe_link_mac_t;
 /** Do not request control permission on the specified link.
  *
  *  No more than one of ::GXIO_MPIPE_LINK_CTL, ::GXIO_MPIPE_LINK_NO_CTL,
- *  or ::GXIO_MPIPE_LINK_EXCL_CTL may be specifed in a gxio_mpipe_link_open()
+ *  or ::GXIO_MPIPE_LINK_EXCL_CTL may be specified in a gxio_mpipe_link_open()
  *  call.  If none are specified, ::GXIO_MPIPE_LINK_CTL is assumed.
  */
 #define GXIO_MPIPE_LINK_NO_CTL             0x00000080UL
@@ -301,7 +301,7 @@ _gxio_mpipe_link_mac_t;
  *  it prevents programs like mpipe-link from configuring the link.
  *
  *  No more than one of ::GXIO_MPIPE_LINK_CTL, ::GXIO_MPIPE_LINK_NO_CTL,
- *  or ::GXIO_MPIPE_LINK_EXCL_CTL may be specifed in a gxio_mpipe_link_open()
+ *  or ::GXIO_MPIPE_LINK_EXCL_CTL may be specified in a gxio_mpipe_link_open()
  *  call.  If none are specified, ::GXIO_MPIPE_LINK_CTL is assumed.
  */
 #define GXIO_MPIPE_LINK_EXCL_CTL           0x00000100UL
@@ -311,7 +311,7 @@ _gxio_mpipe_link_mac_t;
  *  change the desired state of the link when it is closed or the process
  *  exits.  No more than one of ::GXIO_MPIPE_LINK_AUTO_UP,
  *  ::GXIO_MPIPE_LINK_AUTO_UPDOWN, ::GXIO_MPIPE_LINK_AUTO_DOWN, or
- *  ::GXIO_MPIPE_LINK_AUTO_NONE may be specifed in a gxio_mpipe_link_open()
+ *  ::GXIO_MPIPE_LINK_AUTO_NONE may be specified in a gxio_mpipe_link_open()
  *  call.  If none are specified, ::GXIO_MPIPE_LINK_AUTO_UPDOWN is assumed.
  */
 #define GXIO_MPIPE_LINK_AUTO_UP            0x00000200UL
@@ -322,7 +322,7 @@ _gxio_mpipe_link_mac_t;
  *  open, set the desired state of the link to down.  No more than one of
  *  ::GXIO_MPIPE_LINK_AUTO_UP, ::GXIO_MPIPE_LINK_AUTO_UPDOWN,
  *  ::GXIO_MPIPE_LINK_AUTO_DOWN, or ::GXIO_MPIPE_LINK_AUTO_NONE may be
- *  specifed in a gxio_mpipe_link_open() call.  If none are specified,
+ *  specified in a gxio_mpipe_link_open() call.  If none are specified,
  *  ::GXIO_MPIPE_LINK_AUTO_UPDOWN is assumed.
  */
 #define GXIO_MPIPE_LINK_AUTO_UPDOWN        0x00000400UL
@@ -332,7 +332,7 @@ _gxio_mpipe_link_mac_t;
  *  process has the link open, set the desired state of the link to down.
  *  No more than one of ::GXIO_MPIPE_LINK_AUTO_UP,
  *  ::GXIO_MPIPE_LINK_AUTO_UPDOWN, ::GXIO_MPIPE_LINK_AUTO_DOWN, or
- *  ::GXIO_MPIPE_LINK_AUTO_NONE may be specifed in a gxio_mpipe_link_open()
+ *  ::GXIO_MPIPE_LINK_AUTO_NONE may be specified in a gxio_mpipe_link_open()
  *  call.  If none are specified, ::GXIO_MPIPE_LINK_AUTO_UPDOWN is assumed.
  */
 #define GXIO_MPIPE_LINK_AUTO_DOWN          0x00000800UL
@@ -342,7 +342,7 @@ _gxio_mpipe_link_mac_t;
  *  closed or the process exits.  No more than one of
  *  ::GXIO_MPIPE_LINK_AUTO_UP, ::GXIO_MPIPE_LINK_AUTO_UPDOWN,
  *  ::GXIO_MPIPE_LINK_AUTO_DOWN, or ::GXIO_MPIPE_LINK_AUTO_NONE may be
- *  specifed in a gxio_mpipe_link_open() call.  If none are specified,
+ *  specified in a gxio_mpipe_link_open() call.  If none are specified,
  *  ::GXIO_MPIPE_LINK_AUTO_UPDOWN is assumed.
  */
 #define GXIO_MPIPE_LINK_AUTO_NONE          0x00001000UL
diff --git a/arch/tile/kernel/kgdb.c b/arch/tile/kernel/kgdb.c
index a506c2c28943..9247d6b562f4 100644
--- a/arch/tile/kernel/kgdb.c
+++ b/arch/tile/kernel/kgdb.c
@@ -126,15 +126,15 @@ void
 sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *task)
 {
         struct pt_regs *thread_regs;
+        const int NGPRS = TREG_LAST_GPR + 1;
 
         if (task == NULL)
                 return;
 
-        /* Initialize to zero. */
-        memset(gdb_regs, 0, NUMREGBYTES);
-
         thread_regs = task_pt_regs(task);
-        memcpy(gdb_regs, thread_regs, TREG_LAST_GPR * sizeof(unsigned long));
+        memcpy(gdb_regs, thread_regs, NGPRS * sizeof(unsigned long));
+        memset(&gdb_regs[NGPRS], 0,
+               (TILEGX_PC_REGNUM - NGPRS) * sizeof(unsigned long));
         gdb_regs[TILEGX_PC_REGNUM] = thread_regs->pc;
         gdb_regs[TILEGX_FAULTNUM_REGNUM] = thread_regs->faultnum;
 }
@@ -433,9 +433,9 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code,
 struct kgdb_arch arch_kgdb_ops;
 
 /*
- * kgdb_arch_init - Perform any architecture specific initalization.
+ * kgdb_arch_init - Perform any architecture specific initialization.
  *
- * This function will handle the initalization of any architecture
+ * This function will handle the initialization of any architecture
  * specific callbacks.
  */
 int kgdb_arch_init(void)
@@ -447,9 +447,9 @@ int kgdb_arch_init(void)
 }
 
 /*
- * kgdb_arch_exit - Perform any architecture specific uninitalization.
+ * kgdb_arch_exit - Perform any architecture specific uninitialization.
  *
- * This function will handle the uninitalization of any architecture
+ * This function will handle the uninitialization of any architecture
  * specific callbacks, for dynamic registration and unregistration.
  */
 void kgdb_arch_exit(void)
diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c
index 4c017d0d2de8..aa2b44cd8fd3 100644
--- a/arch/tile/kernel/pci_gx.c
+++ b/arch/tile/kernel/pci_gx.c
@@ -1326,7 +1326,7 @@ invalid_device:
 
 
 /*
- * See tile_cfg_read() for relevent comments.
+ * See tile_cfg_read() for relevant comments.
  * Note that "val" is the value to write, not a pointer to that value.
  */
 static int tile_cfg_write(struct pci_bus *bus, unsigned int devfn, int offset,
diff --git a/arch/x86/events/amd/core.c b/arch/x86/events/amd/core.c
index 049ada8d4e9c..86a9bec18dab 100644
--- a/arch/x86/events/amd/core.c
+++ b/arch/x86/events/amd/core.c
@@ -369,7 +369,7 @@ static int amd_pmu_cpu_prepare(int cpu)
 
         WARN_ON_ONCE(cpuc->amd_nb);
 
-        if (boot_cpu_data.x86_max_cores < 2)
+        if (!x86_pmu.amd_nb_constraints)
                 return NOTIFY_OK;
 
         cpuc->amd_nb = amd_alloc_nb(cpu);
@@ -388,7 +388,7 @@ static void amd_pmu_cpu_starting(int cpu)
 
         cpuc->perf_ctr_virt_mask = AMD64_EVENTSEL_HOSTONLY;
 
-        if (boot_cpu_data.x86_max_cores < 2)
+        if (!x86_pmu.amd_nb_constraints)
                 return;
 
         nb_id = amd_get_nb_id(cpu);
@@ -414,7 +414,7 @@ static void amd_pmu_cpu_dead(int cpu)
 {
         struct cpu_hw_events *cpuhw;
 
-        if (boot_cpu_data.x86_max_cores < 2)
+        if (!x86_pmu.amd_nb_constraints)
                 return;
 
         cpuhw = &per_cpu(cpu_hw_events, cpu);
@@ -648,6 +648,8 @@ static __initconst const struct x86_pmu amd_pmu = {
         .cpu_prepare            = amd_pmu_cpu_prepare,
         .cpu_starting           = amd_pmu_cpu_starting,
         .cpu_dead               = amd_pmu_cpu_dead,
+
+        .amd_nb_constraints     = 1,
 };
 
 static int __init amd_core_pmu_init(void)
@@ -674,6 +676,11 @@ static int __init amd_core_pmu_init(void)
         x86_pmu.eventsel        = MSR_F15H_PERF_CTL;
         x86_pmu.perfctr         = MSR_F15H_PERF_CTR;
         x86_pmu.num_counters    = AMD64_NUM_COUNTERS_CORE;
+        /*
+         * AMD Core perfctr has separate MSRs for the NB events, see
+         * the amd/uncore.c driver.
+         */
+        x86_pmu.amd_nb_constraints = 0;
 
         pr_cont("core perfctr, ");
         return 0;
@@ -693,6 +700,14 @@ __init int amd_pmu_init(void)
         if (ret)
                 return ret;
 
+        if (num_possible_cpus() == 1) {
+                /*
+                 * No point in allocating data structures to serialize
+                 * against other CPUs, when there is only the one CPU.
+                 */
+                x86_pmu.amd_nb_constraints = 0;
+        }
+
         /* Events are common for all AMDs */
         memcpy(hw_cache_event_ids, amd_hw_cache_event_ids,
                sizeof(hw_cache_event_ids));
diff --git a/arch/x86/events/amd/ibs.c b/arch/x86/events/amd/ibs.c
index 3ea25c3917c0..feb90f6730e8 100644
--- a/arch/x86/events/amd/ibs.c
+++ b/arch/x86/events/amd/ibs.c
@@ -28,10 +28,46 @@ static u32 ibs_caps;
 #define IBS_FETCH_CONFIG_MASK   (IBS_FETCH_RAND_EN | IBS_FETCH_MAX_CNT)
 #define IBS_OP_CONFIG_MASK      IBS_OP_MAX_CNT
 
+
+/*
+ * IBS states:
+ *
+ * ENABLED; tracks the pmu::add(), pmu::del() state, when set the counter is taken
+ * and any further add()s must fail.
+ *
+ * STARTED/STOPPING/STOPPED; deal with pmu::start(), pmu::stop() state but are
+ * complicated by the fact that the IBS hardware can send late NMIs (ie. after
+ * we've cleared the EN bit).
+ *
+ * In order to consume these late NMIs we have the STOPPED state, any NMI that
+ * happens after we've cleared the EN state will clear this bit and report the
+ * NMI handled (this is fundamentally racy in the face or multiple NMI sources,
+ * someone else can consume our BIT and our NMI will go unhandled).
+ *
+ * And since we cannot set/clear this separate bit together with the EN bit,
+ * there are races; if we cleared STARTED early, an NMI could land in
+ * between clearing STARTED and clearing the EN bit (in fact multiple NMIs
+ * could happen if the period is small enough), and consume our STOPPED bit
+ * and trigger streams of unhandled NMIs.
+ *
+ * If, however, we clear STARTED late, an NMI can hit between clearing the
+ * EN bit and clearing STARTED, still see STARTED set and process the event.
+ * If this event will have the VALID bit clear, we bail properly, but this
+ * is not a given. With VALID set we can end up calling pmu::stop() again
+ * (the throttle logic) and trigger the WARNs in there.
+ *
+ * So what we do is set STOPPING before clearing EN to avoid the pmu::stop()
+ * nesting, and clear STARTED late, so that we have a well defined state over
+ * the clearing of the EN bit.
+ *
+ * XXX: we could probably be using !atomic bitops for all this.
+ */
+
 enum ibs_states {
         IBS_ENABLED     = 0,
         IBS_STARTED     = 1,
         IBS_STOPPING    = 2,
+        IBS_STOPPED     = 3,
 
         IBS_MAX_STATES,
 };
@@ -377,11 +413,10 @@ static void perf_ibs_start(struct perf_event *event, int flags)
 
         perf_ibs_set_period(perf_ibs, hwc, &period);
         /*
-         * Set STARTED before enabling the hardware, such that
-         * a subsequent NMI must observe it. Then clear STOPPING
-         * such that we don't consume NMIs by accident.
+         * Set STARTED before enabling the hardware, such that a subsequent NMI
+         * must observe it.
          */
-        set_bit(IBS_STARTED, pcpu->state);
+        set_bit(IBS_STARTED,    pcpu->state);
         clear_bit(IBS_STOPPING, pcpu->state);
         perf_ibs_enable_event(perf_ibs, hwc, period >> 4);
 
@@ -396,6 +431,9 @@ static void perf_ibs_stop(struct perf_event *event, int flags)
         u64 config;
         int stopping;
 
+        if (test_and_set_bit(IBS_STOPPING, pcpu->state))
+                return;
+
         stopping = test_bit(IBS_STARTED, pcpu->state);
 
         if (!stopping && (hwc->state & PERF_HES_UPTODATE))
@@ -405,12 +443,12 @@ static void perf_ibs_stop(struct perf_event *event, int flags)
 
         if (stopping) {
                 /*
-                 * Set STOPPING before disabling the hardware, such that it
+                 * Set STOPPED before disabling the hardware, such that it
                  * must be visible to NMIs the moment we clear the EN bit,
                  * at which point we can generate an !VALID sample which
                  * we need to consume.
                  */
-                set_bit(IBS_STOPPING, pcpu->state);
+                set_bit(IBS_STOPPED, pcpu->state);
                 perf_ibs_disable_event(perf_ibs, hwc, config);
                 /*
                  * Clear STARTED after disabling the hardware; if it were
@@ -556,7 +594,7 @@ fail:
                  * with samples that even have the valid bit cleared.
                  * Mark all this NMIs as handled.
                  */
-                if (test_and_clear_bit(IBS_STOPPING, pcpu->state))
+                if (test_and_clear_bit(IBS_STOPPED, pcpu->state))
                         return 1;
 
                 return 0;
diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h
index ba6ef18528c9..ad4dc7ffffb5 100644
--- a/arch/x86/events/perf_event.h
+++ b/arch/x86/events/perf_event.h
@@ -608,6 +608,11 @@ struct x86_pmu {
         atomic_t        lbr_exclusive[x86_lbr_exclusive_max];
 
         /*
+         * AMD bits
+         */
+        unsigned int    amd_nb_constraints : 1;
+
+        /*
          * Extra registers for events
          */
         struct extra_reg *extra_regs;
@@ -795,6 +800,9 @@ ssize_t intel_event_sysfs_show(char *page, u64 config);
 
 struct attribute **merge_attr(struct attribute **a, struct attribute **b);
 
+ssize_t events_sysfs_show(struct device *dev, struct device_attribute *attr,
+                          char *page);
+
 #ifdef CONFIG_CPU_SUP_AMD
 
 int amd_pmu_init(void);
@@ -925,9 +933,6 @@ int p6_pmu_init(void);
 
 int knc_pmu_init(void);
 
-ssize_t events_sysfs_show(struct device *dev, struct device_attribute *attr,
-                          char *page);
-
 static inline int is_ht_workaround_enabled(void)
 {
         return !!(x86_pmu.flags & PMU_FL_EXCL_ENABLED);
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index f62a9f37f79f..b7e394485a5f 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -43,7 +43,7 @@
 
 #define KVM_PIO_PAGE_OFFSET 1
 #define KVM_COALESCED_MMIO_PAGE_OFFSET 2
-#define KVM_HALT_POLL_NS_DEFAULT 500000
+#define KVM_HALT_POLL_NS_DEFAULT 400000
 
 #define KVM_IRQCHIP_NUM_PINS  KVM_IOAPIC_NUM_PINS
 
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index 2da46ac16e37..5b3c9a55f51c 100644
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -167,6 +167,14 @@
 #define MSR_PKG_C9_RESIDENCY            0x00000631
 #define MSR_PKG_C10_RESIDENCY           0x00000632
 
+/* Interrupt Response Limit */
+#define MSR_PKGC3_IRTL                  0x0000060a
+#define MSR_PKGC6_IRTL                  0x0000060b
+#define MSR_PKGC7_IRTL                  0x0000060c
+#define MSR_PKGC8_IRTL                  0x00000633
+#define MSR_PKGC9_IRTL                  0x00000634
+#define MSR_PKGC10_IRTL                 0x00000635
+
 /* Run Time Average Power Limiting (RAPL) Interface */
 
 #define MSR_RAPL_POWER_UNIT             0x00000606
@@ -190,6 +198,7 @@
 #define MSR_PP1_ENERGY_STATUS           0x00000641
 #define MSR_PP1_POLICY                  0x00000642
 
+/* Config TDP MSRs */
 #define MSR_CONFIG_TDP_NOMINAL          0x00000648
 #define MSR_CONFIG_TDP_LEVEL_1          0x00000649
 #define MSR_CONFIG_TDP_LEVEL_2          0x0000064A
@@ -210,13 +219,6 @@
 #define MSR_GFX_PERF_LIMIT_REASONS      0x000006B0
 #define MSR_RING_PERF_LIMIT_REASONS     0x000006B1
 
-/* Config TDP MSRs */
-#define MSR_CONFIG_TDP_NOMINAL          0x00000648
-#define MSR_CONFIG_TDP_LEVEL1           0x00000649
-#define MSR_CONFIG_TDP_LEVEL2           0x0000064A
-#define MSR_CONFIG_TDP_CONTROL          0x0000064B
-#define MSR_TURBO_ACTIVATION_RATIO      0x0000064C
-
 /* Hardware P state interface */
 #define MSR_PPERF                       0x0000064e
 #define MSR_PERF_LIMIT_REASONS          0x0000064f
diff --git a/arch/x86/include/asm/pmem.h b/arch/x86/include/asm/pmem.h
index bf8b35d2035a..fbc5e92e1ecc 100644
--- a/arch/x86/include/asm/pmem.h
+++ b/arch/x86/include/asm/pmem.h
@@ -47,6 +47,15 @@ static inline void arch_memcpy_to_pmem(void __pmem *dst, const void *src,
                 BUG();
 }
 
+static inline int arch_memcpy_from_pmem(void *dst, const void __pmem *src,
+                size_t n)
+{
+        if (static_cpu_has(X86_FEATURE_MCE_RECOVERY))
+                return memcpy_mcsafe(dst, (void __force *) src, n);
+        memcpy(dst, (void __force *) src, n);
+        return 0;
+}
+
 /**
  * arch_wmb_pmem - synchronize writes to persistent memory
  *
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 983738ac014c..9264476f3d57 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -132,8 +132,6 @@ struct cpuinfo_x86 {
         u16                     logical_proc_id;
         /* Core id: */
         u16                     cpu_core_id;
-        /* Compute unit id */
-        u8                      compute_unit_id;
         /* Index into per_cpu list: */
         u16                     cpu_index;
         u32                     microcode;
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index 20a3de5cb3b0..66b057306f40 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -155,6 +155,7 @@ static inline int wbinvd_on_all_cpus(void)
         wbinvd();
         return 0;
 }
+#define smp_num_siblings        1
 #endif /* CONFIG_SMP */
 
 extern unsigned disabled_cpus;
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
index 82866697fcf1..ffae84df8a93 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@ -276,11 +276,9 @@ static inline bool is_ia32_task(void)
  */
 #define force_iret() set_thread_flag(TIF_NOTIFY_RESUME)
 
-#endif  /* !__ASSEMBLY__ */
-
-#ifndef __ASSEMBLY__
 extern void arch_task_cache_init(void);
 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
 extern void arch_release_task_struct(struct task_struct *tsk);
-#endif
+#endif  /* !__ASSEMBLY__ */
+
 #endif /* _ASM_X86_THREAD_INFO_H */
diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
index c24b4224d439..1fde8d580a5b 100644
--- a/arch/x86/include/asm/tlbflush.h
+++ b/arch/x86/include/asm/tlbflush.h
@@ -319,12 +319,6 @@ static inline void reset_lazy_tlbstate(void)
 
 #endif  /* SMP */
 
-/* Not inlined due to inc_irq_stat not being defined yet */
-#define flush_tlb_local() {             \
-        inc_irq_stat(irq_tlb_count);    \
-        local_flush_tlb();              \
-}
-
 #ifndef CONFIG_PARAVIRT
 #define flush_tlb_others(mask, mm, start, end)  \
         native_flush_tlb_others(mask, mm, start, end)
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
index 29fa475ec518..a147e676fc7b 100644
--- a/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@ -170,15 +170,13 @@ int amd_get_subcaches(int cpu)
 {
         struct pci_dev *link = node_to_amd_nb(amd_get_nb_id(cpu))->link;
         unsigned int mask;
-        int cuid;
 
         if (!amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
                 return 0;
 
         pci_read_config_dword(link, 0x1d4, &mask);
 
-        cuid = cpu_data(cpu).compute_unit_id;
-        return (mask >> (4 * cuid)) & 0xf;
+        return (mask >> (4 * cpu_data(cpu).cpu_core_id)) & 0xf;
 }
 
 int amd_set_subcaches(int cpu, unsigned long mask)
@@ -204,7 +202,7 @@ int amd_set_subcaches(int cpu, unsigned long mask)
                 pci_write_config_dword(nb->misc, 0x1b8, reg & ~0x180000);
         }
 
-        cuid = cpu_data(cpu).compute_unit_id;
+        cuid = cpu_data(cpu).cpu_core_id;
         mask <<= 4 * cuid;
         mask |= (0xf ^ (1 << cuid)) << 26;
 
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 6e47e3a916f1..7b76eb67a9b3 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -300,7 +300,6 @@ static int nearby_node(int apicid)
 #ifdef CONFIG_SMP
 static void amd_get_topology(struct cpuinfo_x86 *c)
 {
-        u32 cores_per_cu = 1;
         u8 node_id;
         int cpu = smp_processor_id();
 
@@ -313,8 +312,8 @@ static void amd_get_topology(struct cpuinfo_x86 *c)
 
                 /* get compute unit information */
                 smp_num_siblings = ((ebx >> 8) & 3) + 1;
-                c->compute_unit_id = ebx & 0xff;
-                cores_per_cu += ((ebx >> 8) & 3);
+                c->x86_max_cores /= smp_num_siblings;
+                c->cpu_core_id = ebx & 0xff;
         } else if (cpu_has(c, X86_FEATURE_NODEID_MSR)) {
                 u64 value;
 
@@ -325,19 +324,16 @@ static void amd_get_topology(struct cpuinfo_x86 *c)
 
         /* fixup multi-node processor information */
         if (nodes_per_socket > 1) {
-                u32 cores_per_node;
                 u32 cus_per_node;
 
                 set_cpu_cap(c, X86_FEATURE_AMD_DCM);
-                cores_per_node = c->x86_max_cores / nodes_per_socket;
-                cus_per_node = cores_per_node / cores_per_cu;
+                cus_per_node = c->x86_max_cores / nodes_per_socket;
 
                 /* store NodeID, use llc_shared_map to store sibling info */
                 per_cpu(cpu_llc_id, cpu) = node_id;
 
                 /* core id has to be in the [0 .. cores_per_node - 1] range */
-                c->cpu_core_id %= cores_per_node;
-                c->compute_unit_id %= cus_per_node;
+                c->cpu_core_id %= cus_per_node;
         }
 }
 #endif
diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c
index 0b445c2ff735..ac780cad3b86 100644
--- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
@@ -384,6 +384,9 @@ static void intel_thermal_interrupt(void)
 {
         __u64 msr_val;
 
+        if (static_cpu_has(X86_FEATURE_HWP))
+                wrmsrl_safe(MSR_HWP_STATUS, 0);
+
         rdmsrl(MSR_IA32_THERM_STATUS, msr_val);
 
         /* Check for violation of core thermal thresholds*/
diff --git a/arch/x86/kernel/cpu/powerflags.c b/arch/x86/kernel/cpu/powerflags.c
index 31f0f335ed22..1dd8294fd730 100644
--- a/arch/x86/kernel/cpu/powerflags.c
+++ b/arch/x86/kernel/cpu/powerflags.c
@@ -18,4 +18,6 @@ const char *const x86_power_flags[32] = {
         "",     /* tsc invariant mapped to constant_tsc */
         "cpb",  /* core performance boost */
         "eff_freq_ro", /* Readonly aperf/mperf */
+        "proc_feedback", /* processor feedback interface */
+        "acc_power", /* accumulated power mechanism */
 };
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 2367ae07eb76..319b08a5b6ed 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -146,31 +146,6 @@ int default_check_phys_apicid_present(int phys_apicid)
 
 struct boot_params boot_params;
 
-/*
- * Machine setup..
- */
-static struct resource data_resource = {
-        .name   = "Kernel data",
-        .start  = 0,
-        .end    = 0,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM
-};
-
-static struct resource code_resource = {
-        .name   = "Kernel code",
-        .start  = 0,
-        .end    = 0,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM
-};
-
-static struct resource bss_resource = {
-        .name   = "Kernel bss",
-        .start  = 0,
-        .end    = 0,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM
-};
-
-
 #ifdef CONFIG_X86_32
 /* cpu data as detected by the assembly code in head.S */
 struct cpuinfo_x86 new_cpu_data = {
@@ -949,13 +924,6 @@ void __init setup_arch(char **cmdline_p)
 
         mpx_mm_init(&init_mm);
 
-        code_resource.start = __pa_symbol(_text);
-        code_resource.end = __pa_symbol(_etext)-1;
-        data_resource.start = __pa_symbol(_etext);
-        data_resource.end = __pa_symbol(_edata)-1;
-        bss_resource.start = __pa_symbol(__bss_start);
-        bss_resource.end = __pa_symbol(__bss_stop)-1;
-
 #ifdef CONFIG_CMDLINE_BOOL
 #ifdef CONFIG_CMDLINE_OVERRIDE
         strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
@@ -1019,11 +987,6 @@ void __init setup_arch(char **cmdline_p)
 
         x86_init.resources.probe_roms();
 
-        /* after parse_early_param, so could debug it */
-        insert_resource(&iomem_resource, &code_resource);
-        insert_resource(&iomem_resource, &data_resource);
-        insert_resource(&iomem_resource, &bss_resource);
-
         e820_add_kernel_range();
         trim_bios_range();
 #ifdef CONFIG_X86_32
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index b2c99f811c3f..a2065d3b3b39 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -422,7 +422,7 @@ static bool match_smt(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
 
                 if (c->phys_proc_id == o->phys_proc_id &&
                     per_cpu(cpu_llc_id, cpu1) == per_cpu(cpu_llc_id, cpu2) &&
-                    c->compute_unit_id == o->compute_unit_id)
+                    c->cpu_core_id == o->cpu_core_id)
                         return topology_sane(c, o, "smt");
 
         } else if (c->phys_proc_id == o->phys_proc_id &&
diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index 5ff3485acb60..01bd7b7a6866 100644
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -1116,6 +1116,11 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu)
                 break;
         case HVCALL_POST_MESSAGE:
         case HVCALL_SIGNAL_EVENT:
+                /* don't bother userspace if it has no way to handle it */
+                if (!vcpu_to_synic(vcpu)->active) {
+                        res = HV_STATUS_INVALID_HYPERCALL_CODE;
+                        break;
+                }
                 vcpu->run->exit_reason = KVM_EXIT_HYPERV;
                 vcpu->run->hyperv.type = KVM_EXIT_HYPERV_HCALL;
                 vcpu->run->hyperv.u.hcall.input = param;
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 443d2a57ad3d..1a2da0e5a373 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -1369,7 +1369,7 @@ static void start_apic_timer(struct kvm_lapic *apic)
 
                 hrtimer_start(&apic->lapic_timer.timer,
                               ktime_add_ns(now, apic->lapic_timer.period),
-                              HRTIMER_MODE_ABS);
+                              HRTIMER_MODE_ABS_PINNED);
 
                 apic_debug("%s: bus cycle is %" PRId64 "ns, now 0x%016"
                            PRIx64 ", "
@@ -1402,7 +1402,7 @@ static void start_apic_timer(struct kvm_lapic *apic)
                         expire = ktime_add_ns(now, ns);
                         expire = ktime_sub_ns(expire, lapic_timer_advance_ns);
                         hrtimer_start(&apic->lapic_timer.timer,
-                                      expire, HRTIMER_MODE_ABS);
+                                      expire, HRTIMER_MODE_ABS_PINNED);
                 } else
                         apic_timer_expired(apic);
 
@@ -1868,7 +1868,7 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu)
         apic->vcpu = vcpu;
 
         hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC,
-                     HRTIMER_MODE_ABS);
+                     HRTIMER_MODE_ABS_PINNED);
         apic->lapic_timer.timer.function = apic_timer_fn;
 
         /*
@@ -2003,7 +2003,7 @@ void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu)
 
         timer = &vcpu->arch.apic->lapic_timer.timer;
         if (hrtimer_cancel(timer))
-                hrtimer_start_expires(timer, HRTIMER_MODE_ABS);
+                hrtimer_start_expires(timer, HRTIMER_MODE_ABS_PINNED);
 }
 
 /*
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 70e95d097ef1..1ff4dbb73fb7 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -557,8 +557,15 @@ static bool mmu_spte_update(u64 *sptep, u64 new_spte)
               !is_writable_pte(new_spte))
                 ret = true;
 
-        if (!shadow_accessed_mask)
+        if (!shadow_accessed_mask) {
+                /*
+                 * We don't set page dirty when dropping non-writable spte.
+                 * So do it now if the new spte is becoming non-writable.
+                 */
+                if (ret)
+                        kvm_set_pfn_dirty(spte_to_pfn(old_spte));
                 return ret;
+        }
 
         /*
          * Flush TLB when accessed/dirty bits are changed in the page tables,
@@ -605,7 +612,8 @@ static int mmu_spte_clear_track_bits(u64 *sptep)
 
         if (!shadow_accessed_mask || old_spte & shadow_accessed_mask)
                 kvm_set_pfn_accessed(pfn);
-        if (!shadow_dirty_mask || (old_spte & shadow_dirty_mask))
+        if (old_spte & (shadow_dirty_mask ? shadow_dirty_mask :
+                                            PT_WRITABLE_MASK))
                 kvm_set_pfn_dirty(pfn);
         return 1;
 }
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 742d0f7d3556..0a2c70e43bc8 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -6095,12 +6095,10 @@ static int inject_pending_event(struct kvm_vcpu *vcpu, bool req_int_win)
         }
 
         /* try to inject new event if pending */
-        if (vcpu->arch.nmi_pending) {
-                if (kvm_x86_ops->nmi_allowed(vcpu)) {
-                        --vcpu->arch.nmi_pending;
-                        vcpu->arch.nmi_injected = true;
-                        kvm_x86_ops->set_nmi(vcpu);
-                }
+        if (vcpu->arch.nmi_pending && kvm_x86_ops->nmi_allowed(vcpu)) {
+                --vcpu->arch.nmi_pending;
+                vcpu->arch.nmi_injected = true;
+                kvm_x86_ops->set_nmi(vcpu);
         } else if (kvm_cpu_has_injectable_intr(vcpu)) {
                 /*
                  * Because interrupts can be injected asynchronously, we are
@@ -6569,10 +6567,12 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
                 if (inject_pending_event(vcpu, req_int_win) != 0)
                         req_immediate_exit = true;
                 /* enable NMI/IRQ window open exits if needed */
-                else if (vcpu->arch.nmi_pending)
-                        kvm_x86_ops->enable_nmi_window(vcpu);
-                else if (kvm_cpu_has_injectable_intr(vcpu) || req_int_win)
-                        kvm_x86_ops->enable_irq_window(vcpu);
+                else {
+                        if (vcpu->arch.nmi_pending)
+                                kvm_x86_ops->enable_nmi_window(vcpu);
+                        if (kvm_cpu_has_injectable_intr(vcpu) || req_int_win)
+                                kvm_x86_ops->enable_irq_window(vcpu);
+                }
 
                 if (kvm_lapic_enabled(vcpu)) {
                         update_cr8_intercept(vcpu);
diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index 8f4cc3dfac32..fe9b9f776361 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -104,10 +104,8 @@ static void flush_tlb_func(void *info)
 
         inc_irq_stat(irq_tlb_count);
 
-        if (f->flush_mm != this_cpu_read(cpu_tlbstate.active_mm))
+        if (f->flush_mm && f->flush_mm != this_cpu_read(cpu_tlbstate.active_mm))
                 return;
-        if (!f->flush_end)
-                f->flush_end = f->flush_start + PAGE_SIZE;
 
         count_vm_tlb_event(NR_TLB_REMOTE_FLUSH_RECEIVED);
         if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK) {
@@ -135,12 +133,20 @@ void native_flush_tlb_others(const struct cpumask *cpumask,
                                  unsigned long end)
 {
         struct flush_tlb_info info;
+
+        if (end == 0)
+                end = start + PAGE_SIZE;
         info.flush_mm = mm;
         info.flush_start = start;
         info.flush_end = end;
 
         count_vm_tlb_event(NR_TLB_REMOTE_FLUSH);
-        trace_tlb_flush(TLB_REMOTE_SEND_IPI, end - start);
+        if (end == TLB_FLUSH_ALL)
+                trace_tlb_flush(TLB_REMOTE_SEND_IPI, TLB_FLUSH_ALL);
+        else
+                trace_tlb_flush(TLB_REMOTE_SEND_IPI,
+                                (end - start) >> PAGE_SHIFT);
+
         if (is_uv_system()) {
                 unsigned int cpu;
 
diff --git a/arch/x86/ras/mce_amd_inj.c b/arch/x86/ras/mce_amd_inj.c
index 55d38cfa46c2..9e02dcaef683 100644
--- a/arch/x86/ras/mce_amd_inj.c
+++ b/arch/x86/ras/mce_amd_inj.c
@@ -20,6 +20,7 @@
 #include <linux/pci.h>
 
 #include <asm/mce.h>
+#include <asm/smp.h>
 #include <asm/amd_nb.h>
 #include <asm/irq_vectors.h>
 
@@ -206,7 +207,7 @@ static u32 get_nbc_for_node(int node_id)
         struct cpuinfo_x86 *c = &boot_cpu_data;
         u32 cores_per_node;
 
-        cores_per_node = c->x86_max_cores / amd_get_nodes_per_socket();
+        cores_per_node = (c->x86_max_cores * smp_num_siblings) / amd_get_nodes_per_socket();
 
         return cores_per_node * node_id;
 }
diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c
index abf4901c917b..db52a7fafcc2 100644
--- a/arch/x86/xen/apic.c
+++ b/arch/x86/xen/apic.c
@@ -66,7 +66,7 @@ static u32 xen_apic_read(u32 reg)
 
         ret = HYPERVISOR_platform_op(&op);
         if (ret)
-                return 0;
+                op.u.pcpu_info.apic_id = BAD_APICID;
 
         return op.u.pcpu_info.apic_id << 24;
 }
@@ -142,6 +142,14 @@ static void xen_silent_inquire(int apicid)
 {
 }
 
+static int xen_cpu_present_to_apicid(int cpu)
+{
+        if (cpu_present(cpu))
+                return xen_get_apic_id(xen_apic_read(APIC_ID));
+        else
+                return BAD_APICID;
+}
+
 static struct apic xen_pv_apic = {
         .name                           = "Xen PV",
         .probe                          = xen_apic_probe_pv,
@@ -162,7 +170,7 @@ static struct apic xen_pv_apic = {
 
         .ioapic_phys_id_map             = default_ioapic_phys_id_map, /* Used on 32-bit */
         .setup_apic_routing             = NULL,
-        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
+        .cpu_present_to_apicid          = xen_cpu_present_to_apicid,
         .apicid_to_cpu_present          = physid_set_mask_of_physid, /* Used on 32-bit */
         .check_phys_apicid_present      = default_check_phys_apicid_present, /* smp_sanity_check needs it */
         .phys_pkg_id                    = xen_phys_pkg_id, /* detect_ht */
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 3c6d17fd423a..719cf291dcdf 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -545,6 +545,8 @@ static void xen_play_dead(void) /* used only with HOTPLUG_CPU */
          * data back is to call:
          */
         tick_nohz_idle_enter();
+
+        cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);
 }
 
 #else /* !CONFIG_HOTPLUG_CPU */
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/crypto/asymmetric_keys/pkcs7_trust.c b/crypto/asymmetric_keys/pkcs7_trust.c
index 3bbdcc79a3d3..7d7a39b47c62 100644
--- a/crypto/asymmetric_keys/pkcs7_trust.c
+++ b/crypto/asymmetric_keys/pkcs7_trust.c
@@ -178,6 +178,8 @@ int pkcs7_validate_trust(struct pkcs7_message *pkcs7,
         int cached_ret = -ENOKEY;
         int ret;
 
+        *_trusted = false;
+
         for (p = pkcs7->certs; p; p = p->next)
                 p->seen = false;
 
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
index b5e54f2da53d..0d92d0f915e9 100644
--- a/drivers/acpi/acpi_processor.c
+++ b/drivers/acpi/acpi_processor.c
@@ -491,6 +491,58 @@ static void acpi_processor_remove(struct acpi_device *device)
 }
 #endif /* CONFIG_ACPI_HOTPLUG_CPU */
 
+#ifdef CONFIG_X86
+static bool acpi_hwp_native_thermal_lvt_set;
+static acpi_status __init acpi_hwp_native_thermal_lvt_osc(acpi_handle handle,
+                                                          u32 lvl,
+                                                          void *context,
+                                                          void **rv)
+{
+        u8 sb_uuid_str[] = "4077A616-290C-47BE-9EBD-D87058713953";
+        u32 capbuf[2];
+        struct acpi_osc_context osc_context = {
+                .uuid_str = sb_uuid_str,
+                .rev = 1,
+                .cap.length = 8,
+                .cap.pointer = capbuf,
+        };
+
+        if (acpi_hwp_native_thermal_lvt_set)
+                return AE_CTRL_TERMINATE;
+
+        capbuf[0] = 0x0000;
+        capbuf[1] = 0x1000; /* set bit 12 */
+
+        if (ACPI_SUCCESS(acpi_run_osc(handle, &osc_context))) {
+                if (osc_context.ret.pointer && osc_context.ret.length > 1) {
+                        u32 *capbuf_ret = osc_context.ret.pointer;
+
+                        if (capbuf_ret[1] & 0x1000) {
+                                acpi_handle_info(handle,
+                                        "_OSC native thermal LVT Acked\n");
+                                acpi_hwp_native_thermal_lvt_set = true;
+                        }
+                }
+                kfree(osc_context.ret.pointer);
+        }
+
+        return AE_OK;
+}
+
+void __init acpi_early_processor_osc(void)
+{
+        if (boot_cpu_has(X86_FEATURE_HWP)) {
+                acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT,
+                                    ACPI_UINT32_MAX,
+                                    acpi_hwp_native_thermal_lvt_osc,
+                                    NULL, NULL, NULL);
+                acpi_get_devices(ACPI_PROCESSOR_DEVICE_HID,
+                                 acpi_hwp_native_thermal_lvt_osc,
+                                 NULL, NULL);
+        }
+}
+#endif
+
 /*
  * The following ACPI IDs are known to be suitable for representing as
  * processor devices.
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 0e8567846f1a..c068c829b453 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -1019,6 +1019,9 @@ static int __init acpi_bus_init(void)
                 goto error1;
         }
 
+        /* Set capability bits for _OSC under processor scope */
+        acpi_early_processor_osc();
+
         /*
          * _OSC method may exist in module level code,
          * so it must be run after ACPI_FULL_INITIALIZATION
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index a37508ef66c1..7c188472d9c2 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -145,6 +145,12 @@ void acpi_early_processor_set_pdc(void);
 static inline void acpi_early_processor_set_pdc(void) {}
 #endif
 
+#ifdef CONFIG_X86
+void acpi_early_processor_osc(void);
+#else
+static inline void acpi_early_processor_osc(void) {}
+#endif
+
 /* --------------------------------------------------------------------------
                                   Embedded Controller
    -------------------------------------------------------------------------- */
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index a1e0b9ab847a..5fb7718f256c 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -246,6 +246,8 @@ static int device_wakeup_attach(struct device *dev, struct wakeup_source *ws)
                 return -EEXIST;
         }
         dev->power.wakeup = ws;
+        if (dev->power.wakeirq)
+                device_wakeup_attach_irq(dev, dev->power.wakeirq);
         spin_unlock_irq(&dev->power.lock);
         return 0;
 }
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/block/rbd.c b/drivers/block/rbd.c
index 9c6234428607..94a1843b0426 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1953,7 +1953,7 @@ static struct ceph_osd_request *rbd_osd_req_create(
 
         osdc = &rbd_dev->rbd_client->client->osdc;
         osd_req = ceph_osdc_alloc_request(osdc, snapc, num_ops, false,
-                                          GFP_ATOMIC);
+                                          GFP_NOIO);
         if (!osd_req)
                 return NULL;    /* ENOMEM */
 
@@ -2002,7 +2002,7 @@ rbd_osd_req_create_copyup(struct rbd_obj_request *obj_request)
         rbd_dev = img_request->rbd_dev;
         osdc = &rbd_dev->rbd_client->client->osdc;
         osd_req = ceph_osdc_alloc_request(osdc, snapc, num_osd_ops,
-                                                false, GFP_ATOMIC);
+                                                false, GFP_NOIO);
         if (!osd_req)
                 return NULL;    /* ENOMEM */
 
@@ -2504,7 +2504,7 @@ static int rbd_img_request_fill(struct rbd_img_request *img_request,
                                         bio_chain_clone_range(&bio_list,
                                                                 &bio_offset,
                                                                 clone_size,
-                                                                GFP_ATOMIC);
+                                                                GFP_NOIO);
                         if (!obj_request->bio_list)
                                 goto out_unwind;
                 } else if (type == OBJ_REQUEST_PAGES) {
diff --git a/drivers/clk/mediatek/reset.c b/drivers/clk/mediatek/reset.c
index 9e9fe4b19ac4..309049d41f1b 100644
--- a/drivers/clk/mediatek/reset.c
+++ b/drivers/clk/mediatek/reset.c
@@ -57,7 +57,7 @@ static int mtk_reset(struct reset_controller_dev *rcdev,
         return mtk_reset_deassert(rcdev, id);
 }
 
-static struct reset_control_ops mtk_reset_ops = {
+static const struct reset_control_ops mtk_reset_ops = {
         .assert = mtk_reset_assert,
         .deassert = mtk_reset_deassert,
         .reset = mtk_reset,
diff --git a/drivers/clk/mmp/reset.c b/drivers/clk/mmp/reset.c
index b54da1fe73f0..b4e4d6aa2631 100644
--- a/drivers/clk/mmp/reset.c
+++ b/drivers/clk/mmp/reset.c
@@ -74,7 +74,7 @@ static int mmp_clk_reset_deassert(struct reset_controller_dev *rcdev,
         return 0;
 }
 
-static struct reset_control_ops mmp_clk_reset_ops = {
+static const struct reset_control_ops mmp_clk_reset_ops = {
         .assert         = mmp_clk_reset_assert,
         .deassert       = mmp_clk_reset_deassert,
 };
diff --git a/drivers/clk/qcom/gcc-ipq4019.c b/drivers/clk/qcom/gcc-ipq4019.c
index 5428efb9fbf5..3cd1af0af0d9 100644
--- a/drivers/clk/qcom/gcc-ipq4019.c
+++ b/drivers/clk/qcom/gcc-ipq4019.c
@@ -129,20 +129,10 @@ static const char * const gcc_xo_ddr_500_200[] = {
 };
 
 #define F(f, s, h, m, n) { (f), (s), (2 * (h) - 1), (m), (n) }
-#define P_XO 0
-#define FE_PLL_200 1
-#define FE_PLL_500 2
-#define DDRC_PLL_666  3
-
-#define DDRC_PLL_666_SDCC  1
-#define FE_PLL_125_DLY 1
-
-#define FE_PLL_WCSS2G 1
-#define FE_PLL_WCSS5G 1
 
 static const struct freq_tbl ftbl_gcc_audio_pwm_clk[] = {
         F(48000000, P_XO, 1, 0, 0),
-        F(200000000, FE_PLL_200, 1, 0, 0),
+        F(200000000, P_FEPLL200, 1, 0, 0),
         { }
 };
 
@@ -334,15 +324,15 @@ static struct clk_branch gcc_blsp1_qup2_spi_apps_clk = {
 };
 
 static const struct freq_tbl ftbl_gcc_blsp1_uart1_2_apps_clk[] = {
-        F(1843200, FE_PLL_200, 1, 144, 15625),
-        F(3686400, FE_PLL_200, 1, 288, 15625),
-        F(7372800, FE_PLL_200, 1, 576, 15625),
-        F(14745600, FE_PLL_200, 1, 1152, 15625),
-        F(16000000, FE_PLL_200, 1, 2, 25),
+        F(1843200, P_FEPLL200, 1, 144, 15625),
+        F(3686400, P_FEPLL200, 1, 288, 15625),
+        F(7372800, P_FEPLL200, 1, 576, 15625),
+        F(14745600, P_FEPLL200, 1, 1152, 15625),
+        F(16000000, P_FEPLL200, 1, 2, 25),
         F(24000000, P_XO, 1, 1, 2),
-        F(32000000, FE_PLL_200, 1, 4, 25),
-        F(40000000, FE_PLL_200, 1, 1, 5),
-        F(46400000, FE_PLL_200, 1, 29, 125),
+        F(32000000, P_FEPLL200, 1, 4, 25),
+        F(40000000, P_FEPLL200, 1, 1, 5),
+        F(46400000, P_FEPLL200, 1, 29, 125),
         F(48000000, P_XO, 1, 0, 0),
         { }
 };
@@ -410,9 +400,9 @@ static struct clk_branch gcc_blsp1_uart2_apps_clk = {
 };
 
 static const struct freq_tbl ftbl_gcc_gp_clk[] = {
-        F(1250000,  FE_PLL_200, 1, 16, 0),
-        F(2500000,  FE_PLL_200, 1,  8, 0),
-        F(5000000,  FE_PLL_200, 1,  4, 0),
+        F(1250000,  P_FEPLL200, 1, 16, 0),
+        F(2500000,  P_FEPLL200, 1,  8, 0),
+        F(5000000,  P_FEPLL200, 1,  4, 0),
         { }
 };
 
@@ -512,11 +502,11 @@ static struct clk_branch gcc_gp3_clk = {
 static const struct freq_tbl ftbl_gcc_sdcc1_apps_clk[] = {
         F(144000,    P_XO,                      1,  3, 240),
         F(400000,    P_XO,                      1,  1, 0),
-        F(20000000,  FE_PLL_500,                1,  1, 25),
-        F(25000000,  FE_PLL_500,                1,  1, 20),
-        F(50000000,  FE_PLL_500,                1,  1, 10),
-        F(100000000, FE_PLL_500,                1,  1, 5),
-        F(193000000, DDRC_PLL_666_SDCC,         1,  0, 0),
+        F(20000000,  P_FEPLL500,                1,  1, 25),
+        F(25000000,  P_FEPLL500,                1,  1, 20),
+        F(50000000,  P_FEPLL500,                1,  1, 10),
+        F(100000000, P_FEPLL500,                1,  1, 5),
+        F(193000000, P_DDRPLL,          1,  0, 0),
         { }
 };
 
@@ -536,9 +526,9 @@ static struct clk_rcg2  sdcc1_apps_clk_src = {
 
 static const struct freq_tbl ftbl_gcc_apps_clk[] = {
         F(48000000, P_XO,          1, 0, 0),
-        F(200000000, FE_PLL_200,   1, 0, 0),
-        F(500000000, FE_PLL_500,   1, 0, 0),
-        F(626000000, DDRC_PLL_666, 1, 0, 0),
+        F(200000000, P_FEPLL200,   1, 0, 0),
+        F(500000000, P_FEPLL500,   1, 0, 0),
+        F(626000000, P_DDRPLLAPSS, 1, 0, 0),
         { }
 };
 
@@ -557,7 +547,7 @@ static struct clk_rcg2 apps_clk_src = {
 
 static const struct freq_tbl ftbl_gcc_apps_ahb_clk[] = {
         F(48000000, P_XO,          1, 0, 0),
-        F(100000000, FE_PLL_200,   2, 0, 0),
+        F(100000000, P_FEPLL200,   2, 0, 0),
         { }
 };
 
@@ -940,7 +930,7 @@ static struct clk_branch gcc_usb2_mock_utmi_clk = {
 };
 
 static const struct freq_tbl ftbl_gcc_usb30_mock_utmi_clk[] = {
-        F(2000000, FE_PLL_200, 10, 0, 0),
+        F(2000000, P_FEPLL200, 10, 0, 0),
         { }
 };
 
@@ -1007,7 +997,7 @@ static struct clk_branch gcc_usb3_mock_utmi_clk = {
 };
 
 static const struct freq_tbl ftbl_gcc_fephy_dly_clk[] = {
-        F(125000000, FE_PLL_125_DLY, 1, 0, 0),
+        F(125000000, P_FEPLL125DLY, 1, 0, 0),
         { }
 };
 
@@ -1027,7 +1017,7 @@ static struct clk_rcg2 fephy_125m_dly_clk_src = {
 
 static const struct freq_tbl ftbl_gcc_wcss2g_clk[] = {
         F(48000000, P_XO, 1, 0, 0),
-        F(250000000, FE_PLL_WCSS2G, 1, 0, 0),
+        F(250000000, P_FEPLLWCSS2G, 1, 0, 0),
         { }
 };
 
@@ -1097,7 +1087,7 @@ static struct clk_branch gcc_wcss2g_rtc_clk = {
 
 static const struct freq_tbl ftbl_gcc_wcss5g_clk[] = {
         F(48000000, P_XO, 1, 0, 0),
-        F(250000000, FE_PLL_WCSS5G, 1, 0, 0),
+        F(250000000, P_FEPLLWCSS5G, 1, 0, 0),
         { }
 };
 
@@ -1325,6 +1315,16 @@ MODULE_DEVICE_TABLE(of, gcc_ipq4019_match_table);
 
 static int gcc_ipq4019_probe(struct platform_device *pdev)
 {
+        struct device *dev = &pdev->dev;
+
+        clk_register_fixed_rate(dev, "fepll125", "xo", 0, 200000000);
+        clk_register_fixed_rate(dev, "fepll125dly", "xo", 0, 200000000);
+        clk_register_fixed_rate(dev, "fepllwcss2g", "xo", 0, 200000000);
+        clk_register_fixed_rate(dev, "fepllwcss5g", "xo", 0, 200000000);
+        clk_register_fixed_rate(dev, "fepll200", "xo", 0, 200000000);
+        clk_register_fixed_rate(dev, "fepll500", "xo", 0, 200000000);
+        clk_register_fixed_rate(dev, "ddrpllapss", "xo", 0, 666000000);
+
         return qcom_cc_probe(pdev, &gcc_ipq4019_desc);
 }
 
diff --git a/drivers/clk/qcom/reset.c b/drivers/clk/qcom/reset.c
index 6c977d3a8590..0324d8daab9b 100644
--- a/drivers/clk/qcom/reset.c
+++ b/drivers/clk/qcom/reset.c
@@ -55,7 +55,7 @@ qcom_reset_deassert(struct reset_controller_dev *rcdev, unsigned long id)
         return regmap_update_bits(rst->regmap, map->reg, mask, 0);
 }
 
-struct reset_control_ops qcom_reset_ops = {
+const struct reset_control_ops qcom_reset_ops = {
         .reset = qcom_reset,
         .assert = qcom_reset_assert,
         .deassert = qcom_reset_deassert,
diff --git a/drivers/clk/qcom/reset.h b/drivers/clk/qcom/reset.h
index 0e11e2130f97..cda877927d43 100644
--- a/drivers/clk/qcom/reset.h
+++ b/drivers/clk/qcom/reset.h
@@ -32,6 +32,6 @@ struct qcom_reset_controller {
 #define to_qcom_reset_controller(r) \
         container_of(r, struct qcom_reset_controller, rcdev);
 
-extern struct reset_control_ops qcom_reset_ops;
+extern const struct reset_control_ops qcom_reset_ops;
 
 #endif
diff --git a/drivers/clk/rockchip/softrst.c b/drivers/clk/rockchip/softrst.c
index 552f7bb15bc5..21218987bbc3 100644
--- a/drivers/clk/rockchip/softrst.c
+++ b/drivers/clk/rockchip/softrst.c
@@ -81,7 +81,7 @@ static int rockchip_softrst_deassert(struct reset_controller_dev *rcdev,
         return 0;
 }
 
-static struct reset_control_ops rockchip_softrst_ops = {
+static const struct reset_control_ops rockchip_softrst_ops = {
         .assert         = rockchip_softrst_assert,
         .deassert       = rockchip_softrst_deassert,
 };
diff --git a/drivers/clk/sirf/clk-atlas7.c b/drivers/clk/sirf/clk-atlas7.c
index 957aae63e7cc..d0c6c9a2d06a 100644
--- a/drivers/clk/sirf/clk-atlas7.c
+++ b/drivers/clk/sirf/clk-atlas7.c
@@ -1423,7 +1423,7 @@ static int atlas7_reset_module(struct reset_controller_dev *rcdev,
         return 0;
 }
 
-static struct reset_control_ops atlas7_rst_ops = {
+static const struct reset_control_ops atlas7_rst_ops = {
         .reset = atlas7_reset_module,
 };
 
diff --git a/drivers/clk/sunxi/clk-a10-ve.c b/drivers/clk/sunxi/clk-a10-ve.c
index 044c1717b762..d9ea22ec4e25 100644
--- a/drivers/clk/sunxi/clk-a10-ve.c
+++ b/drivers/clk/sunxi/clk-a10-ve.c
@@ -85,7 +85,7 @@ static int sunxi_ve_of_xlate(struct reset_controller_dev *rcdev,
         return 0;
 }
 
-static struct reset_control_ops sunxi_ve_reset_ops = {
+static const struct reset_control_ops sunxi_ve_reset_ops = {
         .assert         = sunxi_ve_reset_assert,
         .deassert       = sunxi_ve_reset_deassert,
 };
diff --git a/drivers/clk/sunxi/clk-sun9i-mmc.c b/drivers/clk/sunxi/clk-sun9i-mmc.c
index a9b176139aca..028dd832a39f 100644
--- a/drivers/clk/sunxi/clk-sun9i-mmc.c
+++ b/drivers/clk/sunxi/clk-sun9i-mmc.c
@@ -83,7 +83,7 @@ static int sun9i_mmc_reset_deassert(struct reset_controller_dev *rcdev,
         return 0;
 }
 
-static struct reset_control_ops sun9i_mmc_reset_ops = {
+static const struct reset_control_ops sun9i_mmc_reset_ops = {
         .assert         = sun9i_mmc_reset_assert,
         .deassert       = sun9i_mmc_reset_deassert,
 };
diff --git a/drivers/clk/sunxi/clk-usb.c b/drivers/clk/sunxi/clk-usb.c
index 5432b1c198a4..fe0c3d169377 100644
--- a/drivers/clk/sunxi/clk-usb.c
+++ b/drivers/clk/sunxi/clk-usb.c
@@ -76,7 +76,7 @@ static int sunxi_usb_reset_deassert(struct reset_controller_dev *rcdev,
         return 0;
 }
 
-static struct reset_control_ops sunxi_usb_reset_ops = {
+static const struct reset_control_ops sunxi_usb_reset_ops = {
         .assert         = sunxi_usb_reset_assert,
         .deassert       = sunxi_usb_reset_deassert,
 };
diff --git a/drivers/clk/tegra/clk.c b/drivers/clk/tegra/clk.c
index 2a3a4fe803d6..f60fe2e344ca 100644
--- a/drivers/clk/tegra/clk.c
+++ b/drivers/clk/tegra/clk.c
@@ -271,7 +271,7 @@ void __init tegra_init_from_table(struct tegra_clk_init_table *tbl,
         }
 }
 
-static struct reset_control_ops rst_ops = {
+static const struct reset_control_ops rst_ops = {
         .assert = tegra_clk_rst_assert,
         .deassert = tegra_clk_rst_deassert,
 };
diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
index f951f911786e..5f8dbe640a20 100644
--- a/drivers/cpufreq/cpufreq-dt.c
+++ b/drivers/cpufreq/cpufreq-dt.c
@@ -4,9 +4,6 @@
  * Copyright (C) 2014 Linaro.
  * Viresh Kumar <viresh.kumar@linaro.org>
  *
- * The OPP code in function set_target() is reused from
- * drivers/cpufreq/omap-cpufreq.c
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 4b644526fd59..8b5a415ee14a 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -64,6 +64,25 @@ static inline int ceiling_fp(int32_t x)
         return ret;
 }
 
+/**
+ * struct sample -      Store performance sample
+ * @core_pct_busy:      Ratio of APERF/MPERF in percent, which is actual
+ *                      performance during last sample period
+ * @busy_scaled:        Scaled busy value which is used to calculate next
+ *                      P state. This can be different than core_pct_busy
+ *                      to account for cpu idle period
+ * @aperf:              Difference of actual performance frequency clock count
+ *                      read from APERF MSR between last and current sample
+ * @mperf:              Difference of maximum performance frequency clock count
+ *                      read from MPERF MSR between last and current sample
+ * @tsc:                Difference of time stamp counter between last and
+ *                      current sample
+ * @freq:               Effective frequency calculated from APERF/MPERF
+ * @time:               Current time from scheduler
+ *
+ * This structure is used in the cpudata structure to store performance sample
+ * data for choosing next P State.
+ */
 struct sample {
         int32_t core_pct_busy;
         int32_t busy_scaled;
@@ -74,6 +93,20 @@ struct sample {
         u64 time;
 };
 
+/**
+ * struct pstate_data - Store P state data
+ * @current_pstate:     Current requested P state
+ * @min_pstate:         Min P state possible for this platform
+ * @max_pstate:         Max P state possible for this platform
+ * @max_pstate_physical:This is physical Max P state for a processor
+ *                      This can be higher than the max_pstate which can
+ *                      be limited by platform thermal design power limits
+ * @scaling:            Scaling factor to  convert frequency to cpufreq
+ *                      frequency units
+ * @turbo_pstate:       Max Turbo P state possible for this platform
+ *
+ * Stores the per cpu model P state limits and current P state.
+ */
 struct pstate_data {
         int     current_pstate;
         int     min_pstate;
@@ -83,6 +116,19 @@ struct pstate_data {
         int     turbo_pstate;
 };
 
+/**
+ * struct vid_data -    Stores voltage information data
+ * @min:                VID data for this platform corresponding to
+ *                      the lowest P state
+ * @max:                VID data corresponding to the highest P State.
+ * @turbo:              VID data for turbo P state
+ * @ratio:              Ratio of (vid max - vid min) /
+ *                      (max P state - Min P State)
+ *
+ * Stores the voltage data for DVFS (Dynamic Voltage and Frequency Scaling)
+ * This data is used in Atom platforms, where in addition to target P state,
+ * the voltage data needs to be specified to select next P State.
+ */
 struct vid_data {
         int min;
         int max;
@@ -90,6 +136,18 @@ struct vid_data {
         int32_t ratio;
 };
 
+/**
+ * struct _pid -        Stores PID data
+ * @setpoint:           Target set point for busyness or performance
+ * @integral:           Storage for accumulated error values
+ * @p_gain:             PID proportional gain
+ * @i_gain:             PID integral gain
+ * @d_gain:             PID derivative gain
+ * @deadband:           PID deadband
+ * @last_err:           Last error storage for integral part of PID calculation
+ *
+ * Stores PID coefficients and last error for PID controller.
+ */
 struct _pid {
         int setpoint;
         int32_t integral;
@@ -100,6 +158,23 @@ struct _pid {
         int32_t last_err;
 };
 
+/**
+ * struct cpudata -     Per CPU instance data storage
+ * @cpu:                CPU number for this instance data
+ * @update_util:        CPUFreq utility callback information
+ * @pstate:             Stores P state limits for this CPU
+ * @vid:                Stores VID limits for this CPU
+ * @pid:                Stores PID parameters for this CPU
+ * @last_sample_time:   Last Sample time
+ * @prev_aperf:         Last APERF value read from APERF MSR
+ * @prev_mperf:         Last MPERF value read from MPERF MSR
+ * @prev_tsc:           Last timestamp counter (TSC) value
+ * @prev_cummulative_iowait: IO Wait time difference from last and
+ *                      current sample
+ * @sample:             Storage for storing last Sample data
+ *
+ * This structure stores per CPU instance data for all CPUs.
+ */
 struct cpudata {
         int cpu;
 
@@ -118,6 +193,19 @@ struct cpudata {
 };
 
 static struct cpudata **all_cpu_data;
+
+/**
+ * struct pid_adjust_policy - Stores static PID configuration data
+ * @sample_rate_ms:     PID calculation sample rate in ms
+ * @sample_rate_ns:     Sample rate calculation in ns
+ * @deadband:           PID deadband
+ * @setpoint:           PID Setpoint
+ * @p_gain_pct:         PID proportional gain
+ * @i_gain_pct:         PID integral gain
+ * @d_gain_pct:         PID derivative gain
+ *
+ * Stores per CPU model static PID configuration data.
+ */
 struct pstate_adjust_policy {
         int sample_rate_ms;
         s64 sample_rate_ns;
@@ -128,6 +216,20 @@ struct pstate_adjust_policy {
         int i_gain_pct;
 };
 
+/**
+ * struct pstate_funcs - Per CPU model specific callbacks
+ * @get_max:            Callback to get maximum non turbo effective P state
+ * @get_max_physical:   Callback to get maximum non turbo physical P state
+ * @get_min:            Callback to get minimum P state
+ * @get_turbo:          Callback to get turbo P state
+ * @get_scaling:        Callback to get frequency scaling factor
+ * @get_val:            Callback to convert P state to actual MSR write value
+ * @get_vid:            Callback to get VID data for Atom platforms
+ * @get_target_pstate:  Callback to a function to calculate next P state to use
+ *
+ * Core and Atom CPU models have different way to get P State limits. This
+ * structure is used to store those callbacks.
+ */
 struct pstate_funcs {
         int (*get_max)(void);
         int (*get_max_physical)(void);
@@ -139,6 +241,11 @@ struct pstate_funcs {
         int32_t (*get_target_pstate)(struct cpudata *);
 };
 
+/**
+ * struct cpu_defaults- Per CPU model default config data
+ * @pid_policy: PID config data
+ * @funcs:              Callback function data
+ */
 struct cpu_defaults {
         struct pstate_adjust_policy pid_policy;
         struct pstate_funcs funcs;
@@ -151,6 +258,34 @@ static struct pstate_adjust_policy pid_params;
 static struct pstate_funcs pstate_funcs;
 static int hwp_active;
 
+
+/**
+ * struct perf_limits - Store user and policy limits
+ * @no_turbo:           User requested turbo state from intel_pstate sysfs
+ * @turbo_disabled:     Platform turbo status either from msr
+ *                      MSR_IA32_MISC_ENABLE or when maximum available pstate
+ *                      matches the maximum turbo pstate
+ * @max_perf_pct:       Effective maximum performance limit in percentage, this
+ *                      is minimum of either limits enforced by cpufreq policy
+ *                      or limits from user set limits via intel_pstate sysfs
+ * @min_perf_pct:       Effective minimum performance limit in percentage, this
+ *                      is maximum of either limits enforced by cpufreq policy
+ *                      or limits from user set limits via intel_pstate sysfs
+ * @max_perf:           This is a scaled value between 0 to 255 for max_perf_pct
+ *                      This value is used to limit max pstate
+ * @min_perf:           This is a scaled value between 0 to 255 for min_perf_pct
+ *                      This value is used to limit min pstate
+ * @max_policy_pct:     The maximum performance in percentage enforced by
+ *                      cpufreq setpolicy interface
+ * @max_sysfs_pct:      The maximum performance in percentage enforced by
+ *                      intel pstate sysfs interface
+ * @min_policy_pct:     The minimum performance in percentage enforced by
+ *                      cpufreq setpolicy interface
+ * @min_sysfs_pct:      The minimum performance in percentage enforced by
+ *                      intel pstate sysfs interface
+ *
+ * Storage for user and policy defined limits.
+ */
 struct perf_limits {
         int no_turbo;
         int turbo_disabled;
@@ -910,7 +1045,14 @@ static inline bool intel_pstate_sample(struct cpudata *cpu, u64 time)
         cpu->prev_aperf = aperf;
         cpu->prev_mperf = mperf;
         cpu->prev_tsc = tsc;
-        return true;
+        /*
+         * First time this function is invoked in a given cycle, all of the
+         * previous sample data fields are equal to zero or stale and they must
+         * be populated with meaningful numbers for things to work, so assume
+         * that sample.time will always be reset before setting the utilization
+         * update hook and make the caller skip the sample then.
+         */
+        return !!cpu->last_sample_time;
 }
 
 static inline int32_t get_avg_frequency(struct cpudata *cpu)
@@ -984,8 +1126,7 @@ static inline int32_t get_target_pstate_use_performance(struct cpudata *cpu)
          * enough period of time to adjust our busyness.
          */
         duration_ns = cpu->sample.time - cpu->last_sample_time;
-        if ((s64)duration_ns > pid_params.sample_rate_ns * 3
-            && cpu->last_sample_time > 0) {
+        if ((s64)duration_ns > pid_params.sample_rate_ns * 3) {
                 sample_ratio = div_fp(int_tofp(pid_params.sample_rate_ns),
                                       int_tofp(duration_ns));
                 core_busy = mul_fp(core_busy, sample_ratio);
@@ -1100,10 +1241,8 @@ static int intel_pstate_init_cpu(unsigned int cpunum)
         intel_pstate_get_cpu_pstates(cpu);
 
         intel_pstate_busy_pid_reset(cpu);
-        intel_pstate_sample(cpu, 0);
 
         cpu->update_util.func = intel_pstate_update_util;
-        cpufreq_set_update_util_data(cpunum, &cpu->update_util);
 
         pr_debug("intel_pstate: controlling: cpu %d\n", cpunum);
 
@@ -1122,22 +1261,54 @@ static unsigned int intel_pstate_get(unsigned int cpu_num)
         return get_avg_frequency(cpu);
 }
 
+static void intel_pstate_set_update_util_hook(unsigned int cpu_num)
+{
+        struct cpudata *cpu = all_cpu_data[cpu_num];
+
+        /* Prevent intel_pstate_update_util() from using stale data. */
+        cpu->sample.time = 0;
+        cpufreq_set_update_util_data(cpu_num, &cpu->update_util);
+}
+
+static void intel_pstate_clear_update_util_hook(unsigned int cpu)
+{
+        cpufreq_set_update_util_data(cpu, NULL);
+        synchronize_sched();
+}
+
+static void intel_pstate_set_performance_limits(struct perf_limits *limits)
+{
+        limits->no_turbo = 0;
+        limits->turbo_disabled = 0;
+        limits->max_perf_pct = 100;
+        limits->max_perf = int_tofp(1);
+        limits->min_perf_pct = 100;
+        limits->min_perf = int_tofp(1);
+        limits->max_policy_pct = 100;
+        limits->max_sysfs_pct = 100;
+        limits->min_policy_pct = 0;
+        limits->min_sysfs_pct = 0;
+}
+
 static int intel_pstate_set_policy(struct cpufreq_policy *policy)
 {
         if (!policy->cpuinfo.max_freq)
                 return -ENODEV;
 
-        if (policy->policy == CPUFREQ_POLICY_PERFORMANCE &&
-            policy->max >= policy->cpuinfo.max_freq) {
-                pr_debug("intel_pstate: set performance\n");
+        intel_pstate_clear_update_util_hook(policy->cpu);
+
+        if (policy->policy == CPUFREQ_POLICY_PERFORMANCE) {
                 limits = &performance_limits;
-                if (hwp_active)
-                        intel_pstate_hwp_set(policy->cpus);
-                return 0;
+                if (policy->max >= policy->cpuinfo.max_freq) {
+                        pr_debug("intel_pstate: set performance\n");
+                        intel_pstate_set_performance_limits(limits);
+                        goto out;
+                }
+        } else {
+                pr_debug("intel_pstate: set powersave\n");
+                limits = &powersave_limits;
         }
 
-        pr_debug("intel_pstate: set powersave\n");
-        limits = &powersave_limits;
         limits->min_policy_pct = (policy->min * 100) / policy->cpuinfo.max_freq;
         limits->min_policy_pct = clamp_t(int, limits->min_policy_pct, 0 , 100);
         limits->max_policy_pct = DIV_ROUND_UP(policy->max * 100,
@@ -1163,6 +1334,9 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)
         limits->max_perf = div_fp(int_tofp(limits->max_perf_pct),
                                   int_tofp(100));
 
+ out:
+        intel_pstate_set_update_util_hook(policy->cpu);
+
         if (hwp_active)
                 intel_pstate_hwp_set(policy->cpus);
 
@@ -1187,8 +1361,7 @@ static void intel_pstate_stop_cpu(struct cpufreq_policy *policy)
 
         pr_debug("intel_pstate: CPU %d exiting\n", cpu_num);
 
-        cpufreq_set_update_util_data(cpu_num, NULL);
-        synchronize_sched();
+        intel_pstate_clear_update_util_hook(cpu_num);
 
         if (hwp_active)
                 return;
@@ -1455,8 +1628,7 @@ out:
         get_online_cpus();
         for_each_online_cpu(cpu) {
                 if (all_cpu_data[cpu]) {
-                        cpufreq_set_update_util_data(cpu, NULL);
-                        synchronize_sched();
+                        intel_pstate_clear_update_util_hook(cpu);
                         kfree(all_cpu_data[cpu]);
                 }
         }
diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c
index fedbff55a7f3..815c4a5cae54 100644
--- a/drivers/firmware/qemu_fw_cfg.c
+++ b/drivers/firmware/qemu_fw_cfg.c
@@ -77,12 +77,28 @@ static inline u16 fw_cfg_sel_endianness(u16 key)
 static inline void fw_cfg_read_blob(u16 key,
                                     void *buf, loff_t pos, size_t count)
 {
+        u32 glk;
+        acpi_status status;
+
+        /* If we have ACPI, ensure mutual exclusion against any potential
+         * device access by the firmware, e.g. via AML methods:
+         */
+        status = acpi_acquire_global_lock(ACPI_WAIT_FOREVER, &glk);
+        if (ACPI_FAILURE(status) && status != AE_NOT_CONFIGURED) {
+                /* Should never get here */
+                WARN(1, "fw_cfg_read_blob: Failed to lock ACPI!\n");
+                memset(buf, 0, count);
+                return;
+        }
+
         mutex_lock(&fw_cfg_dev_lock);
         iowrite16(fw_cfg_sel_endianness(key), fw_cfg_reg_ctrl);
         while (pos-- > 0)
                 ioread8(fw_cfg_reg_data);
         ioread8_rep(fw_cfg_reg_data, buf, count);
         mutex_unlock(&fw_cfg_dev_lock);
+
+        acpi_release_global_lock(glk);
 }
 
 /* clean up fw_cfg device i/o */
@@ -727,12 +743,18 @@ device_param_cb(mmio, &fw_cfg_cmdline_param_ops, NULL, S_IRUSR);
 
 static int __init fw_cfg_sysfs_init(void)
 {
+        int ret;
+
         /* create /sys/firmware/qemu_fw_cfg/ top level directory */
         fw_cfg_top_ko = kobject_create_and_add("qemu_fw_cfg", firmware_kobj);
         if (!fw_cfg_top_ko)
                 return -ENOMEM;
 
-        return platform_driver_register(&fw_cfg_sysfs_driver);
+        ret = platform_driver_register(&fw_cfg_sysfs_driver);
+        if (ret)
+                fw_cfg_kobj_cleanup(fw_cfg_top_ko);
+
+        return ret;
 }
 
 static void __exit fw_cfg_sysfs_exit(void)
diff --git a/drivers/gpio/gpio-menz127.c b/drivers/gpio/gpio-menz127.c
index a68e199d579d..c5c9599a3a71 100644
--- a/drivers/gpio/gpio-menz127.c
+++ b/drivers/gpio/gpio-menz127.c
@@ -37,7 +37,6 @@ struct men_z127_gpio {
         void __iomem *reg_base;
         struct mcb_device *mdev;
         struct resource *mem;
-        spinlock_t lock;
 };
 
 static int men_z127_debounce(struct gpio_chip *gc, unsigned gpio,
@@ -69,7 +68,7 @@ static int men_z127_debounce(struct gpio_chip *gc, unsigned gpio,
                 debounce /= 50;
         }
 
-        spin_lock(&priv->lock);
+        spin_lock(&gc->bgpio_lock);
 
         db_en = readl(priv->reg_base + MEN_Z127_DBER);
 
@@ -84,7 +83,7 @@ static int men_z127_debounce(struct gpio_chip *gc, unsigned gpio,
         writel(db_en, priv->reg_base + MEN_Z127_DBER);
         writel(db_cnt, priv->reg_base + GPIO_TO_DBCNT_REG(gpio));
 
-        spin_unlock(&priv->lock);
+        spin_unlock(&gc->bgpio_lock);
 
         return 0;
 }
@@ -97,7 +96,7 @@ static int men_z127_request(struct gpio_chip *gc, unsigned gpio_pin)
         if (gpio_pin >= gc->ngpio)
                 return -EINVAL;
 
-        spin_lock(&priv->lock);
+        spin_lock(&gc->bgpio_lock);
         od_en = readl(priv->reg_base + MEN_Z127_ODER);
 
         if (gpiochip_line_is_open_drain(gc, gpio_pin))
@@ -106,7 +105,7 @@ static int men_z127_request(struct gpio_chip *gc, unsigned gpio_pin)
                 od_en &= ~BIT(gpio_pin);
 
         writel(od_en, priv->reg_base + MEN_Z127_ODER);
-        spin_unlock(&priv->lock);
+        spin_unlock(&gc->bgpio_lock);
 
         return 0;
 }
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index d0d3065a7557..e66084c295fb 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -18,6 +18,7 @@
 #include <linux/i2c.h>
 #include <linux/platform_data/pca953x.h>
 #include <linux/slab.h>
+#include <asm/unaligned.h>
 #include <linux/of_platform.h>
 #include <linux/acpi.h>
 
@@ -159,7 +160,7 @@ static int pca953x_write_regs(struct pca953x_chip *chip, int reg, u8 *val)
                 switch (chip->chip_type) {
                 case PCA953X_TYPE:
                         ret = i2c_smbus_write_word_data(chip->client,
-                                                        reg << 1, (u16) *val);
+                            reg << 1, cpu_to_le16(get_unaligned((u16 *)val)));
                         break;
                 case PCA957X_TYPE:
                         ret = i2c_smbus_write_byte_data(chip->client, reg << 1,
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index b2b7b78664b8..76ac906b4d78 100644
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -283,8 +283,8 @@ static int pxa_gpio_direction_output(struct gpio_chip *chip,
         writel_relaxed(mask, base + (value ? GPSR_OFFSET : GPCR_OFFSET));
 
         ret = pinctrl_gpio_direction_output(chip->base + offset);
-        if (!ret)
-                return 0;
+        if (ret)
+                return ret;
 
         spin_lock_irqsave(&gpio_lock, flags);
 
diff --git a/drivers/gpio/gpio-xgene.c b/drivers/gpio/gpio-xgene.c
index c0aa387664bf..0dc916191689 100644
--- a/drivers/gpio/gpio-xgene.c
+++ b/drivers/gpio/gpio-xgene.c
@@ -173,6 +173,11 @@ static int xgene_gpio_probe(struct platform_device *pdev)
         }
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                err = -EINVAL;
+                goto err;
+        }
+
         gpio->base = devm_ioremap_nocache(&pdev->dev, res->start,
                                                         resource_size(res));
         if (!gpio->base) {
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 72065532c1c7..b747c76fd2b1 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -68,6 +68,7 @@ LIST_HEAD(gpio_devices);
 static void gpiochip_free_hogs(struct gpio_chip *chip);
 static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip);
 
+static bool gpiolib_initialized;
 
 static inline void desc_set_label(struct gpio_desc *d, const char *label)
 {
@@ -440,9 +441,63 @@ static void gpiodevice_release(struct device *dev)
         cdev_del(&gdev->chrdev);
         list_del(&gdev->list);
         ida_simple_remove(&gpio_ida, gdev->id);
+        kfree(gdev->label);
+        kfree(gdev->descs);
         kfree(gdev);
 }
 
+static int gpiochip_setup_dev(struct gpio_device *gdev)
+{
+        int status;
+
+        cdev_init(&gdev->chrdev, &gpio_fileops);
+        gdev->chrdev.owner = THIS_MODULE;
+        gdev->chrdev.kobj.parent = &gdev->dev.kobj;
+        gdev->dev.devt = MKDEV(MAJOR(gpio_devt), gdev->id);
+        status = cdev_add(&gdev->chrdev, gdev->dev.devt, 1);
+        if (status < 0)
+                chip_warn(gdev->chip, "failed to add char device %d:%d\n",
+                          MAJOR(gpio_devt), gdev->id);
+        else
+                chip_dbg(gdev->chip, "added GPIO chardev (%d:%d)\n",
+                         MAJOR(gpio_devt), gdev->id);
+        status = device_add(&gdev->dev);
+        if (status)
+                goto err_remove_chardev;
+
+        status = gpiochip_sysfs_register(gdev);
+        if (status)
+                goto err_remove_device;
+
+        /* From this point, the .release() function cleans up gpio_device */
+        gdev->dev.release = gpiodevice_release;
+        get_device(&gdev->dev);
+        pr_debug("%s: registered GPIOs %d to %d on device: %s (%s)\n",
+                 __func__, gdev->base, gdev->base + gdev->ngpio - 1,
+                 dev_name(&gdev->dev), gdev->chip->label ? : "generic");
+
+        return 0;
+
+err_remove_device:
+        device_del(&gdev->dev);
+err_remove_chardev:
+        cdev_del(&gdev->chrdev);
+        return status;
+}
+
+static void gpiochip_setup_devs(void)
+{
+        struct gpio_device *gdev;
+        int err;
+
+        list_for_each_entry(gdev, &gpio_devices, list) {
+                err = gpiochip_setup_dev(gdev);
+                if (err)
+                        pr_err("%s: Failed to initialize gpio device (%d)\n",
+                               dev_name(&gdev->dev), err);
+        }
+}
+
 /**
  * gpiochip_add_data() - register a gpio_chip
  * @chip: the chip to register, with chip->base initialized
@@ -457,6 +512,9 @@ static void gpiodevice_release(struct device *dev)
  * the gpio framework's arch_initcall().  Otherwise sysfs initialization
  * for GPIOs will fail rudely.
  *
+ * gpiochip_add_data() must only be called after gpiolib initialization,
+ * ie after core_initcall().
+ *
  * If chip->base is negative, this requests dynamic assignment of
  * a range of valid GPIOs.
  */
@@ -504,8 +562,7 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data)
         else
                 gdev->owner = THIS_MODULE;
 
-        gdev->descs = devm_kcalloc(&gdev->dev, chip->ngpio,
-                                   sizeof(gdev->descs[0]), GFP_KERNEL);
+        gdev->descs = kcalloc(chip->ngpio, sizeof(gdev->descs[0]), GFP_KERNEL);
         if (!gdev->descs) {
                 status = -ENOMEM;
                 goto err_free_gdev;
@@ -514,16 +571,16 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data)
         if (chip->ngpio == 0) {
                 chip_err(chip, "tried to insert a GPIO chip with zero lines\n");
                 status = -EINVAL;
-                goto err_free_gdev;
+                goto err_free_descs;
         }
 
         if (chip->label)
-                gdev->label = devm_kstrdup(&gdev->dev, chip->label, GFP_KERNEL);
+                gdev->label = kstrdup(chip->label, GFP_KERNEL);
         else
-                gdev->label = devm_kstrdup(&gdev->dev, "unknown", GFP_KERNEL);
+                gdev->label = kstrdup("unknown", GFP_KERNEL);
         if (!gdev->label) {
                 status = -ENOMEM;
-                goto err_free_gdev;
+                goto err_free_descs;
         }
 
         gdev->ngpio = chip->ngpio;
@@ -543,7 +600,7 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data)
                 if (base < 0) {
                         status = base;
                         spin_unlock_irqrestore(&gpio_lock, flags);
-                        goto err_free_gdev;
+                        goto err_free_label;
                 }
                 /*
                  * TODO: it should not be necessary to reflect the assigned
@@ -558,7 +615,7 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data)
         status = gpiodev_add_to_list(gdev);
         if (status) {
                 spin_unlock_irqrestore(&gpio_lock, flags);
-                goto err_free_gdev;
+                goto err_free_label;
         }
 
         for (i = 0; i < chip->ngpio; i++) {
@@ -596,39 +653,16 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data)
          * we get a device node entry in sysfs under
          * /sys/bus/gpio/devices/gpiochipN/dev that can be used for
          * coldplug of device nodes and other udev business.
+         * We can do this only if gpiolib has been initialized.
+         * Otherwise, defer until later.
          */
-        cdev_init(&gdev->chrdev, &gpio_fileops);
-        gdev->chrdev.owner = THIS_MODULE;
-        gdev->chrdev.kobj.parent = &gdev->dev.kobj;
-        gdev->dev.devt = MKDEV(MAJOR(gpio_devt), gdev->id);
-        status = cdev_add(&gdev->chrdev, gdev->dev.devt, 1);
-        if (status < 0)
-                chip_warn(chip, "failed to add char device %d:%d\n",
-                          MAJOR(gpio_devt), gdev->id);
-        else
-                chip_dbg(chip, "added GPIO chardev (%d:%d)\n",
-                         MAJOR(gpio_devt), gdev->id);
-        status = device_add(&gdev->dev);
-        if (status)
-                goto err_remove_chardev;
-
-        status = gpiochip_sysfs_register(gdev);
-        if (status)
-                goto err_remove_device;
-
-        /* From this point, the .release() function cleans up gpio_device */
-        gdev->dev.release = gpiodevice_release;
-        get_device(&gdev->dev);
-        pr_debug("%s: registered GPIOs %d to %d on device: %s (%s)\n",
-                 __func__, gdev->base, gdev->base + gdev->ngpio - 1,
-                 dev_name(&gdev->dev), chip->label ? : "generic");
-
+        if (gpiolib_initialized) {
+                status = gpiochip_setup_dev(gdev);
+                if (status)
+                        goto err_remove_chip;
+        }
         return 0;
 
-err_remove_device:
-        device_del(&gdev->dev);
-err_remove_chardev:
-        cdev_del(&gdev->chrdev);
 err_remove_chip:
         acpi_gpiochip_remove(chip);
         gpiochip_free_hogs(chip);
@@ -637,6 +671,10 @@ err_remove_from_list:
         spin_lock_irqsave(&gpio_lock, flags);
         list_del(&gdev->list);
         spin_unlock_irqrestore(&gpio_lock, flags);
+err_free_label:
+        kfree(gdev->label);
+err_free_descs:
+        kfree(gdev->descs);
 err_free_gdev:
         ida_simple_remove(&gpio_ida, gdev->id);
         /* failures here can mean systems won't boot... */
@@ -2231,9 +2269,11 @@ static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
         return desc;
 }
 
-static struct gpio_desc *acpi_find_gpio(struct device *dev, const char *con_id,
+static struct gpio_desc *acpi_find_gpio(struct device *dev,
+                                        const char *con_id,
                                         unsigned int idx,
-                                        enum gpio_lookup_flags *flags)
+                                        enum gpiod_flags flags,
+                                        enum gpio_lookup_flags *lookupflags)
 {
         struct acpi_device *adev = ACPI_COMPANION(dev);
         struct acpi_gpio_info info;
@@ -2264,10 +2304,16 @@ static struct gpio_desc *acpi_find_gpio(struct device *dev, const char *con_id,
                 desc = acpi_get_gpiod_by_index(adev, NULL, idx, &info);
                 if (IS_ERR(desc))
                         return desc;
+
+                if ((flags == GPIOD_OUT_LOW || flags == GPIOD_OUT_HIGH) &&
+                    info.gpioint) {
+                        dev_dbg(dev, "refusing GpioInt() entry when doing GPIOD_OUT_* lookup\n");
+                        return ERR_PTR(-ENOENT);
+                }
         }
 
         if (info.polarity == GPIO_ACTIVE_LOW)
-                *flags |= GPIO_ACTIVE_LOW;
+                *lookupflags |= GPIO_ACTIVE_LOW;
 
         return desc;
 }
@@ -2530,7 +2576,7 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev,
                         desc = of_find_gpio(dev, con_id, idx, &lookupflags);
                 } else if (ACPI_COMPANION(dev)) {
                         dev_dbg(dev, "using ACPI for GPIO lookup\n");
-                        desc = acpi_find_gpio(dev, con_id, idx, &lookupflags);
+                        desc = acpi_find_gpio(dev, con_id, idx, flags, &lookupflags);
                 }
         }
 
@@ -2829,6 +2875,9 @@ static int __init gpiolib_dev_init(void)
         if (ret < 0) {
                 pr_err("gpiolib: failed to allocate char dev region\n");
                 bus_unregister(&gpio_bus_type);
+        } else {
+                gpiolib_initialized = true;
+                gpiochip_setup_devs();
         }
         return ret;
 }
diff --git a/drivers/gpu/drm/amd/acp/Kconfig b/drivers/gpu/drm/amd/acp/Kconfig
index 0f734ee05274..ca77ec10147c 100644
--- a/drivers/gpu/drm/amd/acp/Kconfig
+++ b/drivers/gpu/drm/amd/acp/Kconfig
@@ -1,10 +1,14 @@
-menu "ACP Configuration"
+menu "ACP (Audio CoProcessor) Configuration"
 
 config DRM_AMD_ACP
-       bool "Enable ACP IP support"
+       bool "Enable AMD Audio CoProcessor IP support"
        select MFD_CORE
        select PM_GENERIC_DOMAINS if PM
        help
         Choose this option to enable ACP IP support for AMD SOCs.
+        This adds the ACP (Audio CoProcessor) IP driver and wires
+        it up into the amdgpu driver.  The ACP block provides the DMA
+        engine for the i2s-based ALSA driver. It is required for audio
+        on APUs which utilize an i2s codec.
 
 endmenu
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index c4a21c6428f5..62a778012fe0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1591,6 +1591,7 @@ struct amdgpu_uvd {
         struct amdgpu_bo        *vcpu_bo;
         void                    *cpu_addr;
         uint64_t                gpu_addr;
+        void                    *saved_bo;
         atomic_t                handles[AMDGPU_MAX_UVD_HANDLES];
         struct drm_file         *filp[AMDGPU_MAX_UVD_HANDLES];
         struct delayed_work     idle_work;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index 7a4b101e10c6..6043dc7c3a94 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -816,10 +816,13 @@ static int amdgpu_cgs_get_active_displays_info(void *cgs_device,
         struct drm_device *ddev = adev->ddev;
         struct drm_crtc *crtc;
         uint32_t line_time_us, vblank_lines;
+        struct cgs_mode_info *mode_info;
 
         if (info == NULL)
                 return -EINVAL;
 
+        mode_info = info->mode_info;
+
         if (adev->mode_info.num_crtc && adev->mode_info.mode_config_initialized) {
                 list_for_each_entry(crtc,
                                 &ddev->mode_config.crtc_list, head) {
@@ -828,7 +831,7 @@ static int amdgpu_cgs_get_active_displays_info(void *cgs_device,
                                 info->active_display_mask |= (1 << amdgpu_crtc->crtc_id);
                                 info->display_count++;
                         }
-                        if (info->mode_info != NULL &&
+                        if (mode_info != NULL &&
                                 crtc->enabled && amdgpu_crtc->enabled &&
                                 amdgpu_crtc->hw_mode.clock) {
                                 line_time_us = (amdgpu_crtc->hw_mode.crtc_htotal * 1000) /
@@ -836,10 +839,10 @@ static int amdgpu_cgs_get_active_displays_info(void *cgs_device,
                                 vblank_lines = amdgpu_crtc->hw_mode.crtc_vblank_end -
                                                         amdgpu_crtc->hw_mode.crtc_vdisplay +
                                                         (amdgpu_crtc->v_border * 2);
-                                info->mode_info->vblank_time_us = vblank_lines * line_time_us;
-                                info->mode_info->refresh_rate = drm_mode_vrefresh(&amdgpu_crtc->hw_mode);
-                                info->mode_info->ref_clock = adev->clock.spll.reference_freq;
-                                info->mode_info++;
+                                mode_info->vblank_time_us = vblank_lines * line_time_us;
+                                mode_info->refresh_rate = drm_mode_vrefresh(&amdgpu_crtc->hw_mode);
+                                mode_info->ref_clock = adev->clock.spll.reference_freq;
+                                mode_info = NULL;
                         }
                 }
         }
@@ -847,6 +850,16 @@ static int amdgpu_cgs_get_active_displays_info(void *cgs_device,
         return 0;
 }
 
+
+static int amdgpu_cgs_notify_dpm_enabled(void *cgs_device, bool enabled)
+{
+        CGS_FUNC_ADEV;
+
+        adev->pm.dpm_enabled = enabled;
+
+        return 0;
+}
+
 /** \brief evaluate acpi namespace object, handle or pathname must be valid
  *  \param cgs_device
  *  \param info input/output arguments for the control method
@@ -1097,6 +1110,7 @@ static const struct cgs_ops amdgpu_cgs_ops = {
         amdgpu_cgs_set_powergating_state,
         amdgpu_cgs_set_clockgating_state,
         amdgpu_cgs_get_active_displays_info,
+        amdgpu_cgs_notify_dpm_enabled,
         amdgpu_cgs_call_acpi_method,
         amdgpu_cgs_query_system_info,
 };
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index f0ed974bd4e0..3fb405b3a614 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -57,7 +57,7 @@ static bool amdgpu_flip_handle_fence(struct amdgpu_flip_work *work,
         if (!fence_add_callback(fence, &work->cb, amdgpu_flip_callback))
                 return true;
 
-        fence_put(*f);
+        fence_put(fence);
         return false;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index 4303b447efe8..d81f1f4883a6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -121,7 +121,7 @@ int amdgpu_fence_emit(struct amdgpu_ring *ring, struct fence **f)
 {
         struct amdgpu_device *adev = ring->adev;
         struct amdgpu_fence *fence;
-        struct fence **ptr;
+        struct fence *old, **ptr;
         uint32_t seq;
 
         fence = kmem_cache_alloc(amdgpu_fence_slab, GFP_KERNEL);
@@ -141,7 +141,11 @@ int amdgpu_fence_emit(struct amdgpu_ring *ring, struct fence **f)
         /* This function can't be called concurrently anyway, otherwise
          * emitting the fence would mess up the hardware ring buffer.
          */
-        BUG_ON(rcu_dereference_protected(*ptr, 1));
+        old = rcu_dereference_protected(*ptr, 1);
+        if (old && !fence_is_signaled(old)) {
+                DRM_INFO("rcu slot is busy\n");
+                fence_wait(old, false);
+        }
 
         rcu_assign_pointer(*ptr, fence_get(&fence->base));
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
index f594cfaa97e5..762cfdb85147 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
@@ -219,6 +219,8 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
         if (r) {
                 return r;
         }
+        adev->ddev->vblank_disable_allowed = true;
+
         /* enable msi */
         adev->irq.msi_enabled = false;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 7805a8706af7..598eb0cd5aab 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -382,6 +382,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
                 struct drm_amdgpu_info_vram_gtt vram_gtt;
 
                 vram_gtt.vram_size = adev->mc.real_vram_size;
+                vram_gtt.vram_size -= adev->vram_pin_size;
                 vram_gtt.vram_cpu_accessible_size = adev->mc.visible_vram_size;
                 vram_gtt.vram_cpu_accessible_size -= adev->vram_pin_size;
                 vram_gtt.gtt_size  = adev->mc.gtt_size;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 151a2d42c639..5b6639faa731 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -476,6 +476,17 @@ int amdgpu_bo_evict_vram(struct amdgpu_device *adev)
         return ttm_bo_evict_mm(&adev->mman.bdev, TTM_PL_VRAM);
 }
 
+static const char *amdgpu_vram_names[] = {
+        "UNKNOWN",
+        "GDDR1",
+        "DDR2",
+        "GDDR3",
+        "GDDR4",
+        "GDDR5",
+        "HBM",
+        "DDR3"
+};
+
 int amdgpu_bo_init(struct amdgpu_device *adev)
 {
         /* Add an MTRR for the VRAM */
@@ -484,8 +495,8 @@ int amdgpu_bo_init(struct amdgpu_device *adev)
         DRM_INFO("Detected VRAM RAM=%lluM, BAR=%lluM\n",
                 adev->mc.mc_vram_size >> 20,
                 (unsigned long long)adev->mc.aper_size >> 20);
-        DRM_INFO("RAM width %dbits DDR\n",
-                        adev->mc.vram_width);
+        DRM_INFO("RAM width %dbits %s\n",
+                 adev->mc.vram_width, amdgpu_vram_names[adev->mc.vram_type]);
         return amdgpu_ttm_init(adev);
 }
 
@@ -608,6 +619,10 @@ int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo)
         if ((offset + size) <= adev->mc.visible_vram_size)
                 return 0;
 
+        /* Can't move a pinned BO to visible VRAM */
+        if (abo->pin_count > 0)
+                return -EINVAL;
+
         /* hurrah the memory is not visible ! */
         amdgpu_ttm_placement_from_domain(abo, AMDGPU_GEM_DOMAIN_VRAM);
         lpfn =  adev->mc.visible_vram_size >> PAGE_SHIFT;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
index 3cb6d6c413c7..e9c6ae6ed2f7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
@@ -143,7 +143,7 @@ static int amdgpu_pp_late_init(void *handle)
                                         adev->powerplay.pp_handle);
 
 #ifdef CONFIG_DRM_AMD_POWERPLAY
-        if (adev->pp_enabled) {
+        if (adev->pp_enabled && adev->pm.dpm_enabled) {
                 amdgpu_pm_sysfs_init(adev);
                 amdgpu_dpm_dispatch_task(adev, AMD_PP_EVENT_COMPLETE_INIT, NULL, NULL);
         }
@@ -161,12 +161,8 @@ static int amdgpu_pp_sw_init(void *handle)
                                         adev->powerplay.pp_handle);
 
 #ifdef CONFIG_DRM_AMD_POWERPLAY
-        if (adev->pp_enabled) {
-                if (amdgpu_dpm == 0)
-                        adev->pm.dpm_enabled = false;
-                else
-                        adev->pm.dpm_enabled = true;
-        }
+        if (adev->pp_enabled)
+                adev->pm.dpm_enabled = true;
 #endif
 
         return ret;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index ab34190859a8..6f3369de232f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -384,9 +384,15 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo,
                         struct ttm_mem_reg *new_mem)
 {
         struct amdgpu_device *adev;
+        struct amdgpu_bo *abo;
         struct ttm_mem_reg *old_mem = &bo->mem;
         int r;
 
+        /* Can't move a pinned BO */
+        abo = container_of(bo, struct amdgpu_bo, tbo);
+        if (WARN_ON_ONCE(abo->pin_count > 0))
+                return -EINVAL;
+
         adev = amdgpu_get_adev(bo->bdev);
         if (old_mem->mem_type == TTM_PL_SYSTEM && bo->ttm == NULL) {
                 amdgpu_move_null(bo, new_mem);
@@ -616,7 +622,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/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index c1a581044417..338da80006b6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -241,32 +241,28 @@ int amdgpu_uvd_sw_fini(struct amdgpu_device *adev)
 
 int amdgpu_uvd_suspend(struct amdgpu_device *adev)
 {
-        struct amdgpu_ring *ring = &adev->uvd.ring;
-        int i, r;
+        unsigned size;
+        void *ptr;
+        int i;
 
         if (adev->uvd.vcpu_bo == NULL)
                 return 0;
 
-        for (i = 0; i < AMDGPU_MAX_UVD_HANDLES; ++i) {
-                uint32_t handle = atomic_read(&adev->uvd.handles[i]);
-                if (handle != 0) {
-                        struct fence *fence;
+        for (i = 0; i < AMDGPU_MAX_UVD_HANDLES; ++i)
+                if (atomic_read(&adev->uvd.handles[i]))
+                        break;
 
-                        amdgpu_uvd_note_usage(adev);
+        if (i == AMDGPU_MAX_UVD_HANDLES)
+                return 0;
 
-                        r = amdgpu_uvd_get_destroy_msg(ring, handle, false, &fence);
-                        if (r) {
-                                DRM_ERROR("Error destroying UVD (%d)!\n", r);
-                                continue;
-                        }
+        size = amdgpu_bo_size(adev->uvd.vcpu_bo);
+        ptr = adev->uvd.cpu_addr;
 
-                        fence_wait(fence, false);
-                        fence_put(fence);
+        adev->uvd.saved_bo = kmalloc(size, GFP_KERNEL);
+        if (!adev->uvd.saved_bo)
+                return -ENOMEM;
 
-                        adev->uvd.filp[i] = NULL;
-                        atomic_set(&adev->uvd.handles[i], 0);
-                }
-        }
+        memcpy(adev->uvd.saved_bo, ptr, size);
 
         return 0;
 }
@@ -275,23 +271,29 @@ int amdgpu_uvd_resume(struct amdgpu_device *adev)
 {
         unsigned size;
         void *ptr;
-        const struct common_firmware_header *hdr;
-        unsigned offset;
 
         if (adev->uvd.vcpu_bo == NULL)
                 return -EINVAL;
 
-        hdr = (const struct common_firmware_header *)adev->uvd.fw->data;
-        offset = le32_to_cpu(hdr->ucode_array_offset_bytes);
-        memcpy(adev->uvd.cpu_addr, (adev->uvd.fw->data) + offset,
-                (adev->uvd.fw->size) - offset);
-
         size = amdgpu_bo_size(adev->uvd.vcpu_bo);
-        size -= le32_to_cpu(hdr->ucode_size_bytes);
         ptr = adev->uvd.cpu_addr;
-        ptr += le32_to_cpu(hdr->ucode_size_bytes);
 
-        memset(ptr, 0, size);
+        if (adev->uvd.saved_bo != NULL) {
+                memcpy(ptr, adev->uvd.saved_bo, size);
+                kfree(adev->uvd.saved_bo);
+                adev->uvd.saved_bo = NULL;
+        } else {
+                const struct common_firmware_header *hdr;
+                unsigned offset;
+
+                hdr = (const struct common_firmware_header *)adev->uvd.fw->data;
+                offset = le32_to_cpu(hdr->ucode_array_offset_bytes);
+                memcpy(adev->uvd.cpu_addr, (adev->uvd.fw->data) + offset,
+                        (adev->uvd.fw->size) - offset);
+                size -= le32_to_cpu(hdr->ucode_size_bytes);
+                ptr += le32_to_cpu(hdr->ucode_size_bytes);
+                memset(ptr, 0, size);
+        }
 
         return 0;
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
index 82ce7d943884..05b0353d3880 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
@@ -903,14 +903,6 @@ static int gmc_v7_0_early_init(void *handle)
         gmc_v7_0_set_gart_funcs(adev);
         gmc_v7_0_set_irq_funcs(adev);
 
-        if (adev->flags & AMD_IS_APU) {
-                adev->mc.vram_type = AMDGPU_VRAM_TYPE_UNKNOWN;
-        } else {
-                u32 tmp = RREG32(mmMC_SEQ_MISC0);
-                tmp &= MC_SEQ_MISC0__MT__MASK;
-                adev->mc.vram_type = gmc_v7_0_convert_vram_type(tmp);
-        }
-
         return 0;
 }
 
@@ -927,6 +919,14 @@ static int gmc_v7_0_sw_init(void *handle)
         int dma_bits;
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
+        if (adev->flags & AMD_IS_APU) {
+                adev->mc.vram_type = AMDGPU_VRAM_TYPE_UNKNOWN;
+        } else {
+                u32 tmp = RREG32(mmMC_SEQ_MISC0);
+                tmp &= MC_SEQ_MISC0__MT__MASK;
+                adev->mc.vram_type = gmc_v7_0_convert_vram_type(tmp);
+        }
+
         r = amdgpu_irq_add_id(adev, 146, &adev->mc.vm_fault);
         if (r)
                 return r;
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
index 29bd7b57dc91..02deb3229405 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
@@ -863,14 +863,6 @@ static int gmc_v8_0_early_init(void *handle)
         gmc_v8_0_set_gart_funcs(adev);
         gmc_v8_0_set_irq_funcs(adev);
 
-        if (adev->flags & AMD_IS_APU) {
-                adev->mc.vram_type = AMDGPU_VRAM_TYPE_UNKNOWN;
-        } else {
-                u32 tmp = RREG32(mmMC_SEQ_MISC0);
-                tmp &= MC_SEQ_MISC0__MT__MASK;
-                adev->mc.vram_type = gmc_v8_0_convert_vram_type(tmp);
-        }
-
         return 0;
 }
 
@@ -881,12 +873,27 @@ static int gmc_v8_0_late_init(void *handle)
         return amdgpu_irq_get(adev, &adev->mc.vm_fault, 0);
 }
 
+#define mmMC_SEQ_MISC0_FIJI 0xA71
+
 static int gmc_v8_0_sw_init(void *handle)
 {
         int r;
         int dma_bits;
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
+        if (adev->flags & AMD_IS_APU) {
+                adev->mc.vram_type = AMDGPU_VRAM_TYPE_UNKNOWN;
+        } else {
+                u32 tmp;
+
+                if (adev->asic_type == CHIP_FIJI)
+                        tmp = RREG32(mmMC_SEQ_MISC0_FIJI);
+                else
+                        tmp = RREG32(mmMC_SEQ_MISC0);
+                tmp &= MC_SEQ_MISC0__MT__MASK;
+                adev->mc.vram_type = gmc_v8_0_convert_vram_type(tmp);
+        }
+
         r = amdgpu_irq_add_id(adev, 146, &adev->mc.vm_fault);
         if (r)
                 return r;
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
index c606ccb38d8b..cb463753115b 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
@@ -224,11 +224,11 @@ static int uvd_v4_2_suspend(void *handle)
         int r;
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
-        r = amdgpu_uvd_suspend(adev);
+        r = uvd_v4_2_hw_fini(adev);
         if (r)
                 return r;
 
-        r = uvd_v4_2_hw_fini(adev);
+        r = amdgpu_uvd_suspend(adev);
         if (r)
                 return r;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
index e3c852d9d79a..16476d80f475 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
@@ -220,11 +220,11 @@ static int uvd_v5_0_suspend(void *handle)
         int r;
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
-        r = amdgpu_uvd_suspend(adev);
+        r = uvd_v5_0_hw_fini(adev);
         if (r)
                 return r;
 
-        r = uvd_v5_0_hw_fini(adev);
+        r = amdgpu_uvd_suspend(adev);
         if (r)
                 return r;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
index 3375e614ac67..d49379145ef2 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
@@ -214,15 +214,16 @@ static int uvd_v6_0_suspend(void *handle)
         int r;
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
+        r = uvd_v6_0_hw_fini(adev);
+        if (r)
+                return r;
+
         /* Skip this for APU for now */
         if (!(adev->flags & AMD_IS_APU)) {
                 r = amdgpu_uvd_suspend(adev);
                 if (r)
                         return r;
         }
-        r = uvd_v6_0_hw_fini(adev);
-        if (r)
-                return r;
 
         return r;
 }
diff --git a/drivers/gpu/drm/amd/include/cgs_common.h b/drivers/gpu/drm/amd/include/cgs_common.h
index aec38fc3834f..ab84d4947247 100644
--- a/drivers/gpu/drm/amd/include/cgs_common.h
+++ b/drivers/gpu/drm/amd/include/cgs_common.h
@@ -589,6 +589,8 @@ typedef int(*cgs_get_active_displays_info)(
                                         void *cgs_device,
                                         struct cgs_display_info *info);
 
+typedef int (*cgs_notify_dpm_enabled)(void *cgs_device, bool enabled);
+
 typedef int (*cgs_call_acpi_method)(void *cgs_device,
                                         uint32_t acpi_method,
                                         uint32_t acpi_function,
@@ -644,6 +646,8 @@ struct cgs_ops {
         cgs_set_clockgating_state set_clockgating_state;
         /* display manager */
         cgs_get_active_displays_info get_active_displays_info;
+        /* notify dpm enabled */
+        cgs_notify_dpm_enabled notify_dpm_enabled;
         /* ACPI */
         cgs_call_acpi_method call_acpi_method;
         /* get system info */
@@ -734,8 +738,12 @@ struct cgs_device
         CGS_CALL(set_powergating_state, dev, block_type, state)
 #define cgs_set_clockgating_state(dev, block_type, state)       \
         CGS_CALL(set_clockgating_state, dev, block_type, state)
+#define cgs_notify_dpm_enabled(dev, enabled)    \
+        CGS_CALL(notify_dpm_enabled, dev, enabled)
+
 #define cgs_get_active_displays_info(dev, info) \
         CGS_CALL(get_active_displays_info, dev, info)
+
 #define cgs_call_acpi_method(dev, acpi_method, acpi_function, pintput, poutput, output_count, input_size, output_size)  \
         CGS_CALL(call_acpi_method, dev, acpi_method, acpi_function, pintput, poutput, output_count, input_size, output_size)
 #define cgs_query_system_info(dev, sys_info)    \
diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c b/drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c
index 6b52c78cb404..56856a2864d1 100644
--- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c
+++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c
@@ -137,14 +137,14 @@ static const pem_event_action *resume_event[] = {
         reset_display_configCounter_tasks,
         update_dal_configuration_tasks,
         vari_bright_resume_tasks,
-        block_adjust_power_state_tasks,
         setup_asic_tasks,
         enable_stutter_mode_tasks, /*must do this in boot state and before SMC is started */
         enable_dynamic_state_management_tasks,
         enable_clock_power_gatings_tasks,
         enable_disable_bapm_tasks,
         initialize_thermal_controller_tasks,
-        reset_boot_state_tasks,
+        get_2d_performance_state_tasks,
+        set_performance_state_tasks,
         adjust_power_state_tasks,
         enable_disable_fps_tasks,
         notify_hw_power_source_tasks,
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c
index 51dedf84623c..89f31bc5b68b 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c
@@ -2389,6 +2389,7 @@ static int fiji_populate_smc_vce_level(struct pp_hwmgr *hwmgr,
 
         for(count = 0; count < table->VceLevelCount; count++) {
                 table->VceLevel[count].Frequency = mm_table->entries[count].eclk;
+                table->VceLevel[count].MinVoltage = 0;
                 table->VceLevel[count].MinVoltage |=
                                 (mm_table->entries[count].vddc * VOLTAGE_SCALE) << VDDC_SHIFT;
                 table->VceLevel[count].MinVoltage |=
@@ -2465,6 +2466,7 @@ static int fiji_populate_smc_samu_level(struct pp_hwmgr *hwmgr,
 
         for (count = 0; count < table->SamuLevelCount; count++) {
                 /* not sure whether we need evclk or not */
+                table->SamuLevel[count].MinVoltage = 0;
                 table->SamuLevel[count].Frequency = mm_table->entries[count].samclock;
                 table->SamuLevel[count].MinVoltage |= (mm_table->entries[count].vddc *
                                 VOLTAGE_SCALE) << VDDC_SHIFT;
@@ -2562,6 +2564,7 @@ static int fiji_populate_smc_uvd_level(struct pp_hwmgr *hwmgr,
         table->UvdBootLevel = 0;
 
         for (count = 0; count < table->UvdLevelCount; count++) {
+                table->UvdLevel[count].MinVoltage = 0;
                 table->UvdLevel[count].VclkFrequency = mm_table->entries[count].vclk;
                 table->UvdLevel[count].DclkFrequency = mm_table->entries[count].dclk;
                 table->UvdLevel[count].MinVoltage |= (mm_table->entries[count].vddc *
@@ -2900,6 +2903,8 @@ static int fiji_init_smc_table(struct pp_hwmgr *hwmgr)
         if(FIJI_VOLTAGE_CONTROL_NONE != data->voltage_control)
                 fiji_populate_smc_voltage_tables(hwmgr, table);
 
+        table->SystemFlags = 0;
+
         if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
                         PHM_PlatformCaps_AutomaticDCTransition))
                 table->SystemFlags |= PPSMC_SYSTEMFLAG_GPIO_DC;
@@ -2997,6 +3002,7 @@ static int fiji_init_smc_table(struct pp_hwmgr *hwmgr)
         table->MemoryThermThrottleEnable = 1;
         table->PCIeBootLinkLevel = 0;      /* 0:Gen1 1:Gen2 2:Gen3*/
         table->PCIeGenInterval = 1;
+        table->VRConfig = 0;
 
         result = fiji_populate_vr_config(hwmgr, table);
         PP_ASSERT_WITH_CODE(0 == result,
@@ -5195,6 +5201,67 @@ static int fiji_print_clock_levels(struct pp_hwmgr *hwmgr,
         return size;
 }
 
+static inline bool fiji_are_power_levels_equal(const struct fiji_performance_level *pl1,
+                                                           const struct fiji_performance_level *pl2)
+{
+        return ((pl1->memory_clock == pl2->memory_clock) &&
+                  (pl1->engine_clock == pl2->engine_clock) &&
+                  (pl1->pcie_gen == pl2->pcie_gen) &&
+                  (pl1->pcie_lane == pl2->pcie_lane));
+}
+
+int fiji_check_states_equal(struct pp_hwmgr *hwmgr, const struct pp_hw_power_state *pstate1, const struct pp_hw_power_state *pstate2, bool *equal)
+{
+        const struct fiji_power_state *psa = cast_const_phw_fiji_power_state(pstate1);
+        const struct fiji_power_state *psb = cast_const_phw_fiji_power_state(pstate2);
+        int i;
+
+        if (equal == NULL || psa == NULL || psb == NULL)
+                return -EINVAL;
+
+        /* If the two states don't even have the same number of performance levels they cannot be the same state. */
+        if (psa->performance_level_count != psb->performance_level_count) {
+                *equal = false;
+                return 0;
+        }
+
+        for (i = 0; i < psa->performance_level_count; i++) {
+                if (!fiji_are_power_levels_equal(&(psa->performance_levels[i]), &(psb->performance_levels[i]))) {
+                        /* If we have found even one performance level pair that is different the states are different. */
+                        *equal = false;
+                        return 0;
+                }
+        }
+
+        /* If all performance levels are the same try to use the UVD clocks to break the tie.*/
+        *equal = ((psa->uvd_clks.vclk == psb->uvd_clks.vclk) && (psa->uvd_clks.dclk == psb->uvd_clks.dclk));
+        *equal &= ((psa->vce_clks.evclk == psb->vce_clks.evclk) && (psa->vce_clks.ecclk == psb->vce_clks.ecclk));
+        *equal &= (psa->sclk_threshold == psb->sclk_threshold);
+        *equal &= (psa->acp_clk == psb->acp_clk);
+
+        return 0;
+}
+
+bool fiji_check_smc_update_required_for_display_configuration(struct pp_hwmgr *hwmgr)
+{
+        struct fiji_hwmgr *data = (struct fiji_hwmgr *)(hwmgr->backend);
+        bool is_update_required = false;
+        struct cgs_display_info info = {0,0,NULL};
+
+        cgs_get_active_displays_info(hwmgr->device, &info);
+
+        if (data->display_timing.num_existing_displays != info.display_count)
+                is_update_required = true;
+/* TO DO NEED TO GET DEEP SLEEP CLOCK FROM DAL
+        if (phm_cap_enabled(hwmgr->hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_SclkDeepSleep)) {
+                cgs_get_min_clock_settings(hwmgr->device, &min_clocks);
+                if(min_clocks.engineClockInSR != data->display_timing.minClockInSR)
+                        is_update_required = true;
+*/
+        return is_update_required;
+}
+
+
 static const struct pp_hwmgr_func fiji_hwmgr_funcs = {
         .backend_init = &fiji_hwmgr_backend_init,
         .backend_fini = &tonga_hwmgr_backend_fini,
@@ -5230,6 +5297,8 @@ static const struct pp_hwmgr_func fiji_hwmgr_funcs = {
         .register_internal_thermal_interrupt = fiji_register_internal_thermal_interrupt,
         .set_fan_control_mode = fiji_set_fan_control_mode,
         .get_fan_control_mode = fiji_get_fan_control_mode,
+        .check_states_equal = fiji_check_states_equal,
+        .check_smc_update_required_for_display_configuration = fiji_check_smc_update_required_for_display_configuration,
         .get_pp_table = fiji_get_pp_table,
         .set_pp_table = fiji_set_pp_table,
         .force_clock_level = fiji_force_clock_level,
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
index be31bed2538a..fa208ada6892 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
@@ -58,6 +58,9 @@ void phm_init_dynamic_caps(struct pp_hwmgr *hwmgr)
 
         phm_cap_unset(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_VpuRecoveryInProgress);
 
+        phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_UVDDPM);
+        phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_VCEDPM);
+
         if (acpi_atcs_functions_supported(hwmgr->device, ATCS_FUNCTION_PCIE_PERFORMANCE_REQUEST) &&
                 acpi_atcs_functions_supported(hwmgr->device, ATCS_FUNCTION_PCIE_DEVICE_READY_NOTIFICATION))
                 phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_PCIEPerformanceRequest);
@@ -130,18 +133,25 @@ int phm_set_power_state(struct pp_hwmgr *hwmgr,
 
 int phm_enable_dynamic_state_management(struct pp_hwmgr *hwmgr)
 {
+        int ret = 1;
+        bool enabled;
         PHM_FUNC_CHECK(hwmgr);
 
         if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
                 PHM_PlatformCaps_TablelessHardwareInterface)) {
                 if (NULL != hwmgr->hwmgr_func->dynamic_state_management_enable)
-                        return hwmgr->hwmgr_func->dynamic_state_management_enable(hwmgr);
+                        ret = hwmgr->hwmgr_func->dynamic_state_management_enable(hwmgr);
         } else {
-                return phm_dispatch_table(hwmgr,
+                ret = phm_dispatch_table(hwmgr,
                                 &(hwmgr->enable_dynamic_state_management),
                                 NULL, NULL);
         }
-        return 0;
+
+        enabled = ret == 0 ? true : false;
+
+        cgs_notify_dpm_enabled(hwmgr->device, enabled);
+
+        return ret;
 }
 
 int phm_force_dpm_levels(struct pp_hwmgr *hwmgr, enum amd_dpm_forced_level level)
diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c
index 56b829f97699..3ac1ae4d8caf 100644
--- a/drivers/gpu/drm/arm/hdlcd_drv.c
+++ b/drivers/gpu/drm/arm/hdlcd_drv.c
@@ -57,14 +57,13 @@ static int hdlcd_load(struct drm_device *drm, unsigned long flags)
                 DRM_ERROR("failed to map control registers area\n");
                 ret = PTR_ERR(hdlcd->mmio);
                 hdlcd->mmio = NULL;
-                goto fail;
+                return ret;
         }
 
         version = hdlcd_read(hdlcd, HDLCD_REG_VERSION);
         if ((version & HDLCD_PRODUCT_MASK) != HDLCD_PRODUCT_ID) {
                 DRM_ERROR("unknown product id: 0x%x\n", version);
-                ret = -EINVAL;
-                goto fail;
+                return -EINVAL;
         }
         DRM_INFO("found ARM HDLCD version r%dp%d\n",
                 (version & HDLCD_VERSION_MAJOR_MASK) >> 8,
@@ -73,7 +72,7 @@ static int hdlcd_load(struct drm_device *drm, unsigned long flags)
         /* Get the optional framebuffer memory resource */
         ret = of_reserved_mem_device_init(drm->dev);
         if (ret && ret != -ENODEV)
-                goto fail;
+                return ret;
 
         ret = dma_set_mask_and_coherent(drm->dev, DMA_BIT_MASK(32));
         if (ret)
@@ -101,8 +100,6 @@ irq_fail:
         drm_crtc_cleanup(&hdlcd->crtc);
 setup_fail:
         of_reserved_mem_device_release(drm->dev);
-fail:
-        devm_clk_put(drm->dev, hdlcd->clk);
 
         return ret;
 }
@@ -412,7 +409,6 @@ err_unload:
         pm_runtime_put_sync(drm->dev);
         pm_runtime_disable(drm->dev);
         of_reserved_mem_device_release(drm->dev);
-        devm_clk_put(dev, hdlcd->clk);
 err_free:
         drm_dev_unref(drm);
 
@@ -436,10 +432,6 @@ static void hdlcd_drm_unbind(struct device *dev)
         pm_runtime_put_sync(drm->dev);
         pm_runtime_disable(drm->dev);
         of_reserved_mem_device_release(drm->dev);
-        if (!IS_ERR(hdlcd->clk)) {
-                devm_clk_put(drm->dev, hdlcd->clk);
-                hdlcd->clk = NULL;
-        }
         drm_mode_config_cleanup(drm);
         drm_dev_unregister(drm);
         drm_dev_unref(drm);
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_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c
index 7d58f594cffe..df64ed1c0139 100644
--- a/drivers/gpu/drm/drm_dp_helper.c
+++ b/drivers/gpu/drm/drm_dp_helper.c
@@ -179,7 +179,7 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request,
 {
         struct drm_dp_aux_msg msg;
         unsigned int retry;
-        int err;
+        int err = 0;
 
         memset(&msg, 0, sizeof(msg));
         msg.address = offset;
@@ -187,6 +187,8 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request,
         msg.buffer = buffer;
         msg.size = size;
 
+        mutex_lock(&aux->hw_mutex);
+
         /*
          * The specification doesn't give any recommendation on how often to
          * retry native transactions. We used to retry 7 times like for
@@ -195,25 +197,24 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request,
          */
         for (retry = 0; retry < 32; retry++) {
 
-                mutex_lock(&aux->hw_mutex);
                 err = aux->transfer(aux, &msg);
-                mutex_unlock(&aux->hw_mutex);
                 if (err < 0) {
                         if (err == -EBUSY)
                                 continue;
 
-                        return err;
+                        goto unlock;
                 }
 
 
                 switch (msg.reply & DP_AUX_NATIVE_REPLY_MASK) {
                 case DP_AUX_NATIVE_REPLY_ACK:
                         if (err < size)
-                                return -EPROTO;
-                        return err;
+                                err = -EPROTO;
+                        goto unlock;
 
                 case DP_AUX_NATIVE_REPLY_NACK:
-                        return -EIO;
+                        err = -EIO;
+                        goto unlock;
 
                 case DP_AUX_NATIVE_REPLY_DEFER:
                         usleep_range(AUX_RETRY_INTERVAL, AUX_RETRY_INTERVAL + 100);
@@ -222,7 +223,11 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request,
         }
 
         DRM_DEBUG_KMS("too many retries, giving up\n");
-        return -EIO;
+        err = -EIO;
+
+unlock:
+        mutex_unlock(&aux->hw_mutex);
+        return err;
 }
 
 /**
@@ -544,9 +549,7 @@ static int drm_dp_i2c_do_msg(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
         int max_retries = max(7, drm_dp_i2c_retry_count(msg, dp_aux_i2c_speed_khz));
 
         for (retry = 0, defer_i2c = 0; retry < (max_retries + defer_i2c); retry++) {
-                mutex_lock(&aux->hw_mutex);
                 ret = aux->transfer(aux, msg);
-                mutex_unlock(&aux->hw_mutex);
                 if (ret < 0) {
                         if (ret == -EBUSY)
                                 continue;
@@ -685,6 +688,8 @@ static int drm_dp_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs,
 
         memset(&msg, 0, sizeof(msg));
 
+        mutex_lock(&aux->hw_mutex);
+
         for (i = 0; i < num; i++) {
                 msg.address = msgs[i].addr;
                 drm_dp_i2c_msg_set_request(&msg, &msgs[i]);
@@ -739,6 +744,8 @@ static int drm_dp_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs,
         msg.size = 0;
         (void)drm_dp_i2c_do_msg(aux, &msg);
 
+        mutex_unlock(&aux->hw_mutex);
+
         return err;
 }
 
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/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c
index 7bb1f1aff932..c52f9adf5e04 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_dp.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c
@@ -220,7 +220,7 @@ i2c_dp_aux_prepare_bus(struct i2c_adapter *adapter)
  * FIXME: This is the old dp aux helper, gma500 is the last driver that needs to
  * be ported over to the new helper code in drm_dp_helper.c like i915 or radeon.
  */
-static int __deprecated
+static int
 i2c_dp_aux_add_bus(struct i2c_adapter *adapter)
 {
         int error;
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 3d31d3ac589e..dabc08987b5e 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;
@@ -2206,7 +2206,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;
 
@@ -2346,7 +2346,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 6be40f3ba2c7..18ba8139e922 100644
--- a/drivers/gpu/drm/i915/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
@@ -683,7 +683,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/imx/dw_hdmi-imx.c b/drivers/gpu/drm/imx/dw_hdmi-imx.c
index 2a95d10e9d92..a24631fdf4ad 100644
--- a/drivers/gpu/drm/imx/dw_hdmi-imx.c
+++ b/drivers/gpu/drm/imx/dw_hdmi-imx.c
@@ -225,8 +225,6 @@ static int dw_hdmi_imx_bind(struct device *dev, struct device *master,
         if (!iores)
                 return -ENXIO;
 
-        platform_set_drvdata(pdev, hdmi);
-
         encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node);
         /*
          * If we failed to find the CRTC(s) which this encoder is
@@ -245,7 +243,16 @@ static int dw_hdmi_imx_bind(struct device *dev, struct device *master,
         drm_encoder_init(drm, encoder, &dw_hdmi_imx_encoder_funcs,
                          DRM_MODE_ENCODER_TMDS, NULL);
 
-        return dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data);
+        ret = dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data);
+
+        /*
+         * If dw_hdmi_bind() fails we'll never call dw_hdmi_unbind(),
+         * which would have called the encoder cleanup.  Do it manually.
+         */
+        if (ret)
+                drm_encoder_cleanup(encoder);
+
+        return ret;
 }
 
 static void dw_hdmi_imx_unbind(struct device *dev, struct device *master,
diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
index 9876e0f0c3e1..e26dcdec2aba 100644
--- a/drivers/gpu/drm/imx/imx-drm-core.c
+++ b/drivers/gpu/drm/imx/imx-drm-core.c
@@ -326,7 +326,6 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
 {
         struct imx_drm_device *imxdrm = drm->dev_private;
         struct imx_drm_crtc *imx_drm_crtc;
-        int ret;
 
         /*
          * The vblank arrays are dimensioned by MAX_CRTC - we can't
@@ -351,10 +350,6 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
 
         *new_crtc = imx_drm_crtc;
 
-        ret = drm_mode_crtc_set_gamma_size(imx_drm_crtc->crtc, 256);
-        if (ret)
-                goto err_register;
-
         drm_crtc_helper_add(crtc,
                         imx_drm_crtc->imx_drm_helper_funcs.crtc_helper_funcs);
 
@@ -362,11 +357,6 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
                         imx_drm_crtc->imx_drm_helper_funcs.crtc_funcs, NULL);
 
         return 0;
-
-err_register:
-        imxdrm->crtc[--imxdrm->pipes] = NULL;
-        kfree(imx_drm_crtc);
-        return ret;
 }
 EXPORT_SYMBOL_GPL(imx_drm_add_crtc);
 
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c
index 588827844f30..681ec6eb77d9 100644
--- a/drivers/gpu/drm/imx/ipuv3-plane.c
+++ b/drivers/gpu/drm/imx/ipuv3-plane.c
@@ -72,22 +72,101 @@ static inline int calc_bandwidth(int width, int height, unsigned int vref)
 int ipu_plane_set_base(struct ipu_plane *ipu_plane, struct drm_framebuffer *fb,
                        int x, int y)
 {
-        struct drm_gem_cma_object *cma_obj;
-        unsigned long eba;
-        int active;
-
-        cma_obj = drm_fb_cma_get_gem_obj(fb, 0);
-        if (!cma_obj) {
-                DRM_DEBUG_KMS("entry is null.\n");
-                return -EFAULT;
+        struct drm_gem_cma_object *cma_obj[3];
+        unsigned long eba, ubo, vbo;
+        int active, i;
+
+        for (i = 0; i < drm_format_num_planes(fb->pixel_format); i++) {
+                cma_obj[i] = drm_fb_cma_get_gem_obj(fb, i);
+                if (!cma_obj[i]) {
+                        DRM_DEBUG_KMS("plane %d entry is null.\n", i);
+                        return -EFAULT;
+                }
         }
 
-        dev_dbg(ipu_plane->base.dev->dev, "phys = %pad, x = %d, y = %d",
-                &cma_obj->paddr, x, y);
-
-        eba = cma_obj->paddr + fb->offsets[0] +
+        eba = cma_obj[0]->paddr + fb->offsets[0] +
               fb->pitches[0] * y + (fb->bits_per_pixel >> 3) * x;
 
+        if (eba & 0x7) {
+                DRM_DEBUG_KMS("base address must be a multiple of 8.\n");
+                return -EINVAL;
+        }
+
+        if (fb->pitches[0] < 1 || fb->pitches[0] > 16384) {
+                DRM_DEBUG_KMS("pitches out of range.\n");
+                return -EINVAL;
+        }
+
+        if (ipu_plane->enabled && fb->pitches[0] != ipu_plane->stride[0]) {
+                DRM_DEBUG_KMS("pitches must not change while plane is enabled.\n");
+                return -EINVAL;
+        }
+
+        ipu_plane->stride[0] = fb->pitches[0];
+
+        switch (fb->pixel_format) {
+        case DRM_FORMAT_YUV420:
+        case DRM_FORMAT_YVU420:
+                /*
+                 * Multiplanar formats have to meet the following restrictions:
+                 * - The (up to) three plane addresses are EBA, EBA+UBO, EBA+VBO
+                 * - EBA, UBO and VBO are a multiple of 8
+                 * - UBO and VBO are unsigned and not larger than 0xfffff8
+                 * - Only EBA may be changed while scanout is active
+                 * - The strides of U and V planes must be identical.
+                 */
+                ubo = cma_obj[1]->paddr + fb->offsets[1] +
+                      fb->pitches[1] * y / 2 + x / 2 - eba;
+                vbo = cma_obj[2]->paddr + fb->offsets[2] +
+                      fb->pitches[2] * y / 2 + x / 2 - eba;
+
+                if ((ubo & 0x7) || (vbo & 0x7)) {
+                        DRM_DEBUG_KMS("U/V buffer offsets must be a multiple of 8.\n");
+                        return -EINVAL;
+                }
+
+                if ((ubo > 0xfffff8) || (vbo > 0xfffff8)) {
+                        DRM_DEBUG_KMS("U/V buffer offsets must be positive and not larger than 0xfffff8.\n");
+                        return -EINVAL;
+                }
+
+                if (ipu_plane->enabled && ((ipu_plane->u_offset != ubo) ||
+                                           (ipu_plane->v_offset != vbo))) {
+                        DRM_DEBUG_KMS("U/V buffer offsets must not change while plane is enabled.\n");
+                        return -EINVAL;
+                }
+
+                if (fb->pitches[1] != fb->pitches[2]) {
+                        DRM_DEBUG_KMS("U/V pitches must be identical.\n");
+                        return -EINVAL;
+                }
+
+                if (fb->pitches[1] < 1 || fb->pitches[1] > 16384) {
+                        DRM_DEBUG_KMS("U/V pitches out of range.\n");
+                        return -EINVAL;
+                }
+
+                if (ipu_plane->enabled &&
+                    (ipu_plane->stride[1] != fb->pitches[1])) {
+                        DRM_DEBUG_KMS("U/V pitches must not change while plane is enabled.\n");
+                        return -EINVAL;
+                }
+
+                ipu_plane->u_offset = ubo;
+                ipu_plane->v_offset = vbo;
+                ipu_plane->stride[1] = fb->pitches[1];
+
+                dev_dbg(ipu_plane->base.dev->dev,
+                        "phys = %pad %pad %pad, x = %d, y = %d",
+                        &cma_obj[0]->paddr, &cma_obj[1]->paddr,
+                        &cma_obj[2]->paddr, x, y);
+                break;
+        default:
+                dev_dbg(ipu_plane->base.dev->dev, "phys = %pad, x = %d, y = %d",
+                        &cma_obj[0]->paddr, x, y);
+                break;
+        }
+
         if (ipu_plane->enabled) {
                 active = ipu_idmac_get_current_buffer(ipu_plane->ipu_ch);
                 ipu_cpmem_set_buffer(ipu_plane->ipu_ch, !active, eba);
@@ -201,12 +280,6 @@ int ipu_plane_mode_set(struct ipu_plane *ipu_plane, struct drm_crtc *crtc,
                 }
         }
 
-        ret = ipu_dmfc_init_channel(ipu_plane->dmfc, crtc_w);
-        if (ret) {
-                dev_err(dev, "initializing dmfc channel failed with %d\n", ret);
-                return ret;
-        }
-
         ret = ipu_dmfc_alloc_bandwidth(ipu_plane->dmfc,
                         calc_bandwidth(crtc_w, crtc_h,
                                        calc_vref(mode)), 64);
@@ -215,6 +288,8 @@ int ipu_plane_mode_set(struct ipu_plane *ipu_plane, struct drm_crtc *crtc,
                 return ret;
         }
 
+        ipu_dmfc_config_wait4eot(ipu_plane->dmfc, crtc_w);
+
         ipu_cpmem_zero(ipu_plane->ipu_ch);
         ipu_cpmem_set_resolution(ipu_plane->ipu_ch, src_w, src_h);
         ret = ipu_cpmem_set_fmt(ipu_plane->ipu_ch, fb->pixel_format);
@@ -233,6 +308,18 @@ int ipu_plane_mode_set(struct ipu_plane *ipu_plane, struct drm_crtc *crtc,
         if (interlaced)
                 ipu_cpmem_interlaced_scan(ipu_plane->ipu_ch, fb->pitches[0]);
 
+        if (fb->pixel_format == DRM_FORMAT_YUV420) {
+                ipu_cpmem_set_yuv_planar_full(ipu_plane->ipu_ch,
+                                              ipu_plane->stride[1],
+                                              ipu_plane->u_offset,
+                                              ipu_plane->v_offset);
+        } else if (fb->pixel_format == DRM_FORMAT_YVU420) {
+                ipu_cpmem_set_yuv_planar_full(ipu_plane->ipu_ch,
+                                              ipu_plane->stride[1],
+                                              ipu_plane->v_offset,
+                                              ipu_plane->u_offset);
+        }
+
         ipu_plane->w = src_w;
         ipu_plane->h = src_h;
 
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.h b/drivers/gpu/drm/imx/ipuv3-plane.h
index 3a443b413c60..4448fd4ad4eb 100644
--- a/drivers/gpu/drm/imx/ipuv3-plane.h
+++ b/drivers/gpu/drm/imx/ipuv3-plane.h
@@ -29,6 +29,10 @@ struct ipu_plane {
         int                     w;
         int                     h;
 
+        unsigned int            u_offset;
+        unsigned int            v_offset;
+        unsigned int            stride[2];
+
         bool                    enabled;
 };
 
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdmi.h
index b04a64664673..65428cf233ce 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.h
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.h
@@ -196,7 +196,7 @@ void __exit msm_hdmi_phy_driver_unregister(void);
 int msm_hdmi_pll_8960_init(struct platform_device *pdev);
 int msm_hdmi_pll_8996_init(struct platform_device *pdev);
 #else
-static inline int msm_hdmi_pll_8960_init(struct platform_device *pdev);
+static inline int msm_hdmi_pll_8960_init(struct platform_device *pdev)
 {
         return -ENODEV;
 }
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index d52910e2c26c..c03b96709179 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -467,9 +467,6 @@ static void msm_preclose(struct drm_device *dev, struct drm_file *file)
         struct msm_file_private *ctx = file->driver_priv;
         struct msm_kms *kms = priv->kms;
 
-        if (kms)
-                kms->funcs->preclose(kms, file);
-
         mutex_lock(&dev->struct_mutex);
         if (ctx == priv->lastctx)
                 priv->lastctx = NULL;
diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h
index 9bcabaada179..e32222c3d44f 100644
--- a/drivers/gpu/drm/msm/msm_kms.h
+++ b/drivers/gpu/drm/msm/msm_kms.h
@@ -55,7 +55,6 @@ struct msm_kms_funcs {
                         struct drm_encoder *slave_encoder,
                         bool is_cmd_mode);
         /* cleanup: */
-        void (*preclose)(struct msm_kms *kms, struct drm_file *file);
         void (*destroy)(struct msm_kms *kms);
 };
 
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h b/drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h
index 16641cec18a2..b5370cb56e3c 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h
@@ -11,6 +11,7 @@ struct nvkm_device_tegra {
 
         struct reset_control *rst;
         struct clk *clk;
+        struct clk *clk_ref;
         struct clk *clk_pwr;
 
         struct regulator *vdd;
@@ -36,6 +37,10 @@ struct nvkm_device_tegra_func {
          * bypassed). A value of 0 means an IOMMU is never used.
          */
         u8 iommu_bit;
+        /*
+         * Whether the chip requires a reference clock
+         */
+        bool require_ref_clk;
 };
 
 int nvkm_device_tegra_new(const struct nvkm_device_tegra_func *,
diff --git a/drivers/gpu/drm/nouveau/nouveau_platform.c b/drivers/gpu/drm/nouveau/nouveau_platform.c
index 2dfe58af12e4..4c4cc2260257 100644
--- a/drivers/gpu/drm/nouveau/nouveau_platform.c
+++ b/drivers/gpu/drm/nouveau/nouveau_platform.c
@@ -55,6 +55,11 @@ static const struct nvkm_device_tegra_func gk20a_platform_data = {
         .iommu_bit = 34,
 };
 
+static const struct nvkm_device_tegra_func gm20b_platform_data = {
+        .iommu_bit = 34,
+        .require_ref_clk = true,
+};
+
 static const struct of_device_id nouveau_platform_match[] = {
         {
                 .compatible = "nvidia,gk20a",
@@ -62,7 +67,7 @@ static const struct of_device_id nouveau_platform_match[] = {
         },
         {
                 .compatible = "nvidia,gm20b",
-                .data = &gk20a_platform_data,
+                .data = &gm20b_platform_data,
         },
         { }
 };
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
index 9afa5f3e3c1c..ec12efb4689a 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
@@ -35,6 +35,11 @@ nvkm_device_tegra_power_up(struct nvkm_device_tegra *tdev)
         ret = clk_prepare_enable(tdev->clk);
         if (ret)
                 goto err_clk;
+        if (tdev->clk_ref) {
+                ret = clk_prepare_enable(tdev->clk_ref);
+                if (ret)
+                        goto err_clk_ref;
+        }
         ret = clk_prepare_enable(tdev->clk_pwr);
         if (ret)
                 goto err_clk_pwr;
@@ -57,6 +62,9 @@ nvkm_device_tegra_power_up(struct nvkm_device_tegra *tdev)
 err_clamp:
         clk_disable_unprepare(tdev->clk_pwr);
 err_clk_pwr:
+        if (tdev->clk_ref)
+                clk_disable_unprepare(tdev->clk_ref);
+err_clk_ref:
         clk_disable_unprepare(tdev->clk);
 err_clk:
         regulator_disable(tdev->vdd);
@@ -71,6 +79,8 @@ nvkm_device_tegra_power_down(struct nvkm_device_tegra *tdev)
         udelay(10);
 
         clk_disable_unprepare(tdev->clk_pwr);
+        if (tdev->clk_ref)
+                clk_disable_unprepare(tdev->clk_ref);
         clk_disable_unprepare(tdev->clk);
         udelay(10);
 
@@ -274,6 +284,13 @@ nvkm_device_tegra_new(const struct nvkm_device_tegra_func *func,
                 goto free;
         }
 
+        if (func->require_ref_clk)
+                tdev->clk_ref = devm_clk_get(&pdev->dev, "ref");
+        if (IS_ERR(tdev->clk_ref)) {
+                ret = PTR_ERR(tdev->clk_ref);
+                goto free;
+        }
+
         tdev->clk_pwr = devm_clk_get(&pdev->dev, "pwr");
         if (IS_ERR(tdev->clk_pwr)) {
                 ret = PTR_ERR(tdev->clk_pwr);
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index cf61e0856f4a..b80b08f71cb4 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -275,13 +275,15 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode)
                 if (ASIC_IS_DCE3(rdev) && !ASIC_IS_DCE6(rdev))
                         atombios_enable_crtc_memreq(crtc, ATOM_ENABLE);
                 atombios_blank_crtc(crtc, ATOM_DISABLE);
-                drm_vblank_on(dev, radeon_crtc->crtc_id);
+                if (dev->num_crtcs > radeon_crtc->crtc_id)
+                        drm_vblank_on(dev, radeon_crtc->crtc_id);
                 radeon_crtc_load_lut(crtc);
                 break;
         case DRM_MODE_DPMS_STANDBY:
         case DRM_MODE_DPMS_SUSPEND:
         case DRM_MODE_DPMS_OFF:
-                drm_vblank_off(dev, radeon_crtc->crtc_id);
+                if (dev->num_crtcs > radeon_crtc->crtc_id)
+                        drm_vblank_off(dev, radeon_crtc->crtc_id);
                 if (radeon_crtc->enabled)
                         atombios_blank_crtc(crtc, ATOM_ENABLE);
                 if (ASIC_IS_DCE3(rdev) && !ASIC_IS_DCE6(rdev))
diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c
index 979f3bf65f2c..1e9304d1c88f 100644
--- a/drivers/gpu/drm/radeon/radeon_irq_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c
@@ -291,6 +291,8 @@ int radeon_irq_kms_init(struct radeon_device *rdev)
         if (r) {
                 return r;
         }
+        rdev->ddev->vblank_disable_allowed = true;
+
         /* enable msi */
         rdev->msi_enabled = 0;
 
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
index 24152dfef199..478d4099b0d0 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
@@ -331,13 +331,15 @@ static void radeon_crtc_dpms(struct drm_crtc *crtc, int mode)
                                                                          RADEON_CRTC_DISP_REQ_EN_B));
                         WREG32_P(RADEON_CRTC_EXT_CNTL, crtc_ext_cntl, ~(mask | crtc_ext_cntl));
                 }
-                drm_vblank_on(dev, radeon_crtc->crtc_id);
+                if (dev->num_crtcs > radeon_crtc->crtc_id)
+                        drm_vblank_on(dev, radeon_crtc->crtc_id);
                 radeon_crtc_load_lut(crtc);
                 break;
         case DRM_MODE_DPMS_STANDBY:
         case DRM_MODE_DPMS_SUSPEND:
         case DRM_MODE_DPMS_OFF:
-                drm_vblank_off(dev, radeon_crtc->crtc_id);
+                if (dev->num_crtcs > radeon_crtc->crtc_id)
+                        drm_vblank_off(dev, radeon_crtc->crtc_id);
                 if (radeon_crtc->crtc_id)
                         WREG32_P(RADEON_CRTC2_GEN_CNTL, mask, ~(RADEON_CRTC2_EN | mask));
                 else {
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index dd46c38676db..2d901bf28a94 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -799,6 +799,10 @@ int radeon_bo_fault_reserve_notify(struct ttm_buffer_object *bo)
         if ((offset + size) <= rdev->mc.visible_vram_size)
                 return 0;
 
+        /* Can't move a pinned BO to visible VRAM */
+        if (rbo->pin_count > 0)
+                return -EINVAL;
+
         /* hurrah the memory is not visible ! */
         radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_VRAM);
         lpfn =  rdev->mc.visible_vram_size >> PAGE_SHIFT;
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 6d8c32377c6f..7dddfdce85e6 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -397,9 +397,15 @@ static int radeon_bo_move(struct ttm_buffer_object *bo,
                         struct ttm_mem_reg *new_mem)
 {
         struct radeon_device *rdev;
+        struct radeon_bo *rbo;
         struct ttm_mem_reg *old_mem = &bo->mem;
         int r;
 
+        /* Can't move a pinned BO */
+        rbo = container_of(bo, struct radeon_bo, tbo);
+        if (WARN_ON_ONCE(rbo->pin_count > 0))
+                return -EINVAL;
+
         rdev = radeon_get_rdev(bo->bdev);
         if (old_mem->mem_type == TTM_PL_SYSTEM && bo->ttm == NULL) {
                 radeon_move_null(bo, new_mem);
@@ -609,7 +615,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/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
index cb75ab72098a..af4df81c4e0c 100644
--- a/drivers/gpu/drm/radeon/si_dpm.c
+++ b/drivers/gpu/drm/radeon/si_dpm.c
@@ -2926,9 +2926,11 @@ static struct si_dpm_quirk si_dpm_quirk_list[] = {
         /* PITCAIRN - https://bugs.freedesktop.org/show_bug.cgi?id=76490 */
         { PCI_VENDOR_ID_ATI, 0x6810, 0x1462, 0x3036, 0, 120000 },
         { PCI_VENDOR_ID_ATI, 0x6811, 0x174b, 0xe271, 0, 120000 },
+        { PCI_VENDOR_ID_ATI, 0x6811, 0x174b, 0x2015, 0, 120000 },
         { PCI_VENDOR_ID_ATI, 0x6810, 0x174b, 0xe271, 85000, 90000 },
         { PCI_VENDOR_ID_ATI, 0x6811, 0x1462, 0x2015, 0, 120000 },
         { PCI_VENDOR_ID_ATI, 0x6811, 0x1043, 0x2015, 0, 120000 },
+        { PCI_VENDOR_ID_ATI, 0x6811, 0x148c, 0x2015, 0, 120000 },
         { 0, 0, 0, 0 },
 };
 
@@ -3008,6 +3010,10 @@ static void si_apply_state_adjust_rules(struct radeon_device *rdev,
                 }
                 ++p;
         }
+        /* limit mclk on all R7 370 parts for stability */
+        if (rdev->pdev->device == 0x6811 &&
+            rdev->pdev->revision == 0x81)
+                max_mclk = 120000;
 
         if (rps->vce_active) {
                 rps->evclk = rdev->pm.dpm.vce_states[rdev->pm.dpm.vce_level].evclk;
diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
index 3d3cf2f8891e..d5cfef75fc80 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -271,8 +271,6 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
         if (!iores)
                 return -ENXIO;
 
-        platform_set_drvdata(pdev, hdmi);
-
         encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node);
         /*
          * If we failed to find the CRTC(s) which this encoder is
@@ -293,7 +291,16 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
         drm_encoder_init(drm, encoder, &dw_hdmi_rockchip_encoder_funcs,
                          DRM_MODE_ENCODER_TMDS, NULL);
 
-        return dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data);
+        ret = dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data);
+
+        /*
+         * If dw_hdmi_bind() fails we'll never call dw_hdmi_unbind(),
+         * which would have called the encoder cleanup.  Do it manually.
+         */
+        if (ret)
+                drm_encoder_cleanup(encoder);
+
+        return ret;
 }
 
 static void dw_hdmi_rockchip_unbind(struct device *dev, struct device *master,
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index 896da09e49ee..f556a8f4fde6 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -251,6 +251,27 @@ static int rockchip_drm_unload(struct drm_device *drm_dev)
         return 0;
 }
 
+static void rockchip_drm_crtc_cancel_pending_vblank(struct drm_crtc *crtc,
+                                                    struct drm_file *file_priv)
+{
+        struct rockchip_drm_private *priv = crtc->dev->dev_private;
+        int pipe = drm_crtc_index(crtc);
+
+        if (pipe < ROCKCHIP_MAX_CRTC &&
+            priv->crtc_funcs[pipe] &&
+            priv->crtc_funcs[pipe]->cancel_pending_vblank)
+                priv->crtc_funcs[pipe]->cancel_pending_vblank(crtc, file_priv);
+}
+
+static void rockchip_drm_preclose(struct drm_device *dev,
+                                  struct drm_file *file_priv)
+{
+        struct drm_crtc *crtc;
+
+        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
+                rockchip_drm_crtc_cancel_pending_vblank(crtc, file_priv);
+}
+
 void rockchip_drm_lastclose(struct drm_device *dev)
 {
         struct rockchip_drm_private *priv = dev->dev_private;
@@ -281,6 +302,7 @@ static struct drm_driver rockchip_drm_driver = {
                                   DRIVER_PRIME | DRIVER_ATOMIC,
         .load                   = rockchip_drm_load,
         .unload                 = rockchip_drm_unload,
+        .preclose               = rockchip_drm_preclose,
         .lastclose              = rockchip_drm_lastclose,
         .get_vblank_counter     = drm_vblank_no_hw_counter,
         .enable_vblank          = rockchip_drm_crtc_enable_vblank,
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
index 3529f692edb8..00d17d71aa4c 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
@@ -40,6 +40,7 @@ struct rockchip_crtc_funcs {
         int (*enable_vblank)(struct drm_crtc *crtc);
         void (*disable_vblank)(struct drm_crtc *crtc);
         void (*wait_for_update)(struct drm_crtc *crtc);
+        void (*cancel_pending_vblank)(struct drm_crtc *crtc, struct drm_file *file_priv);
 };
 
 struct rockchip_atomic_commit {
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index fd370548d7d7..a619f120f801 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -499,10 +499,25 @@ err_disable_hclk:
 static void vop_crtc_disable(struct drm_crtc *crtc)
 {
         struct vop *vop = to_vop(crtc);
+        int i;
 
         if (!vop->is_enabled)
                 return;
 
+        /*
+         * We need to make sure that all windows are disabled before we
+         * disable that crtc. Otherwise we might try to scan from a destroyed
+         * buffer later.
+         */
+        for (i = 0; i < vop->data->win_size; i++) {
+                struct vop_win *vop_win = &vop->win[i];
+                const struct vop_win_data *win = vop_win->data;
+
+                spin_lock(&vop->reg_lock);
+                VOP_WIN_SET(vop, win, enable, 0);
+                spin_unlock(&vop->reg_lock);
+        }
+
         drm_crtc_vblank_off(crtc);
 
         /*
@@ -549,6 +564,7 @@ static int vop_plane_atomic_check(struct drm_plane *plane,
                            struct drm_plane_state *state)
 {
         struct drm_crtc *crtc = state->crtc;
+        struct drm_crtc_state *crtc_state;
         struct drm_framebuffer *fb = state->fb;
         struct vop_win *vop_win = to_vop_win(plane);
         struct vop_plane_state *vop_plane_state = to_vop_plane_state(state);
@@ -563,12 +579,13 @@ static int vop_plane_atomic_check(struct drm_plane *plane,
         int max_scale = win->phy->scl ? FRAC_16_16(8, 1) :
                                         DRM_PLANE_HELPER_NO_SCALING;
 
-        crtc = crtc ? crtc : plane->state->crtc;
-        /*
-         * Both crtc or plane->state->crtc can be null.
-         */
         if (!crtc || !fb)
                 goto out_disable;
+
+        crtc_state = drm_atomic_get_existing_crtc_state(state->state, crtc);
+        if (WARN_ON(!crtc_state))
+                return -EINVAL;
+
         src->x1 = state->src_x;
         src->y1 = state->src_y;
         src->x2 = state->src_x + state->src_w;
@@ -580,8 +597,8 @@ static int vop_plane_atomic_check(struct drm_plane *plane,
 
         clip.x1 = 0;
         clip.y1 = 0;
-        clip.x2 = crtc->mode.hdisplay;
-        clip.y2 = crtc->mode.vdisplay;
+        clip.x2 = crtc_state->adjusted_mode.hdisplay;
+        clip.y2 = crtc_state->adjusted_mode.vdisplay;
 
         ret = drm_plane_helper_check_update(plane, crtc, state->fb,
                                             src, dest, &clip,
@@ -873,10 +890,30 @@ static void vop_crtc_wait_for_update(struct drm_crtc *crtc)
         WARN_ON(!wait_for_completion_timeout(&vop->wait_update_complete, 100));
 }
 
+static void vop_crtc_cancel_pending_vblank(struct drm_crtc *crtc,
+                                           struct drm_file *file_priv)
+{
+        struct drm_device *drm = crtc->dev;
+        struct vop *vop = to_vop(crtc);
+        struct drm_pending_vblank_event *e;
+        unsigned long flags;
+
+        spin_lock_irqsave(&drm->event_lock, flags);
+        e = vop->event;
+        if (e && e->base.file_priv == file_priv) {
+                vop->event = NULL;
+
+                e->base.destroy(&e->base);
+                file_priv->event_space += sizeof(e->event);
+        }
+        spin_unlock_irqrestore(&drm->event_lock, flags);
+}
+
 static const struct rockchip_crtc_funcs private_crtc_funcs = {
         .enable_vblank = vop_crtc_enable_vblank,
         .disable_vblank = vop_crtc_disable_vblank,
         .wait_for_update = vop_crtc_wait_for_update,
+        .cancel_pending_vblank = vop_crtc_cancel_pending_vblank,
 };
 
 static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,
@@ -885,9 +922,6 @@ static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,
 {
         struct vop *vop = to_vop(crtc);
 
-        if (adjusted_mode->htotal == 0 || adjusted_mode->vtotal == 0)
-                return false;
-
         adjusted_mode->clock =
                 clk_round_rate(vop->dclk, mode->clock * 1000) / 1000;
 
@@ -1108,7 +1142,7 @@ static int vop_create_crtc(struct vop *vop)
         const struct vop_data *vop_data = vop->data;
         struct device *dev = vop->dev;
         struct drm_device *drm_dev = vop->drm_dev;
-        struct drm_plane *primary = NULL, *cursor = NULL, *plane;
+        struct drm_plane *primary = NULL, *cursor = NULL, *plane, *tmp;
         struct drm_crtc *crtc = &vop->crtc;
         struct device_node *port;
         int ret;
@@ -1148,7 +1182,7 @@ static int vop_create_crtc(struct vop *vop)
         ret = drm_crtc_init_with_planes(drm_dev, crtc, primary, cursor,
                                         &vop_crtc_funcs, NULL);
         if (ret)
-                return ret;
+                goto err_cleanup_planes;
 
         drm_crtc_helper_add(crtc, &vop_crtc_helper_funcs);
 
@@ -1181,6 +1215,7 @@ static int vop_create_crtc(struct vop *vop)
         if (!port) {
                 DRM_ERROR("no port node found in %s\n",
                           dev->of_node->full_name);
+                ret = -ENOENT;
                 goto err_cleanup_crtc;
         }
 
@@ -1194,7 +1229,8 @@ static int vop_create_crtc(struct vop *vop)
 err_cleanup_crtc:
         drm_crtc_cleanup(crtc);
 err_cleanup_planes:
-        list_for_each_entry(plane, &drm_dev->mode_config.plane_list, head)
+        list_for_each_entry_safe(plane, tmp, &drm_dev->mode_config.plane_list,
+                                 head)
                 drm_plane_cleanup(plane);
         return ret;
 }
@@ -1202,9 +1238,28 @@ err_cleanup_planes:
 static void vop_destroy_crtc(struct vop *vop)
 {
         struct drm_crtc *crtc = &vop->crtc;
+        struct drm_device *drm_dev = vop->drm_dev;
+        struct drm_plane *plane, *tmp;
 
         rockchip_unregister_crtc_funcs(crtc);
         of_node_put(crtc->port);
+
+        /*
+         * We need to cleanup the planes now.  Why?
+         *
+         * The planes are "&vop->win[i].base".  That means the memory is
+         * all part of the big "struct vop" chunk of memory.  That memory
+         * was devm allocated and associated with this component.  We need to
+         * free it ourselves before vop_unbind() finishes.
+         */
+        list_for_each_entry_safe(plane, tmp, &drm_dev->mode_config.plane_list,
+                                 head)
+                vop_plane_destroy(plane);
+
+        /*
+         * Destroy CRTC after vop_plane_destroy() since vop_disable_plane()
+         * references the CRTC.
+         */
         drm_crtc_cleanup(crtc);
 }
 
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/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
index 33239a2b264a..fd1eb9d03f0b 100644
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c
@@ -536,7 +536,7 @@ static int udlfb_create(struct drm_fb_helper *helper,
 out_destroy_fbi:
         drm_fb_helper_release_fbi(helper);
 out_gfree:
-        drm_gem_object_unreference(&ufbdev->ufb.obj->base);
+        drm_gem_object_unreference_unlocked(&ufbdev->ufb.obj->base);
 out:
         return ret;
 }
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c
index 2a0a784ab6ee..d7528e0d8442 100644
--- a/drivers/gpu/drm/udl/udl_gem.c
+++ b/drivers/gpu/drm/udl/udl_gem.c
@@ -52,7 +52,7 @@ udl_gem_create(struct drm_file *file,
                 return ret;
         }
 
-        drm_gem_object_unreference(&obj->base);
+        drm_gem_object_unreference_unlocked(&obj->base);
         *handle_p = handle;
         return 0;
 }
diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c
index e797dfc07ae3..7e2a12c4fed2 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/gpu/ipu-v3/ipu-cpmem.c b/drivers/gpu/ipu-v3/ipu-cpmem.c
index 883a314cd83a..6494a4d28171 100644
--- a/drivers/gpu/ipu-v3/ipu-cpmem.c
+++ b/drivers/gpu/ipu-v3/ipu-cpmem.c
@@ -395,60 +395,48 @@ void ipu_cpmem_set_yuv_interleaved(struct ipuv3_channel *ch, u32 pixel_format)
 EXPORT_SYMBOL_GPL(ipu_cpmem_set_yuv_interleaved);
 
 void ipu_cpmem_set_yuv_planar_full(struct ipuv3_channel *ch,
-                                   u32 pixel_format, int stride,
-                                   int u_offset, int v_offset)
+                                   unsigned int uv_stride,
+                                   unsigned int u_offset, unsigned int v_offset)
 {
-        switch (pixel_format) {
-        case V4L2_PIX_FMT_YUV420:
-        case V4L2_PIX_FMT_YUV422P:
-                ipu_ch_param_write_field(ch, IPU_FIELD_SLUV, (stride / 2) - 1);
-                ipu_ch_param_write_field(ch, IPU_FIELD_UBO, u_offset / 8);
-                ipu_ch_param_write_field(ch, IPU_FIELD_VBO, v_offset / 8);
-                break;
-        case V4L2_PIX_FMT_YVU420:
-                ipu_ch_param_write_field(ch, IPU_FIELD_SLUV, (stride / 2) - 1);
-                ipu_ch_param_write_field(ch, IPU_FIELD_UBO, v_offset / 8);
-                ipu_ch_param_write_field(ch, IPU_FIELD_VBO, u_offset / 8);
-                break;
-        case V4L2_PIX_FMT_NV12:
-        case V4L2_PIX_FMT_NV16:
-                ipu_ch_param_write_field(ch, IPU_FIELD_SLUV, stride - 1);
-                ipu_ch_param_write_field(ch, IPU_FIELD_UBO, u_offset / 8);
-                ipu_ch_param_write_field(ch, IPU_FIELD_VBO, u_offset / 8);
-                break;
-        }
+        ipu_ch_param_write_field(ch, IPU_FIELD_SLUV, uv_stride - 1);
+        ipu_ch_param_write_field(ch, IPU_FIELD_UBO, u_offset / 8);
+        ipu_ch_param_write_field(ch, IPU_FIELD_VBO, v_offset / 8);
 }
 EXPORT_SYMBOL_GPL(ipu_cpmem_set_yuv_planar_full);
 
 void ipu_cpmem_set_yuv_planar(struct ipuv3_channel *ch,
                               u32 pixel_format, int stride, int height)
 {
-        int u_offset, v_offset;
+        int fourcc, u_offset, v_offset;
         int uv_stride = 0;
 
-        switch (pixel_format) {
-        case V4L2_PIX_FMT_YUV420:
-        case V4L2_PIX_FMT_YVU420:
+        fourcc = v4l2_pix_fmt_to_drm_fourcc(pixel_format);
+        switch (fourcc) {
+        case DRM_FORMAT_YUV420:
                 uv_stride = stride / 2;
                 u_offset = stride * height;
                 v_offset = u_offset + (uv_stride * height / 2);
-                ipu_cpmem_set_yuv_planar_full(ch, pixel_format, stride,
-                                              u_offset, v_offset);
                 break;
-        case V4L2_PIX_FMT_YUV422P:
+        case DRM_FORMAT_YVU420:
+                uv_stride = stride / 2;
+                v_offset = stride * height;
+                u_offset = v_offset + (uv_stride * height / 2);
+                break;
+        case DRM_FORMAT_YUV422:
                 uv_stride = stride / 2;
                 u_offset = stride * height;
                 v_offset = u_offset + (uv_stride * height);
-                ipu_cpmem_set_yuv_planar_full(ch, pixel_format, stride,
-                                              u_offset, v_offset);
                 break;
-        case V4L2_PIX_FMT_NV12:
-        case V4L2_PIX_FMT_NV16:
+        case DRM_FORMAT_NV12:
+        case DRM_FORMAT_NV16:
+                uv_stride = stride;
                 u_offset = stride * height;
-                ipu_cpmem_set_yuv_planar_full(ch, pixel_format, stride,
-                                              u_offset, 0);
+                v_offset = 0;
                 break;
+        default:
+                return;
         }
+        ipu_cpmem_set_yuv_planar_full(ch, uv_stride, u_offset, v_offset);
 }
 EXPORT_SYMBOL_GPL(ipu_cpmem_set_yuv_planar);
 
@@ -684,17 +672,25 @@ int ipu_cpmem_set_image(struct ipuv3_channel *ch, struct ipu_image *image)
 
         switch (pix->pixelformat) {
         case V4L2_PIX_FMT_YUV420:
-        case V4L2_PIX_FMT_YVU420:
                 offset = Y_OFFSET(pix, image->rect.left, image->rect.top);
                 u_offset = U_OFFSET(pix, image->rect.left,
                                     image->rect.top) - offset;
                 v_offset = V_OFFSET(pix, image->rect.left,
                                     image->rect.top) - offset;
 
-                ipu_cpmem_set_yuv_planar_full(ch, pix->pixelformat,
-                                              pix->bytesperline,
+                ipu_cpmem_set_yuv_planar_full(ch, pix->bytesperline / 2,
                                               u_offset, v_offset);
                 break;
+        case V4L2_PIX_FMT_YVU420:
+                offset = Y_OFFSET(pix, image->rect.left, image->rect.top);
+                u_offset = U_OFFSET(pix, image->rect.left,
+                                    image->rect.top) - offset;
+                v_offset = V_OFFSET(pix, image->rect.left,
+                                    image->rect.top) - offset;
+
+                ipu_cpmem_set_yuv_planar_full(ch, pix->bytesperline / 2,
+                                              v_offset, u_offset);
+                break;
         case V4L2_PIX_FMT_YUV422P:
                 offset = Y_OFFSET(pix, image->rect.left, image->rect.top);
                 u_offset = U2_OFFSET(pix, image->rect.left,
@@ -702,8 +698,7 @@ int ipu_cpmem_set_image(struct ipuv3_channel *ch, struct ipu_image *image)
                 v_offset = V2_OFFSET(pix, image->rect.left,
                                      image->rect.top) - offset;
 
-                ipu_cpmem_set_yuv_planar_full(ch, pix->pixelformat,
-                                              pix->bytesperline,
+                ipu_cpmem_set_yuv_planar_full(ch, pix->bytesperline / 2,
                                               u_offset, v_offset);
                 break;
         case V4L2_PIX_FMT_NV12:
@@ -712,8 +707,7 @@ int ipu_cpmem_set_image(struct ipuv3_channel *ch, struct ipu_image *image)
                                      image->rect.top) - offset;
                 v_offset = 0;
 
-                ipu_cpmem_set_yuv_planar_full(ch, pix->pixelformat,
-                                              pix->bytesperline,
+                ipu_cpmem_set_yuv_planar_full(ch, pix->bytesperline,
                                               u_offset, v_offset);
                 break;
         case V4L2_PIX_FMT_NV16:
@@ -722,8 +716,7 @@ int ipu_cpmem_set_image(struct ipuv3_channel *ch, struct ipu_image *image)
                                       image->rect.top) - offset;
                 v_offset = 0;
 
-                ipu_cpmem_set_yuv_planar_full(ch, pix->pixelformat,
-                                              pix->bytesperline,
+                ipu_cpmem_set_yuv_planar_full(ch, pix->bytesperline,
                                               u_offset, v_offset);
                 break;
         case V4L2_PIX_FMT_UYVY:
diff --git a/drivers/gpu/ipu-v3/ipu-dmfc.c b/drivers/gpu/ipu-v3/ipu-dmfc.c
index 042c3958e2a0..837b1ec22800 100644
--- a/drivers/gpu/ipu-v3/ipu-dmfc.c
+++ b/drivers/gpu/ipu-v3/ipu-dmfc.c
@@ -350,11 +350,13 @@ out:
 }
 EXPORT_SYMBOL_GPL(ipu_dmfc_alloc_bandwidth);
 
-int ipu_dmfc_init_channel(struct dmfc_channel *dmfc, int width)
+void ipu_dmfc_config_wait4eot(struct dmfc_channel *dmfc, int width)
 {
         struct ipu_dmfc_priv *priv = dmfc->priv;
         u32 dmfc_gen1;
 
+        mutex_lock(&priv->mutex);
+
         dmfc_gen1 = readl(priv->base + DMFC_GENERAL1);
 
         if ((dmfc->slots * 64 * 4) / width > dmfc->data->max_fifo_lines)
@@ -364,9 +366,9 @@ int ipu_dmfc_init_channel(struct dmfc_channel *dmfc, int width)
 
         writel(dmfc_gen1, priv->base + DMFC_GENERAL1);
 
-        return 0;
+        mutex_unlock(&priv->mutex);
 }
-EXPORT_SYMBOL_GPL(ipu_dmfc_init_channel);
+EXPORT_SYMBOL_GPL(ipu_dmfc_config_wait4eot);
 
 struct dmfc_channel *ipu_dmfc_get(struct ipu_soc *ipu, int ipu_channel)
 {
diff --git a/drivers/hwmon/max1111.c b/drivers/hwmon/max1111.c
index 36544c4f653c..303d0c9df907 100644
--- a/drivers/hwmon/max1111.c
+++ b/drivers/hwmon/max1111.c
@@ -85,6 +85,9 @@ static struct max1111_data *the_max1111;
 
 int max1111_read_channel(int channel)
 {
+        if (!the_max1111 || !the_max1111->spi)
+                return -ENODEV;
+
         return max1111_read(&the_max1111->spi->dev, channel);
 }
 EXPORT_SYMBOL(max1111_read_channel);
@@ -258,6 +261,9 @@ static int max1111_remove(struct spi_device *spi)
 {
         struct max1111_data *data = spi_get_drvdata(spi);
 
+#ifdef CONFIG_SHARPSL_PM
+        the_max1111 = NULL;
+#endif
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&spi->dev.kobj, &max1110_attr_group);
         sysfs_remove_group(&spi->dev.kobj, &max1111_attr_group);
diff --git a/drivers/i2c/busses/i2c-jz4780.c b/drivers/i2c/busses/i2c-jz4780.c
index f325663c27c5..ba14a863b451 100644
--- a/drivers/i2c/busses/i2c-jz4780.c
+++ b/drivers/i2c/busses/i2c-jz4780.c
@@ -771,11 +771,16 @@ static int jz4780_i2c_probe(struct platform_device *pdev)
         ret = of_property_read_u32(pdev->dev.of_node, "clock-frequency",
                                    &clk_freq);
         if (ret) {
-                dev_err(&pdev->dev, "clock-frequency not specified in DT");
+                dev_err(&pdev->dev, "clock-frequency not specified in DT\n");
                 goto err;
         }
 
         i2c->speed = clk_freq / 1000;
+        if (i2c->speed == 0) {
+                ret = -EINVAL;
+                dev_err(&pdev->dev, "clock-frequency minimum is 1000\n");
+                goto err;
+        }
         jz4780_i2c_set_speed(i2c);
 
         dev_info(&pdev->dev, "Bus frequency is %d KHz\n", i2c->speed);
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 0f2f8484e8ec..e584d88ee337 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -525,22 +525,16 @@ static int i2c_device_match(struct device *dev, struct device_driver *drv)
         return 0;
 }
 
-
-/* uevent helps with hotplug: modprobe -q $(MODALIAS) */
 static int i2c_device_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
-        struct i2c_client       *client = to_i2c_client(dev);
+        struct i2c_client *client = to_i2c_client(dev);
         int rc;
 
         rc = acpi_device_uevent_modalias(dev, env);
         if (rc != -ENODEV)
                 return rc;
 
-        if (add_uevent_var(env, "MODALIAS=%s%s",
-                           I2C_MODULE_PREFIX, client->name))
-                return -ENOMEM;
-        dev_dbg(dev, "uevent\n");
-        return 0;
+        return add_uevent_var(env, "MODALIAS=%s%s", I2C_MODULE_PREFIX, client->name);
 }
 
 /* i2c bus recovery routines */
diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c
index 7748a0a5ddb9..8de073aed001 100644
--- a/drivers/i2c/muxes/i2c-demux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c
@@ -140,22 +140,34 @@ static int i2c_demux_change_master(struct i2c_demux_pinctrl_priv *priv, u32 new_
         return i2c_demux_activate_master(priv, new_chan);
 }
 
-static ssize_t cur_master_show(struct device *dev, struct device_attribute *attr,
-                           char *buf)
+static ssize_t available_masters_show(struct device *dev,
+                                      struct device_attribute *attr,
+                                      char *buf)
 {
         struct i2c_demux_pinctrl_priv *priv = dev_get_drvdata(dev);
         int count = 0, i;
 
         for (i = 0; i < priv->num_chan && count < PAGE_SIZE; i++)
-                count += scnprintf(buf + count, PAGE_SIZE - count, "%c %d - %s\n",
-                                 i == priv->cur_chan ? '*' : ' ', i,
-                                 priv->chan[i].parent_np->full_name);
+                count += scnprintf(buf + count, PAGE_SIZE - count, "%d:%s%c",
+                                   i, priv->chan[i].parent_np->full_name,
+                                   i == priv->num_chan - 1 ? '\n' : ' ');
 
         return count;
 }
+static DEVICE_ATTR_RO(available_masters);
 
-static ssize_t cur_master_store(struct device *dev, struct device_attribute *attr,
-                            const char *buf, size_t count)
+static ssize_t current_master_show(struct device *dev,
+                                   struct device_attribute *attr,
+                                   char *buf)
+{
+        struct i2c_demux_pinctrl_priv *priv = dev_get_drvdata(dev);
+
+        return sprintf(buf, "%d\n", priv->cur_chan);
+}
+
+static ssize_t current_master_store(struct device *dev,
+                                    struct device_attribute *attr,
+                                    const char *buf, size_t count)
 {
         struct i2c_demux_pinctrl_priv *priv = dev_get_drvdata(dev);
         unsigned int val;
@@ -172,7 +184,7 @@ static ssize_t cur_master_store(struct device *dev, struct device_attribute *att
 
         return ret < 0 ? ret : count;
 }
-static DEVICE_ATTR_RW(cur_master);
+static DEVICE_ATTR_RW(current_master);
 
 static int i2c_demux_pinctrl_probe(struct platform_device *pdev)
 {
@@ -218,12 +230,18 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev)
         /* switch to first parent as active master */
         i2c_demux_activate_master(priv, 0);
 
-        err = device_create_file(&pdev->dev, &dev_attr_cur_master);
+        err = device_create_file(&pdev->dev, &dev_attr_available_masters);
         if (err)
                 goto err_rollback;
 
+        err = device_create_file(&pdev->dev, &dev_attr_current_master);
+        if (err)
+                goto err_rollback_available;
+
         return 0;
 
+err_rollback_available:
+        device_remove_file(&pdev->dev, &dev_attr_available_masters);
 err_rollback:
         for (j = 0; j < i; j++) {
                 of_node_put(priv->chan[j].parent_np);
@@ -238,7 +256,8 @@ static int i2c_demux_pinctrl_remove(struct platform_device *pdev)
         struct i2c_demux_pinctrl_priv *priv = platform_get_drvdata(pdev);
         int i;
 
-        device_remove_file(&pdev->dev, &dev_attr_cur_master);
+        device_remove_file(&pdev->dev, &dev_attr_current_master);
+        device_remove_file(&pdev->dev, &dev_attr_available_masters);
 
         i2c_demux_deactivate_master(priv);
 
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index 9f0a48e39b8a..80e933b296f6 100644
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -451,7 +451,7 @@ err_free:
         return ret;
 }
 
-static const struct ide_port_info icside_v6_port_info __initconst = {
+static const struct ide_port_info icside_v6_port_info = {
         .init_dma               = icside_dma_off_init,
         .port_ops               = &icside_v6_no_dma_port_ops,
         .host_flags             = IDE_HFLAG_SERIALIZE | IDE_HFLAG_MMIO,
diff --git a/drivers/ide/palm_bk3710.c b/drivers/ide/palm_bk3710.c
index 8012e43bf8f6..46427ea01753 100644
--- a/drivers/ide/palm_bk3710.c
+++ b/drivers/ide/palm_bk3710.c
@@ -325,6 +325,8 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
 
         clk_enable(clk);
         rate = clk_get_rate(clk);
+        if (!rate)
+                return -EINVAL;
 
         /* NOTE:  round *down* to meet minimum timings; we count in clocks */
         ideclk_period = 1000000000UL / rate;
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index ba947df5a8c7..c6935de425fa 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -660,6 +660,35 @@ static struct cpuidle_state skl_cstates[] = {
                 .enter = NULL }
 };
 
+static struct cpuidle_state skx_cstates[] = {
+        {
+                .name = "C1-SKX",
+                .desc = "MWAIT 0x00",
+                .flags = MWAIT2flg(0x00),
+                .exit_latency = 2,
+                .target_residency = 2,
+                .enter = &intel_idle,
+                .enter_freeze = intel_idle_freeze, },
+        {
+                .name = "C1E-SKX",
+                .desc = "MWAIT 0x01",
+                .flags = MWAIT2flg(0x01),
+                .exit_latency = 10,
+                .target_residency = 20,
+                .enter = &intel_idle,
+                .enter_freeze = intel_idle_freeze, },
+        {
+                .name = "C6-SKX",
+                .desc = "MWAIT 0x20",
+                .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
+                .exit_latency = 133,
+                .target_residency = 600,
+                .enter = &intel_idle,
+                .enter_freeze = intel_idle_freeze, },
+        {
+                .enter = NULL }
+};
+
 static struct cpuidle_state atom_cstates[] = {
         {
                 .name = "C1E-ATM",
@@ -818,8 +847,11 @@ static int cpu_hotplug_notify(struct notifier_block *n,
                  * driver in this case
                  */
                 dev = per_cpu_ptr(intel_idle_cpuidle_devices, hotcpu);
-                if (!dev->registered)
-                        intel_idle_cpu_init(hotcpu);
+                if (dev->registered)
+                        break;
+
+                if (intel_idle_cpu_init(hotcpu))
+                        return NOTIFY_BAD;
 
                 break;
         }
@@ -904,6 +936,10 @@ static const struct idle_cpu idle_cpu_skl = {
         .disable_promotion_to_c1e = true,
 };
 
+static const struct idle_cpu idle_cpu_skx = {
+        .state_table = skx_cstates,
+        .disable_promotion_to_c1e = true,
+};
 
 static const struct idle_cpu idle_cpu_avn = {
         .state_table = avn_cstates,
@@ -945,6 +981,9 @@ static const struct x86_cpu_id intel_idle_ids[] __initconst = {
         ICPU(0x56, idle_cpu_bdw),
         ICPU(0x4e, idle_cpu_skl),
         ICPU(0x5e, idle_cpu_skl),
+        ICPU(0x8e, idle_cpu_skl),
+        ICPU(0x9e, idle_cpu_skl),
+        ICPU(0x55, idle_cpu_skx),
         ICPU(0x57, idle_cpu_knl),
         {}
 };
@@ -987,22 +1026,15 @@ static int __init intel_idle_probe(void)
         icpu = (const struct idle_cpu *)id->driver_data;
         cpuidle_state_table = icpu->state_table;
 
-        if (boot_cpu_has(X86_FEATURE_ARAT))     /* Always Reliable APIC Timer */
-                lapic_timer_reliable_states = LAPIC_TIMER_ALWAYS_RELIABLE;
-        else
-                on_each_cpu(__setup_broadcast_timer, (void *)true, 1);
-
         pr_debug(PREFIX "v" INTEL_IDLE_VERSION
                 " model 0x%X\n", boot_cpu_data.x86_model);
 
-        pr_debug(PREFIX "lapic_timer_reliable_states 0x%x\n",
-                lapic_timer_reliable_states);
         return 0;
 }
 
 /*
  * intel_idle_cpuidle_devices_uninit()
- * unregister, free cpuidle_devices
+ * Unregisters the cpuidle devices.
  */
 static void intel_idle_cpuidle_devices_uninit(void)
 {
@@ -1013,9 +1045,6 @@ static void intel_idle_cpuidle_devices_uninit(void)
                 dev = per_cpu_ptr(intel_idle_cpuidle_devices, i);
                 cpuidle_unregister_device(dev);
         }
-
-        free_percpu(intel_idle_cpuidle_devices);
-        return;
 }
 
 /*
@@ -1111,7 +1140,7 @@ static void intel_idle_state_table_update(void)
  * intel_idle_cpuidle_driver_init()
  * allocate, initialize cpuidle_states
  */
-static int __init intel_idle_cpuidle_driver_init(void)
+static void __init intel_idle_cpuidle_driver_init(void)
 {
         int cstate;
         struct cpuidle_driver *drv = &intel_idle_driver;
@@ -1163,18 +1192,10 @@ static int __init intel_idle_cpuidle_driver_init(void)
                 drv->state_count += 1;
         }
 
-        if (icpu->auto_demotion_disable_flags)
-                on_each_cpu(auto_demotion_disable, NULL, 1);
-
         if (icpu->byt_auto_demotion_disable_flag) {
                 wrmsrl(MSR_CC6_DEMOTION_POLICY_CONFIG, 0);
                 wrmsrl(MSR_MC6_DEMOTION_POLICY_CONFIG, 0);
         }
-
-        if (icpu->disable_promotion_to_c1e)     /* each-cpu is redundant */
-                on_each_cpu(c1e_promotion_disable, NULL, 1);
-
-        return 0;
 }
 
 
@@ -1193,7 +1214,6 @@ static int intel_idle_cpu_init(int cpu)
 
         if (cpuidle_register_device(dev)) {
                 pr_debug(PREFIX "cpuidle_register_device %d failed!\n", cpu);
-                intel_idle_cpuidle_devices_uninit();
                 return -EIO;
         }
 
@@ -1218,40 +1238,51 @@ static int __init intel_idle_init(void)
         if (retval)
                 return retval;
 
+        intel_idle_cpuidle_devices = alloc_percpu(struct cpuidle_device);
+        if (intel_idle_cpuidle_devices == NULL)
+                return -ENOMEM;
+
         intel_idle_cpuidle_driver_init();
         retval = cpuidle_register_driver(&intel_idle_driver);
         if (retval) {
                 struct cpuidle_driver *drv = cpuidle_get_driver();
                 printk(KERN_DEBUG PREFIX "intel_idle yielding to %s",
                         drv ? drv->name : "none");
+                free_percpu(intel_idle_cpuidle_devices);
                 return retval;
         }
 
-        intel_idle_cpuidle_devices = alloc_percpu(struct cpuidle_device);
-        if (intel_idle_cpuidle_devices == NULL)
-                return -ENOMEM;
-
         cpu_notifier_register_begin();
 
         for_each_online_cpu(i) {
                 retval = intel_idle_cpu_init(i);
                 if (retval) {
+                        intel_idle_cpuidle_devices_uninit();
                         cpu_notifier_register_done();
                         cpuidle_unregister_driver(&intel_idle_driver);
+                        free_percpu(intel_idle_cpuidle_devices);
                         return retval;
                 }
         }
         __register_cpu_notifier(&cpu_hotplug_notifier);
 
+        if (boot_cpu_has(X86_FEATURE_ARAT))     /* Always Reliable APIC Timer */
+                lapic_timer_reliable_states = LAPIC_TIMER_ALWAYS_RELIABLE;
+        else
+                on_each_cpu(__setup_broadcast_timer, (void *)true, 1);
+
         cpu_notifier_register_done();
 
+        pr_debug(PREFIX "lapic_timer_reliable_states 0x%x\n",
+                lapic_timer_reliable_states);
+
         return 0;
 }
 
 static void __exit intel_idle_exit(void)
 {
-        intel_idle_cpuidle_devices_uninit();
-        cpuidle_unregister_driver(&intel_idle_driver);
+        struct cpuidle_device *dev;
+        int i;
 
         cpu_notifier_register_begin();
 
@@ -1259,9 +1290,15 @@ static void __exit intel_idle_exit(void)
                 on_each_cpu(__setup_broadcast_timer, (void *)false, 1);
         __unregister_cpu_notifier(&cpu_hotplug_notifier);
 
+        for_each_possible_cpu(i) {
+                dev = per_cpu_ptr(intel_idle_cpuidle_devices, i);
+                cpuidle_unregister_device(dev);
+        }
+
         cpu_notifier_register_done();
 
-        return;
+        cpuidle_unregister_driver(&intel_idle_driver);
+        free_percpu(intel_idle_cpuidle_devices);
 }
 
 module_init(intel_idle_init);
diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c
index 91a52c275d0e..197e693e7e7b 100644
--- a/drivers/iio/accel/bmc150-accel-core.c
+++ b/drivers/iio/accel/bmc150-accel-core.c
@@ -553,7 +553,7 @@ static int bmc150_accel_get_axis(struct bmc150_accel_data *data,
         struct device *dev = regmap_get_device(data->regmap);
         int ret;
         int axis = chan->scan_index;
-        unsigned int raw_val;
+        __le16 raw_val;
 
         mutex_lock(&data->mutex);
         ret = bmc150_accel_set_power_state(data, true);
@@ -563,14 +563,14 @@ static int bmc150_accel_get_axis(struct bmc150_accel_data *data,
         }
 
         ret = regmap_bulk_read(data->regmap, BMC150_ACCEL_AXIS_TO_REG(axis),
-                               &raw_val, 2);
+                               &raw_val, sizeof(raw_val));
         if (ret < 0) {
                 dev_err(dev, "Error reading axis %d\n", axis);
                 bmc150_accel_set_power_state(data, false);
                 mutex_unlock(&data->mutex);
                 return ret;
         }
-        *val = sign_extend32(raw_val >> chan->scan_type.shift,
+        *val = sign_extend32(le16_to_cpu(raw_val) >> chan->scan_type.shift,
                              chan->scan_type.realbits - 1);
         ret = bmc150_accel_set_power_state(data, false);
         mutex_unlock(&data->mutex);
diff --git a/drivers/iio/adc/max1363.c b/drivers/iio/adc/max1363.c
index 929508e5266c..998dc3caad4c 100644
--- a/drivers/iio/adc/max1363.c
+++ b/drivers/iio/adc/max1363.c
@@ -1386,7 +1386,7 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
         },
         [max11644] = {
                 .bits = 12,
-                .int_vref_mv = 2048,
+                .int_vref_mv = 4096,
                 .mode_list = max11644_mode_list,
                 .num_modes = ARRAY_SIZE(max11644_mode_list),
                 .default_mode = s0to1,
@@ -1396,7 +1396,7 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
         },
         [max11645] = {
                 .bits = 12,
-                .int_vref_mv = 4096,
+                .int_vref_mv = 2048,
                 .mode_list = max11644_mode_list,
                 .num_modes = ARRAY_SIZE(max11644_mode_list),
                 .default_mode = s0to1,
@@ -1406,7 +1406,7 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
         },
         [max11646] = {
                 .bits = 10,
-                .int_vref_mv = 2048,
+                .int_vref_mv = 4096,
                 .mode_list = max11644_mode_list,
                 .num_modes = ARRAY_SIZE(max11644_mode_list),
                 .default_mode = s0to1,
@@ -1416,7 +1416,7 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
         },
         [max11647] = {
                 .bits = 10,
-                .int_vref_mv = 4096,
+                .int_vref_mv = 2048,
                 .mode_list = max11644_mode_list,
                 .num_modes = ARRAY_SIZE(max11644_mode_list),
                 .default_mode = s0to1,
@@ -1680,6 +1680,10 @@ static const struct i2c_device_id max1363_id[] = {
         { "max11615", max11615 },
         { "max11616", max11616 },
         { "max11617", max11617 },
+        { "max11644", max11644 },
+        { "max11645", max11645 },
+        { "max11646", max11646 },
+        { "max11647", max11647 },
         {}
 };
 
diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c
index b2b1071c1892..7ccc044063f6 100644
--- a/drivers/iio/gyro/bmg160_core.c
+++ b/drivers/iio/gyro/bmg160_core.c
@@ -453,7 +453,7 @@ static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val)
 {
         struct device *dev = regmap_get_device(data->regmap);
         int ret;
-        unsigned int raw_val;
+        __le16 raw_val;
 
         mutex_lock(&data->mutex);
         ret = bmg160_set_power_state(data, true);
@@ -463,7 +463,7 @@ static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val)
         }
 
         ret = regmap_bulk_read(data->regmap, BMG160_AXIS_TO_REG(axis), &raw_val,
-                               2);
+                               sizeof(raw_val));
         if (ret < 0) {
                 dev_err(dev, "Error reading axis %d\n", axis);
                 bmg160_set_power_state(data, false);
@@ -471,7 +471,7 @@ static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val)
                 return ret;
         }
 
-        *val = sign_extend32(raw_val, 15);
+        *val = sign_extend32(le16_to_cpu(raw_val), 15);
         ret = bmg160_set_power_state(data, false);
         mutex_unlock(&data->mutex);
         if (ret < 0)
diff --git a/drivers/iio/health/max30100.c b/drivers/iio/health/max30100.c
index 09db89359544..90ab8a2d2846 100644
--- a/drivers/iio/health/max30100.c
+++ b/drivers/iio/health/max30100.c
@@ -238,12 +238,13 @@ static irqreturn_t max30100_interrupt_handler(int irq, void *private)
 
         mutex_lock(&data->lock);
 
-        while (cnt-- || (cnt = max30100_fifo_count(data) > 0)) {
+        while (cnt || (cnt = max30100_fifo_count(data) > 0)) {
                 ret = max30100_read_measurement(data);
                 if (ret)
                         break;
 
                 iio_push_to_buffers(data->indio_dev, data->buffer);
+                cnt--;
         }
 
         mutex_unlock(&data->lock);
diff --git a/drivers/iio/imu/inv_mpu6050/Kconfig b/drivers/iio/imu/inv_mpu6050/Kconfig
index c05d474587d2..f756feecfa4c 100644
--- a/drivers/iio/imu/inv_mpu6050/Kconfig
+++ b/drivers/iio/imu/inv_mpu6050/Kconfig
@@ -9,9 +9,8 @@ config INV_MPU6050_IIO
 
 config INV_MPU6050_I2C
         tristate "Invensense MPU6050 devices (I2C)"
-        depends on I2C
+        depends on I2C_MUX
         select INV_MPU6050_IIO
-        select I2C_MUX
         select REGMAP_I2C
         help
           This driver supports the Invensense MPU6050/6500/9150 motion tracking
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index b976332d45d3..90462fcf5436 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -653,6 +653,7 @@ static int iio_verify_update(struct iio_dev *indio_dev,
         unsigned int modes;
 
         memset(config, 0, sizeof(*config));
+        config->watermark = ~0;
 
         /*
          * If there is just one buffer and we are removing it there is nothing
diff --git a/drivers/iio/light/apds9960.c b/drivers/iio/light/apds9960.c
index 35928fb1b66a..b4dbb3912977 100644
--- a/drivers/iio/light/apds9960.c
+++ b/drivers/iio/light/apds9960.c
@@ -774,7 +774,7 @@ static void apds9960_read_gesture_fifo(struct apds9960_data *data)
         mutex_lock(&data->lock);
         data->gesture_mode_running = 1;
 
-        while (cnt-- || (cnt = apds9660_fifo_is_empty(data) > 0)) {
+        while (cnt || (cnt = apds9660_fifo_is_empty(data) > 0)) {
                 ret = regmap_bulk_read(data->regmap, APDS9960_REG_GFIFO_BASE,
                                       &data->buffer, 4);
 
@@ -782,6 +782,7 @@ static void apds9960_read_gesture_fifo(struct apds9960_data *data)
                         goto err_read;
 
                 iio_push_to_buffers(data->indio_dev, data->buffer);
+                cnt--;
         }
 
 err_read:
diff --git a/drivers/iio/magnetometer/st_magn.h b/drivers/iio/magnetometer/st_magn.h
index 06a4d9c35581..9daca4681922 100644
--- a/drivers/iio/magnetometer/st_magn.h
+++ b/drivers/iio/magnetometer/st_magn.h
@@ -44,6 +44,7 @@ static inline int st_magn_allocate_ring(struct iio_dev *indio_dev)
 static inline void st_magn_deallocate_ring(struct iio_dev *indio_dev)
 {
 }
+#define ST_MAGN_TRIGGER_SET_STATE NULL
 #endif /* CONFIG_IIO_BUFFER */
 
 #endif /* ST_MAGN_H */
diff --git a/drivers/infiniband/hw/i40iw/i40iw_cm.c b/drivers/infiniband/hw/i40iw/i40iw_cm.c
index 92745d755272..38f917a6c778 100644
--- a/drivers/infiniband/hw/i40iw/i40iw_cm.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_cm.c
@@ -1992,7 +1992,6 @@ static int i40iw_addr_resolve_neigh(struct i40iw_device *iwdev,
 /**
  * i40iw_get_dst_ipv6
  */
-#if IS_ENABLED(CONFIG_IPV6)
 static struct dst_entry *i40iw_get_dst_ipv6(struct sockaddr_in6 *src_addr,
                                             struct sockaddr_in6 *dst_addr)
 {
@@ -2008,7 +2007,6 @@ static struct dst_entry *i40iw_get_dst_ipv6(struct sockaddr_in6 *src_addr,
         dst = ip6_route_output(&init_net, NULL, &fl6);
         return dst;
 }
-#endif
 
 /**
  * i40iw_addr_resolve_neigh_ipv6 - resolve neighbor ipv6 address
@@ -2016,7 +2014,6 @@ static struct dst_entry *i40iw_get_dst_ipv6(struct sockaddr_in6 *src_addr,
  * @dst_ip: remote ip address
  * @arpindex: if there is an arp entry
  */
-#if IS_ENABLED(CONFIG_IPV6)
 static int i40iw_addr_resolve_neigh_ipv6(struct i40iw_device *iwdev,
                                          u32 *src,
                                          u32 *dest,
@@ -2089,7 +2086,6 @@ static int i40iw_addr_resolve_neigh_ipv6(struct i40iw_device *iwdev,
         dst_release(dst);
         return rc;
 }
-#endif
 
 /**
  * i40iw_ipv4_is_loopback - check if loopback
@@ -2190,13 +2186,13 @@ static struct i40iw_cm_node *i40iw_make_cm_node(
                                                             cm_info->loc_addr[0],
                                                             cm_info->rem_addr[0],
                                                             oldarpindex);
-#if IS_ENABLED(CONFIG_IPV6)
-                else
+                else if (IS_ENABLED(CONFIG_IPV6))
                         arpindex = i40iw_addr_resolve_neigh_ipv6(iwdev,
                                                                  cm_info->loc_addr,
                                                                  cm_info->rem_addr,
                                                                  oldarpindex);
-#endif
+                else
+                        arpindex = -EINVAL;
         }
         if (arpindex < 0) {
                 i40iw_pr_err("cm_node arpindex\n");
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index f16c818ad2e6..b46c25542a7c 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -776,15 +776,6 @@ void mlx5_ib_qp_disable_pagefaults(struct mlx5_ib_qp *qp);
 void mlx5_ib_qp_enable_pagefaults(struct mlx5_ib_qp *qp);
 void mlx5_ib_invalidate_range(struct ib_umem *umem, unsigned long start,
                               unsigned long end);
-int mlx5_ib_get_vf_config(struct ib_device *device, int vf,
-                          u8 port, struct ifla_vf_info *info);
-int mlx5_ib_set_vf_link_state(struct ib_device *device, int vf,
-                              u8 port, int state);
-int mlx5_ib_get_vf_stats(struct ib_device *device, int vf,
-                         u8 port, struct ifla_vf_stats *stats);
-int mlx5_ib_set_vf_guid(struct ib_device *device, int vf, u8 port,
-                        u64 guid, int type);
-
 #else /* CONFIG_INFINIBAND_ON_DEMAND_PAGING */
 static inline void mlx5_ib_internal_fill_odp_caps(struct mlx5_ib_dev *dev)
 {
@@ -801,6 +792,15 @@ static inline void mlx5_ib_qp_enable_pagefaults(struct mlx5_ib_qp *qp)  {}
 
 #endif /* CONFIG_INFINIBAND_ON_DEMAND_PAGING */
 
+int mlx5_ib_get_vf_config(struct ib_device *device, int vf,
+                          u8 port, struct ifla_vf_info *info);
+int mlx5_ib_set_vf_link_state(struct ib_device *device, int vf,
+                              u8 port, int state);
+int mlx5_ib_get_vf_stats(struct ib_device *device, int vf,
+                         u8 port, struct ifla_vf_stats *stats);
+int mlx5_ib_set_vf_guid(struct ib_device *device, int vf, u8 port,
+                        u64 guid, int type);
+
 __be16 mlx5_get_roce_udp_sport(struct mlx5_ib_dev *dev, u8 port_num,
                                int index);
 
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index 60b30d338a81..411e4464ca23 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -63,7 +63,6 @@ isert_rdma_accept(struct isert_conn *isert_conn);
 struct rdma_cm_id *isert_setup_id(struct isert_np *isert_np);
 
 static void isert_release_work(struct work_struct *work);
-static void isert_wait4flush(struct isert_conn *isert_conn);
 static void isert_recv_done(struct ib_cq *cq, struct ib_wc *wc);
 static void isert_send_done(struct ib_cq *cq, struct ib_wc *wc);
 static void isert_login_recv_done(struct ib_cq *cq, struct ib_wc *wc);
@@ -141,7 +140,7 @@ isert_create_qp(struct isert_conn *isert_conn,
         attr.qp_context = isert_conn;
         attr.send_cq = comp->cq;
         attr.recv_cq = comp->cq;
-        attr.cap.max_send_wr = ISERT_QP_MAX_REQ_DTOS;
+        attr.cap.max_send_wr = ISERT_QP_MAX_REQ_DTOS + 1;
         attr.cap.max_recv_wr = ISERT_QP_MAX_RECV_DTOS + 1;
         attr.cap.max_send_sge = device->ib_device->attrs.max_sge;
         isert_conn->max_sge = min(device->ib_device->attrs.max_sge,
@@ -887,7 +886,7 @@ isert_disconnected_handler(struct rdma_cm_id *cma_id,
                 break;
         case ISER_CONN_UP:
                 isert_conn_terminate(isert_conn);
-                isert_wait4flush(isert_conn);
+                ib_drain_qp(isert_conn->qp);
                 isert_handle_unbound_conn(isert_conn);
                 break;
         case ISER_CONN_BOUND:
@@ -3213,36 +3212,6 @@ isert_wait4cmds(struct iscsi_conn *conn)
         }
 }
 
-static void
-isert_beacon_done(struct ib_cq *cq, struct ib_wc *wc)
-{
-        struct isert_conn *isert_conn = wc->qp->qp_context;
-
-        isert_print_wc(wc, "beacon");
-
-        isert_info("conn %p completing wait_comp_err\n", isert_conn);
-        complete(&isert_conn->wait_comp_err);
-}
-
-static void
-isert_wait4flush(struct isert_conn *isert_conn)
-{
-        struct ib_recv_wr *bad_wr;
-        static struct ib_cqe cqe = { .done = isert_beacon_done };
-
-        isert_info("conn %p\n", isert_conn);
-
-        init_completion(&isert_conn->wait_comp_err);
-        isert_conn->beacon.wr_cqe = &cqe;
-        /* post an indication that all flush errors were consumed */
-        if (ib_post_recv(isert_conn->qp, &isert_conn->beacon, &bad_wr)) {
-                isert_err("conn %p failed to post beacon", isert_conn);
-                return;
-        }
-
-        wait_for_completion(&isert_conn->wait_comp_err);
-}
-
 /**
  * isert_put_unsol_pending_cmds() - Drop commands waiting for
  *     unsolicitate dataout
@@ -3288,7 +3257,7 @@ static void isert_wait_conn(struct iscsi_conn *conn)
         isert_conn_terminate(isert_conn);
         mutex_unlock(&isert_conn->mutex);
 
-        isert_wait4flush(isert_conn);
+        ib_drain_qp(isert_conn->qp);
         isert_put_unsol_pending_cmds(conn);
         isert_wait4cmds(conn);
         isert_wait4logout(isert_conn);
@@ -3300,7 +3269,7 @@ static void isert_free_conn(struct iscsi_conn *conn)
 {
         struct isert_conn *isert_conn = conn->context;
 
-        isert_wait4flush(isert_conn);
+        ib_drain_qp(isert_conn->qp);
         isert_put_conn(isert_conn);
 }
 
diff --git a/drivers/infiniband/ulp/isert/ib_isert.h b/drivers/infiniband/ulp/isert/ib_isert.h
index 192788a4820c..147900cbb578 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.h
+++ b/drivers/infiniband/ulp/isert/ib_isert.h
@@ -209,14 +209,12 @@ struct isert_conn {
         struct ib_qp            *qp;
         struct isert_device     *device;
         struct mutex            mutex;
-        struct completion       wait_comp_err;
         struct kref             kref;
         struct list_head        fr_pool;
         int                     fr_pool_size;
         /* lock to protect fastreg pool */
         spinlock_t              pool_lock;
         struct work_struct      release_work;
-        struct ib_recv_wr       beacon;
         bool                    logout_posted;
         bool                    snd_w_inv;
 };
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 0bd3cb2f3c67..8b42401d4795 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -1264,26 +1264,40 @@ free_mem:
  */
 static struct srpt_send_ioctx *srpt_get_send_ioctx(struct srpt_rdma_ch *ch)
 {
-        struct se_session *se_sess;
         struct srpt_send_ioctx *ioctx;
-        int tag;
+        unsigned long flags;
 
         BUG_ON(!ch);
-        se_sess = ch->sess;
 
-        tag = percpu_ida_alloc(&se_sess->sess_tag_pool, TASK_RUNNING);
-        if (tag < 0) {
-                pr_err("Unable to obtain tag for srpt_send_ioctx\n");
-                return NULL;
+        ioctx = NULL;
+        spin_lock_irqsave(&ch->spinlock, flags);
+        if (!list_empty(&ch->free_list)) {
+                ioctx = list_first_entry(&ch->free_list,
+                                         struct srpt_send_ioctx, free_list);
+                list_del(&ioctx->free_list);
         }
-        ioctx = &((struct srpt_send_ioctx *)se_sess->sess_cmd_map)[tag];
-        memset(ioctx, 0, sizeof(struct srpt_send_ioctx));
-        ioctx->ch = ch;
+        spin_unlock_irqrestore(&ch->spinlock, flags);
+
+        if (!ioctx)
+                return ioctx;
+
+        BUG_ON(ioctx->ch != ch);
         spin_lock_init(&ioctx->spinlock);
         ioctx->state = SRPT_STATE_NEW;
+        ioctx->n_rbuf = 0;
+        ioctx->rbufs = NULL;
+        ioctx->n_rdma = 0;
+        ioctx->n_rdma_wrs = 0;
+        ioctx->rdma_wrs = NULL;
+        ioctx->mapped_sg_count = 0;
         init_completion(&ioctx->tx_done);
-
-        ioctx->cmd.map_tag = tag;
+        ioctx->queue_status_only = false;
+        /*
+         * transport_init_se_cmd() does not initialize all fields, so do it
+         * here.
+         */
+        memset(&ioctx->cmd, 0, sizeof(ioctx->cmd));
+        memset(&ioctx->sense_data, 0, sizeof(ioctx->sense_data));
 
         return ioctx;
 }
@@ -2021,7 +2035,7 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
         struct ib_cm_rep_param *rep_param;
         struct srpt_rdma_ch *ch, *tmp_ch;
         u32 it_iu_len;
-        int ret = 0;
+        int i, ret = 0;
         unsigned char *p;
 
         WARN_ON_ONCE(irqs_disabled());
@@ -2143,6 +2157,12 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
         if (!ch->ioctx_ring)
                 goto free_ch;
 
+        INIT_LIST_HEAD(&ch->free_list);
+        for (i = 0; i < ch->rq_size; i++) {
+                ch->ioctx_ring[i]->ch = ch;
+                list_add_tail(&ch->ioctx_ring[i]->free_list, &ch->free_list);
+        }
+
         ret = srpt_create_ch_ib(ch);
         if (ret) {
                 rej->reason = cpu_to_be32(
@@ -2173,8 +2193,7 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
         p = &ch->sess_name[0];
 
 try_again:
-        ch->sess = target_alloc_session(&sport->port_tpg_1, ch->rq_size,
-                                        sizeof(struct srpt_send_ioctx),
+        ch->sess = target_alloc_session(&sport->port_tpg_1, 0, 0,
                                         TARGET_PROT_NORMAL, p, ch, NULL);
         if (IS_ERR(ch->sess)) {
                 pr_info("Rejected login because no ACL has been"
@@ -2881,7 +2900,7 @@ static void srpt_release_cmd(struct se_cmd *se_cmd)
         struct srpt_send_ioctx *ioctx = container_of(se_cmd,
                                 struct srpt_send_ioctx, cmd);
         struct srpt_rdma_ch *ch = ioctx->ch;
-        struct se_session *se_sess = ch->sess;
+        unsigned long flags;
 
         WARN_ON(ioctx->state != SRPT_STATE_DONE);
         WARN_ON(ioctx->mapped_sg_count != 0);
@@ -2892,7 +2911,9 @@ static void srpt_release_cmd(struct se_cmd *se_cmd)
                 ioctx->n_rbuf = 0;
         }
 
-        percpu_ida_free(&se_sess->sess_tag_pool, se_cmd->map_tag);
+        spin_lock_irqsave(&ch->spinlock, flags);
+        list_add(&ioctx->free_list, &ch->free_list);
+        spin_unlock_irqrestore(&ch->spinlock, flags);
 }
 
 /**
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.h b/drivers/infiniband/ulp/srpt/ib_srpt.h
index ca288f019315..af9b8b527340 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.h
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.h
@@ -179,6 +179,7 @@ struct srpt_recv_ioctx {
  * struct srpt_send_ioctx - SRPT send I/O context.
  * @ioctx:       See above.
  * @ch:          Channel pointer.
+ * @free_list:   Node in srpt_rdma_ch.free_list.
  * @n_rbuf:      Number of data buffers in the received SRP command.
  * @rbufs:       Pointer to SRP data buffer array.
  * @single_rbuf: SRP data buffer if the command has only a single buffer.
@@ -201,6 +202,7 @@ struct srpt_send_ioctx {
         struct srp_direct_buf   *rbufs;
         struct srp_direct_buf   single_rbuf;
         struct scatterlist      *sg;
+        struct list_head        free_list;
         spinlock_t              spinlock;
         enum srpt_command_state state;
         struct se_cmd           cmd;
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index 72d6182666cb..58f2fe687a24 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -403,7 +403,7 @@ static int __finalise_sg(struct device *dev, struct scatterlist *sg, int nents,
                 unsigned int s_length = sg_dma_len(s);
                 unsigned int s_dma_len = s->length;
 
-                s->offset = s_offset;
+                s->offset += s_offset;
                 s->length = s_length;
                 sg_dma_address(s) = dma_addr + s_offset;
                 dma_addr += s_dma_len;
@@ -422,7 +422,7 @@ static void __invalidate_sg(struct scatterlist *sg, int nents)
 
         for_each_sg(sg, s, nents, i) {
                 if (sg_dma_address(s) != DMA_ERROR_CODE)
-                        s->offset = sg_dma_address(s);
+                        s->offset += sg_dma_address(s);
                 if (sg_dma_len(s))
                         s->length = sg_dma_len(s);
                 sg_dma_address(s) = DMA_ERROR_CODE;
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index a2e1b7f14df2..e1852e845d21 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -2458,7 +2458,7 @@ static struct dmar_domain *get_domain_for_dev(struct device *dev, int gaw)
         }
 
         /* register PCI DMA alias device */
-        if (req_id != dma_alias && dev_is_pci(dev)) {
+        if (dev_is_pci(dev) && req_id != dma_alias) {
                 tmp = dmar_insert_one_dev_info(iommu, PCI_BUS_NUM(dma_alias),
                                                dma_alias & 0xff, NULL, domain);
 
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index bfd4f7c3b1d8..b9df1411c894 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -848,7 +848,8 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev)
         if (!group->default_domain) {
                 group->default_domain = __iommu_domain_alloc(dev->bus,
                                                              IOMMU_DOMAIN_DMA);
-                group->domain = group->default_domain;
+                if (!group->domain)
+                        group->domain = group->default_domain;
         }
 
         ret = iommu_group_add_device(group, dev);
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index a6f593a0a29e..5710a06c3049 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -315,8 +315,8 @@ static bool rk_iommu_is_stall_active(struct rk_iommu *iommu)
         int i;
 
         for (i = 0; i < iommu->num_mmu; i++)
-                active &= rk_iommu_read(iommu->bases[i], RK_MMU_STATUS) &
-                                        RK_MMU_STATUS_STALL_ACTIVE;
+                active &= !!(rk_iommu_read(iommu->bases[i], RK_MMU_STATUS) &
+                                           RK_MMU_STATUS_STALL_ACTIVE);
 
         return active;
 }
@@ -327,8 +327,8 @@ static bool rk_iommu_is_paging_enabled(struct rk_iommu *iommu)
         int i;
 
         for (i = 0; i < iommu->num_mmu; i++)
-                enable &= rk_iommu_read(iommu->bases[i], RK_MMU_STATUS) &
-                                        RK_MMU_STATUS_PAGING_ENABLED;
+                enable &= !!(rk_iommu_read(iommu->bases[i], RK_MMU_STATUS) &
+                                           RK_MMU_STATUS_PAGING_ENABLED);
 
         return enable;
 }
diff --git a/drivers/isdn/hisax/isac.c b/drivers/isdn/hisax/isac.c
index 7fdf78f46433..df7e05ca8f9c 100644
--- a/drivers/isdn/hisax/isac.c
+++ b/drivers/isdn/hisax/isac.c
@@ -215,9 +215,11 @@ isac_interrupt(struct IsdnCardState *cs, u_char val)
                         if (count == 0)
                                 count = 32;
                         isac_empty_fifo(cs, count);
-                        if ((count = cs->rcvidx) > 0) {
+                        count = cs->rcvidx;
+                        if (count > 0) {
                                 cs->rcvidx = 0;
-                                if (!(skb = alloc_skb(count, GFP_ATOMIC)))
+                                skb = alloc_skb(count, GFP_ATOMIC);
+                                if (!skb)
                                         printk(KERN_WARNING "HiSax: D receive out of memory\n");
                                 else {
                                         memcpy(skb_put(skb, count), cs->rcvbuf, count);
@@ -251,7 +253,8 @@ isac_interrupt(struct IsdnCardState *cs, u_char val)
                                 cs->tx_skb = NULL;
                         }
                 }
-                if ((cs->tx_skb = skb_dequeue(&cs->sq))) {
+                cs->tx_skb = skb_dequeue(&cs->sq);
+                if (cs->tx_skb) {
                         cs->tx_cnt = 0;
                         isac_fill_fifo(cs);
                 } else
@@ -313,7 +316,8 @@ afterXPR:
 #if ARCOFI_USE
                         if (v1 & 0x08) {
                                 if (!cs->dc.isac.mon_rx) {
-                                        if (!(cs->dc.isac.mon_rx = kmalloc(MAX_MON_FRAME, GFP_ATOMIC))) {
+                                        cs->dc.isac.mon_rx = kmalloc(MAX_MON_FRAME, GFP_ATOMIC);
+                                        if (!cs->dc.isac.mon_rx) {
                                                 if (cs->debug & L1_DEB_WARN)
                                                         debugl1(cs, "ISAC MON RX out of memory!");
                                                 cs->dc.isac.mocr &= 0xf0;
@@ -343,7 +347,8 @@ afterXPR:
                 afterMONR0:
                         if (v1 & 0x80) {
                                 if (!cs->dc.isac.mon_rx) {
-                                        if (!(cs->dc.isac.mon_rx = kmalloc(MAX_MON_FRAME, GFP_ATOMIC))) {
+                                        cs->dc.isac.mon_rx = kmalloc(MAX_MON_FRAME, GFP_ATOMIC);
+                                        if (!cs->dc.isac.mon_rx) {
                                                 if (cs->debug & L1_DEB_WARN)
                                                         debugl1(cs, "ISAC MON RX out of memory!");
                                                 cs->dc.isac.mocr &= 0x0f;
diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c
index 0ddf638d60f3..043828d541f7 100644
--- a/drivers/mailbox/pcc.c
+++ b/drivers/mailbox/pcc.c
@@ -361,8 +361,6 @@ static int __init acpi_pcc_probe(void)
                 struct acpi_generic_address *db_reg;
                 struct acpi_pcct_hw_reduced *pcct_ss;
                 pcc_mbox_channels[i].con_priv = pcct_entry;
-                pcct_entry = (struct acpi_subtable_header *)
-                        ((unsigned long) pcct_entry + pcct_entry->length);
 
                 /* If doorbell is in system memory cache the virt address */
                 pcct_ss = (struct acpi_pcct_hw_reduced *)pcct_entry;
@@ -370,6 +368,8 @@ static int __init acpi_pcc_probe(void)
                 if (db_reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
                         pcc_doorbell_vaddr[i] = acpi_os_ioremap(db_reg->address,
                                                         db_reg->bit_width/8);
+                pcct_entry = (struct acpi_subtable_header *)
+                        ((unsigned long) pcct_entry + pcct_entry->length);
         }
 
         pcc_mbox_ctrl.num_chans = count;
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 7df6b4f1548a..3fe86b54d50b 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -322,7 +322,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)
 {
@@ -1673,6 +1673,9 @@ static void bitmap_free(struct bitmap *bitmap)
         if (!bitmap) /* there was no bitmap */
                 return;
 
+        if (bitmap->sysfs_can_clear)
+                sysfs_put(bitmap->sysfs_can_clear);
+
         if (mddev_is_clustered(bitmap->mddev) && bitmap->mddev->cluster_info &&
                 bitmap->cluster_slot == md_cluster_ops->slot_number(bitmap->mddev))
                 md_cluster_stop(bitmap->mddev);
@@ -1712,15 +1715,13 @@ void bitmap_destroy(struct mddev *mddev)
         if (mddev->thread)
                 mddev->thread->timeout = MAX_SCHEDULE_TIMEOUT;
 
-        if (bitmap->sysfs_can_clear)
-                sysfs_put(bitmap->sysfs_can_clear);
-
         bitmap_free(bitmap);
 }
 
 /*
  * initialize the bitmap structure
  * if this returns an error, bitmap_destroy must be called to do clean up
+ * once mddev->bitmap is set
  */
 struct bitmap *bitmap_create(struct mddev *mddev, int slot)
 {
@@ -1865,8 +1866,10 @@ int bitmap_copy_from_slot(struct mddev *mddev, int slot,
         struct bitmap_counts *counts;
         struct bitmap *bitmap = bitmap_create(mddev, slot);
 
-        if (IS_ERR(bitmap))
+        if (IS_ERR(bitmap)) {
+                bitmap_free(bitmap);
                 return PTR_ERR(bitmap);
+        }
 
         rv = bitmap_init_from_disk(bitmap, 0);
         if (rv)
@@ -2170,14 +2173,14 @@ location_store(struct mddev *mddev, const char *buf, size_t len)
                                 else {
                                         mddev->bitmap = bitmap;
                                         rv = bitmap_load(mddev);
-                                        if (rv) {
-                                                bitmap_destroy(mddev);
+                                        if (rv)
                                                 mddev->bitmap_info.offset = 0;
-                                        }
                                 }
                                 mddev->pers->quiesce(mddev, 0);
-                                if (rv)
+                                if (rv) {
+                                        bitmap_destroy(mddev);
                                         return rv;
+                                }
                         }
                 }
         }
diff --git a/drivers/md/md.c b/drivers/md/md.c
index c068f171b4eb..194580fba7fd 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -718,6 +718,7 @@ static void super_written(struct bio *bio)
 
         if (atomic_dec_and_test(&mddev->pending_writes))
                 wake_up(&mddev->sb_wait);
+        rdev_dec_pending(rdev, mddev);
         bio_put(bio);
 }
 
@@ -732,6 +733,8 @@ void md_super_write(struct mddev *mddev, struct md_rdev *rdev,
          */
         struct bio *bio = bio_alloc_mddev(GFP_NOIO, 1, mddev);
 
+        atomic_inc(&rdev->nr_pending);
+
         bio->bi_bdev = rdev->meta_bdev ? rdev->meta_bdev : rdev->bdev;
         bio->bi_iter.bi_sector = sector;
         bio_add_page(bio, page, size, 0);
@@ -6883,7 +6886,7 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode,
 
         case ADD_NEW_DISK:
                 /* We can support ADD_NEW_DISK on read-only arrays
-                 * on if we are re-adding a preexisting device.
+                 * only if we are re-adding a preexisting device.
                  * So require mddev->pers and MD_DISK_SYNC.
                  */
                 if (mddev->pers) {
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 39fb21e048e6..a7f2b9c9f8a0 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -570,7 +570,7 @@ static int read_balance(struct r1conf *conf, struct r1bio *r1_bio, int *max_sect
                         if (best_dist_disk < 0) {
                                 if (is_badblock(rdev, this_sector, sectors,
                                                 &first_bad, &bad_sectors)) {
-                                        if (first_bad < this_sector)
+                                        if (first_bad <= this_sector)
                                                 /* Cannot use this */
                                                 continue;
                                         best_good_sectors = first_bad - this_sector;
diff --git a/drivers/media/usb/au0828/au0828-cards.c b/drivers/media/usb/au0828/au0828-cards.c
index ca861aea68a5..6b469e8c4c6e 100644
--- a/drivers/media/usb/au0828/au0828-cards.c
+++ b/drivers/media/usb/au0828/au0828-cards.c
@@ -228,10 +228,6 @@ void au0828_card_analog_fe_setup(struct au0828_dev *dev)
                                 "au8522", 0x8e >> 1, NULL);
                 if (sd == NULL)
                         pr_err("analog subdev registration failed\n");
-#ifdef CONFIG_MEDIA_CONTROLLER
-                if (sd)
-                        dev->decoder = &sd->entity;
-#endif
         }
 
         /* Setup tuners */
diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c
index 5dc82e8c8670..cc22b32776ad 100644
--- a/drivers/media/usb/au0828/au0828-core.c
+++ b/drivers/media/usb/au0828/au0828-core.c
@@ -137,8 +137,14 @@ static void au0828_unregister_media_device(struct au0828_dev *dev)
 #ifdef CONFIG_MEDIA_CONTROLLER
         if (dev->media_dev &&
                 media_devnode_is_registered(&dev->media_dev->devnode)) {
+                /* clear enable_source, disable_source */
+                dev->media_dev->source_priv = NULL;
+                dev->media_dev->enable_source = NULL;
+                dev->media_dev->disable_source = NULL;
+
                 media_device_unregister(dev->media_dev);
                 media_device_cleanup(dev->media_dev);
+                kfree(dev->media_dev);
                 dev->media_dev = NULL;
         }
 #endif
@@ -166,7 +172,7 @@ static void au0828_usb_disconnect(struct usb_interface *interface)
            Set the status so poll routines can check and avoid
            access after disconnect.
         */
-        dev->dev_state = DEV_DISCONNECTED;
+        set_bit(DEV_DISCONNECTED, &dev->dev_state);
 
         au0828_rc_unregister(dev);
         /* Digital TV */
@@ -192,7 +198,7 @@ static int au0828_media_device_init(struct au0828_dev *dev,
 #ifdef CONFIG_MEDIA_CONTROLLER
         struct media_device *mdev;
 
-        mdev = media_device_get_devres(&udev->dev);
+        mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
         if (!mdev)
                 return -ENOMEM;
 
@@ -456,7 +462,8 @@ static int au0828_media_device_register(struct au0828_dev *dev,
 {
 #ifdef CONFIG_MEDIA_CONTROLLER
         int ret;
-        struct media_entity *entity, *demod = NULL, *tuner = NULL;
+        struct media_entity *entity, *demod = NULL;
+        struct media_link *link;
 
         if (!dev->media_dev)
                 return 0;
@@ -482,26 +489,37 @@ static int au0828_media_device_register(struct au0828_dev *dev,
         }
 
         /*
-         * Find tuner and demod to disable the link between
-         * the two to avoid disable step when tuner is requested
-         * by video or audio. Note that this step can't be done
-         * until dvb graph is created during dvb register.
+         * Find tuner, decoder and demod.
+         *
+         * The tuner and decoder should be cached, as they'll be used by
+         *      au0828_enable_source.
+         *
+         * It also needs to disable the link between tuner and
+         * decoder/demod, to avoid disable step when tuner is requested
+         * by video or audio. Note that this step can't be done until dvb
+         * graph is created during dvb register.
         */
         media_device_for_each_entity(entity, dev->media_dev) {
-                if (entity->function == MEDIA_ENT_F_DTV_DEMOD)
+                switch (entity->function) {
+                case MEDIA_ENT_F_TUNER:
+                        dev->tuner = entity;
+                        break;
+                case MEDIA_ENT_F_ATV_DECODER:
+                        dev->decoder = entity;
+                        break;
+                case MEDIA_ENT_F_DTV_DEMOD:
                         demod = entity;
-                else if (entity->function == MEDIA_ENT_F_TUNER)
-                        tuner = entity;
+                        break;
+                }
         }
-        /* Disable link between tuner and demod */
-        if (tuner && demod) {
-                struct media_link *link;
 
-                list_for_each_entry(link, &demod->links, list) {
-                        if (link->sink->entity == demod &&
-                            link->source->entity == tuner) {
+        /* Disable link between tuner->demod and/or tuner->decoder */
+        if (dev->tuner) {
+                list_for_each_entry(link, &dev->tuner->links, list) {
+                        if (demod && link->sink->entity == demod)
+                                media_entity_setup_link(link, 0);
+                        if (dev->decoder && link->sink->entity == dev->decoder)
                                 media_entity_setup_link(link, 0);
-                        }
                 }
         }
 
diff --git a/drivers/media/usb/au0828/au0828-input.c b/drivers/media/usb/au0828/au0828-input.c
index b0f067971979..3d6687f0407d 100644
--- a/drivers/media/usb/au0828/au0828-input.c
+++ b/drivers/media/usb/au0828/au0828-input.c
@@ -130,7 +130,7 @@ static int au0828_get_key_au8522(struct au0828_rc *ir)
         bool first = true;
 
         /* do nothing if device is disconnected */
-        if (ir->dev->dev_state == DEV_DISCONNECTED)
+        if (test_bit(DEV_DISCONNECTED, &ir->dev->dev_state))
                 return 0;
 
         /* Check IR int */
@@ -260,7 +260,7 @@ static void au0828_rc_stop(struct rc_dev *rc)
         cancel_delayed_work_sync(&ir->work);
 
         /* do nothing if device is disconnected */
-        if (ir->dev->dev_state != DEV_DISCONNECTED) {
+        if (!test_bit(DEV_DISCONNECTED, &ir->dev->dev_state)) {
                 /* Disable IR */
                 au8522_rc_clear(ir, 0xe0, 1 << 4);
         }
diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c
index 13f6dab9ccc2..32d7db96479c 100644
--- a/drivers/media/usb/au0828/au0828-video.c
+++ b/drivers/media/usb/au0828/au0828-video.c
@@ -106,14 +106,13 @@ static inline void print_err_status(struct au0828_dev *dev,
 
 static int check_dev(struct au0828_dev *dev)
 {
-        if (dev->dev_state & DEV_DISCONNECTED) {
+        if (test_bit(DEV_DISCONNECTED, &dev->dev_state)) {
                 pr_info("v4l2 ioctl: device not present\n");
                 return -ENODEV;
         }
 
-        if (dev->dev_state & DEV_MISCONFIGURED) {
-                pr_info("v4l2 ioctl: device is misconfigured; "
-                       "close and open it again\n");
+        if (test_bit(DEV_MISCONFIGURED, &dev->dev_state)) {
+                pr_info("v4l2 ioctl: device is misconfigured; close and open it again\n");
                 return -EIO;
         }
         return 0;
@@ -521,8 +520,8 @@ static inline int au0828_isoc_copy(struct au0828_dev *dev, struct urb *urb)
         if (!dev)
                 return 0;
 
-        if ((dev->dev_state & DEV_DISCONNECTED) ||
-            (dev->dev_state & DEV_MISCONFIGURED))
+        if (test_bit(DEV_DISCONNECTED, &dev->dev_state) ||
+            test_bit(DEV_MISCONFIGURED, &dev->dev_state))
                 return 0;
 
         if (urb->status < 0) {
@@ -824,10 +823,10 @@ static int au0828_stream_interrupt(struct au0828_dev *dev)
         int ret = 0;
 
         dev->stream_state = STREAM_INTERRUPT;
-        if (dev->dev_state == DEV_DISCONNECTED)
+        if (test_bit(DEV_DISCONNECTED, &dev->dev_state))
                 return -ENODEV;
         else if (ret) {
-                dev->dev_state = DEV_MISCONFIGURED;
+                set_bit(DEV_MISCONFIGURED, &dev->dev_state);
                 dprintk(1, "%s device is misconfigured!\n", __func__);
                 return ret;
         }
@@ -1026,7 +1025,7 @@ static int au0828_v4l2_open(struct file *filp)
         int ret;
 
         dprintk(1,
-                "%s called std_set %d dev_state %d stream users %d users %d\n",
+                "%s called std_set %d dev_state %ld stream users %d users %d\n",
                 __func__, dev->std_set_in_tuner_core, dev->dev_state,
                 dev->streaming_users, dev->users);
 
@@ -1045,7 +1044,7 @@ static int au0828_v4l2_open(struct file *filp)
                 au0828_analog_stream_enable(dev);
                 au0828_analog_stream_reset(dev);
                 dev->stream_state = STREAM_OFF;
-                dev->dev_state |= DEV_INITIALIZED;
+                set_bit(DEV_INITIALIZED, &dev->dev_state);
         }
         dev->users++;
         mutex_unlock(&dev->lock);
@@ -1059,7 +1058,7 @@ static int au0828_v4l2_close(struct file *filp)
         struct video_device *vdev = video_devdata(filp);
 
         dprintk(1,
-                "%s called std_set %d dev_state %d stream users %d users %d\n",
+                "%s called std_set %d dev_state %ld stream users %d users %d\n",
                 __func__, dev->std_set_in_tuner_core, dev->dev_state,
                 dev->streaming_users, dev->users);
 
@@ -1075,7 +1074,7 @@ static int au0828_v4l2_close(struct file *filp)
                 del_timer_sync(&dev->vbi_timeout);
         }
 
-        if (dev->dev_state == DEV_DISCONNECTED)
+        if (test_bit(DEV_DISCONNECTED, &dev->dev_state))
                 goto end;
 
         if (dev->users == 1) {
@@ -1135,7 +1134,7 @@ static void au0828_init_tuner(struct au0828_dev *dev)
                 .type = V4L2_TUNER_ANALOG_TV,
         };
 
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
 
         if (dev->std_set_in_tuner_core)
@@ -1207,7 +1206,7 @@ static int vidioc_querycap(struct file *file, void  *priv,
         struct video_device *vdev = video_devdata(file);
         struct au0828_dev *dev = video_drvdata(file);
 
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
 
         strlcpy(cap->driver, "au0828", sizeof(cap->driver));
@@ -1250,7 +1249,7 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
 {
         struct au0828_dev *dev = video_drvdata(file);
 
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
 
         f->fmt.pix.width = dev->width;
@@ -1269,7 +1268,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
 {
         struct au0828_dev *dev = video_drvdata(file);
 
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
 
         return au0828_set_format(dev, VIDIOC_TRY_FMT, f);
@@ -1281,7 +1280,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
         struct au0828_dev *dev = video_drvdata(file);
         int rc;
 
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
 
         rc = check_dev(dev);
@@ -1303,7 +1302,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id norm)
 {
         struct au0828_dev *dev = video_drvdata(file);
 
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
 
         if (norm == dev->std)
@@ -1335,7 +1334,7 @@ static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *norm)
 {
         struct au0828_dev *dev = video_drvdata(file);
 
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
 
         *norm = dev->std;
@@ -1357,7 +1356,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
                 [AU0828_VMUX_DVB] = "DVB",
         };
 
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
 
         tmp = input->index;
@@ -1387,7 +1386,7 @@ static int vidioc_g_input(struct file *file, void *priv, unsigned int *i)
 {
         struct au0828_dev *dev = video_drvdata(file);
 
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
 
         *i = dev->ctrl_input;
@@ -1398,7 +1397,7 @@ static void au0828_s_input(struct au0828_dev *dev, int index)
 {
         int i;
 
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
 
         switch (AUVI_INPUT(index).type) {
@@ -1496,7 +1495,7 @@ static int vidioc_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
 {
         struct au0828_dev *dev = video_drvdata(file);
 
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
 
         a->index = dev->ctrl_ainput;
@@ -1516,7 +1515,7 @@ static int vidioc_s_audio(struct file *file, void *priv, const struct v4l2_audio
         if (a->index != dev->ctrl_ainput)
                 return -EINVAL;
 
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
         return 0;
 }
@@ -1534,7 +1533,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, struct v4l2_tuner *t)
         if (ret)
                 return ret;
 
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
 
         strcpy(t->name, "Auvitek tuner");
@@ -1554,7 +1553,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
         if (t->index != 0)
                 return -EINVAL;
 
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
 
         au0828_init_tuner(dev);
@@ -1576,7 +1575,7 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 
         if (freq->tuner != 0)
                 return -EINVAL;
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
         freq->frequency = dev->ctrl_freq;
         return 0;
@@ -1591,7 +1590,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
         if (freq->tuner != 0)
                 return -EINVAL;
 
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
 
         au0828_init_tuner(dev);
@@ -1617,7 +1616,7 @@ static int vidioc_g_fmt_vbi_cap(struct file *file, void *priv,
 {
         struct au0828_dev *dev = video_drvdata(file);
 
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
 
         format->fmt.vbi.samples_per_line = dev->vbi_width;
@@ -1643,7 +1642,7 @@ static int vidioc_cropcap(struct file *file, void *priv,
         if (cc->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                 return -EINVAL;
 
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
 
         cc->bounds.left = 0;
@@ -1665,7 +1664,7 @@ static int vidioc_g_register(struct file *file, void *priv,
 {
         struct au0828_dev *dev = video_drvdata(file);
 
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
 
         reg->val = au0828_read(dev, reg->reg);
@@ -1678,7 +1677,7 @@ static int vidioc_s_register(struct file *file, void *priv,
 {
         struct au0828_dev *dev = video_drvdata(file);
 
-        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
+        dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
                 dev->std_set_in_tuner_core, dev->dev_state);
 
         return au0828_writereg(dev, reg->reg, reg->val);
diff --git a/drivers/media/usb/au0828/au0828.h b/drivers/media/usb/au0828/au0828.h
index ff7f8510fb77..87f32846f1c0 100644
--- a/drivers/media/usb/au0828/au0828.h
+++ b/drivers/media/usb/au0828/au0828.h
@@ -21,6 +21,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/bitops.h>
 #include <linux/usb.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
@@ -121,9 +122,9 @@ enum au0828_stream_state {
 
 /* device state */
 enum au0828_dev_state {
-        DEV_INITIALIZED = 0x01,
-        DEV_DISCONNECTED = 0x02,
-        DEV_MISCONFIGURED = 0x04
+        DEV_INITIALIZED = 0,
+        DEV_DISCONNECTED = 1,
+        DEV_MISCONFIGURED = 2
 };
 
 struct au0828_dev;
@@ -247,7 +248,7 @@ struct au0828_dev {
         int input_type;
         int std_set_in_tuner_core;
         unsigned int ctrl_input;
-        enum au0828_dev_state dev_state;
+        long unsigned int dev_state; /* defined at enum au0828_dev_state */;
         enum au0828_stream_state stream_state;
         wait_queue_head_t open;
 
diff --git a/drivers/media/v4l2-core/v4l2-mc.c b/drivers/media/v4l2-core/v4l2-mc.c
index 2a7b79bc90fd..2228cd3a846e 100644
--- a/drivers/media/v4l2-core/v4l2-mc.c
+++ b/drivers/media/v4l2-core/v4l2-mc.c
@@ -34,7 +34,7 @@ int v4l2_mc_create_media_graph(struct media_device *mdev)
 {
         struct media_entity *entity;
         struct media_entity *if_vid = NULL, *if_aud = NULL;
-        struct media_entity *tuner = NULL, *decoder = NULL, *dtv_demod = NULL;
+        struct media_entity *tuner = NULL, *decoder = NULL;
         struct media_entity *io_v4l = NULL, *io_vbi = NULL, *io_swradio = NULL;
         bool is_webcam = false;
         u32 flags;
diff --git a/drivers/media/v4l2-core/videobuf-dma-sg.c b/drivers/media/v4l2-core/videobuf-dma-sg.c
index df4c052c6bd6..f300f060b3f3 100644
--- a/drivers/media/v4l2-core/videobuf-dma-sg.c
+++ b/drivers/media/v4l2-core/videobuf-dma-sg.c
@@ -349,7 +349,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 1d94607611d8..6e4c55a4aab5 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -356,11 +356,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/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
index 62aa5d0efcee..79e19017343e 100644
--- a/drivers/mmc/host/sdhci-pci-core.c
+++ b/drivers/mmc/host/sdhci-pci-core.c
@@ -390,6 +390,7 @@ static int byt_sd_probe_slot(struct sdhci_pci_slot *slot)
         slot->cd_idx = 0;
         slot->cd_override_level = true;
         if (slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXT_SD ||
+            slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXTM_SD ||
             slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_APL_SD)
                 slot->host->mmc_host_ops.get_cd = bxt_get_cd;
 
@@ -1173,6 +1174,30 @@ static const struct pci_device_id pci_ids[] = {
 
         {
                 .vendor         = PCI_VENDOR_ID_INTEL,
+                .device         = PCI_DEVICE_ID_INTEL_BXTM_EMMC,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .driver_data    = (kernel_ulong_t)&sdhci_intel_byt_emmc,
+        },
+
+        {
+                .vendor         = PCI_VENDOR_ID_INTEL,
+                .device         = PCI_DEVICE_ID_INTEL_BXTM_SDIO,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .driver_data    = (kernel_ulong_t)&sdhci_intel_byt_sdio,
+        },
+
+        {
+                .vendor         = PCI_VENDOR_ID_INTEL,
+                .device         = PCI_DEVICE_ID_INTEL_BXTM_SD,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .driver_data    = (kernel_ulong_t)&sdhci_intel_byt_sd,
+        },
+
+        {
+                .vendor         = PCI_VENDOR_ID_INTEL,
                 .device         = PCI_DEVICE_ID_INTEL_APL_EMMC,
                 .subvendor      = PCI_ANY_ID,
                 .subdevice      = PCI_ANY_ID,
diff --git a/drivers/mmc/host/sdhci-pci.h b/drivers/mmc/host/sdhci-pci.h
index d1a0b4db60db..89e7151684a1 100644
--- a/drivers/mmc/host/sdhci-pci.h
+++ b/drivers/mmc/host/sdhci-pci.h
@@ -28,6 +28,9 @@
 #define PCI_DEVICE_ID_INTEL_BXT_SD      0x0aca
 #define PCI_DEVICE_ID_INTEL_BXT_EMMC    0x0acc
 #define PCI_DEVICE_ID_INTEL_BXT_SDIO    0x0ad0
+#define PCI_DEVICE_ID_INTEL_BXTM_SD     0x1aca
+#define PCI_DEVICE_ID_INTEL_BXTM_EMMC   0x1acc
+#define PCI_DEVICE_ID_INTEL_BXTM_SDIO   0x1ad0
 #define PCI_DEVICE_ID_INTEL_APL_SD      0x5aca
 #define PCI_DEVICE_ID_INTEL_APL_EMMC    0x5acc
 #define PCI_DEVICE_ID_INTEL_APL_SDIO    0x5ad0
diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index aca439d3ca83..30132500aa1c 100644
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -309,8 +309,30 @@ static void pxav3_set_uhs_signaling(struct sdhci_host *host, unsigned int uhs)
                 __func__, uhs, ctrl_2);
 }
 
+static void pxav3_set_power(struct sdhci_host *host, unsigned char mode,
+                            unsigned short vdd)
+{
+        struct mmc_host *mmc = host->mmc;
+        u8 pwr = host->pwr;
+
+        sdhci_set_power(host, mode, vdd);
+
+        if (host->pwr == pwr)
+                return;
+
+        if (host->pwr == 0)
+                vdd = 0;
+
+        if (!IS_ERR(mmc->supply.vmmc)) {
+                spin_unlock_irq(&host->lock);
+                mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
+                spin_lock_irq(&host->lock);
+        }
+}
+
 static const struct sdhci_ops pxav3_sdhci_ops = {
         .set_clock = sdhci_set_clock,
+        .set_power = pxav3_set_power,
         .platform_send_init_74_clocks = pxav3_gen_init_74_clocks,
         .get_max_clock = sdhci_pltfm_clk_get_max_clock,
         .set_bus_width = sdhci_set_bus_width,
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 8670f162dec7..6bd3d1794966 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1210,10 +1210,24 @@ clock_set:
 }
 EXPORT_SYMBOL_GPL(sdhci_set_clock);
 
-static void sdhci_set_power(struct sdhci_host *host, unsigned char mode,
-                            unsigned short vdd)
+static void sdhci_set_power_reg(struct sdhci_host *host, unsigned char mode,
+                                unsigned short vdd)
 {
         struct mmc_host *mmc = host->mmc;
+
+        spin_unlock_irq(&host->lock);
+        mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
+        spin_lock_irq(&host->lock);
+
+        if (mode != MMC_POWER_OFF)
+                sdhci_writeb(host, SDHCI_POWER_ON, SDHCI_POWER_CONTROL);
+        else
+                sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);
+}
+
+void sdhci_set_power(struct sdhci_host *host, unsigned char mode,
+                     unsigned short vdd)
+{
         u8 pwr = 0;
 
         if (mode != MMC_POWER_OFF) {
@@ -1245,7 +1259,6 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned char mode,
                 sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);
                 if (host->quirks2 & SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON)
                         sdhci_runtime_pm_bus_off(host);
-                vdd = 0;
         } else {
                 /*
                  * Spec says that we should clear the power reg before setting
@@ -1276,12 +1289,20 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned char mode,
                 if (host->quirks & SDHCI_QUIRK_DELAY_AFTER_POWER)
                         mdelay(10);
         }
+}
+EXPORT_SYMBOL_GPL(sdhci_set_power);
 
-        if (!IS_ERR(mmc->supply.vmmc)) {
-                spin_unlock_irq(&host->lock);
-                mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
-                spin_lock_irq(&host->lock);
-        }
+static void __sdhci_set_power(struct sdhci_host *host, unsigned char mode,
+                              unsigned short vdd)
+{
+        struct mmc_host *mmc = host->mmc;
+
+        if (host->ops->set_power)
+                host->ops->set_power(host, mode, vdd);
+        else if (!IS_ERR(mmc->supply.vmmc))
+                sdhci_set_power_reg(host, mode, vdd);
+        else
+                sdhci_set_power(host, mode, vdd);
 }
 
 /*****************************************************************************\
@@ -1431,7 +1452,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)
                 }
         }
 
-        sdhci_set_power(host, ios->power_mode, ios->vdd);
+        __sdhci_set_power(host, ios->power_mode, ios->vdd);
 
         if (host->ops->platform_send_init_74_clocks)
                 host->ops->platform_send_init_74_clocks(host, ios->power_mode);
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 3bd28033dbd9..0f39f4f84d10 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -529,6 +529,8 @@ struct sdhci_ops {
 #endif
 
         void    (*set_clock)(struct sdhci_host *host, unsigned int clock);
+        void    (*set_power)(struct sdhci_host *host, unsigned char mode,
+                             unsigned short vdd);
 
         int             (*enable_dma)(struct sdhci_host *host);
         unsigned int    (*get_max_clock)(struct sdhci_host *host);
@@ -660,6 +662,8 @@ static inline bool sdhci_sdio_irq_enabled(struct sdhci_host *host)
 }
 
 void sdhci_set_clock(struct sdhci_host *host, unsigned int clock);
+void sdhci_set_power(struct sdhci_host *host, unsigned char mode,
+                     unsigned short vdd);
 void sdhci_set_bus_width(struct sdhci_host *host, int width);
 void sdhci_reset(struct sdhci_host *host, u8 mask);
 void sdhci_set_uhs_signaling(struct sdhci_host *host, unsigned timing);
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 8d870ce9f944..d9a655f47d41 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 675435873823..7fb0c034dcb6 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;
@@ -133,7 +133,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 03f6e74c1906..0521b4662748 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -1125,7 +1125,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 b2752fe711f2..807c06e203c3 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/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
index fa086e09d6b7..50454be86570 100644
--- a/drivers/net/dsa/mv88e6xxx.c
+++ b/drivers/net/dsa/mv88e6xxx.c
@@ -2264,6 +2264,57 @@ static void mv88e6xxx_bridge_work(struct work_struct *work)
         mutex_unlock(&ps->smi_mutex);
 }
 
+static int _mv88e6xxx_phy_page_write(struct dsa_switch *ds, int port, int page,
+                                     int reg, int val)
+{
+        int ret;
+
+        ret = _mv88e6xxx_phy_write_indirect(ds, port, 0x16, page);
+        if (ret < 0)
+                goto restore_page_0;
+
+        ret = _mv88e6xxx_phy_write_indirect(ds, port, reg, val);
+restore_page_0:
+        _mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0);
+
+        return ret;
+}
+
+static int _mv88e6xxx_phy_page_read(struct dsa_switch *ds, int port, int page,
+                                    int reg)
+{
+        int ret;
+
+        ret = _mv88e6xxx_phy_write_indirect(ds, port, 0x16, page);
+        if (ret < 0)
+                goto restore_page_0;
+
+        ret = _mv88e6xxx_phy_read_indirect(ds, port, reg);
+restore_page_0:
+        _mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0);
+
+        return ret;
+}
+
+static int mv88e6xxx_power_on_serdes(struct dsa_switch *ds)
+{
+        int ret;
+
+        ret = _mv88e6xxx_phy_page_read(ds, REG_FIBER_SERDES, PAGE_FIBER_SERDES,
+                                       MII_BMCR);
+        if (ret < 0)
+                return ret;
+
+        if (ret & BMCR_PDOWN) {
+                ret &= ~BMCR_PDOWN;
+                ret = _mv88e6xxx_phy_page_write(ds, REG_FIBER_SERDES,
+                                                PAGE_FIBER_SERDES, MII_BMCR,
+                                                ret);
+        }
+
+        return ret;
+}
+
 static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port)
 {
         struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
@@ -2367,6 +2418,23 @@ static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port)
                         goto abort;
         }
 
+        /* If this port is connected to a SerDes, make sure the SerDes is not
+         * powered down.
+         */
+        if (mv88e6xxx_6352_family(ds)) {
+                ret = _mv88e6xxx_reg_read(ds, REG_PORT(port), PORT_STATUS);
+                if (ret < 0)
+                        goto abort;
+                ret &= PORT_STATUS_CMODE_MASK;
+                if ((ret == PORT_STATUS_CMODE_100BASE_X) ||
+                    (ret == PORT_STATUS_CMODE_1000BASE_X) ||
+                    (ret == PORT_STATUS_CMODE_SGMII)) {
+                        ret = mv88e6xxx_power_on_serdes(ds);
+                        if (ret < 0)
+                                goto abort;
+                }
+        }
+
         /* Port Control 2: don't force a good FCS, set the maximum frame size to
          * 10240 bytes, disable 802.1q tags checking, don't discard tagged or
          * untagged frames on this port, do a destination address lookup on all
@@ -2714,13 +2782,9 @@ int mv88e6xxx_phy_page_read(struct dsa_switch *ds, int port, int page, int reg)
         int ret;
 
         mutex_lock(&ps->smi_mutex);
-        ret = _mv88e6xxx_phy_write_indirect(ds, port, 0x16, page);
-        if (ret < 0)
-                goto error;
-        ret = _mv88e6xxx_phy_read_indirect(ds, port, reg);
-error:
-        _mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0);
+        ret = _mv88e6xxx_phy_page_read(ds, port, page, reg);
         mutex_unlock(&ps->smi_mutex);
+
         return ret;
 }
 
@@ -2731,14 +2795,9 @@ int mv88e6xxx_phy_page_write(struct dsa_switch *ds, int port, int page,
         int ret;
 
         mutex_lock(&ps->smi_mutex);
-        ret = _mv88e6xxx_phy_write_indirect(ds, port, 0x16, page);
-        if (ret < 0)
-                goto error;
-
-        ret = _mv88e6xxx_phy_write_indirect(ds, port, reg, val);
-error:
-        _mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0);
+        ret = _mv88e6xxx_phy_page_write(ds, port, page, reg, val);
         mutex_unlock(&ps->smi_mutex);
+
         return ret;
 }
 
diff --git a/drivers/net/dsa/mv88e6xxx.h b/drivers/net/dsa/mv88e6xxx.h
index 9a038aba48fb..26a424acd10f 100644
--- a/drivers/net/dsa/mv88e6xxx.h
+++ b/drivers/net/dsa/mv88e6xxx.h
@@ -28,6 +28,10 @@
 #define SMI_CMD_OP_45_READ_DATA_INC     ((3 << 10) | SMI_CMD_BUSY)
 #define SMI_DATA                0x01
 
+/* Fiber/SERDES Registers are located at SMI address F, page 1 */
+#define REG_FIBER_SERDES        0x0f
+#define PAGE_FIBER_SERDES       0x01
+
 #define REG_PORT(p)             (0x10 + (p))
 #define PORT_STATUS             0x00
 #define PORT_STATUS_PAUSE_EN    BIT(15)
@@ -45,6 +49,10 @@
 #define PORT_STATUS_MGMII       BIT(6) /* 6185 */
 #define PORT_STATUS_TX_PAUSED   BIT(5)
 #define PORT_STATUS_FLOW_CTRL   BIT(4)
+#define PORT_STATUS_CMODE_MASK  0x0f
+#define PORT_STATUS_CMODE_100BASE_X     0x8
+#define PORT_STATUS_CMODE_1000BASE_X    0x9
+#define PORT_STATUS_CMODE_SGMII         0xa
 #define PORT_PCS_CTRL           0x01
 #define PORT_PCS_CTRL_RGMII_DELAY_RXCLK BIT(15)
 #define PORT_PCS_CTRL_RGMII_DELAY_TXCLK BIT(14)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index aabbd51db981..12a009d720cd 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -2653,7 +2653,7 @@ static int bnxt_hwrm_do_send_msg(struct bnxt *bp, void *msg, u32 msg_len,
         /* Write request msg to hwrm channel */
         __iowrite32_copy(bp->bar0, data, msg_len / 4);
 
-        for (i = msg_len; i < HWRM_MAX_REQ_LEN; i += 4)
+        for (i = msg_len; i < BNXT_HWRM_MAX_REQ_LEN; i += 4)
                 writel(0, bp->bar0 + i);
 
         /* currently supports only one outstanding message */
@@ -3391,11 +3391,11 @@ static int bnxt_hwrm_ring_alloc(struct bnxt *bp)
                 struct bnxt_cp_ring_info *cpr = &bnapi->cp_ring;
                 struct bnxt_ring_struct *ring = &cpr->cp_ring_struct;
 
+                cpr->cp_doorbell = bp->bar1 + i * 0x80;
                 rc = hwrm_ring_alloc_send_msg(bp, ring, HWRM_RING_ALLOC_CMPL, i,
                                               INVALID_STATS_CTX_ID);
                 if (rc)
                         goto err_out;
-                cpr->cp_doorbell = bp->bar1 + i * 0x80;
                 BNXT_CP_DB(cpr->cp_doorbell, cpr->cp_raw_cons);
                 bp->grp_info[i].cp_fw_ring_id = ring->fw_ring_id;
         }
@@ -3830,6 +3830,7 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp)
         struct hwrm_ver_get_input req = {0};
         struct hwrm_ver_get_output *resp = bp->hwrm_cmd_resp_addr;
 
+        bp->hwrm_max_req_len = HWRM_MAX_REQ_LEN;
         bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_VER_GET, -1, -1);
         req.hwrm_intf_maj = HWRM_VERSION_MAJOR;
         req.hwrm_intf_min = HWRM_VERSION_MINOR;
@@ -3855,6 +3856,9 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp)
         if (!bp->hwrm_cmd_timeout)
                 bp->hwrm_cmd_timeout = DFLT_HWRM_CMD_TIMEOUT;
 
+        if (resp->hwrm_intf_maj >= 1)
+                bp->hwrm_max_req_len = le16_to_cpu(resp->max_req_win_len);
+
 hwrm_ver_get_exit:
         mutex_unlock(&bp->hwrm_cmd_lock);
         return rc;
@@ -4555,7 +4559,7 @@ bnxt_hwrm_set_pause_common(struct bnxt *bp, struct hwrm_port_phy_cfg_input *req)
                 if (bp->link_info.req_flow_ctrl & BNXT_LINK_PAUSE_RX)
                         req->auto_pause |= PORT_PHY_CFG_REQ_AUTO_PAUSE_RX;
                 if (bp->link_info.req_flow_ctrl & BNXT_LINK_PAUSE_TX)
-                        req->auto_pause |= PORT_PHY_CFG_REQ_AUTO_PAUSE_RX;
+                        req->auto_pause |= PORT_PHY_CFG_REQ_AUTO_PAUSE_TX;
                 req->enables |=
                         cpu_to_le32(PORT_PHY_CFG_REQ_ENABLES_AUTO_PAUSE);
         } else {
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index ec04c47172b7..709b95b8fcba 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -477,6 +477,7 @@ struct rx_tpa_end_cmp_ext {
 #define RING_CMP(idx)           ((idx) & bp->cp_ring_mask)
 #define NEXT_CMP(idx)           RING_CMP(ADV_RAW_CMP(idx, 1))
 
+#define BNXT_HWRM_MAX_REQ_LEN           (bp->hwrm_max_req_len)
 #define DFLT_HWRM_CMD_TIMEOUT           500
 #define HWRM_CMD_TIMEOUT                (bp->hwrm_cmd_timeout)
 #define HWRM_RESET_TIMEOUT              ((HWRM_CMD_TIMEOUT) * 4)
@@ -953,6 +954,7 @@ struct bnxt {
         dma_addr_t              hw_tx_port_stats_map;
         int                     hw_port_stats_size;
 
+        u16                     hwrm_max_req_len;
         int                     hwrm_cmd_timeout;
         struct mutex            hwrm_cmd_lock;  /* serialize hwrm messages */
         struct hwrm_ver_get_output      ver_resp;
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 9ada1662b651..2e472f6dbf2d 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -855,10 +855,8 @@ static void bnxt_get_pauseparam(struct net_device *dev,
         if (BNXT_VF(bp))
                 return;
         epause->autoneg = !!(link_info->autoneg & BNXT_AUTONEG_FLOW_CTRL);
-        epause->rx_pause =
-                ((link_info->auto_pause_setting & BNXT_LINK_PAUSE_RX) != 0);
-        epause->tx_pause =
-                ((link_info->auto_pause_setting & BNXT_LINK_PAUSE_TX) != 0);
+        epause->rx_pause = !!(link_info->req_flow_ctrl & BNXT_LINK_PAUSE_RX);
+        epause->tx_pause = !!(link_info->req_flow_ctrl & BNXT_LINK_PAUSE_TX);
 }
 
 static int bnxt_set_pauseparam(struct net_device *dev,
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 6746fd03cb3a..cf6445d148ca 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -1171,6 +1171,7 @@ static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev,
         struct enet_cb *tx_cb_ptr;
         struct netdev_queue *txq;
         unsigned int pkts_compl = 0;
+        unsigned int bytes_compl = 0;
         unsigned int c_index;
         unsigned int txbds_ready;
         unsigned int txbds_processed = 0;
@@ -1193,16 +1194,13 @@ static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev,
                 tx_cb_ptr = &priv->tx_cbs[ring->clean_ptr];
                 if (tx_cb_ptr->skb) {
                         pkts_compl++;
-                        dev->stats.tx_packets++;
-                        dev->stats.tx_bytes += tx_cb_ptr->skb->len;
+                        bytes_compl += GENET_CB(tx_cb_ptr->skb)->bytes_sent;
                         dma_unmap_single(&dev->dev,
                                          dma_unmap_addr(tx_cb_ptr, dma_addr),
                                          dma_unmap_len(tx_cb_ptr, dma_len),
                                          DMA_TO_DEVICE);
                         bcmgenet_free_cb(tx_cb_ptr);
                 } else if (dma_unmap_addr(tx_cb_ptr, dma_addr)) {
-                        dev->stats.tx_bytes +=
-                                dma_unmap_len(tx_cb_ptr, dma_len);
                         dma_unmap_page(&dev->dev,
                                        dma_unmap_addr(tx_cb_ptr, dma_addr),
                                        dma_unmap_len(tx_cb_ptr, dma_len),
@@ -1220,6 +1218,9 @@ static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev,
         ring->free_bds += txbds_processed;
         ring->c_index = (ring->c_index + txbds_processed) & DMA_C_INDEX_MASK;
 
+        dev->stats.tx_packets += pkts_compl;
+        dev->stats.tx_bytes += bytes_compl;
+
         if (ring->free_bds > (MAX_SKB_FRAGS + 1)) {
                 txq = netdev_get_tx_queue(dev, ring->queue);
                 if (netif_tx_queue_stopped(txq))
@@ -1296,7 +1297,7 @@ static int bcmgenet_xmit_single(struct net_device *dev,
 
         tx_cb_ptr->skb = skb;
 
-        skb_len = skb_headlen(skb) < ETH_ZLEN ? ETH_ZLEN : skb_headlen(skb);
+        skb_len = skb_headlen(skb);
 
         mapping = dma_map_single(kdev, skb->data, skb_len, DMA_TO_DEVICE);
         ret = dma_mapping_error(kdev, mapping);
@@ -1464,6 +1465,11 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)
                 goto out;
         }
 
+        /* Retain how many bytes will be sent on the wire, without TSB inserted
+         * by transmit checksum offload
+         */
+        GENET_CB(skb)->bytes_sent = skb->len;
+
         /* set the SKB transmit checksum */
         if (priv->desc_64b_en) {
                 skb = bcmgenet_put_tx_csum(dev, skb);
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
index 967367557309..1e2dc34d331a 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
@@ -531,6 +531,12 @@ struct bcmgenet_hw_params {
         u32             flags;
 };
 
+struct bcmgenet_skb_cb {
+        unsigned int bytes_sent;        /* bytes on the wire (no TSB) */
+};
+
+#define GENET_CB(skb)   ((struct bcmgenet_skb_cb *)((skb)->cb))
+
 struct bcmgenet_tx_ring {
         spinlock_t      lock;           /* ring lock */
         struct napi_struct napi;        /* NAPI per tx queue */
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 6619178ed77b..48a7d7dee846 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -917,7 +917,10 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag,
                 unsigned int frag_len = bp->rx_buffer_size;
 
                 if (offset + frag_len > len) {
-                        BUG_ON(frag != last_frag);
+                        if (unlikely(frag != last_frag)) {
+                                dev_kfree_skb_any(skb);
+                                return -1;
+                        }
                         frag_len = len - offset;
                 }
                 skb_copy_to_linear_data_offset(skb, offset,
@@ -945,8 +948,23 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag,
         return 0;
 }
 
+static inline void macb_init_rx_ring(struct macb *bp)
+{
+        dma_addr_t addr;
+        int i;
+
+        addr = bp->rx_buffers_dma;
+        for (i = 0; i < RX_RING_SIZE; i++) {
+                bp->rx_ring[i].addr = addr;
+                bp->rx_ring[i].ctrl = 0;
+                addr += bp->rx_buffer_size;
+        }
+        bp->rx_ring[RX_RING_SIZE - 1].addr |= MACB_BIT(RX_WRAP);
+}
+
 static int macb_rx(struct macb *bp, int budget)
 {
+        bool reset_rx_queue = false;
         int received = 0;
         unsigned int tail;
         int first_frag = -1;
@@ -972,10 +990,18 @@ static int macb_rx(struct macb *bp, int budget)
 
                 if (ctrl & MACB_BIT(RX_EOF)) {
                         int dropped;
-                        BUG_ON(first_frag == -1);
+
+                        if (unlikely(first_frag == -1)) {
+                                reset_rx_queue = true;
+                                continue;
+                        }
 
                         dropped = macb_rx_frame(bp, first_frag, tail);
                         first_frag = -1;
+                        if (unlikely(dropped < 0)) {
+                                reset_rx_queue = true;
+                                continue;
+                        }
                         if (!dropped) {
                                 received++;
                                 budget--;
@@ -983,6 +1009,26 @@ static int macb_rx(struct macb *bp, int budget)
                 }
         }
 
+        if (unlikely(reset_rx_queue)) {
+                unsigned long flags;
+                u32 ctrl;
+
+                netdev_err(bp->dev, "RX queue corruption: reset it\n");
+
+                spin_lock_irqsave(&bp->lock, flags);
+
+                ctrl = macb_readl(bp, NCR);
+                macb_writel(bp, NCR, ctrl & ~MACB_BIT(RE));
+
+                macb_init_rx_ring(bp);
+                macb_writel(bp, RBQP, bp->rx_ring_dma);
+
+                macb_writel(bp, NCR, ctrl | MACB_BIT(RE));
+
+                spin_unlock_irqrestore(&bp->lock, flags);
+                return received;
+        }
+
         if (first_frag != -1)
                 bp->rx_tail = first_frag;
         else
@@ -1100,7 +1146,7 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)
                         macb_writel(bp, NCR, ctrl | MACB_BIT(RE));
 
                         if (bp->caps & MACB_CAPS_ISR_CLEAR_ON_WRITE)
-                                macb_writel(bp, ISR, MACB_BIT(RXUBR));
+                                queue_writel(queue, ISR, MACB_BIT(RXUBR));
                 }
 
                 if (status & MACB_BIT(ISR_ROVR)) {
@@ -1523,15 +1569,8 @@ static void gem_init_rings(struct macb *bp)
 static void macb_init_rings(struct macb *bp)
 {
         int i;
-        dma_addr_t addr;
 
-        addr = bp->rx_buffers_dma;
-        for (i = 0; i < RX_RING_SIZE; i++) {
-                bp->rx_ring[i].addr = addr;
-                bp->rx_ring[i].ctrl = 0;
-                addr += bp->rx_buffer_size;
-        }
-        bp->rx_ring[RX_RING_SIZE - 1].addr |= MACB_BIT(RX_WRAP);
+        macb_init_rx_ring(bp);
 
         for (i = 0; i < TX_RING_SIZE; i++) {
                 bp->queues[0].tx_ring[i].addr = 0;
@@ -2957,9 +2996,10 @@ static int macb_probe(struct platform_device *pdev)
         phy_node =  of_get_next_available_child(np, NULL);
         if (phy_node) {
                 int gpio = of_get_named_gpio(phy_node, "reset-gpios", 0);
-                if (gpio_is_valid(gpio))
+                if (gpio_is_valid(gpio)) {
                         bp->reset_gpio = gpio_to_desc(gpio);
-                gpiod_direction_output(bp->reset_gpio, 1);
+                        gpiod_direction_output(bp->reset_gpio, 1);
+                }
         }
         of_node_put(phy_node);
 
@@ -3029,7 +3069,8 @@ static int macb_remove(struct platform_device *pdev)
                 mdiobus_free(bp->mii_bus);
 
                 /* Shutdown the PHY if there is a GPIO reset */
-                gpiod_set_value(bp->reset_gpio, 0);
+                if (bp->reset_gpio)
+                        gpiod_set_value(bp->reset_gpio, 0);
 
                 unregister_netdev(dev);
                 clk_disable_unprepare(bp->tx_clk);
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h b/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h
index 06bc2d2e7a73..a2cdfc1261dc 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h
@@ -166,6 +166,7 @@ CH_PCI_DEVICE_ID_TABLE_DEFINE_BEGIN
         CH_PCI_ID_TABLE_FENTRY(0x5099), /* Custom 2x40G QSFP */
         CH_PCI_ID_TABLE_FENTRY(0x509a), /* Custom T520-CR */
         CH_PCI_ID_TABLE_FENTRY(0x509b), /* Custom T540-CR LOM */
+        CH_PCI_ID_TABLE_FENTRY(0x509c), /* Custom T520-CR*/
 
         /* T6 adapters:
          */
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 37c081583084..08243c2ff4b4 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -943,8 +943,8 @@ fec_restart(struct net_device *ndev)
                 else
                         val &= ~FEC_RACC_OPTIONS;
                 writel(val, fep->hwp + FEC_RACC);
+                writel(PKT_MAXBUF_SIZE, fep->hwp + FEC_FTRL);
         }
-        writel(PKT_MAXBUF_SIZE, fep->hwp + FEC_FTRL);
 #endif
 
         /*
diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.h b/drivers/net/ethernet/hisilicon/hns/hnae.h
index 37d0cce392be..e8d36aaea223 100644
--- a/drivers/net/ethernet/hisilicon/hns/hnae.h
+++ b/drivers/net/ethernet/hisilicon/hns/hnae.h
@@ -469,7 +469,7 @@ struct hnae_ae_ops {
                                    u32 *tx_usecs, u32 *rx_usecs);
         void (*get_rx_max_coalesced_frames)(struct hnae_handle *handle,
                                             u32 *tx_frames, u32 *rx_frames);
-        void (*set_coalesce_usecs)(struct hnae_handle *handle, u32 timeout);
+        int (*set_coalesce_usecs)(struct hnae_handle *handle, u32 timeout);
         int (*set_coalesce_frames)(struct hnae_handle *handle,
                                    u32 coalesce_frames);
         void (*set_promisc_mode)(struct hnae_handle *handle, u32 en);
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
index 285c893ab135..a1cb461ac45f 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
@@ -159,11 +159,6 @@ struct hnae_handle *hns_ae_get_handle(struct hnae_ae_dev *dev,
                 ae_handle->qs[i]->tx_ring.q = ae_handle->qs[i];
 
                 ring_pair_cb->used_by_vf = 1;
-                if (port_idx < DSAF_SERVICE_PORT_NUM_PER_DSAF)
-                        ring_pair_cb->port_id_in_dsa = port_idx;
-                else
-                        ring_pair_cb->port_id_in_dsa = 0;
-
                 ring_pair_cb++;
         }
 
@@ -453,59 +448,46 @@ static int hns_ae_set_pauseparam(struct hnae_handle *handle,
 static void hns_ae_get_coalesce_usecs(struct hnae_handle *handle,
                                       u32 *tx_usecs, u32 *rx_usecs)
 {
-        int port;
-
-        port = hns_ae_map_eport_to_dport(handle->eport_id);
+        struct ring_pair_cb *ring_pair =
+                container_of(handle->qs[0], struct ring_pair_cb, q);
 
-        *tx_usecs = hns_rcb_get_coalesce_usecs(
-                hns_ae_get_dsaf_dev(handle->dev),
-                hns_dsaf_get_comm_idx_by_port(port));
-        *rx_usecs = hns_rcb_get_coalesce_usecs(
-                hns_ae_get_dsaf_dev(handle->dev),
-                hns_dsaf_get_comm_idx_by_port(port));
+        *tx_usecs = hns_rcb_get_coalesce_usecs(ring_pair->rcb_common,
+                                               ring_pair->port_id_in_comm);
+        *rx_usecs = hns_rcb_get_coalesce_usecs(ring_pair->rcb_common,
+                                               ring_pair->port_id_in_comm);
 }
 
 static void hns_ae_get_rx_max_coalesced_frames(struct hnae_handle *handle,
                                                u32 *tx_frames, u32 *rx_frames)
 {
-        int port;
+        struct ring_pair_cb *ring_pair =
+                container_of(handle->qs[0], struct ring_pair_cb, q);
 
-        assert(handle);
-
-        port = hns_ae_map_eport_to_dport(handle->eport_id);
-
-        *tx_frames = hns_rcb_get_coalesced_frames(
-                hns_ae_get_dsaf_dev(handle->dev), port);
-        *rx_frames = hns_rcb_get_coalesced_frames(
-                hns_ae_get_dsaf_dev(handle->dev), port);
+        *tx_frames = hns_rcb_get_coalesced_frames(ring_pair->rcb_common,
+                                                  ring_pair->port_id_in_comm);
+        *rx_frames = hns_rcb_get_coalesced_frames(ring_pair->rcb_common,
+                                                  ring_pair->port_id_in_comm);
 }
 
-static void hns_ae_set_coalesce_usecs(struct hnae_handle *handle,
-                                      u32 timeout)
+static int hns_ae_set_coalesce_usecs(struct hnae_handle *handle,
+                                     u32 timeout)
 {
-        int port;
+        struct ring_pair_cb *ring_pair =
+                container_of(handle->qs[0], struct ring_pair_cb, q);
 
-        assert(handle);
-
-        port = hns_ae_map_eport_to_dport(handle->eport_id);
-
-        hns_rcb_set_coalesce_usecs(hns_ae_get_dsaf_dev(handle->dev),
-                                   port, timeout);
+        return hns_rcb_set_coalesce_usecs(
+                ring_pair->rcb_common, ring_pair->port_id_in_comm, timeout);
 }
 
 static int  hns_ae_set_coalesce_frames(struct hnae_handle *handle,
                                        u32 coalesce_frames)
 {
-        int port;
-        int ret;
+        struct ring_pair_cb *ring_pair =
+                container_of(handle->qs[0], struct ring_pair_cb, q);
 
-        assert(handle);
-
-        port = hns_ae_map_eport_to_dport(handle->eport_id);
-
-        ret = hns_rcb_set_coalesced_frames(hns_ae_get_dsaf_dev(handle->dev),
-                                           port, coalesce_frames);
-        return ret;
+        return hns_rcb_set_coalesced_frames(
+                ring_pair->rcb_common,
+                ring_pair->port_id_in_comm, coalesce_frames);
 }
 
 void hns_ae_update_stats(struct hnae_handle *handle,
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c
index 6e2b76ede075..44abb08de155 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c
@@ -664,7 +664,8 @@ static void hns_gmac_get_strings(u32 stringset, u8 *data)
                 return;
 
         for (i = 0; i < ARRAY_SIZE(g_gmac_stats_string); i++) {
-                snprintf(buff, ETH_GSTRING_LEN, g_gmac_stats_string[i].desc);
+                snprintf(buff, ETH_GSTRING_LEN, "%s",
+                         g_gmac_stats_string[i].desc);
                 buff = buff + ETH_GSTRING_LEN;
         }
 }
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
index 5c1ac9ba1bf2..5978a5c8ef35 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
@@ -2219,17 +2219,17 @@ void hns_dsaf_get_regs(struct dsaf_device *ddev, u32 port, void *data)
         /* dsaf onode registers */
         for (i = 0; i < DSAF_XOD_NUM; i++) {
                 p[311 + i] = dsaf_read_dev(ddev,
-                                DSAF_XOD_ETS_TSA_TC0_TC3_CFG_0_REG + j * 0x90);
+                                DSAF_XOD_ETS_TSA_TC0_TC3_CFG_0_REG + i * 0x90);
                 p[319 + i] = dsaf_read_dev(ddev,
-                                DSAF_XOD_ETS_TSA_TC4_TC7_CFG_0_REG + j * 0x90);
+                                DSAF_XOD_ETS_TSA_TC4_TC7_CFG_0_REG + i * 0x90);
                 p[327 + i] = dsaf_read_dev(ddev,
-                                DSAF_XOD_ETS_BW_TC0_TC3_CFG_0_REG + j * 0x90);
+                                DSAF_XOD_ETS_BW_TC0_TC3_CFG_0_REG + i * 0x90);
                 p[335 + i] = dsaf_read_dev(ddev,
-                                DSAF_XOD_ETS_BW_TC4_TC7_CFG_0_REG + j * 0x90);
+                                DSAF_XOD_ETS_BW_TC4_TC7_CFG_0_REG + i * 0x90);
                 p[343 + i] = dsaf_read_dev(ddev,
-                                DSAF_XOD_ETS_BW_OFFSET_CFG_0_REG + j * 0x90);
+                                DSAF_XOD_ETS_BW_OFFSET_CFG_0_REG + i * 0x90);
                 p[351 + i] = dsaf_read_dev(ddev,
-                                DSAF_XOD_ETS_TOKEN_CFG_0_REG + j * 0x90);
+                                DSAF_XOD_ETS_TOKEN_CFG_0_REG + i * 0x90);
         }
 
         p[359] = dsaf_read_dev(ddev, DSAF_XOD_PFS_CFG_0_0_REG + port * 0x90);
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
index 607c3be42241..e69b02287c44 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
@@ -244,31 +244,35 @@ void hns_ppe_com_srst(struct ppe_common_cb *ppe_common, u32 val)
  */
 phy_interface_t hns_mac_get_phy_if(struct hns_mac_cb *mac_cb)
 {
-        u32 hilink3_mode;
-        u32 hilink4_mode;
+        u32 mode;
+        u32 reg;
+        u32 shift;
+        bool is_ver1 = AE_IS_VER1(mac_cb->dsaf_dev->dsaf_ver);
         void __iomem *sys_ctl_vaddr = mac_cb->sys_ctl_vaddr;
-        int dev_id = mac_cb->mac_id;
+        int mac_id = mac_cb->mac_id;
         phy_interface_t phy_if = PHY_INTERFACE_MODE_NA;
 
-        hilink3_mode = dsaf_read_reg(sys_ctl_vaddr, HNS_MAC_HILINK3_REG);
-        hilink4_mode = dsaf_read_reg(sys_ctl_vaddr, HNS_MAC_HILINK4_REG);
-        if (dev_id >= 0 && dev_id <= 3) {
-                if (hilink4_mode == 0)
-                        phy_if = PHY_INTERFACE_MODE_SGMII;
-                else
+        if (is_ver1 && (mac_id >= 6 && mac_id <= 7)) {
+                phy_if = PHY_INTERFACE_MODE_SGMII;
+        } else if (mac_id >= 0 && mac_id <= 3) {
+                reg = is_ver1 ? HNS_MAC_HILINK4_REG : HNS_MAC_HILINK4V2_REG;
+                mode = dsaf_read_reg(sys_ctl_vaddr, reg);
+                /* mac_id 0, 1, 2, 3 ---> hilink4 lane 0, 1, 2, 3 */
+                shift = is_ver1 ? 0 : mac_id;
+                if (dsaf_get_bit(mode, shift))
                         phy_if = PHY_INTERFACE_MODE_XGMII;
-        } else if (dev_id >= 4 && dev_id <= 5) {
-                if (hilink3_mode == 0)
-                        phy_if = PHY_INTERFACE_MODE_SGMII;
                 else
+                        phy_if = PHY_INTERFACE_MODE_SGMII;
+        } else if (mac_id >= 4 && mac_id <= 7) {
+                reg = is_ver1 ? HNS_MAC_HILINK3_REG : HNS_MAC_HILINK3V2_REG;
+                mode = dsaf_read_reg(sys_ctl_vaddr, reg);
+                /* mac_id 4, 5, 6, 7 ---> hilink3 lane 2, 3, 0, 1 */
+                shift = is_ver1 ? 0 : mac_id <= 5 ? mac_id - 2 : mac_id - 6;
+                if (dsaf_get_bit(mode, shift))
                         phy_if = PHY_INTERFACE_MODE_XGMII;
-        } else {
-                phy_if = PHY_INTERFACE_MODE_SGMII;
+                else
+                        phy_if = PHY_INTERFACE_MODE_SGMII;
         }
-
-        dev_dbg(mac_cb->dev,
-                "hilink3_mode=%d, hilink4_mode=%d dev_id=%d, phy_if=%d\n",
-                hilink3_mode, hilink4_mode, dev_id, phy_if);
         return phy_if;
 }
 
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
index 12188807468c..28ee26e5c478 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
@@ -215,9 +215,9 @@ static void hns_rcb_ring_init(struct ring_pair_cb *ring_pair, int ring_type)
                 dsaf_write_dev(q, RCB_RING_RX_RING_BD_LEN_REG,
                                bd_size_type);
                 dsaf_write_dev(q, RCB_RING_RX_RING_BD_NUM_REG,
-                               ring_pair->port_id_in_dsa);
+                               ring_pair->port_id_in_comm);
                 dsaf_write_dev(q, RCB_RING_RX_RING_PKTLINE_REG,
-                               ring_pair->port_id_in_dsa);
+                               ring_pair->port_id_in_comm);
         } else {
                 dsaf_write_dev(q, RCB_RING_TX_RING_BASEADDR_L_REG,
                                (u32)dma);
@@ -227,9 +227,9 @@ static void hns_rcb_ring_init(struct ring_pair_cb *ring_pair, int ring_type)
                 dsaf_write_dev(q, RCB_RING_TX_RING_BD_LEN_REG,
                                bd_size_type);
                 dsaf_write_dev(q, RCB_RING_TX_RING_BD_NUM_REG,
-                               ring_pair->port_id_in_dsa);
+                               ring_pair->port_id_in_comm);
                 dsaf_write_dev(q, RCB_RING_TX_RING_PKTLINE_REG,
-                               ring_pair->port_id_in_dsa);
+                               ring_pair->port_id_in_comm);
         }
 }
 
@@ -256,50 +256,16 @@ static void hns_rcb_set_port_desc_cnt(struct rcb_common_cb *rcb_common,
                        desc_cnt);
 }
 
-/**
- *hns_rcb_set_port_coalesced_frames - set rcb port coalesced frames
- *@rcb_common: rcb_common device
- *@port_idx:port index
- *@coalesced_frames:BD num for coalesced frames
- */
-static int  hns_rcb_set_port_coalesced_frames(struct rcb_common_cb *rcb_common,
-                                              u32 port_idx,
-                                              u32 coalesced_frames)
-{
-        if (coalesced_frames >= rcb_common->desc_num ||
-            coalesced_frames > HNS_RCB_MAX_COALESCED_FRAMES)
-                return -EINVAL;
-
-        dsaf_write_dev(rcb_common, RCB_CFG_PKTLINE_REG + port_idx * 4,
-                       coalesced_frames);
-        return 0;
-}
-
-/**
- *hns_rcb_get_port_coalesced_frames - set rcb port coalesced frames
- *@rcb_common: rcb_common device
- *@port_idx:port index
- * return coaleseced frames value
- */
-static u32 hns_rcb_get_port_coalesced_frames(struct rcb_common_cb *rcb_common,
-                                             u32 port_idx)
+static void hns_rcb_set_port_timeout(
+        struct rcb_common_cb *rcb_common, u32 port_idx, u32 timeout)
 {
-        if (port_idx >= HNS_RCB_SERVICE_NW_ENGINE_NUM)
-                port_idx = 0;
-
-        return dsaf_read_dev(rcb_common,
-                             RCB_CFG_PKTLINE_REG + port_idx * 4);
-}
-
-/**
- *hns_rcb_set_timeout - set rcb port coalesced time_out
- *@rcb_common: rcb_common device
- *@time_out:time for coalesced time_out
- */
-static void hns_rcb_set_timeout(struct rcb_common_cb *rcb_common,
-                                u32 timeout)
-{
-        dsaf_write_dev(rcb_common, RCB_CFG_OVERTIME_REG, timeout);
+        if (AE_IS_VER1(rcb_common->dsaf_dev->dsaf_ver))
+                dsaf_write_dev(rcb_common, RCB_CFG_OVERTIME_REG,
+                               timeout * HNS_RCB_CLK_FREQ_MHZ);
+        else
+                dsaf_write_dev(rcb_common,
+                               RCB_PORT_CFG_OVERTIME_REG + port_idx * 4,
+                               timeout);
 }
 
 static int hns_rcb_common_get_port_num(struct rcb_common_cb *rcb_common)
@@ -361,10 +327,11 @@ int hns_rcb_common_init_hw(struct rcb_common_cb *rcb_common)
 
         for (i = 0; i < port_num; i++) {
                 hns_rcb_set_port_desc_cnt(rcb_common, i, rcb_common->desc_num);
-                (void)hns_rcb_set_port_coalesced_frames(
-                        rcb_common, i, rcb_common->coalesced_frames);
+                (void)hns_rcb_set_coalesced_frames(
+                        rcb_common, i, HNS_RCB_DEF_COALESCED_FRAMES);
+                hns_rcb_set_port_timeout(
+                        rcb_common, i, HNS_RCB_DEF_COALESCED_USECS);
         }
-        hns_rcb_set_timeout(rcb_common, rcb_common->timeout);
 
         dsaf_write_dev(rcb_common, RCB_COM_CFG_ENDIAN_REG,
                        HNS_RCB_COMMON_ENDIAN);
@@ -460,7 +427,8 @@ static void hns_rcb_ring_pair_get_cfg(struct ring_pair_cb *ring_pair_cb)
         hns_rcb_ring_get_cfg(&ring_pair_cb->q, TX_RING);
 }
 
-static int hns_rcb_get_port(struct rcb_common_cb *rcb_common, int ring_idx)
+static int hns_rcb_get_port_in_comm(
+        struct rcb_common_cb *rcb_common, int ring_idx)
 {
         int comm_index = rcb_common->comm_index;
         int port;
@@ -470,7 +438,7 @@ static int hns_rcb_get_port(struct rcb_common_cb *rcb_common, int ring_idx)
                 q_num = (int)rcb_common->max_q_per_vf * rcb_common->max_vfn;
                 port = ring_idx / q_num;
         } else {
-                port = HNS_RCB_SERVICE_NW_ENGINE_NUM + comm_index - 1;
+                port = 0; /* config debug-ports port_id_in_comm to 0*/
         }
 
         return port;
@@ -518,7 +486,8 @@ void hns_rcb_get_cfg(struct rcb_common_cb *rcb_common)
                 ring_pair_cb->index = i;
                 ring_pair_cb->q.io_base =
                         RCB_COMM_BASE_TO_RING_BASE(rcb_common->io_base, i);
-                ring_pair_cb->port_id_in_dsa = hns_rcb_get_port(rcb_common, i);
+                ring_pair_cb->port_id_in_comm =
+                        hns_rcb_get_port_in_comm(rcb_common, i);
                 ring_pair_cb->virq[HNS_RCB_IRQ_IDX_TX] =
                 is_ver1 ? irq_of_parse_and_map(np, base_irq_idx + i * 2) :
                           platform_get_irq(pdev, base_irq_idx + i * 3 + 1);
@@ -534,82 +503,95 @@ void hns_rcb_get_cfg(struct rcb_common_cb *rcb_common)
 /**
  *hns_rcb_get_coalesced_frames - get rcb port coalesced frames
  *@rcb_common: rcb_common device
- *@comm_index:port index
- *return coalesced_frames
+ *@port_idx:port id in comm
+ *
+ *Returns: coalesced_frames
  */
-u32 hns_rcb_get_coalesced_frames(struct dsaf_device *dsaf_dev, int port)
+u32 hns_rcb_get_coalesced_frames(
+        struct rcb_common_cb *rcb_common, u32 port_idx)
 {
-        int comm_index =  hns_dsaf_get_comm_idx_by_port(port);
-        struct rcb_common_cb *rcb_comm = dsaf_dev->rcb_common[comm_index];
-
-        return hns_rcb_get_port_coalesced_frames(rcb_comm, port);
+        return dsaf_read_dev(rcb_common, RCB_CFG_PKTLINE_REG + port_idx * 4);
 }
 
 /**
  *hns_rcb_get_coalesce_usecs - get rcb port coalesced time_out
  *@rcb_common: rcb_common device
- *@comm_index:port index
- *return time_out
+ *@port_idx:port id in comm
+ *
+ *Returns: time_out
  */
-u32 hns_rcb_get_coalesce_usecs(struct dsaf_device *dsaf_dev, int comm_index)
+u32 hns_rcb_get_coalesce_usecs(
+        struct rcb_common_cb *rcb_common, u32 port_idx)
 {
-        struct rcb_common_cb *rcb_comm = dsaf_dev->rcb_common[comm_index];
-
-        return rcb_comm->timeout;
+        if (AE_IS_VER1(rcb_common->dsaf_dev->dsaf_ver))
+                return dsaf_read_dev(rcb_common, RCB_CFG_OVERTIME_REG) /
+                       HNS_RCB_CLK_FREQ_MHZ;
+        else
+                return dsaf_read_dev(rcb_common,
+                                     RCB_PORT_CFG_OVERTIME_REG + port_idx * 4);
 }
 
 /**
  *hns_rcb_set_coalesce_usecs - set rcb port coalesced time_out
  *@rcb_common: rcb_common device
- *@comm_index: comm :index
- *@etx_usecs:tx time for coalesced time_out
- *@rx_usecs:rx time for coalesced time_out
+ *@port_idx:port id in comm
+ *@timeout:tx/rx time for coalesced time_out
+ *
+ * Returns:
+ * Zero for success, or an error code in case of failure
  */
-void hns_rcb_set_coalesce_usecs(struct dsaf_device *dsaf_dev,
-                                int port, u32 timeout)
+int hns_rcb_set_coalesce_usecs(
+        struct rcb_common_cb *rcb_common, u32 port_idx, u32 timeout)
 {
-        int comm_index =  hns_dsaf_get_comm_idx_by_port(port);
-        struct rcb_common_cb *rcb_comm = dsaf_dev->rcb_common[comm_index];
+        u32 old_timeout = hns_rcb_get_coalesce_usecs(rcb_common, port_idx);
 
-        if (rcb_comm->timeout == timeout)
-                return;
+        if (timeout == old_timeout)
+                return 0;
 
-        if (comm_index == HNS_DSAF_COMM_SERVICE_NW_IDX) {
-                dev_err(dsaf_dev->dev,
-                        "error: not support coalesce_usecs setting!\n");
-                return;
+        if (AE_IS_VER1(rcb_common->dsaf_dev->dsaf_ver)) {
+                if (rcb_common->comm_index == HNS_DSAF_COMM_SERVICE_NW_IDX) {
+                        dev_err(rcb_common->dsaf_dev->dev,
+                                "error: not support coalesce_usecs setting!\n");
+                        return -EINVAL;
+                }
         }
-        rcb_comm->timeout = timeout;
-        hns_rcb_set_timeout(rcb_comm, rcb_comm->timeout);
+        if (timeout > HNS_RCB_MAX_COALESCED_USECS) {
+                dev_err(rcb_common->dsaf_dev->dev,
+                        "error: not support coalesce %dus!\n", timeout);
+                return -EINVAL;
+        }
+        hns_rcb_set_port_timeout(rcb_common, port_idx, timeout);
+        return 0;
 }
 
 /**
  *hns_rcb_set_coalesced_frames - set rcb coalesced frames
  *@rcb_common: rcb_common device
- *@tx_frames:tx BD num for coalesced frames
- *@rx_frames:rx BD num for coalesced frames
- *Return 0 on success, negative on failure
+ *@port_idx:port id in comm
+ *@coalesced_frames:tx/rx BD num for coalesced frames
+ *
+ * Returns:
+ * Zero for success, or an error code in case of failure
  */
-int hns_rcb_set_coalesced_frames(struct dsaf_device *dsaf_dev,
-                                 int port, u32 coalesced_frames)
+int hns_rcb_set_coalesced_frames(
+        struct rcb_common_cb *rcb_common, u32 port_idx, u32 coalesced_frames)
 {
-        int comm_index =  hns_dsaf_get_comm_idx_by_port(port);
-        struct rcb_common_cb *rcb_comm = dsaf_dev->rcb_common[comm_index];
-        u32 coalesced_reg_val;
-        int ret;
+        u32 old_waterline = hns_rcb_get_coalesced_frames(rcb_common, port_idx);
 
-        coalesced_reg_val = hns_rcb_get_port_coalesced_frames(rcb_comm, port);
-
-        if (coalesced_reg_val == coalesced_frames)
+        if (coalesced_frames == old_waterline)
                 return 0;
 
-        if (coalesced_frames >= HNS_RCB_MIN_COALESCED_FRAMES) {
-                ret = hns_rcb_set_port_coalesced_frames(rcb_comm, port,
-                                                        coalesced_frames);
-                return ret;
-        } else {
+        if (coalesced_frames >= rcb_common->desc_num ||
+            coalesced_frames > HNS_RCB_MAX_COALESCED_FRAMES ||
+            coalesced_frames < HNS_RCB_MIN_COALESCED_FRAMES) {
+                dev_err(rcb_common->dsaf_dev->dev,
+                        "error: not support coalesce_frames setting!\n");
                 return -EINVAL;
         }
+
+        dsaf_write_dev(rcb_common, RCB_CFG_PKTLINE_REG + port_idx * 4,
+                       coalesced_frames);
+        return 0;
 }
 
 /**
@@ -749,8 +731,6 @@ int hns_rcb_common_get_cfg(struct dsaf_device *dsaf_dev,
         rcb_common->dsaf_dev = dsaf_dev;
 
         rcb_common->desc_num = dsaf_dev->desc_num;
-        rcb_common->coalesced_frames = HNS_RCB_DEF_COALESCED_FRAMES;
-        rcb_common->timeout = HNS_RCB_MAX_TIME_OUT;
 
         hns_rcb_get_queue_mode(dsaf_mode, comm_index, &max_vfn, &max_q_per_vf);
         rcb_common->max_vfn = max_vfn;
@@ -951,6 +931,10 @@ void hns_rcb_get_strings(int stringset, u8 *data, int index)
 void hns_rcb_get_common_regs(struct rcb_common_cb *rcb_com, void *data)
 {
         u32 *regs = data;
+        bool is_ver1 = AE_IS_VER1(rcb_com->dsaf_dev->dsaf_ver);
+        bool is_dbg = (rcb_com->comm_index != HNS_DSAF_COMM_SERVICE_NW_IDX);
+        u32 reg_tmp;
+        u32 reg_num_tmp;
         u32 i = 0;
 
         /*rcb common registers */
@@ -1004,12 +988,16 @@ void hns_rcb_get_common_regs(struct rcb_common_cb *rcb_com, void *data)
                         = dsaf_read_dev(rcb_com, RCB_CFG_PKTLINE_REG + 4 * i);
         }
 
-        regs[70] = dsaf_read_dev(rcb_com, RCB_CFG_OVERTIME_REG);
-        regs[71] = dsaf_read_dev(rcb_com, RCB_CFG_PKTLINE_INT_NUM_REG);
-        regs[72] = dsaf_read_dev(rcb_com, RCB_CFG_OVERTIME_INT_NUM_REG);
+        reg_tmp = is_ver1 ? RCB_CFG_OVERTIME_REG : RCB_PORT_CFG_OVERTIME_REG;
+        reg_num_tmp = (is_ver1 || is_dbg) ? 1 : 6;
+        for (i = 0; i < reg_num_tmp; i++)
+                regs[70 + i] = dsaf_read_dev(rcb_com, reg_tmp);
+
+        regs[76] = dsaf_read_dev(rcb_com, RCB_CFG_PKTLINE_INT_NUM_REG);
+        regs[77] = dsaf_read_dev(rcb_com, RCB_CFG_OVERTIME_INT_NUM_REG);
 
         /* mark end of rcb common regs */
-        for (i = 73; i < 80; i++)
+        for (i = 78; i < 80; i++)
                 regs[i] = 0xcccccccc;
 }
 
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
index 81fe9f849973..eb61014ad615 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
@@ -38,7 +38,9 @@ struct rcb_common_cb;
 #define HNS_RCB_MAX_COALESCED_FRAMES            1023
 #define HNS_RCB_MIN_COALESCED_FRAMES            1
 #define HNS_RCB_DEF_COALESCED_FRAMES            50
-#define HNS_RCB_MAX_TIME_OUT                    0x500
+#define HNS_RCB_CLK_FREQ_MHZ                    350
+#define HNS_RCB_MAX_COALESCED_USECS             0x3ff
+#define HNS_RCB_DEF_COALESCED_USECS             3
 
 #define HNS_RCB_COMMON_ENDIAN                   1
 
@@ -82,7 +84,7 @@ struct ring_pair_cb {
 
         int virq[HNS_RCB_IRQ_NUM_PER_QUEUE];
 
-        u8 port_id_in_dsa;
+        u8 port_id_in_comm;
         u8 used_by_vf;
 
         struct hns_ring_hw_stats hw_stats;
@@ -97,8 +99,6 @@ struct rcb_common_cb {
 
         u8 comm_index;
         u32 ring_num;
-        u32 coalesced_frames; /* frames  threshold of  rx interrupt   */
-        u32 timeout; /* time threshold of  rx interrupt  */
         u32 desc_num; /*  desc num per queue*/
 
         struct ring_pair_cb ring_pair_cb[0];
@@ -125,13 +125,14 @@ void hns_rcbv2_int_clr_hw(struct hnae_queue *q, u32 flag);
 void hns_rcb_init_hw(struct ring_pair_cb *ring);
 void hns_rcb_reset_ring_hw(struct hnae_queue *q);
 void hns_rcb_wait_fbd_clean(struct hnae_queue **qs, int q_num, u32 flag);
-
-u32 hns_rcb_get_coalesced_frames(struct dsaf_device *dsaf_dev, int comm_index);
-u32 hns_rcb_get_coalesce_usecs(struct dsaf_device *dsaf_dev, int comm_index);
-void hns_rcb_set_coalesce_usecs(struct dsaf_device *dsaf_dev,
-                                int comm_index, u32 timeout);
-int hns_rcb_set_coalesced_frames(struct dsaf_device *dsaf_dev,
-                                 int comm_index, u32 coalesce_frames);
+u32 hns_rcb_get_coalesced_frames(
+        struct rcb_common_cb *rcb_common, u32 port_idx);
+u32 hns_rcb_get_coalesce_usecs(
+        struct rcb_common_cb *rcb_common, u32 port_idx);
+int hns_rcb_set_coalesce_usecs(
+        struct rcb_common_cb *rcb_common, u32 port_idx, u32 timeout);
+int hns_rcb_set_coalesced_frames(
+        struct rcb_common_cb *rcb_common, u32 port_idx, u32 coalesced_frames);
 void hns_rcb_update_stats(struct hnae_queue *queue);
 
 void hns_rcb_get_stats(struct hnae_queue *queue, u64 *data);
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
index bf62687e5ea7..7d7204f45e78 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
@@ -103,6 +103,8 @@
 /*serdes offset**/
 #define HNS_MAC_HILINK3_REG DSAF_SUB_SC_HILINK3_CRG_CTRL0_REG
 #define HNS_MAC_HILINK4_REG DSAF_SUB_SC_HILINK4_CRG_CTRL0_REG
+#define HNS_MAC_HILINK3V2_REG DSAF_SUB_SC_HILINK3_CRG_CTRL1_REG
+#define HNS_MAC_HILINK4V2_REG DSAF_SUB_SC_HILINK4_CRG_CTRL1_REG
 #define HNS_MAC_LANE0_CTLEDFE_REG 0x000BFFCCULL
 #define HNS_MAC_LANE1_CTLEDFE_REG 0x000BFFBCULL
 #define HNS_MAC_LANE2_CTLEDFE_REG 0x000BFFACULL
@@ -404,6 +406,7 @@
 #define RCB_CFG_OVERTIME_REG                    0x9300
 #define RCB_CFG_PKTLINE_INT_NUM_REG             0x9304
 #define RCB_CFG_OVERTIME_INT_NUM_REG            0x9308
+#define RCB_PORT_CFG_OVERTIME_REG               0x9430
 
 #define RCB_RING_RX_RING_BASEADDR_L_REG         0x00000
 #define RCB_RING_RX_RING_BASEADDR_H_REG         0x00004
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
index 71aa37b4b338..687204b780b0 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
@@ -913,10 +913,7 @@ static int hns_nic_tx_poll_one(struct hns_nic_ring_data *ring_data,
 static void hns_nic_tx_fini_pro(struct hns_nic_ring_data *ring_data)
 {
         struct hnae_ring *ring = ring_data->ring;
-        int head = ring->next_to_clean;
-
-        /* for hardware bug fixed */
-        head = readl_relaxed(ring->io_base + RCB_REG_HEAD);
+        int head = readl_relaxed(ring->io_base + RCB_REG_HEAD);
 
         if (head != ring->next_to_clean) {
                 ring_data->ring->q->handle->dev->ops->toggle_ring_irq(
@@ -959,8 +956,8 @@ static int hns_nic_common_poll(struct napi_struct *napi, int budget)
                 napi_complete(napi);
                 ring_data->ring->q->handle->dev->ops->toggle_ring_irq(
                         ring_data->ring, 0);
-
-                ring_data->fini_process(ring_data);
+                if (ring_data->fini_process)
+                        ring_data->fini_process(ring_data);
                 return 0;
         }
 
@@ -1723,6 +1720,7 @@ static int hns_nic_init_ring_data(struct hns_nic_priv *priv)
 {
         struct hnae_handle *h = priv->ae_handle;
         struct hns_nic_ring_data *rd;
+        bool is_ver1 = AE_IS_VER1(priv->enet_ver);
         int i;
 
         if (h->q_num > NIC_MAX_Q_PER_VF) {
@@ -1740,7 +1738,7 @@ static int hns_nic_init_ring_data(struct hns_nic_priv *priv)
                 rd->queue_index = i;
                 rd->ring = &h->qs[i]->tx_ring;
                 rd->poll_one = hns_nic_tx_poll_one;
-                rd->fini_process = hns_nic_tx_fini_pro;
+                rd->fini_process = is_ver1 ? hns_nic_tx_fini_pro : NULL;
 
                 netif_napi_add(priv->netdev, &rd->napi,
                                hns_nic_common_poll, NIC_TX_CLEAN_MAX_NUM);
@@ -1752,7 +1750,7 @@ static int hns_nic_init_ring_data(struct hns_nic_priv *priv)
                 rd->ring = &h->qs[i - h->q_num]->rx_ring;
                 rd->poll_one = hns_nic_rx_poll_one;
                 rd->ex_process = hns_nic_rx_up_pro;
-                rd->fini_process = hns_nic_rx_fini_pro;
+                rd->fini_process = is_ver1 ? hns_nic_rx_fini_pro : NULL;
 
                 netif_napi_add(priv->netdev, &rd->napi,
                                hns_nic_common_poll, NIC_RX_CLEAN_MAX_NUM);
@@ -1816,7 +1814,7 @@ static int hns_nic_try_get_ae(struct net_device *ndev)
         h = hnae_get_handle(&priv->netdev->dev,
                             priv->ae_node, priv->port_id, NULL);
         if (IS_ERR_OR_NULL(h)) {
-                ret = PTR_ERR(h);
+                ret = -ENODEV;
                 dev_dbg(priv->dev, "has not handle, register notifier!\n");
                 goto out;
         }
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
index 9c3ba65988e1..3d746c887873 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
@@ -794,8 +794,10 @@ static int hns_set_coalesce(struct net_device *net_dev,
             (!ops->set_coalesce_frames))
                 return -ESRCH;
 
-        ops->set_coalesce_usecs(priv->ae_handle,
-                                        ec->rx_coalesce_usecs);
+        ret = ops->set_coalesce_usecs(priv->ae_handle,
+                                      ec->rx_coalesce_usecs);
+        if (ret)
+                return ret;
 
         ret = ops->set_coalesce_frames(
                 priv->ae_handle,
@@ -1013,8 +1015,8 @@ int hns_phy_led_set(struct net_device *netdev, int value)
         struct phy_device *phy_dev = priv->phy;
 
         retval = phy_write(phy_dev, HNS_PHY_PAGE_REG, HNS_PHY_PAGE_LED);
-        retval = phy_write(phy_dev, HNS_LED_FC_REG, value);
-        retval = phy_write(phy_dev, HNS_PHY_PAGE_REG, HNS_PHY_PAGE_COPPER);
+        retval |= phy_write(phy_dev, HNS_LED_FC_REG, value);
+        retval |= phy_write(phy_dev, HNS_PHY_PAGE_REG, HNS_PHY_PAGE_COPPER);
         if (retval) {
                 netdev_err(netdev, "mdiobus_write fail !\n");
                 return retval;
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 3fc7bde699ba..ae90d4f12b70 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -3106,7 +3106,7 @@ static int e1000_maybe_stop_tx(struct net_device *netdev,
         return __e1000_maybe_stop_tx(netdev, size);
 }
 
-#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1)
+#define TXD_USE_COUNT(S, X) (((S) + ((1 << (X)) - 1)) >> (X))
 static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
                                     struct net_device *netdev)
 {
@@ -3256,12 +3256,29 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
                              nr_frags, mss);
 
         if (count) {
+                /* The descriptors needed is higher than other Intel drivers
+                 * due to a number of workarounds.  The breakdown is below:
+                 * Data descriptors: MAX_SKB_FRAGS + 1
+                 * Context Descriptor: 1
+                 * Keep head from touching tail: 2
+                 * Workarounds: 3
+                 */
+                int desc_needed = MAX_SKB_FRAGS + 7;
+
                 netdev_sent_queue(netdev, skb->len);
                 skb_tx_timestamp(skb);
 
                 e1000_tx_queue(adapter, tx_ring, tx_flags, count);
+
+                /* 82544 potentially requires twice as many data descriptors
+                 * in order to guarantee buffers don't end on evenly-aligned
+                 * dwords
+                 */
+                if (adapter->pcix_82544)
+                        desc_needed += MAX_SKB_FRAGS + 1;
+
                 /* Make sure there is space in the ring for the next send. */
-                e1000_maybe_stop_tx(netdev, tx_ring, MAX_SKB_FRAGS + 2);
+                e1000_maybe_stop_tx(netdev, tx_ring, desc_needed);
 
                 if (!skb->xmit_more ||
                     netif_xmit_stopped(netdev_get_tx_queue(netdev, 0))) {
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 67006431726a..344912957cab 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -8559,6 +8559,7 @@ static int i40e_sw_init(struct i40e_pf *pf)
                              I40E_FLAG_OUTER_UDP_CSUM_CAPABLE |
                              I40E_FLAG_WB_ON_ITR_CAPABLE |
                              I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE |
+                             I40E_FLAG_NO_PCI_LINK_CHECK |
                              I40E_FLAG_100M_SGMII_CAPABLE |
                              I40E_FLAG_USE_SET_LLDP_MIB |
                              I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index 84fa28ceb200..e4949af7dd6b 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -661,9 +661,7 @@ struct ixgbe_adapter {
 #define IXGBE_FLAG2_RSS_FIELD_IPV6_UDP          (u32)(1 << 9)
 #define IXGBE_FLAG2_PTP_PPS_ENABLED             (u32)(1 << 10)
 #define IXGBE_FLAG2_PHY_INTERRUPT               (u32)(1 << 11)
-#ifdef CONFIG_IXGBE_VXLAN
 #define IXGBE_FLAG2_VXLAN_REREG_NEEDED          BIT(12)
-#endif
 #define IXGBE_FLAG2_VLAN_PROMISC                BIT(13)
 
         /* Tx fast path data */
@@ -675,6 +673,9 @@ struct ixgbe_adapter {
         int num_rx_queues;
         u16 rx_itr_setting;
 
+        /* Port number used to identify VXLAN traffic */
+        __be16 vxlan_port;
+
         /* TX */
         struct ixgbe_ring *tx_ring[MAX_TX_QUEUES] ____cacheline_aligned_in_smp;
 
@@ -782,9 +783,6 @@ struct ixgbe_adapter {
         u32 timer_event_accumulator;
         u32 vferr_refcount;
         struct ixgbe_mac_addr *mac_table;
-#ifdef CONFIG_IXGBE_VXLAN
-        u16 vxlan_port;
-#endif
         struct kobject *info_kobj;
 #ifdef CONFIG_IXGBE_HWMON
         struct hwmon_buff *ixgbe_hwmon_buff;
@@ -879,6 +877,8 @@ extern const char ixgbe_driver_version[];
 extern char ixgbe_default_device_descr[];
 #endif /* IXGBE_FCOE */
 
+int ixgbe_open(struct net_device *netdev);
+int ixgbe_close(struct net_device *netdev);
 void ixgbe_up(struct ixgbe_adapter *adapter);
 void ixgbe_down(struct ixgbe_adapter *adapter);
 void ixgbe_reinit_locked(struct ixgbe_adapter *adapter);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index 726e0eeee63b..b3530e1e3ce1 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -2053,7 +2053,7 @@ static void ixgbe_diag_test(struct net_device *netdev,
 
                 if (if_running)
                         /* indicate we're in test mode */
-                        dev_close(netdev);
+                        ixgbe_close(netdev);
                 else
                         ixgbe_reset(adapter);
 
@@ -2091,7 +2091,7 @@ skip_loopback:
                 /* clear testing bit and return adapter to previous state */
                 clear_bit(__IXGBE_TESTING, &adapter->state);
                 if (if_running)
-                        dev_open(netdev);
+                        ixgbe_open(netdev);
                 else if (hw->mac.ops.disable_tx_laser)
                         hw->mac.ops.disable_tx_laser(hw);
         } else {
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 569cb0757c93..7df3fe29b210 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -4531,9 +4531,7 @@ static void ixgbe_clear_vxlan_port(struct ixgbe_adapter *adapter)
         case ixgbe_mac_X550:
         case ixgbe_mac_X550EM_x:
                 IXGBE_WRITE_REG(&adapter->hw, IXGBE_VXLANCTRL, 0);
-#ifdef CONFIG_IXGBE_VXLAN
                 adapter->vxlan_port = 0;
-#endif
                 break;
         default:
                 break;
@@ -5994,7 +5992,7 @@ static int ixgbe_change_mtu(struct net_device *netdev, int new_mtu)
  * handler is registered with the OS, the watchdog timer is started,
  * and the stack is notified that the interface is ready.
  **/
-static int ixgbe_open(struct net_device *netdev)
+int ixgbe_open(struct net_device *netdev)
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_hw *hw = &adapter->hw;
@@ -6096,7 +6094,7 @@ static void ixgbe_close_suspend(struct ixgbe_adapter *adapter)
  * needs to be disabled.  A global MAC reset is issued to stop the
  * hardware, and all transmit and receive resources are freed.
  **/
-static int ixgbe_close(struct net_device *netdev)
+int ixgbe_close(struct net_device *netdev)
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
@@ -7560,11 +7558,10 @@ static void ixgbe_atr(struct ixgbe_ring *ring,
                 struct ipv6hdr *ipv6;
         } hdr;
         struct tcphdr *th;
+        unsigned int hlen;
         struct sk_buff *skb;
-#ifdef CONFIG_IXGBE_VXLAN
-        u8 encap = false;
-#endif /* CONFIG_IXGBE_VXLAN */
         __be16 vlan_id;
+        int l4_proto;
 
         /* if ring doesn't have a interrupt vector, cannot perform ATR */
         if (!q_vector)
@@ -7576,62 +7573,50 @@ static void ixgbe_atr(struct ixgbe_ring *ring,
 
         ring->atr_count++;
 
+        /* currently only IPv4/IPv6 with TCP is supported */
+        if ((first->protocol != htons(ETH_P_IP)) &&
+            (first->protocol != htons(ETH_P_IPV6)))
+                return;
+
         /* snag network header to get L4 type and address */
         skb = first->skb;
         hdr.network = skb_network_header(skb);
-        if (!skb->encapsulation) {
-                th = tcp_hdr(skb);
-        } else {
 #ifdef CONFIG_IXGBE_VXLAN
+        if (skb->encapsulation &&
+            first->protocol == htons(ETH_P_IP) &&
+            hdr.ipv4->protocol != IPPROTO_UDP) {
                 struct ixgbe_adapter *adapter = q_vector->adapter;
 
-                if (!adapter->vxlan_port)
-                        return;
-                if (first->protocol != htons(ETH_P_IP) ||
-                    hdr.ipv4->version != IPVERSION ||
-                    hdr.ipv4->protocol != IPPROTO_UDP) {
-                        return;
-                }
-                if (ntohs(udp_hdr(skb)->dest) != adapter->vxlan_port)
-                        return;
-                encap = true;
-                hdr.network = skb_inner_network_header(skb);
-                th = inner_tcp_hdr(skb);
-#else
-                return;
-#endif /* CONFIG_IXGBE_VXLAN */
+                /* verify the port is recognized as VXLAN */
+                if (adapter->vxlan_port &&
+                    udp_hdr(skb)->dest == adapter->vxlan_port)
+                        hdr.network = skb_inner_network_header(skb);
         }
+#endif /* CONFIG_IXGBE_VXLAN */
 
         /* Currently only IPv4/IPv6 with TCP is supported */
         switch (hdr.ipv4->version) {
         case IPVERSION:
-                if (hdr.ipv4->protocol != IPPROTO_TCP)
-                        return;
+                /* access ihl as u8 to avoid unaligned access on ia64 */
+                hlen = (hdr.network[0] & 0x0F) << 2;
+                l4_proto = hdr.ipv4->protocol;
                 break;
         case 6:
-                if (likely((unsigned char *)th - hdr.network ==
-                           sizeof(struct ipv6hdr))) {
-                        if (hdr.ipv6->nexthdr != IPPROTO_TCP)
-                                return;
-                } else {
-                        __be16 frag_off;
-                        u8 l4_hdr;
-
-                        ipv6_skip_exthdr(skb, hdr.network - skb->data +
-                                              sizeof(struct ipv6hdr),
-                                         &l4_hdr, &frag_off);
-                        if (unlikely(frag_off))
-                                return;
-                        if (l4_hdr != IPPROTO_TCP)
-                                return;
-                }
+                hlen = hdr.network - skb->data;
+                l4_proto = ipv6_find_hdr(skb, &hlen, IPPROTO_TCP, NULL, NULL);
+                hlen -= hdr.network - skb->data;
                 break;
         default:
                 return;
         }
 
-        /* skip this packet since it is invalid or the socket is closing */
-        if (!th || th->fin)
+        if (l4_proto != IPPROTO_TCP)
+                return;
+
+        th = (struct tcphdr *)(hdr.network + hlen);
+
+        /* skip this packet since the socket is closing */
+        if (th->fin)
                 return;
 
         /* sample on all syn packets or once every atr sample count */
@@ -7682,10 +7667,8 @@ static void ixgbe_atr(struct ixgbe_ring *ring,
                 break;
         }
 
-#ifdef CONFIG_IXGBE_VXLAN
-        if (encap)
+        if (hdr.network != skb_network_header(skb))
                 input.formatted.flow_type |= IXGBE_ATR_L4TYPE_TUNNEL_MASK;
-#endif /* CONFIG_IXGBE_VXLAN */
 
         /* This assumes the Rx queue and Tx queue are bound to the same CPU */
         ixgbe_fdir_add_signature_filter_82599(&q_vector->adapter->hw,
@@ -8209,10 +8192,17 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc)
 static int ixgbe_delete_clsu32(struct ixgbe_adapter *adapter,
                                struct tc_cls_u32_offload *cls)
 {
+        u32 uhtid = TC_U32_USERHTID(cls->knode.handle);
+        u32 loc;
         int err;
 
+        if ((uhtid != 0x800) && (uhtid >= IXGBE_MAX_LINK_HANDLE))
+                return -EINVAL;
+
+        loc = cls->knode.handle & 0xfffff;
+
         spin_lock(&adapter->fdir_perfect_lock);
-        err = ixgbe_update_ethtool_fdir_entry(adapter, NULL, cls->knode.handle);
+        err = ixgbe_update_ethtool_fdir_entry(adapter, NULL, loc);
         spin_unlock(&adapter->fdir_perfect_lock);
         return err;
 }
@@ -8221,20 +8211,30 @@ static int ixgbe_configure_clsu32_add_hnode(struct ixgbe_adapter *adapter,
                                             __be16 protocol,
                                             struct tc_cls_u32_offload *cls)
 {
+        u32 uhtid = TC_U32_USERHTID(cls->hnode.handle);
+
+        if (uhtid >= IXGBE_MAX_LINK_HANDLE)
+                return -EINVAL;
+
         /* This ixgbe devices do not support hash tables at the moment
          * so abort when given hash tables.
          */
         if (cls->hnode.divisor > 0)
                 return -EINVAL;
 
-        set_bit(TC_U32_USERHTID(cls->hnode.handle), &adapter->tables);
+        set_bit(uhtid - 1, &adapter->tables);
         return 0;
 }
 
 static int ixgbe_configure_clsu32_del_hnode(struct ixgbe_adapter *adapter,
                                             struct tc_cls_u32_offload *cls)
 {
-        clear_bit(TC_U32_USERHTID(cls->hnode.handle), &adapter->tables);
+        u32 uhtid = TC_U32_USERHTID(cls->hnode.handle);
+
+        if (uhtid >= IXGBE_MAX_LINK_HANDLE)
+                return -EINVAL;
+
+        clear_bit(uhtid - 1, &adapter->tables);
         return 0;
 }
 
@@ -8252,27 +8252,29 @@ static int ixgbe_configure_clsu32(struct ixgbe_adapter *adapter,
 #endif
         int i, err = 0;
         u8 queue;
-        u32 handle;
+        u32 uhtid, link_uhtid;
 
         memset(&mask, 0, sizeof(union ixgbe_atr_input));
-        handle = cls->knode.handle;
+        uhtid = TC_U32_USERHTID(cls->knode.handle);
+        link_uhtid = TC_U32_USERHTID(cls->knode.link_handle);
 
-        /* At the moment cls_u32 jumps to transport layer and skips past
+        /* At the moment cls_u32 jumps to network layer and skips past
          * L2 headers. The canonical method to match L2 frames is to use
          * negative values. However this is error prone at best but really
          * just broken because there is no way to "know" what sort of hdr
-         * is in front of the transport layer. Fix cls_u32 to support L2
+         * is in front of the network layer. Fix cls_u32 to support L2
          * headers when needed.
          */
         if (protocol != htons(ETH_P_IP))
                 return -EINVAL;
 
-        if (cls->knode.link_handle ||
-            cls->knode.link_handle >= IXGBE_MAX_LINK_HANDLE) {
+        if (link_uhtid) {
                 struct ixgbe_nexthdr *nexthdr = ixgbe_ipv4_jumps;
-                u32 uhtid = TC_U32_USERHTID(cls->knode.link_handle);
 
-                if (!test_bit(uhtid, &adapter->tables))
+                if (link_uhtid >= IXGBE_MAX_LINK_HANDLE)
+                        return -EINVAL;
+
+                if (!test_bit(link_uhtid - 1, &adapter->tables))
                         return -EINVAL;
 
                 for (i = 0; nexthdr[i].jump; i++) {
@@ -8288,10 +8290,7 @@ static int ixgbe_configure_clsu32(struct ixgbe_adapter *adapter,
                             nexthdr->mask != cls->knode.sel->keys[0].mask)
                                 return -EINVAL;
 
-                        if (uhtid >= IXGBE_MAX_LINK_HANDLE)
-                                return -EINVAL;
-
-                        adapter->jump_tables[uhtid] = nexthdr->jump;
+                        adapter->jump_tables[link_uhtid] = nexthdr->jump;
                 }
                 return 0;
         }
@@ -8308,13 +8307,13 @@ static int ixgbe_configure_clsu32(struct ixgbe_adapter *adapter,
          * To add support for new nodes update ixgbe_model.h parse structures
          * this function _should_ be generic try not to hardcode values here.
          */
-        if (TC_U32_USERHTID(handle) == 0x800) {
+        if (uhtid == 0x800) {
                 field_ptr = adapter->jump_tables[0];
         } else {
-                if (TC_U32_USERHTID(handle) >= ARRAY_SIZE(adapter->jump_tables))
+                if (uhtid >= IXGBE_MAX_LINK_HANDLE)
                         return -EINVAL;
 
-                field_ptr = adapter->jump_tables[TC_U32_USERHTID(handle)];
+                field_ptr = adapter->jump_tables[uhtid];
         }
 
         if (!field_ptr)
@@ -8332,8 +8331,7 @@ static int ixgbe_configure_clsu32(struct ixgbe_adapter *adapter,
                 int j;
 
                 for (j = 0; field_ptr[j].val; j++) {
-                        if (field_ptr[j].off == off &&
-                            field_ptr[j].mask == m) {
+                        if (field_ptr[j].off == off) {
                                 field_ptr[j].val(input, &mask, val, m);
                                 input->filter.formatted.flow_type |=
                                         field_ptr[j].type;
@@ -8393,8 +8391,8 @@ err_out:
         return -EINVAL;
 }
 
-int __ixgbe_setup_tc(struct net_device *dev, u32 handle, __be16 proto,
-                     struct tc_to_netdev *tc)
+static int __ixgbe_setup_tc(struct net_device *dev, u32 handle, __be16 proto,
+                            struct tc_to_netdev *tc)
 {
         struct ixgbe_adapter *adapter = netdev_priv(dev);
 
@@ -8554,7 +8552,6 @@ static void ixgbe_add_vxlan_port(struct net_device *dev, sa_family_t sa_family,
 {
         struct ixgbe_adapter *adapter = netdev_priv(dev);
         struct ixgbe_hw *hw = &adapter->hw;
-        u16 new_port = ntohs(port);
 
         if (!(adapter->flags & IXGBE_FLAG_VXLAN_OFFLOAD_CAPABLE))
                 return;
@@ -8562,18 +8559,18 @@ static void ixgbe_add_vxlan_port(struct net_device *dev, sa_family_t sa_family,
         if (sa_family == AF_INET6)
                 return;
 
-        if (adapter->vxlan_port == new_port)
+        if (adapter->vxlan_port == port)
                 return;
 
         if (adapter->vxlan_port) {
                 netdev_info(dev,
                             "Hit Max num of VXLAN ports, not adding port %d\n",
-                            new_port);
+                            ntohs(port));
                 return;
         }
 
-        adapter->vxlan_port = new_port;
-        IXGBE_WRITE_REG(hw, IXGBE_VXLANCTRL, new_port);
+        adapter->vxlan_port = port;
+        IXGBE_WRITE_REG(hw, IXGBE_VXLANCTRL, ntohs(port));
 }
 
 /**
@@ -8586,7 +8583,6 @@ static void ixgbe_del_vxlan_port(struct net_device *dev, sa_family_t sa_family,
                                  __be16 port)
 {
         struct ixgbe_adapter *adapter = netdev_priv(dev);
-        u16 new_port = ntohs(port);
 
         if (!(adapter->flags & IXGBE_FLAG_VXLAN_OFFLOAD_CAPABLE))
                 return;
@@ -8594,9 +8590,9 @@ static void ixgbe_del_vxlan_port(struct net_device *dev, sa_family_t sa_family,
         if (sa_family == AF_INET6)
                 return;
 
-        if (adapter->vxlan_port != new_port) {
+        if (adapter->vxlan_port != port) {
                 netdev_info(dev, "Port %d was not found, not deleting\n",
-                            new_port);
+                            ntohs(port));
                 return;
         }
 
@@ -9265,17 +9261,6 @@ skip_sriov:
         netdev->priv_flags |= IFF_UNICAST_FLT;
         netdev->priv_flags |= IFF_SUPP_NOFCS;
 
-#ifdef CONFIG_IXGBE_VXLAN
-        switch (adapter->hw.mac.type) {
-        case ixgbe_mac_X550:
-        case ixgbe_mac_X550EM_x:
-                netdev->hw_enc_features |= NETIF_F_RXCSUM;
-                break;
-        default:
-                break;
-        }
-#endif /* CONFIG_IXGBE_VXLAN */
-
 #ifdef CONFIG_IXGBE_DCB
         netdev->dcbnl_ops = &dcbnl_ops;
 #endif
@@ -9329,6 +9314,8 @@ skip_sriov:
                 goto err_sw_init;
         }
 
+        /* Set hw->mac.addr to permanent MAC address */
+        ether_addr_copy(hw->mac.addr, hw->mac.perm_addr);
         ixgbe_mac_set_default_filter(adapter);
 
         setup_timer(&adapter->service_timer, &ixgbe_service_timer,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_model.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_model.h
index ce48872d4782..74c53ad9d268 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_model.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_model.h
@@ -32,7 +32,6 @@
 
 struct ixgbe_mat_field {
         unsigned int off;
-        unsigned int mask;
         int (*val)(struct ixgbe_fdir_filter *input,
                    union ixgbe_atr_input *mask,
                    u32 val, u32 m);
@@ -58,35 +57,27 @@ static inline int ixgbe_mat_prgm_dip(struct ixgbe_fdir_filter *input,
 }
 
 static struct ixgbe_mat_field ixgbe_ipv4_fields[] = {
-        { .off = 12, .mask = -1, .val = ixgbe_mat_prgm_sip,
+        { .off = 12, .val = ixgbe_mat_prgm_sip,
           .type = IXGBE_ATR_FLOW_TYPE_IPV4},
-        { .off = 16, .mask = -1, .val = ixgbe_mat_prgm_dip,
+        { .off = 16, .val = ixgbe_mat_prgm_dip,
           .type = IXGBE_ATR_FLOW_TYPE_IPV4},
         { .val = NULL } /* terminal node */
 };
 
-static inline int ixgbe_mat_prgm_sport(struct ixgbe_fdir_filter *input,
+static inline int ixgbe_mat_prgm_ports(struct ixgbe_fdir_filter *input,
                                        union ixgbe_atr_input *mask,
                                        u32 val, u32 m)
 {
         input->filter.formatted.src_port = val & 0xffff;
         mask->formatted.src_port = m & 0xffff;
-        return 0;
-};
+        input->filter.formatted.dst_port = val >> 16;
+        mask->formatted.dst_port = m >> 16;
 
-static inline int ixgbe_mat_prgm_dport(struct ixgbe_fdir_filter *input,
-                                       union ixgbe_atr_input *mask,
-                                       u32 val, u32 m)
-{
-        input->filter.formatted.dst_port = val & 0xffff;
-        mask->formatted.dst_port = m & 0xffff;
         return 0;
 };
 
 static struct ixgbe_mat_field ixgbe_tcp_fields[] = {
-        {.off = 0, .mask = 0xffff, .val = ixgbe_mat_prgm_sport,
-         .type = IXGBE_ATR_FLOW_TYPE_TCPV4},
-        {.off = 2, .mask = 0xffff, .val = ixgbe_mat_prgm_dport,
+        {.off = 0, .val = ixgbe_mat_prgm_ports,
          .type = IXGBE_ATR_FLOW_TYPE_TCPV4},
         { .val = NULL } /* terminal node */
 };
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
index 87aca3f7c3de..68a9c646498e 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
@@ -355,7 +355,7 @@ static s32 ixgbe_iosf_wait(struct ixgbe_hw *hw, u32 *ctrl)
                 command = IXGBE_READ_REG(hw, IXGBE_SB_IOSF_INDIRECT_CTRL);
                 if (!(command & IXGBE_SB_IOSF_CTRL_BUSY))
                         break;
-                usleep_range(10, 20);
+                udelay(10);
         }
         if (ctrl)
                 *ctrl = command;
diff --git a/drivers/net/ethernet/intel/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c
index c48aef613b0a..d7aa4b203f40 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ethtool.c
@@ -680,7 +680,7 @@ static void ixgbevf_diag_test(struct net_device *netdev,
 
                 if (if_running)
                         /* indicate we're in test mode */
-                        dev_close(netdev);
+                        ixgbevf_close(netdev);
                 else
                         ixgbevf_reset(adapter);
 
@@ -692,7 +692,7 @@ static void ixgbevf_diag_test(struct net_device *netdev,
 
                 clear_bit(__IXGBEVF_TESTING, &adapter->state);
                 if (if_running)
-                        dev_open(netdev);
+                        ixgbevf_open(netdev);
         } else {
                 hw_dbg(&adapter->hw, "online testing starting\n");
                 /* Online tests */
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
index 68ec7daa04fd..991eeae81473 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
@@ -486,6 +486,8 @@ extern const struct ixgbe_mbx_operations ixgbevf_mbx_ops;
 extern const char ixgbevf_driver_name[];
 extern const char ixgbevf_driver_version[];
 
+int ixgbevf_open(struct net_device *netdev);
+int ixgbevf_close(struct net_device *netdev);
 void ixgbevf_up(struct ixgbevf_adapter *adapter);
 void ixgbevf_down(struct ixgbevf_adapter *adapter);
 void ixgbevf_reinit_locked(struct ixgbevf_adapter *adapter);
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 0ea14c0a2e74..b0edae94d73d 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -3122,7 +3122,7 @@ static void ixgbevf_free_all_rx_resources(struct ixgbevf_adapter *adapter)
  * handler is registered with the OS, the watchdog timer is started,
  * and the stack is notified that the interface is ready.
  **/
-static int ixgbevf_open(struct net_device *netdev)
+int ixgbevf_open(struct net_device *netdev)
 {
         struct ixgbevf_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_hw *hw = &adapter->hw;
@@ -3205,7 +3205,7 @@ err_setup_reset:
  * needs to be disabled.  A global MAC reset is issued to stop the
  * hardware, and all transmit and receive resources are freed.
  **/
-static int ixgbevf_close(struct net_device *netdev)
+int ixgbevf_close(struct net_device *netdev)
 {
         struct ixgbevf_adapter *adapter = netdev_priv(netdev);
 
@@ -3692,19 +3692,23 @@ static int ixgbevf_set_mac(struct net_device *netdev, void *p)
         struct ixgbevf_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_hw *hw = &adapter->hw;
         struct sockaddr *addr = p;
+        int err;
 
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EADDRNOTAVAIL;
 
-        ether_addr_copy(netdev->dev_addr, addr->sa_data);
-        ether_addr_copy(hw->mac.addr, addr->sa_data);
-
         spin_lock_bh(&adapter->mbx_lock);
 
-        hw->mac.ops.set_rar(hw, 0, hw->mac.addr, 0);
+        err = hw->mac.ops.set_rar(hw, 0, addr->sa_data, 0);
 
         spin_unlock_bh(&adapter->mbx_lock);
 
+        if (err)
+                return -EPERM;
+
+        ether_addr_copy(hw->mac.addr, addr->sa_data);
+        ether_addr_copy(netdev->dev_addr, addr->sa_data);
+
         return 0;
 }
 
diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c
index 61a98f4c5746..4d613a4f2a7f 100644
--- a/drivers/net/ethernet/intel/ixgbevf/vf.c
+++ b/drivers/net/ethernet/intel/ixgbevf/vf.c
@@ -408,8 +408,10 @@ static s32 ixgbevf_set_rar_vf(struct ixgbe_hw *hw, u32 index, u8 *addr,
 
         /* if nacked the address was rejected, use "perm_addr" */
         if (!ret_val &&
-            (msgbuf[0] == (IXGBE_VF_SET_MAC_ADDR | IXGBE_VT_MSGTYPE_NACK)))
+            (msgbuf[0] == (IXGBE_VF_SET_MAC_ADDR | IXGBE_VT_MSGTYPE_NACK))) {
                 ixgbevf_get_mac_addr_vf(hw, hw->mac.addr);
+                return IXGBE_ERR_MBX;
+        }
 
         return ret_val;
 }
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 577f7ca7deba..7fc490225da5 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -260,7 +260,6 @@
 
 #define MVNETA_VLAN_TAG_LEN             4
 
-#define MVNETA_CPU_D_CACHE_LINE_SIZE    32
 #define MVNETA_TX_CSUM_DEF_SIZE         1600
 #define MVNETA_TX_CSUM_MAX_SIZE         9800
 #define MVNETA_ACC_MODE_EXT1            1
@@ -300,7 +299,7 @@
 #define MVNETA_RX_PKT_SIZE(mtu) \
         ALIGN((mtu) + MVNETA_MH_SIZE + MVNETA_VLAN_TAG_LEN + \
               ETH_HLEN + ETH_FCS_LEN,                        \
-              MVNETA_CPU_D_CACHE_LINE_SIZE)
+              cache_line_size())
 
 #define IS_TSO_HEADER(txq, addr) \
         ((addr >= txq->tso_hdrs_phys) && \
@@ -2764,9 +2763,6 @@ static int mvneta_rxq_init(struct mvneta_port *pp,
         if (rxq->descs == NULL)
                 return -ENOMEM;
 
-        BUG_ON(rxq->descs !=
-               PTR_ALIGN(rxq->descs, MVNETA_CPU_D_CACHE_LINE_SIZE));
-
         rxq->last_desc = rxq->size - 1;
 
         /* Set Rx descriptors queue starting address */
@@ -2837,10 +2833,6 @@ static int mvneta_txq_init(struct mvneta_port *pp,
         if (txq->descs == NULL)
                 return -ENOMEM;
 
-        /* Make sure descriptor address is cache line size aligned  */
-        BUG_ON(txq->descs !=
-               PTR_ALIGN(txq->descs, MVNETA_CPU_D_CACHE_LINE_SIZE));
-
         txq->last_desc = txq->size - 1;
 
         /* Set maximum bandwidth for enabled TXQs */
@@ -3050,6 +3042,20 @@ static int mvneta_check_mtu_valid(struct net_device *dev, int mtu)
         return mtu;
 }
 
+static void mvneta_percpu_enable(void *arg)
+{
+        struct mvneta_port *pp = arg;
+
+        enable_percpu_irq(pp->dev->irq, IRQ_TYPE_NONE);
+}
+
+static void mvneta_percpu_disable(void *arg)
+{
+        struct mvneta_port *pp = arg;
+
+        disable_percpu_irq(pp->dev->irq);
+}
+
 /* Change the device mtu */
 static int mvneta_change_mtu(struct net_device *dev, int mtu)
 {
@@ -3074,6 +3080,7 @@ static int mvneta_change_mtu(struct net_device *dev, int mtu)
          * reallocation of the queues
          */
         mvneta_stop_dev(pp);
+        on_each_cpu(mvneta_percpu_disable, pp, true);
 
         mvneta_cleanup_txqs(pp);
         mvneta_cleanup_rxqs(pp);
@@ -3097,6 +3104,7 @@ static int mvneta_change_mtu(struct net_device *dev, int mtu)
                 return ret;
         }
 
+        on_each_cpu(mvneta_percpu_enable, pp, true);
         mvneta_start_dev(pp);
         mvneta_port_up(pp);
 
@@ -3250,20 +3258,6 @@ static void mvneta_mdio_remove(struct mvneta_port *pp)
         pp->phy_dev = NULL;
 }
 
-static void mvneta_percpu_enable(void *arg)
-{
-        struct mvneta_port *pp = arg;
-
-        enable_percpu_irq(pp->dev->irq, IRQ_TYPE_NONE);
-}
-
-static void mvneta_percpu_disable(void *arg)
-{
-        struct mvneta_port *pp = arg;
-
-        disable_percpu_irq(pp->dev->irq);
-}
-
 /* Electing a CPU must be done in an atomic way: it should be done
  * after or before the removal/insertion of a CPU and this function is
  * not reentrant.
diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c
index c797971aefab..868a957f24bb 100644
--- a/drivers/net/ethernet/marvell/mvpp2.c
+++ b/drivers/net/ethernet/marvell/mvpp2.c
@@ -321,7 +321,6 @@
 /* Lbtd 802.3 type */
 #define MVPP2_IP_LBDT_TYPE              0xfffa
 
-#define MVPP2_CPU_D_CACHE_LINE_SIZE     32
 #define MVPP2_TX_CSUM_MAX_SIZE          9800
 
 /* Timeout constants */
@@ -377,7 +376,7 @@
 
 #define MVPP2_RX_PKT_SIZE(mtu) \
         ALIGN((mtu) + MVPP2_MH_SIZE + MVPP2_VLAN_TAG_LEN + \
-              ETH_HLEN + ETH_FCS_LEN, MVPP2_CPU_D_CACHE_LINE_SIZE)
+              ETH_HLEN + ETH_FCS_LEN, cache_line_size())
 
 #define MVPP2_RX_BUF_SIZE(pkt_size)     ((pkt_size) + NET_SKB_PAD)
 #define MVPP2_RX_TOTAL_SIZE(buf_size)   ((buf_size) + MVPP2_SKB_SHINFO_SIZE)
@@ -4493,10 +4492,6 @@ static int mvpp2_aggr_txq_init(struct platform_device *pdev,
         if (!aggr_txq->descs)
                 return -ENOMEM;
 
-        /* Make sure descriptor address is cache line size aligned  */
-        BUG_ON(aggr_txq->descs !=
-               PTR_ALIGN(aggr_txq->descs, MVPP2_CPU_D_CACHE_LINE_SIZE));
-
         aggr_txq->last_desc = aggr_txq->size - 1;
 
         /* Aggr TXQ no reset WA */
@@ -4526,9 +4521,6 @@ static int mvpp2_rxq_init(struct mvpp2_port *port,
         if (!rxq->descs)
                 return -ENOMEM;
 
-        BUG_ON(rxq->descs !=
-               PTR_ALIGN(rxq->descs, MVPP2_CPU_D_CACHE_LINE_SIZE));
-
         rxq->last_desc = rxq->size - 1;
 
         /* Zero occupied and non-occupied counters - direct access */
@@ -4616,10 +4608,6 @@ static int mvpp2_txq_init(struct mvpp2_port *port,
         if (!txq->descs)
                 return -ENOMEM;
 
-        /* Make sure descriptor address is cache line size aligned  */
-        BUG_ON(txq->descs !=
-               PTR_ALIGN(txq->descs, MVPP2_CPU_D_CACHE_LINE_SIZE));
-
         txq->last_desc = txq->size - 1;
 
         /* Set Tx descriptors queue starting address - indirect access */
@@ -6059,8 +6047,10 @@ static int mvpp2_port_init(struct mvpp2_port *port)
 
                 /* Map physical Rx queue to port's logical Rx queue */
                 rxq = devm_kzalloc(dev, sizeof(*rxq), GFP_KERNEL);
-                if (!rxq)
+                if (!rxq) {
+                        err = -ENOMEM;
                         goto err_free_percpu;
+                }
                 /* Map this Rx queue to a physical queue */
                 rxq->id = port->first_rxq + queue;
                 rxq->port = port->id;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_int.c b/drivers/net/ethernet/qlogic/qed/qed_int.c
index ffd0accc2ec9..2017b0121f5f 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_int.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_int.c
@@ -2750,7 +2750,7 @@ void qed_int_igu_enable_int(struct qed_hwfn *p_hwfn,
 int qed_int_igu_enable(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt,
                        enum qed_int_mode int_mode)
 {
-        int rc;
+        int rc = 0;
 
         /* Configure AEU signal change to produce attentions */
         qed_wr(p_hwfn, p_ptt, IGU_REG_ATTENTION_ENABLE, 0);
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge.h b/drivers/net/ethernet/qlogic/qlge/qlge.h
index ef332708e5f2..6d31f92ef2b6 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge.h
+++ b/drivers/net/ethernet/qlogic/qlge/qlge.h
@@ -18,7 +18,7 @@
  */
 #define DRV_NAME        "qlge"
 #define DRV_STRING      "QLogic 10 Gigabit PCI-E Ethernet Driver "
-#define DRV_VERSION     "1.00.00.34"
+#define DRV_VERSION     "1.00.00.35"
 
 #define WQ_ADDR_ALIGN   0x3     /* 4 byte alignment */
 
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 4e1a7dba7c4a..087e14a3fba7 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -1377,11 +1377,11 @@ static netdev_tx_t ravb_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 
                 /* TAG and timestamp required flag */
                 skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
-                skb_tx_timestamp(skb);
                 desc->tagh_tsr = (ts_skb->tag >> 4) | TX_TSR;
                 desc->ds_tagl |= le16_to_cpu(ts_skb->tag << 12);
         }
 
+        skb_tx_timestamp(skb);
         /* Descriptor type must be set after all the above writes */
         dma_wmb();
         desc->die_dt = DT_FEND;
diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
index b02eed12bfc5..73427e29df2a 100644
--- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
+++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
@@ -155,11 +155,11 @@ static int sxgbe_platform_probe(struct platform_device *pdev)
         return 0;
 
 err_rx_irq_unmap:
-        while (--i)
+        while (i--)
                 irq_dispose_mapping(priv->rxq[i]->irq_no);
         i = SXGBE_TX_QUEUES;
 err_tx_irq_unmap:
-        while (--i)
+        while (i--)
                 irq_dispose_mapping(priv->txq[i]->irq_no);
         irq_dispose_mapping(priv->irq);
 err_drv_remove:
diff --git a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
index e13228f115f0..011386f6f24d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
@@ -199,11 +199,6 @@ static void ndesc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
 {
         unsigned int tdes1 = p->des1;
 
-        if (mode == STMMAC_CHAIN_MODE)
-                norm_set_tx_desc_len_on_chain(p, len);
-        else
-                norm_set_tx_desc_len_on_ring(p, len);
-
         if (is_fs)
                 tdes1 |= TDES1_FIRST_SEGMENT;
         else
@@ -217,10 +212,15 @@ static void ndesc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
         if (ls)
                 tdes1 |= TDES1_LAST_SEGMENT;
 
-        if (tx_own)
-                tdes1 |= TDES0_OWN;
-
         p->des1 = tdes1;
+
+        if (mode == STMMAC_CHAIN_MODE)
+                norm_set_tx_desc_len_on_chain(p, len);
+        else
+                norm_set_tx_desc_len_on_ring(p, len);
+
+        if (tx_own)
+                p->des0 |= TDES0_OWN;
 }
 
 static void ndesc_set_tx_ic(struct dma_desc *p)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 4c5ce9848ca9..fcbd4be562e2 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -278,7 +278,6 @@ static void stmmac_eee_ctrl_timer(unsigned long arg)
  */
 bool stmmac_eee_init(struct stmmac_priv *priv)
 {
-        char *phy_bus_name = priv->plat->phy_bus_name;
         unsigned long flags;
         bool ret = false;
 
@@ -289,10 +288,6 @@ bool stmmac_eee_init(struct stmmac_priv *priv)
             (priv->pcs == STMMAC_PCS_RTBI))
                 goto out;
 
-        /* Never init EEE in case of a switch is attached */
-        if (phy_bus_name && (!strcmp(phy_bus_name, "fixed")))
-                goto out;
-
         /* MAC core supports the EEE feature. */
         if (priv->dma_cap.eee) {
                 int tx_lpi_timer = priv->tx_lpi_timer;
@@ -772,10 +767,16 @@ static void stmmac_adjust_link(struct net_device *dev)
 
         spin_unlock_irqrestore(&priv->lock, flags);
 
-        /* At this stage, it could be needed to setup the EEE or adjust some
-         * MAC related HW registers.
-         */
-        priv->eee_enabled = stmmac_eee_init(priv);
+        if (phydev->is_pseudo_fixed_link)
+                /* Stop PHY layer to call the hook to adjust the link in case
+                 * of a switch is attached to the stmmac driver.
+                 */
+                phydev->irq = PHY_IGNORE_INTERRUPT;
+        else
+                /* At this stage, init the EEE if supported.
+                 * Never called in case of fixed_link.
+                 */
+                priv->eee_enabled = stmmac_eee_init(priv);
 }
 
 /**
@@ -827,12 +828,8 @@ static int stmmac_init_phy(struct net_device *dev)
                 phydev = of_phy_connect(dev, priv->plat->phy_node,
                                         &stmmac_adjust_link, 0, interface);
         } else {
-                if (priv->plat->phy_bus_name)
-                        snprintf(bus_id, MII_BUS_ID_SIZE, "%s-%x",
-                                 priv->plat->phy_bus_name, priv->plat->bus_id);
-                else
-                        snprintf(bus_id, MII_BUS_ID_SIZE, "stmmac-%x",
-                                 priv->plat->bus_id);
+                snprintf(bus_id, MII_BUS_ID_SIZE, "stmmac-%x",
+                         priv->plat->bus_id);
 
                 snprintf(phy_id_fmt, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id,
                          priv->plat->phy_addr);
@@ -870,11 +867,6 @@ static int stmmac_init_phy(struct net_device *dev)
                 return -ENODEV;
         }
 
-        /* If attached to a switch, there is no reason to poll phy handler */
-        if (priv->plat->phy_bus_name)
-                if (!strcmp(priv->plat->phy_bus_name, "fixed"))
-                        phydev->irq = PHY_IGNORE_INTERRUPT;
-
         pr_debug("stmmac_init_phy:  %s: attached to PHY (UID 0x%x)"
                  " Link = %d\n", dev->name, phydev->phy_id, phydev->link);
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index ea76129dafc2..06704ca6f9ca 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -198,20 +198,12 @@ int stmmac_mdio_register(struct net_device *ndev)
         struct mii_bus *new_bus;
         struct stmmac_priv *priv = netdev_priv(ndev);
         struct stmmac_mdio_bus_data *mdio_bus_data = priv->plat->mdio_bus_data;
-        int addr, found;
         struct device_node *mdio_node = priv->plat->mdio_node;
+        int addr, found;
 
         if (!mdio_bus_data)
                 return 0;
 
-        if (IS_ENABLED(CONFIG_OF)) {
-                if (mdio_node) {
-                        netdev_dbg(ndev, "FOUND MDIO subnode\n");
-                } else {
-                        netdev_warn(ndev, "No MDIO subnode found\n");
-                }
-        }
-
         new_bus = mdiobus_alloc();
         if (new_bus == NULL)
                 return -ENOMEM;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index dcbd2a1601e8..cf37ea558ecc 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -132,6 +132,69 @@ static struct stmmac_axi *stmmac_axi_setup(struct platform_device *pdev)
 }
 
 /**
+ * stmmac_dt_phy - parse device-tree driver parameters to allocate PHY resources
+ * @plat: driver data platform structure
+ * @np: device tree node
+ * @dev: device pointer
+ * Description:
+ * The mdio bus will be allocated in case of a phy transceiver is on board;
+ * it will be NULL if the fixed-link is configured.
+ * If there is the "snps,dwmac-mdio" sub-node the mdio will be allocated
+ * in any case (for DSA, mdio must be registered even if fixed-link).
+ * The table below sums the supported configurations:
+ *      -------------------------------
+ *      snps,phy-addr   |     Y
+ *      -------------------------------
+ *      phy-handle      |     Y
+ *      -------------------------------
+ *      fixed-link      |     N
+ *      -------------------------------
+ *      snps,dwmac-mdio |
+ *        even if       |     Y
+ *      fixed-link      |
+ *      -------------------------------
+ *
+ * It returns 0 in case of success otherwise -ENODEV.
+ */
+static int stmmac_dt_phy(struct plat_stmmacenet_data *plat,
+                         struct device_node *np, struct device *dev)
+{
+        bool mdio = true;
+
+        /* If phy-handle property is passed from DT, use it as the PHY */
+        plat->phy_node = of_parse_phandle(np, "phy-handle", 0);
+        if (plat->phy_node)
+                dev_dbg(dev, "Found phy-handle subnode\n");
+
+        /* If phy-handle is not specified, check if we have a fixed-phy */
+        if (!plat->phy_node && of_phy_is_fixed_link(np)) {
+                if ((of_phy_register_fixed_link(np) < 0))
+                        return -ENODEV;
+
+                dev_dbg(dev, "Found fixed-link subnode\n");
+                plat->phy_node = of_node_get(np);
+                mdio = false;
+        }
+
+        /* If snps,dwmac-mdio is passed from DT, always register the MDIO */
+        for_each_child_of_node(np, plat->mdio_node) {
+                if (of_device_is_compatible(plat->mdio_node, "snps,dwmac-mdio"))
+                        break;
+        }
+
+        if (plat->mdio_node) {
+                dev_dbg(dev, "Found MDIO subnode\n");
+                mdio = true;
+        }
+
+        if (mdio)
+                plat->mdio_bus_data =
+                        devm_kzalloc(dev, sizeof(struct stmmac_mdio_bus_data),
+                                     GFP_KERNEL);
+        return 0;
+}
+
+/**
  * stmmac_probe_config_dt - parse device-tree driver parameters
  * @pdev: platform_device structure
  * @plat: driver data platform structure
@@ -146,7 +209,6 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
         struct device_node *np = pdev->dev.of_node;
         struct plat_stmmacenet_data *plat;
         struct stmmac_dma_cfg *dma_cfg;
-        struct device_node *child_node = NULL;
 
         plat = devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL);
         if (!plat)
@@ -166,36 +228,15 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
         /* Default to phy auto-detection */
         plat->phy_addr = -1;
 
-        /* If we find a phy-handle property, use it as the PHY */
-        plat->phy_node = of_parse_phandle(np, "phy-handle", 0);
-
-        /* If phy-handle is not specified, check if we have a fixed-phy */
-        if (!plat->phy_node && of_phy_is_fixed_link(np)) {
-                if ((of_phy_register_fixed_link(np) < 0))
-                        return ERR_PTR(-ENODEV);
-
-                plat->phy_node = of_node_get(np);
-        }
-
-        for_each_child_of_node(np, child_node)
-                if (of_device_is_compatible(child_node, "snps,dwmac-mdio")) {
-                        plat->mdio_node = child_node;
-                        break;
-                }
-
         /* "snps,phy-addr" is not a standard property. Mark it as deprecated
          * and warn of its use. Remove this when phy node support is added.
          */
         if (of_property_read_u32(np, "snps,phy-addr", &plat->phy_addr) == 0)
                 dev_warn(&pdev->dev, "snps,phy-addr property is deprecated\n");
 
-        if ((plat->phy_node && !of_phy_is_fixed_link(np)) || !plat->mdio_node)
-                plat->mdio_bus_data = NULL;
-        else
-                plat->mdio_bus_data =
-                        devm_kzalloc(&pdev->dev,
-                                     sizeof(struct stmmac_mdio_bus_data),
-                                     GFP_KERNEL);
+        /* To Configure PHY by using all device-tree supported properties */
+        if (stmmac_dt_phy(plat, np, &pdev->dev))
+                return ERR_PTR(-ENODEV);
 
         of_property_read_u32(np, "tx-fifo-depth", &plat->tx_fifo_size);
 
diff --git a/drivers/net/phy/bcm7xxx.c b/drivers/net/phy/bcm7xxx.c
index b881a7b1e4f6..9636da0b6efc 100644
--- a/drivers/net/phy/bcm7xxx.c
+++ b/drivers/net/phy/bcm7xxx.c
@@ -339,6 +339,8 @@ static struct phy_driver bcm7xxx_driver[] = {
         BCM7XXX_28NM_GPHY(PHY_ID_BCM7439, "Broadcom BCM7439"),
         BCM7XXX_28NM_GPHY(PHY_ID_BCM7439_2, "Broadcom BCM7439 (2)"),
         BCM7XXX_28NM_GPHY(PHY_ID_BCM7445, "Broadcom BCM7445"),
+        BCM7XXX_40NM_EPHY(PHY_ID_BCM7346, "Broadcom BCM7346"),
+        BCM7XXX_40NM_EPHY(PHY_ID_BCM7362, "Broadcom BCM7362"),
         BCM7XXX_40NM_EPHY(PHY_ID_BCM7425, "Broadcom BCM7425"),
         BCM7XXX_40NM_EPHY(PHY_ID_BCM7429, "Broadcom BCM7429"),
         BCM7XXX_40NM_EPHY(PHY_ID_BCM7435, "Broadcom BCM7435"),
@@ -348,6 +350,8 @@ static struct mdio_device_id __maybe_unused bcm7xxx_tbl[] = {
         { PHY_ID_BCM7250, 0xfffffff0, },
         { PHY_ID_BCM7364, 0xfffffff0, },
         { PHY_ID_BCM7366, 0xfffffff0, },
+        { PHY_ID_BCM7346, 0xfffffff0, },
+        { PHY_ID_BCM7362, 0xfffffff0, },
         { PHY_ID_BCM7425, 0xfffffff0, },
         { PHY_ID_BCM7429, 0xfffffff0, },
         { PHY_ID_BCM7439, 0xfffffff0, },
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 26c64d2782fa..a0f64cba86ba 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -1198,6 +1198,9 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
                 goto err_dev_open;
         }
 
+        dev_uc_sync_multiple(port_dev, dev);
+        dev_mc_sync_multiple(port_dev, dev);
+
         err = vlan_vids_add_by_dev(port_dev, dev);
         if (err) {
                 netdev_err(dev, "Failed to add vlan ids to device %s\n",
@@ -1261,6 +1264,8 @@ err_enable_netpoll:
         vlan_vids_del_by_dev(port_dev, dev);
 
 err_vids_add:
+        dev_uc_unsync(port_dev, dev);
+        dev_mc_unsync(port_dev, dev);
         dev_close(port_dev);
 
 err_dev_open:
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index afdf950617c3..2c9e45f50edb 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -622,7 +622,8 @@ static int tun_attach(struct tun_struct *tun, struct file *file, bool skip_filte
 
         /* Re-attach the filter to persist device */
         if (!skip_filter && (tun->filter_attached == true)) {
-                err = sk_attach_filter(&tun->fprog, tfile->socket.sk);
+                err = __sk_attach_filter(&tun->fprog, tfile->socket.sk,
+                                         lockdep_rtnl_is_held());
                 if (!err)
                         goto out;
         }
@@ -1014,7 +1015,6 @@ static void tun_net_init(struct net_device *dev)
                 /* Zero header length */
                 dev->type = ARPHRD_NONE;
                 dev->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;
-                dev->tx_queue_len = TUN_READQ_SIZE;  /* We prefer our own queue length */
                 break;
 
         case IFF_TAP:
@@ -1026,7 +1026,6 @@ static void tun_net_init(struct net_device *dev)
 
                 eth_hw_addr_random(dev);
 
-                dev->tx_queue_len = TUN_READQ_SIZE;  /* We prefer our own queue length */
                 break;
         }
 }
@@ -1480,6 +1479,8 @@ static void tun_setup(struct net_device *dev)
 
         dev->ethtool_ops = &tun_ethtool_ops;
         dev->destructor = tun_free_netdev;
+        /* We prefer our own queue length */
+        dev->tx_queue_len = TUN_READQ_SIZE;
 }
 
 /* Trivial set of netlink ops to allow deleting tun or tap
@@ -1822,7 +1823,7 @@ static void tun_detach_filter(struct tun_struct *tun, int n)
 
         for (i = 0; i < n; i++) {
                 tfile = rtnl_dereference(tun->tfiles[i]);
-                sk_detach_filter(tfile->socket.sk);
+                __sk_detach_filter(tfile->socket.sk, lockdep_rtnl_is_held());
         }
 
         tun->filter_attached = false;
@@ -1835,7 +1836,8 @@ static int tun_attach_filter(struct tun_struct *tun)
 
         for (i = 0; i < tun->numqueues; i++) {
                 tfile = rtnl_dereference(tun->tfiles[i]);
-                ret = sk_attach_filter(&tun->fprog, tfile->socket.sk);
+                ret = __sk_attach_filter(&tun->fprog, tfile->socket.sk,
+                                         lockdep_rtnl_is_held());
                 if (ret) {
                         tun_detach_filter(tun, i);
                         return ret;
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 86ba30ba35e8..2fb31edab125 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -1626,6 +1626,13 @@ static const struct usb_device_id cdc_devs[] = {
           .driver_info = (unsigned long) &wwan_info,
         },
 
+        /* Telit LE910 V2 */
+        { USB_DEVICE_AND_INTERFACE_INFO(0x1bc7, 0x0036,
+                USB_CLASS_COMM,
+                USB_CDC_SUBCLASS_NCM, USB_CDC_PROTO_NONE),
+          .driver_info = (unsigned long)&wwan_noarp_info,
+        },
+
         /* DW5812 LTE Verizon Mobile Broadband Card
          * Unlike DW5550 this device requires FLAG_NOARP
          */
diff --git a/drivers/net/usb/plusb.c b/drivers/net/usb/plusb.c
index 1bfe0fcaccf5..22e1a9a99a7d 100644
--- a/drivers/net/usb/plusb.c
+++ b/drivers/net/usb/plusb.c
@@ -38,7 +38,7 @@
  * HEADS UP:  this handshaking isn't all that robust.  This driver
  * gets confused easily if you unplug one end of the cable then
  * try to connect it again; you'll need to restart both ends. The
- * "naplink" software (used by some PlayStation/2 deveopers) does
+ * "naplink" software (used by some PlayStation/2 developers) does
  * the handshaking much better!   Also, sometimes this hardware
  * seems to get wedged under load.  Prolific docs are weak, and
  * don't identify differences between PL2301 and PL2302, much less
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 7d717c66bcb0..9d1fce8a6e84 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -844,6 +844,7 @@ static const struct usb_device_id products[] = {
         {QMI_FIXED_INTF(0x19d2, 0x1426, 2)},    /* ZTE MF91 */
         {QMI_FIXED_INTF(0x19d2, 0x1428, 2)},    /* Telewell TW-LTE 4G v2 */
         {QMI_FIXED_INTF(0x19d2, 0x2002, 4)},    /* ZTE (Vodafone) K3765-Z */
+        {QMI_FIXED_INTF(0x2001, 0x7e19, 4)},    /* D-Link DWM-221 B1 */
         {QMI_FIXED_INTF(0x0f3d, 0x68a2, 8)},    /* Sierra Wireless MC7700 */
         {QMI_FIXED_INTF(0x114f, 0x68a2, 8)},    /* Sierra Wireless MC7750 */
         {QMI_FIXED_INTF(0x1199, 0x68a2, 8)},    /* Sierra Wireless MC7710 in QMI mode */
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/bus.c b/drivers/nvdimm/bus.c
index fc82743aefb6..19f822d7f652 100644
--- a/drivers/nvdimm/bus.c
+++ b/drivers/nvdimm/bus.c
@@ -407,7 +407,7 @@ static const struct nd_cmd_desc __nd_cmd_dimm_descs[] = {
         [ND_CMD_IMPLEMENTED] = { },
         [ND_CMD_SMART] = {
                 .out_num = 2,
-                .out_sizes = { 4, 8, },
+                .out_sizes = { 4, 128, },
         },
         [ND_CMD_SMART_THRESHOLD] = {
                 .out_num = 2,
diff --git a/drivers/nvdimm/core.c b/drivers/nvdimm/core.c
index 79646d0c3277..182a93fe3712 100644
--- a/drivers/nvdimm/core.c
+++ b/drivers/nvdimm/core.c
@@ -417,8 +417,8 @@ static void __add_badblock_range(struct badblocks *bb, u64 ns_offset, u64 len)
                 set_badblock(bb, start_sector, num_sectors);
 }
 
-static void namespace_add_poison(struct list_head *poison_list,
-                struct badblocks *bb, struct resource *res)
+static void badblocks_populate(struct list_head *poison_list,
+                struct badblocks *bb, const struct resource *res)
 {
         struct nd_poison *pl;
 
@@ -460,36 +460,35 @@ static void namespace_add_poison(struct list_head *poison_list,
 }
 
 /**
- * nvdimm_namespace_add_poison() - Convert a list of poison ranges to badblocks
- * @ndns:       the namespace containing poison ranges
- * @bb:         badblocks instance to populate
- * @offset:     offset at the start of the namespace before 'sector 0'
+ * nvdimm_badblocks_populate() - Convert a list of poison ranges to badblocks
+ * @region: parent region of the range to interrogate
+ * @bb: badblocks instance to populate
+ * @res: resource range to consider
  *
- * The poison list generated during NFIT initialization may contain multiple,
- * possibly overlapping ranges in the SPA (System Physical Address) space.
- * Compare each of these ranges to the namespace currently being initialized,
- * and add badblocks to the gendisk for all matching sub-ranges
+ * The poison list generated during bus initialization may contain
+ * multiple, possibly overlapping physical address ranges.  Compare each
+ * of these ranges to the resource range currently being initialized,
+ * and add badblocks entries for all matching sub-ranges
  */
-void nvdimm_namespace_add_poison(struct nd_namespace_common *ndns,
-                struct badblocks *bb, resource_size_t offset)
+void nvdimm_badblocks_populate(struct nd_region *nd_region,
+                struct badblocks *bb, const struct resource *res)
 {
-        struct nd_namespace_io *nsio = to_nd_namespace_io(&ndns->dev);
-        struct nd_region *nd_region = to_nd_region(ndns->dev.parent);
         struct nvdimm_bus *nvdimm_bus;
         struct list_head *poison_list;
-        struct resource res = {
-                .start = nsio->res.start + offset,
-                .end = nsio->res.end,
-        };
 
-        nvdimm_bus = to_nvdimm_bus(nd_region->dev.parent);
+        if (!is_nd_pmem(&nd_region->dev)) {
+                dev_WARN_ONCE(&nd_region->dev, 1,
+                                "%s only valid for pmem regions\n", __func__);
+                return;
+        }
+        nvdimm_bus = walk_to_nvdimm_bus(&nd_region->dev);
         poison_list = &nvdimm_bus->poison_list;
 
         nvdimm_bus_lock(&nvdimm_bus->dev);
-        namespace_add_poison(poison_list, bb, &res);
+        badblocks_populate(poison_list, bb, res);
         nvdimm_bus_unlock(&nvdimm_bus->dev);
 }
-EXPORT_SYMBOL_GPL(nvdimm_namespace_add_poison);
+EXPORT_SYMBOL_GPL(nvdimm_badblocks_populate);
 
 static int add_poison(struct nvdimm_bus *nvdimm_bus, u64 addr, u64 length)
 {
diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h
index 1799bd97a9ce..875c524fafb0 100644
--- a/drivers/nvdimm/nd.h
+++ b/drivers/nvdimm/nd.h
@@ -266,8 +266,8 @@ int nvdimm_namespace_attach_btt(struct nd_namespace_common *ndns);
 int nvdimm_namespace_detach_btt(struct nd_namespace_common *ndns);
 const char *nvdimm_namespace_disk_name(struct nd_namespace_common *ndns,
                 char *name);
-void nvdimm_namespace_add_poison(struct nd_namespace_common *ndns,
-                struct badblocks *bb, resource_size_t offset);
+void nvdimm_badblocks_populate(struct nd_region *nd_region,
+                struct badblocks *bb, const struct resource *res);
 int nd_blk_region_init(struct nd_region *nd_region);
 void __nd_iostat_start(struct bio *bio, unsigned long *start);
 static inline bool nd_iostat_start(struct bio *bio, unsigned long *start)
diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c
index 254d3bc13f70..e071e214feba 100644
--- a/drivers/nvdimm/pfn_devs.c
+++ b/drivers/nvdimm/pfn_devs.c
@@ -376,7 +376,7 @@ int nd_pfn_validate(struct nd_pfn *nd_pfn)
         } else {
                 /* from init we validate */
                 if (memcmp(nd_pfn->uuid, pfn_sb->uuid, 16) != 0)
-                        return -EINVAL;
+                        return -ENODEV;
         }
 
         if (nd_pfn->align > nvdimm_namespace_capacity(ndns)) {
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index ca5721c306bb..8e09c544d892 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -99,7 +99,7 @@ static int pmem_do_bvec(struct pmem_device *pmem, struct page *page,
                 if (unlikely(bad_pmem))
                         rc = -EIO;
                 else {
-                        memcpy_from_pmem(mem + off, pmem_addr, len);
+                        rc = memcpy_from_pmem(mem + off, pmem_addr, len);
                         flush_dcache_page(page);
                 }
         } else {
@@ -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();
 
@@ -244,7 +244,9 @@ static void pmem_detach_disk(struct pmem_device *pmem)
 static int pmem_attach_disk(struct device *dev,
                 struct nd_namespace_common *ndns, struct pmem_device *pmem)
 {
+        struct nd_namespace_io *nsio = to_nd_namespace_io(&ndns->dev);
         int nid = dev_to_node(dev);
+        struct resource bb_res;
         struct gendisk *disk;
 
         blk_queue_make_request(pmem->pmem_queue, pmem_make_request);
@@ -271,8 +273,17 @@ static int pmem_attach_disk(struct device *dev,
         devm_exit_badblocks(dev, &pmem->bb);
         if (devm_init_badblocks(dev, &pmem->bb))
                 return -ENOMEM;
-        nvdimm_namespace_add_poison(ndns, &pmem->bb, pmem->data_offset);
-
+        bb_res.start = nsio->res.start + pmem->data_offset;
+        bb_res.end = nsio->res.end;
+        if (is_nd_pfn(dev)) {
+                struct nd_pfn *nd_pfn = to_nd_pfn(dev);
+                struct nd_pfn_sb *pfn_sb = nd_pfn->pfn_sb;
+
+                bb_res.start += __le32_to_cpu(pfn_sb->start_pad);
+                bb_res.end -= __le32_to_cpu(pfn_sb->end_trunc);
+        }
+        nvdimm_badblocks_populate(to_nd_region(dev->parent), &pmem->bb,
+                        &bb_res);
         disk->bb = &pmem->bb;
         add_disk(disk);
         revalidate_disk(disk);
@@ -295,7 +306,7 @@ static int pmem_rw_bytes(struct nd_namespace_common *ndns,
 
                 if (unlikely(is_bad_pmem(&pmem->bb, offset / 512, sz_align)))
                         return -EIO;
-                memcpy_from_pmem(buf, pmem->virt_addr + offset, size);
+                return memcpy_from_pmem(buf, pmem->virt_addr + offset, size);
         } else {
                 memcpy_to_pmem(pmem->virt_addr + offset, buf, size);
                 wmb_pmem();
@@ -553,7 +564,7 @@ static int nd_pmem_probe(struct device *dev)
         ndns->rw_bytes = pmem_rw_bytes;
         if (devm_init_badblocks(dev, &pmem->bb))
                 return -ENOMEM;
-        nvdimm_namespace_add_poison(ndns, &pmem->bb, 0);
+        nvdimm_badblocks_populate(nd_region, &pmem->bb, &nsio->res);
 
         if (is_nd_btt(dev)) {
                 /* btt allocates its own request_queue */
@@ -595,14 +606,25 @@ static void nd_pmem_notify(struct device *dev, enum nvdimm_event event)
 {
         struct pmem_device *pmem = dev_get_drvdata(dev);
         struct nd_namespace_common *ndns = pmem->ndns;
+        struct nd_region *nd_region = to_nd_region(dev->parent);
+        struct nd_namespace_io *nsio = to_nd_namespace_io(&ndns->dev);
+        struct resource res = {
+                .start = nsio->res.start + pmem->data_offset,
+                .end = nsio->res.end,
+        };
 
         if (event != NVDIMM_REVALIDATE_POISON)
                 return;
 
-        if (is_nd_btt(dev))
-                nvdimm_namespace_add_poison(ndns, &pmem->bb, 0);
-        else
-                nvdimm_namespace_add_poison(ndns, &pmem->bb, pmem->data_offset);
+        if (is_nd_pfn(dev)) {
+                struct nd_pfn *nd_pfn = to_nd_pfn(dev);
+                struct nd_pfn_sb *pfn_sb = nd_pfn->pfn_sb;
+
+                res.start += __le32_to_cpu(pfn_sb->start_pad);
+                res.end -= __le32_to_cpu(pfn_sb->end_trunc);
+        }
+
+        nvdimm_badblocks_populate(nd_region, &pmem->bb, &res);
 }
 
 MODULE_ALIAS("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/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c
index 4c2fa05b4589..944674ee3464 100644
--- a/drivers/pcmcia/db1xxx_ss.c
+++ b/drivers/pcmcia/db1xxx_ss.c
@@ -56,6 +56,7 @@ struct db1x_pcmcia_sock {
         int     stschg_irq;     /* card-status-change irq */
         int     card_irq;       /* card irq */
         int     eject_irq;      /* db1200/pb1200 have these */
+        int     insert_gpio;    /* db1000 carddetect gpio */
 
 #define BOARD_TYPE_DEFAULT      0       /* most boards */
 #define BOARD_TYPE_DB1200       1       /* IRQs aren't gpios */
@@ -83,7 +84,7 @@ static int db1200_card_inserted(struct db1x_pcmcia_sock *sock)
 /* carddetect gpio: low-active */
 static int db1000_card_inserted(struct db1x_pcmcia_sock *sock)
 {
-        return !gpio_get_value(irq_to_gpio(sock->insert_irq));
+        return !gpio_get_value(sock->insert_gpio);
 }
 
 static int db1x_card_inserted(struct db1x_pcmcia_sock *sock)
@@ -457,9 +458,15 @@ static int db1x_pcmcia_socket_probe(struct platform_device *pdev)
         r = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "card");
         sock->card_irq = r ? r->start : 0;
 
-        /* insert: irq which triggers on card insertion/ejection */
+        /* insert: irq which triggers on card insertion/ejection
+         * BIG FAT NOTE: on DB1000/1100/1500/1550 we pass a GPIO here!
+         */
         r = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "insert");
         sock->insert_irq = r ? r->start : -1;
+        if (sock->board_type == BOARD_TYPE_DEFAULT) {
+                sock->insert_gpio = r ? r->start : -1;
+                sock->insert_irq = r ? gpio_to_irq(r->start) : -1;
+        }
 
         /* stschg: irq which trigger on card status change (optional) */
         r = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "stschg");
diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c
index 46210512d8ec..9cfa544072b5 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx.c
@@ -762,19 +762,18 @@ int imx_pinctrl_probe(struct platform_device *pdev,
 
         if (of_property_read_bool(dev_np, "fsl,input-sel")) {
                 np = of_parse_phandle(dev_np, "fsl,input-sel", 0);
-                if (np) {
-                        ipctl->input_sel_base = of_iomap(np, 0);
-                        if (IS_ERR(ipctl->input_sel_base)) {
-                                of_node_put(np);
-                                dev_err(&pdev->dev,
-                                        "iomuxc input select base address not found\n");
-                                return PTR_ERR(ipctl->input_sel_base);
-                        }
-                } else {
+                if (!np) {
                         dev_err(&pdev->dev, "iomuxc fsl,input-sel property not found\n");
                         return -EINVAL;
                 }
+
+                ipctl->input_sel_base = of_iomap(np, 0);
                 of_node_put(np);
+                if (!ipctl->input_sel_base) {
+                        dev_err(&pdev->dev,
+                                "iomuxc input select base address not found\n");
+                        return -ENOMEM;
+                }
         }
 
         imx_pinctrl_desc.name = dev_name(&pdev->dev);
diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index 85536b467c25..6c2c816f8e5f 100644
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -665,6 +665,35 @@ static void intel_gpio_irq_ack(struct irq_data *d)
         spin_unlock(&pctrl->lock);
 }
 
+static void intel_gpio_irq_enable(struct irq_data *d)
+{
+        struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
+        struct intel_pinctrl *pctrl = gpiochip_get_data(gc);
+        const struct intel_community *community;
+        unsigned pin = irqd_to_hwirq(d);
+        unsigned long flags;
+
+        spin_lock_irqsave(&pctrl->lock, flags);
+
+        community = intel_get_community(pctrl, pin);
+        if (community) {
+                unsigned padno = pin_to_padno(community, pin);
+                unsigned gpp_size = community->gpp_size;
+                unsigned gpp_offset = padno % gpp_size;
+                unsigned gpp = padno / gpp_size;
+                u32 value;
+
+                /* Clear interrupt status first to avoid unexpected interrupt */
+                writel(BIT(gpp_offset), community->regs + GPI_IS + gpp * 4);
+
+                value = readl(community->regs + community->ie_offset + gpp * 4);
+                value |= BIT(gpp_offset);
+                writel(value, community->regs + community->ie_offset + gpp * 4);
+        }
+
+        spin_unlock_irqrestore(&pctrl->lock, flags);
+}
+
 static void intel_gpio_irq_mask_unmask(struct irq_data *d, bool mask)
 {
         struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
@@ -741,8 +770,9 @@ static int intel_gpio_irq_type(struct irq_data *d, unsigned type)
                 value |= PADCFG0_RXINV;
         } else if (type & IRQ_TYPE_EDGE_RISING) {
                 value |= PADCFG0_RXEVCFG_EDGE << PADCFG0_RXEVCFG_SHIFT;
-        } else if (type & IRQ_TYPE_LEVEL_LOW) {
-                value |= PADCFG0_RXINV;
+        } else if (type & IRQ_TYPE_LEVEL_MASK) {
+                if (type & IRQ_TYPE_LEVEL_LOW)
+                        value |= PADCFG0_RXINV;
         } else {
                 value |= PADCFG0_RXEVCFG_DISABLED << PADCFG0_RXEVCFG_SHIFT;
         }
@@ -852,6 +882,7 @@ static irqreturn_t intel_gpio_irq(int irq, void *data)
 
 static struct irq_chip intel_gpio_irqchip = {
         .name = "intel-gpio",
+        .irq_enable = intel_gpio_irq_enable,
         .irq_ack = intel_gpio_irq_ack,
         .irq_mask = intel_gpio_irq_mask,
         .irq_unmask = intel_gpio_irq_unmask,
diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
index 352406108fa0..c8969dd49449 100644
--- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c
+++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
@@ -990,7 +990,7 @@ static void nmk_gpio_dbg_show_one(struct seq_file *s,
                 int val;
 
                 if (pull)
-                        pullidx = data_out ? 1 : 2;
+                        pullidx = data_out ? 2 : 1;
 
                 seq_printf(s, " gpio-%-3d (%-20.20s) in  %s %s",
                            gpio,
diff --git a/drivers/pinctrl/pinctrl-pistachio.c b/drivers/pinctrl/pinctrl-pistachio.c
index 856f736cb1a6..2673cd9d106e 100644
--- a/drivers/pinctrl/pinctrl-pistachio.c
+++ b/drivers/pinctrl/pinctrl-pistachio.c
@@ -469,27 +469,27 @@ static const char * const pistachio_mips_pll_lock_groups[] = {
         "mfio83",
 };
 
-static const char * const pistachio_sys_pll_lock_groups[] = {
+static const char * const pistachio_audio_pll_lock_groups[] = {
         "mfio84",
 };
 
-static const char * const pistachio_wifi_pll_lock_groups[] = {
+static const char * const pistachio_rpu_v_pll_lock_groups[] = {
         "mfio85",
 };
 
-static const char * const pistachio_bt_pll_lock_groups[] = {
+static const char * const pistachio_rpu_l_pll_lock_groups[] = {
         "mfio86",
 };
 
-static const char * const pistachio_rpu_v_pll_lock_groups[] = {
+static const char * const pistachio_sys_pll_lock_groups[] = {
         "mfio87",
 };
 
-static const char * const pistachio_rpu_l_pll_lock_groups[] = {
+static const char * const pistachio_wifi_pll_lock_groups[] = {
         "mfio88",
 };
 
-static const char * const pistachio_audio_pll_lock_groups[] = {
+static const char * const pistachio_bt_pll_lock_groups[] = {
         "mfio89",
 };
 
@@ -559,12 +559,12 @@ enum pistachio_mux_option {
         PISTACHIO_FUNCTION_DREQ4,
         PISTACHIO_FUNCTION_DREQ5,
         PISTACHIO_FUNCTION_MIPS_PLL_LOCK,
+        PISTACHIO_FUNCTION_AUDIO_PLL_LOCK,
+        PISTACHIO_FUNCTION_RPU_V_PLL_LOCK,
+        PISTACHIO_FUNCTION_RPU_L_PLL_LOCK,
         PISTACHIO_FUNCTION_SYS_PLL_LOCK,
         PISTACHIO_FUNCTION_WIFI_PLL_LOCK,
         PISTACHIO_FUNCTION_BT_PLL_LOCK,
-        PISTACHIO_FUNCTION_RPU_V_PLL_LOCK,
-        PISTACHIO_FUNCTION_RPU_L_PLL_LOCK,
-        PISTACHIO_FUNCTION_AUDIO_PLL_LOCK,
         PISTACHIO_FUNCTION_DEBUG_RAW_CCA_IND,
         PISTACHIO_FUNCTION_DEBUG_ED_SEC20_CCA_IND,
         PISTACHIO_FUNCTION_DEBUG_ED_SEC40_CCA_IND,
@@ -620,12 +620,12 @@ static const struct pistachio_function pistachio_functions[] = {
         FUNCTION(dreq4),
         FUNCTION(dreq5),
         FUNCTION(mips_pll_lock),
+        FUNCTION(audio_pll_lock),
+        FUNCTION(rpu_v_pll_lock),
+        FUNCTION(rpu_l_pll_lock),
         FUNCTION(sys_pll_lock),
         FUNCTION(wifi_pll_lock),
         FUNCTION(bt_pll_lock),
-        FUNCTION(rpu_v_pll_lock),
-        FUNCTION(rpu_l_pll_lock),
-        FUNCTION(audio_pll_lock),
         FUNCTION(debug_raw_cca_ind),
         FUNCTION(debug_ed_sec20_cca_ind),
         FUNCTION(debug_ed_sec40_cca_ind),
diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c
index 412c6b78140a..a13f2b6f6fc0 100644
--- a/drivers/pinctrl/pinctrl-xway.c
+++ b/drivers/pinctrl/pinctrl-xway.c
@@ -1573,6 +1573,22 @@ static int xway_gpio_dir_out(struct gpio_chip *chip, unsigned int pin, int val)
         return 0;
 }
 
+/*
+ * gpiolib gpiod_to_irq callback function.
+ * Returns the mapped IRQ (external interrupt) number for a given GPIO pin.
+ */
+static int xway_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
+{
+        struct ltq_pinmux_info *info = dev_get_drvdata(chip->parent);
+        int i;
+
+        for (i = 0; i < info->num_exin; i++)
+                if (info->exin[i] == offset)
+                        return ltq_eiu_get_irq(i);
+
+        return -1;
+}
+
 static struct gpio_chip xway_chip = {
         .label = "gpio-xway",
         .direction_input = xway_gpio_dir_in,
@@ -1581,6 +1597,7 @@ static struct gpio_chip xway_chip = {
         .set = xway_gpio_set,
         .request = gpiochip_generic_request,
         .free = gpiochip_generic_free,
+        .to_irq = xway_gpio_to_irq,
         .base = -1,
 };
 
diff --git a/drivers/pinctrl/qcom/pinctrl-ipq4019.c b/drivers/pinctrl/qcom/pinctrl-ipq4019.c
index b5d81ced6ce6..b68ae424cee2 100644
--- a/drivers/pinctrl/qcom/pinctrl-ipq4019.c
+++ b/drivers/pinctrl/qcom/pinctrl-ipq4019.c
@@ -237,7 +237,7 @@ DECLARE_QCA_GPIO_PINS(99);
                 .pins = gpio##id##_pins,                \
                 .npins = (unsigned)ARRAY_SIZE(gpio##id##_pins), \
                 .funcs = (int[]){                       \
-                        qca_mux_NA, /* gpio mode */     \
+                        qca_mux_gpio, /* gpio mode */   \
                         qca_mux_##f1,                   \
                         qca_mux_##f2,                   \
                         qca_mux_##f3,                   \
@@ -254,11 +254,11 @@ DECLARE_QCA_GPIO_PINS(99);
                         qca_mux_##f14                   \
                 },                                      \
                 .nfuncs = 15,                           \
-                .ctl_reg = 0x1000 + 0x10 * id,          \
-                .io_reg = 0x1004 + 0x10 * id,           \
-                .intr_cfg_reg = 0x1008 + 0x10 * id,     \
-                .intr_status_reg = 0x100c + 0x10 * id,  \
-                .intr_target_reg = 0x400 + 0x4 * id,    \
+                .ctl_reg = 0x0 + 0x1000 * id,           \
+                .io_reg = 0x4 + 0x1000 * id,            \
+                .intr_cfg_reg = 0x8 + 0x1000 * id,      \
+                .intr_status_reg = 0xc + 0x1000 * id,   \
+                .intr_target_reg = 0x8 + 0x1000 * id,   \
                 .mux_bit = 2,                   \
                 .pull_bit = 0,                  \
                 .drv_bit = 6,                   \
@@ -414,7 +414,7 @@ static const struct msm_pinctrl_soc_data ipq4019_pinctrl = {
         .nfunctions = ARRAY_SIZE(ipq4019_functions),
         .groups = ipq4019_groups,
         .ngroups = ARRAY_SIZE(ipq4019_groups),
-        .ngpios = 70,
+        .ngpios = 100,
 };
 
 static int ipq4019_pinctrl_probe(struct platform_device *pdev)
diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c
index dc3609f0c60b..ee0c1f2567d9 100644
--- a/drivers/pinctrl/sh-pfc/core.c
+++ b/drivers/pinctrl/sh-pfc/core.c
@@ -546,7 +546,9 @@ static int sh_pfc_probe(struct platform_device *pdev)
                         return ret;
         }
 
-        pinctrl_provide_dummies();
+        /* Enable dummy states for those platforms without pinctrl support */
+        if (!of_have_populated_dt())
+                pinctrl_provide_dummies();
 
         ret = sh_pfc_init_ranges(pfc);
         if (ret < 0)
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c b/drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c
index 00265f0435a7..8b381d69df86 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c
@@ -485,6 +485,7 @@ static const struct sunxi_pinctrl_desc sun8i_a33_pinctrl_data = {
         .pins = sun8i_a33_pins,
         .npins = ARRAY_SIZE(sun8i_a33_pins),
         .irq_banks = 2,
+        .irq_bank_base = 1,
 };
 
 static int sun8i_a33_pinctrl_probe(struct platform_device *pdev)
diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
index 12a1dfabb1af..3b017dbd289c 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
@@ -579,7 +579,7 @@ static void sunxi_pinctrl_irq_release_resources(struct irq_data *d)
 static int sunxi_pinctrl_irq_set_type(struct irq_data *d, unsigned int type)
 {
         struct sunxi_pinctrl *pctl = irq_data_get_irq_chip_data(d);
-        u32 reg = sunxi_irq_cfg_reg(d->hwirq);
+        u32 reg = sunxi_irq_cfg_reg(d->hwirq, pctl->desc->irq_bank_base);
         u8 index = sunxi_irq_cfg_offset(d->hwirq);
         unsigned long flags;
         u32 regval;
@@ -626,7 +626,8 @@ static int sunxi_pinctrl_irq_set_type(struct irq_data *d, unsigned int type)
 static void sunxi_pinctrl_irq_ack(struct irq_data *d)
 {
         struct sunxi_pinctrl *pctl = irq_data_get_irq_chip_data(d);
-        u32 status_reg = sunxi_irq_status_reg(d->hwirq);
+        u32 status_reg = sunxi_irq_status_reg(d->hwirq,
+                                              pctl->desc->irq_bank_base);
         u8 status_idx = sunxi_irq_status_offset(d->hwirq);
 
         /* Clear the IRQ */
@@ -636,7 +637,7 @@ static void sunxi_pinctrl_irq_ack(struct irq_data *d)
 static void sunxi_pinctrl_irq_mask(struct irq_data *d)
 {
         struct sunxi_pinctrl *pctl = irq_data_get_irq_chip_data(d);
-        u32 reg = sunxi_irq_ctrl_reg(d->hwirq);
+        u32 reg = sunxi_irq_ctrl_reg(d->hwirq, pctl->desc->irq_bank_base);
         u8 idx = sunxi_irq_ctrl_offset(d->hwirq);
         unsigned long flags;
         u32 val;
@@ -653,7 +654,7 @@ static void sunxi_pinctrl_irq_mask(struct irq_data *d)
 static void sunxi_pinctrl_irq_unmask(struct irq_data *d)
 {
         struct sunxi_pinctrl *pctl = irq_data_get_irq_chip_data(d);
-        u32 reg = sunxi_irq_ctrl_reg(d->hwirq);
+        u32 reg = sunxi_irq_ctrl_reg(d->hwirq, pctl->desc->irq_bank_base);
         u8 idx = sunxi_irq_ctrl_offset(d->hwirq);
         unsigned long flags;
         u32 val;
@@ -745,7 +746,7 @@ static void sunxi_pinctrl_irq_handler(struct irq_desc *desc)
         if (bank == pctl->desc->irq_banks)
                 return;
 
-        reg = sunxi_irq_status_reg_from_bank(bank);
+        reg = sunxi_irq_status_reg_from_bank(bank, pctl->desc->irq_bank_base);
         val = readl(pctl->membase + reg);
 
         if (val) {
@@ -1024,9 +1025,11 @@ int sunxi_pinctrl_init(struct platform_device *pdev,
 
         for (i = 0; i < pctl->desc->irq_banks; i++) {
                 /* Mask and clear all IRQs before registering a handler */
-                writel(0, pctl->membase + sunxi_irq_ctrl_reg_from_bank(i));
+                writel(0, pctl->membase + sunxi_irq_ctrl_reg_from_bank(i,
+                                                pctl->desc->irq_bank_base));
                 writel(0xffffffff,
-                        pctl->membase + sunxi_irq_status_reg_from_bank(i));
+                       pctl->membase + sunxi_irq_status_reg_from_bank(i,
+                                                pctl->desc->irq_bank_base));
 
                 irq_set_chained_handler_and_data(pctl->irq[i],
                                                  sunxi_pinctrl_irq_handler,
diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.h b/drivers/pinctrl/sunxi/pinctrl-sunxi.h
index e248e81a0f9e..0afce1ab12d0 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.h
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.h
@@ -97,6 +97,7 @@ struct sunxi_pinctrl_desc {
         int                             npins;
         unsigned                        pin_base;
         unsigned                        irq_banks;
+        unsigned                        irq_bank_base;
         bool                            irq_read_needs_mux;
 };
 
@@ -233,12 +234,12 @@ static inline u32 sunxi_pull_offset(u16 pin)
         return pin_num * PULL_PINS_BITS;
 }
 
-static inline u32 sunxi_irq_cfg_reg(u16 irq)
+static inline u32 sunxi_irq_cfg_reg(u16 irq, unsigned bank_base)
 {
         u8 bank = irq / IRQ_PER_BANK;
         u8 reg = (irq % IRQ_PER_BANK) / IRQ_CFG_IRQ_PER_REG * 0x04;
 
-        return IRQ_CFG_REG + bank * IRQ_MEM_SIZE + reg;
+        return IRQ_CFG_REG + (bank_base + bank) * IRQ_MEM_SIZE + reg;
 }
 
 static inline u32 sunxi_irq_cfg_offset(u16 irq)
@@ -247,16 +248,16 @@ static inline u32 sunxi_irq_cfg_offset(u16 irq)
         return irq_num * IRQ_CFG_IRQ_BITS;
 }
 
-static inline u32 sunxi_irq_ctrl_reg_from_bank(u8 bank)
+static inline u32 sunxi_irq_ctrl_reg_from_bank(u8 bank, unsigned bank_base)
 {
-        return IRQ_CTRL_REG + bank * IRQ_MEM_SIZE;
+        return IRQ_CTRL_REG + (bank_base + bank) * IRQ_MEM_SIZE;
 }
 
-static inline u32 sunxi_irq_ctrl_reg(u16 irq)
+static inline u32 sunxi_irq_ctrl_reg(u16 irq, unsigned bank_base)
 {
         u8 bank = irq / IRQ_PER_BANK;
 
-        return sunxi_irq_ctrl_reg_from_bank(bank);
+        return sunxi_irq_ctrl_reg_from_bank(bank, bank_base);
 }
 
 static inline u32 sunxi_irq_ctrl_offset(u16 irq)
@@ -265,16 +266,16 @@ static inline u32 sunxi_irq_ctrl_offset(u16 irq)
         return irq_num * IRQ_CTRL_IRQ_BITS;
 }
 
-static inline u32 sunxi_irq_status_reg_from_bank(u8 bank)
+static inline u32 sunxi_irq_status_reg_from_bank(u8 bank, unsigned bank_base)
 {
-        return IRQ_STATUS_REG + bank * IRQ_MEM_SIZE;
+        return IRQ_STATUS_REG + (bank_base + bank) * IRQ_MEM_SIZE;
 }
 
-static inline u32 sunxi_irq_status_reg(u16 irq)
+static inline u32 sunxi_irq_status_reg(u16 irq, unsigned bank_base)
 {
         u8 bank = irq / IRQ_PER_BANK;
 
-        return sunxi_irq_status_reg_from_bank(bank);
+        return sunxi_irq_status_reg_from_bank(bank, bank_base);
 }
 
 static inline u32 sunxi_irq_status_offset(u16 irq)
diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index 9973cebb4d6f..07462d79d040 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -309,8 +309,7 @@ static ssize_t goldfish_pipe_read_write(struct file *filp, char __user *buffer,
                  * much memory to the process.
                  */
                 down_read(&current->mm->mmap_sem);
-                ret = get_user_pages(current, current->mm, address, 1,
-                                     !is_write, 0, &page, NULL);
+                ret = get_user_pages(address, 1, !is_write, 0, &page, NULL);
                 up_read(&current->mm->mmap_sem);
                 if (ret < 0)
                         break;
diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
index cdfd01f0adb8..8fad0a7044d3 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -1091,6 +1091,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
         RAPL_CPU(0x3f, rapl_defaults_hsw_server),/* Haswell servers */
         RAPL_CPU(0x4f, rapl_defaults_hsw_server),/* Broadwell servers */
         RAPL_CPU(0x45, rapl_defaults_core),/* Haswell ULT */
+        RAPL_CPU(0x46, rapl_defaults_core),/* Haswell */
         RAPL_CPU(0x47, rapl_defaults_core),/* Broadwell-H */
         RAPL_CPU(0x4E, rapl_defaults_core),/* Skylake */
         RAPL_CPU(0x4C, rapl_defaults_cht),/* Braswell/Cherryview */
diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
index 9607bc826460..5d4d91846357 100644
--- a/drivers/rapidio/devices/rio_mport_cdev.c
+++ b/drivers/rapidio/devices/rio_mport_cdev.c
@@ -886,7 +886,7 @@ rio_dma_transfer(struct file *filp, uint32_t transfer_mode,
                 }
 
                 down_read(&current->mm->mmap_sem);
-                pinned = get_user_pages(current, current->mm,
+                pinned = get_user_pages(
                                 (unsigned long)xfer->loc_addr & PAGE_MASK,
                                 nr_pages, dir == DMA_FROM_DEVICE, 0,
                                 page_list, NULL);
diff --git a/drivers/remoteproc/st_remoteproc.c b/drivers/remoteproc/st_remoteproc.c
index 6bb04d453247..6f056caa8a56 100644
--- a/drivers/remoteproc/st_remoteproc.c
+++ b/drivers/remoteproc/st_remoteproc.c
@@ -189,9 +189,9 @@ static int st_rproc_parse_dt(struct platform_device *pdev)
         }
 
         ddata->boot_base = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
-        if (!ddata->boot_base) {
+        if (IS_ERR(ddata->boot_base)) {
                 dev_err(dev, "Boot base not found\n");
-                return -EINVAL;
+                return PTR_ERR(ddata->boot_base);
         }
 
         err = of_property_read_u32_index(np, "st,syscfg", 1,
diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c
index 17ad5749e91d..1e560188dd13 100644
--- a/drivers/s390/block/dasd_alias.c
+++ b/drivers/s390/block/dasd_alias.c
@@ -317,17 +317,17 @@ static int _add_device_to_lcu(struct alias_lcu *lcu,
         struct alias_pav_group *group;
         struct dasd_uid uid;
 
+        spin_lock(get_ccwdev_lock(device->cdev));
         private->uid.type = lcu->uac->unit[private->uid.real_unit_addr].ua_type;
         private->uid.base_unit_addr =
                 lcu->uac->unit[private->uid.real_unit_addr].base_ua;
         uid = private->uid;
-
+        spin_unlock(get_ccwdev_lock(device->cdev));
         /* if we have no PAV anyway, we don't need to bother with PAV groups */
         if (lcu->pav == NO_PAV) {
                 list_move(&device->alias_list, &lcu->active_devices);
                 return 0;
         }
-
         group = _find_group(lcu, &uid);
         if (!group) {
                 group = kzalloc(sizeof(*group), GFP_ATOMIC);
@@ -397,130 +397,6 @@ suborder_not_supported(struct dasd_ccw_req *cqr)
         return 0;
 }
 
-/*
- * This function tries to lock all devices on an lcu via trylock
- * return NULL on success otherwise return first failed device
- */
-static struct dasd_device *_trylock_all_devices_on_lcu(struct alias_lcu *lcu,
-                                                      struct dasd_device *pos)
-
-{
-        struct alias_pav_group *pavgroup;
-        struct dasd_device *device;
-
-        list_for_each_entry(device, &lcu->active_devices, alias_list) {
-                if (device == pos)
-                        continue;
-                if (!spin_trylock(get_ccwdev_lock(device->cdev)))
-                        return device;
-        }
-        list_for_each_entry(device, &lcu->inactive_devices, alias_list) {
-                if (device == pos)
-                        continue;
-                if (!spin_trylock(get_ccwdev_lock(device->cdev)))
-                        return device;
-        }
-        list_for_each_entry(pavgroup, &lcu->grouplist, group) {
-                list_for_each_entry(device, &pavgroup->baselist, alias_list) {
-                        if (device == pos)
-                                continue;
-                        if (!spin_trylock(get_ccwdev_lock(device->cdev)))
-                                return device;
-                }
-                list_for_each_entry(device, &pavgroup->aliaslist, alias_list) {
-                        if (device == pos)
-                                continue;
-                        if (!spin_trylock(get_ccwdev_lock(device->cdev)))
-                                return device;
-                }
-        }
-        return NULL;
-}
-
-/*
- * unlock all devices except the one that is specified as pos
- * stop if enddev is specified and reached
- */
-static void _unlock_all_devices_on_lcu(struct alias_lcu *lcu,
-                                       struct dasd_device *pos,
-                                       struct dasd_device *enddev)
-
-{
-        struct alias_pav_group *pavgroup;
-        struct dasd_device *device;
-
-        list_for_each_entry(device, &lcu->active_devices, alias_list) {
-                if (device == pos)
-                        continue;
-                if (device == enddev)
-                        return;
-                spin_unlock(get_ccwdev_lock(device->cdev));
-        }
-        list_for_each_entry(device, &lcu->inactive_devices, alias_list) {
-                if (device == pos)
-                        continue;
-                if (device == enddev)
-                        return;
-                spin_unlock(get_ccwdev_lock(device->cdev));
-        }
-        list_for_each_entry(pavgroup, &lcu->grouplist, group) {
-                list_for_each_entry(device, &pavgroup->baselist, alias_list) {
-                        if (device == pos)
-                                continue;
-                        if (device == enddev)
-                                return;
-                        spin_unlock(get_ccwdev_lock(device->cdev));
-                }
-                list_for_each_entry(device, &pavgroup->aliaslist, alias_list) {
-                        if (device == pos)
-                                continue;
-                        if (device == enddev)
-                                return;
-                        spin_unlock(get_ccwdev_lock(device->cdev));
-                }
-        }
-}
-
-/*
- *  this function is needed because the locking order
- *  device lock -> lcu lock
- *  needs to be assured when iterating over devices in an LCU
- *
- *  if a device is specified in pos then the device lock is already hold
- */
-static void _trylock_and_lock_lcu_irqsave(struct alias_lcu *lcu,
-                                          struct dasd_device *pos,
-                                          unsigned long *flags)
-{
-        struct dasd_device *failed;
-
-        do {
-                spin_lock_irqsave(&lcu->lock, *flags);
-                failed = _trylock_all_devices_on_lcu(lcu, pos);
-                if (failed) {
-                        _unlock_all_devices_on_lcu(lcu, pos, failed);
-                        spin_unlock_irqrestore(&lcu->lock, *flags);
-                        cpu_relax();
-                }
-        } while (failed);
-}
-
-static void _trylock_and_lock_lcu(struct alias_lcu *lcu,
-                                  struct dasd_device *pos)
-{
-        struct dasd_device *failed;
-
-        do {
-                spin_lock(&lcu->lock);
-                failed = _trylock_all_devices_on_lcu(lcu, pos);
-                if (failed) {
-                        _unlock_all_devices_on_lcu(lcu, pos, failed);
-                        spin_unlock(&lcu->lock);
-                        cpu_relax();
-                }
-        } while (failed);
-}
-
 static int read_unit_address_configuration(struct dasd_device *device,
                                            struct alias_lcu *lcu)
 {
@@ -615,7 +491,7 @@ static int _lcu_update(struct dasd_device *refdev, struct alias_lcu *lcu)
         if (rc)
                 return rc;
 
-        _trylock_and_lock_lcu_irqsave(lcu, NULL, &flags);
+        spin_lock_irqsave(&lcu->lock, flags);
         lcu->pav = NO_PAV;
         for (i = 0; i < MAX_DEVICES_PER_LCU; ++i) {
                 switch (lcu->uac->unit[i].ua_type) {
@@ -634,7 +510,6 @@ static int _lcu_update(struct dasd_device *refdev, struct alias_lcu *lcu)
                                  alias_list) {
                 _add_device_to_lcu(lcu, device, refdev);
         }
-        _unlock_all_devices_on_lcu(lcu, NULL, NULL);
         spin_unlock_irqrestore(&lcu->lock, flags);
         return 0;
 }
@@ -722,8 +597,7 @@ int dasd_alias_add_device(struct dasd_device *device)
 
         lcu = private->lcu;
         rc = 0;
-        spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
-        spin_lock(&lcu->lock);
+        spin_lock_irqsave(&lcu->lock, flags);
         if (!(lcu->flags & UPDATE_PENDING)) {
                 rc = _add_device_to_lcu(lcu, device, device);
                 if (rc)
@@ -733,8 +607,7 @@ int dasd_alias_add_device(struct dasd_device *device)
                 list_move(&device->alias_list, &lcu->active_devices);
                 _schedule_lcu_update(lcu, device);
         }
-        spin_unlock(&lcu->lock);
-        spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
+        spin_unlock_irqrestore(&lcu->lock, flags);
         return rc;
 }
 
@@ -933,15 +806,27 @@ static void _stop_all_devices_on_lcu(struct alias_lcu *lcu)
         struct alias_pav_group *pavgroup;
         struct dasd_device *device;
 
-        list_for_each_entry(device, &lcu->active_devices, alias_list)
+        list_for_each_entry(device, &lcu->active_devices, alias_list) {
+                spin_lock(get_ccwdev_lock(device->cdev));
                 dasd_device_set_stop_bits(device, DASD_STOPPED_SU);
-        list_for_each_entry(device, &lcu->inactive_devices, alias_list)
+                spin_unlock(get_ccwdev_lock(device->cdev));
+        }
+        list_for_each_entry(device, &lcu->inactive_devices, alias_list) {
+                spin_lock(get_ccwdev_lock(device->cdev));
                 dasd_device_set_stop_bits(device, DASD_STOPPED_SU);
+                spin_unlock(get_ccwdev_lock(device->cdev));
+        }
         list_for_each_entry(pavgroup, &lcu->grouplist, group) {
-                list_for_each_entry(device, &pavgroup->baselist, alias_list)
+                list_for_each_entry(device, &pavgroup->baselist, alias_list) {
+                        spin_lock(get_ccwdev_lock(device->cdev));
                         dasd_device_set_stop_bits(device, DASD_STOPPED_SU);
-                list_for_each_entry(device, &pavgroup->aliaslist, alias_list)
+                        spin_unlock(get_ccwdev_lock(device->cdev));
+                }
+                list_for_each_entry(device, &pavgroup->aliaslist, alias_list) {
+                        spin_lock(get_ccwdev_lock(device->cdev));
                         dasd_device_set_stop_bits(device, DASD_STOPPED_SU);
+                        spin_unlock(get_ccwdev_lock(device->cdev));
+                }
         }
 }
 
@@ -950,15 +835,27 @@ static void _unstop_all_devices_on_lcu(struct alias_lcu *lcu)
         struct alias_pav_group *pavgroup;
         struct dasd_device *device;
 
-        list_for_each_entry(device, &lcu->active_devices, alias_list)
+        list_for_each_entry(device, &lcu->active_devices, alias_list) {
+                spin_lock(get_ccwdev_lock(device->cdev));
                 dasd_device_remove_stop_bits(device, DASD_STOPPED_SU);
-        list_for_each_entry(device, &lcu->inactive_devices, alias_list)
+                spin_unlock(get_ccwdev_lock(device->cdev));
+        }
+        list_for_each_entry(device, &lcu->inactive_devices, alias_list) {
+                spin_lock(get_ccwdev_lock(device->cdev));
                 dasd_device_remove_stop_bits(device, DASD_STOPPED_SU);
+                spin_unlock(get_ccwdev_lock(device->cdev));
+        }
         list_for_each_entry(pavgroup, &lcu->grouplist, group) {
-                list_for_each_entry(device, &pavgroup->baselist, alias_list)
+                list_for_each_entry(device, &pavgroup->baselist, alias_list) {
+                        spin_lock(get_ccwdev_lock(device->cdev));
                         dasd_device_remove_stop_bits(device, DASD_STOPPED_SU);
-                list_for_each_entry(device, &pavgroup->aliaslist, alias_list)
+                        spin_unlock(get_ccwdev_lock(device->cdev));
+                }
+                list_for_each_entry(device, &pavgroup->aliaslist, alias_list) {
+                        spin_lock(get_ccwdev_lock(device->cdev));
                         dasd_device_remove_stop_bits(device, DASD_STOPPED_SU);
+                        spin_unlock(get_ccwdev_lock(device->cdev));
+                }
         }
 }
 
@@ -984,48 +881,32 @@ static void summary_unit_check_handling_work(struct work_struct *work)
         spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
         reset_summary_unit_check(lcu, device, suc_data->reason);
 
-        _trylock_and_lock_lcu_irqsave(lcu, NULL, &flags);
+        spin_lock_irqsave(&lcu->lock, flags);
         _unstop_all_devices_on_lcu(lcu);
         _restart_all_base_devices_on_lcu(lcu);
         /* 3. read new alias configuration */
         _schedule_lcu_update(lcu, device);
         lcu->suc_data.device = NULL;
         dasd_put_device(device);
-        _unlock_all_devices_on_lcu(lcu, NULL, NULL);
         spin_unlock_irqrestore(&lcu->lock, flags);
 }
 
-/*
- * note: this will be called from int handler context (cdev locked)
- */
-void dasd_alias_handle_summary_unit_check(struct dasd_device *device,
-                                          struct irb *irb)
+void dasd_alias_handle_summary_unit_check(struct work_struct *work)
 {
+        struct dasd_device *device = container_of(work, struct dasd_device,
+                                                  suc_work);
         struct dasd_eckd_private *private = device->private;
         struct alias_lcu *lcu;
-        char reason;
-        char *sense;
-
-        sense = dasd_get_sense(irb);
-        if (sense) {
-                reason = sense[8];
-                DBF_DEV_EVENT(DBF_NOTICE, device, "%s %x",
-                            "eckd handle summary unit check: reason", reason);
-        } else {
-                DBF_DEV_EVENT(DBF_WARNING, device, "%s",
-                            "eckd handle summary unit check:"
-                            " no reason code available");
-                return;
-        }
+        unsigned long flags;
 
         lcu = private->lcu;
         if (!lcu) {
                 DBF_DEV_EVENT(DBF_WARNING, device, "%s",
                             "device not ready to handle summary"
                             " unit check (no lcu structure)");
-                return;
+                goto out;
         }
-        _trylock_and_lock_lcu(lcu, device);
+        spin_lock_irqsave(&lcu->lock, flags);
         /* If this device is about to be removed just return and wait for
          * the next interrupt on a different device
          */
@@ -1033,27 +914,26 @@ void dasd_alias_handle_summary_unit_check(struct dasd_device *device,
                 DBF_DEV_EVENT(DBF_WARNING, device, "%s",
                             "device is in offline processing,"
                             " don't do summary unit check handling");
-                _unlock_all_devices_on_lcu(lcu, device, NULL);
-                spin_unlock(&lcu->lock);
-                return;
+                goto out_unlock;
         }
         if (lcu->suc_data.device) {
                 /* already scheduled or running */
                 DBF_DEV_EVENT(DBF_WARNING, device, "%s",
                             "previous instance of summary unit check worker"
                             " still pending");
-                _unlock_all_devices_on_lcu(lcu, device, NULL);
-                spin_unlock(&lcu->lock);
-                return ;
+                goto out_unlock;
         }
         _stop_all_devices_on_lcu(lcu);
         /* prepare for lcu_update */
-        private->lcu->flags |= NEED_UAC_UPDATE | UPDATE_PENDING;
-        lcu->suc_data.reason = reason;
+        lcu->flags |= NEED_UAC_UPDATE | UPDATE_PENDING;
+        lcu->suc_data.reason = private->suc_reason;
         lcu->suc_data.device = device;
         dasd_get_device(device);
-        _unlock_all_devices_on_lcu(lcu, device, NULL);
-        spin_unlock(&lcu->lock);
         if (!schedule_work(&lcu->suc_data.worker))
                 dasd_put_device(device);
+out_unlock:
+        spin_unlock_irqrestore(&lcu->lock, flags);
+out:
+        clear_bit(DASD_FLAG_SUC, &device->flags);
+        dasd_put_device(device);
 };
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 75c032dcf173..c1b4ae55e129 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -1682,6 +1682,8 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
 
         /* setup work queue for validate server*/
         INIT_WORK(&device->kick_validate, dasd_eckd_do_validate_server);
+        /* setup work queue for summary unit check */
+        INIT_WORK(&device->suc_work, dasd_alias_handle_summary_unit_check);
 
         if (!ccw_device_is_pathgroup(device->cdev)) {
                 dev_warn(&device->cdev->dev,
@@ -2549,14 +2551,6 @@ static void dasd_eckd_check_for_device_change(struct dasd_device *device,
                     device->state == DASD_STATE_ONLINE &&
                     !test_bit(DASD_FLAG_OFFLINE, &device->flags) &&
                     !test_bit(DASD_FLAG_SUSPENDED, &device->flags)) {
-                        /*
-                         * the state change could be caused by an alias
-                         * reassignment remove device from alias handling
-                         * to prevent new requests from being scheduled on
-                         * the wrong alias device
-                         */
-                        dasd_alias_remove_device(device);
-
                         /* schedule worker to reload device */
                         dasd_reload_device(device);
                 }
@@ -2571,7 +2565,27 @@ static void dasd_eckd_check_for_device_change(struct dasd_device *device,
         /* summary unit check */
         if ((sense[27] & DASD_SENSE_BIT_0) && (sense[7] == 0x0D) &&
             (scsw_dstat(&irb->scsw) & DEV_STAT_UNIT_CHECK)) {
-                dasd_alias_handle_summary_unit_check(device, irb);
+                if (test_and_set_bit(DASD_FLAG_SUC, &device->flags)) {
+                        DBF_DEV_EVENT(DBF_WARNING, device, "%s",
+                                      "eckd suc: device already notified");
+                        return;
+                }
+                sense = dasd_get_sense(irb);
+                if (!sense) {
+                        DBF_DEV_EVENT(DBF_WARNING, device, "%s",
+                                      "eckd suc: no reason code available");
+                        clear_bit(DASD_FLAG_SUC, &device->flags);
+                        return;
+
+                }
+                private->suc_reason = sense[8];
+                DBF_DEV_EVENT(DBF_NOTICE, device, "%s %x",
+                              "eckd handle summary unit check: reason",
+                              private->suc_reason);
+                dasd_get_device(device);
+                if (!schedule_work(&device->suc_work))
+                        dasd_put_device(device);
+
                 return;
         }
 
@@ -4495,6 +4509,12 @@ static int dasd_eckd_reload_device(struct dasd_device *device)
         struct dasd_uid uid;
         unsigned long flags;
 
+        /*
+         * remove device from alias handling to prevent new requests
+         * from being scheduled on the wrong alias device
+         */
+        dasd_alias_remove_device(device);
+
         spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
         old_base = private->uid.base_unit_addr;
         spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
diff --git a/drivers/s390/block/dasd_eckd.h b/drivers/s390/block/dasd_eckd.h
index f8f91ee652d3..6d9a6d3517cd 100644
--- a/drivers/s390/block/dasd_eckd.h
+++ b/drivers/s390/block/dasd_eckd.h
@@ -525,6 +525,7 @@ struct dasd_eckd_private {
         int count;
 
         u32 fcx_max_data;
+        char suc_reason;
 };
 
 
@@ -534,7 +535,7 @@ void dasd_alias_disconnect_device_from_lcu(struct dasd_device *);
 int dasd_alias_add_device(struct dasd_device *);
 int dasd_alias_remove_device(struct dasd_device *);
 struct dasd_device *dasd_alias_get_start_dev(struct dasd_device *);
-void dasd_alias_handle_summary_unit_check(struct dasd_device *, struct irb *);
+void dasd_alias_handle_summary_unit_check(struct work_struct *);
 void dasd_eckd_reset_ccw_to_base_io(struct dasd_ccw_req *);
 void dasd_alias_lcu_setup_complete(struct dasd_device *);
 void dasd_alias_wait_for_lcu_setup(struct dasd_device *);
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 8de29be32a56..0f0add932e7a 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -470,6 +470,7 @@ struct dasd_device {
         struct work_struct restore_device;
         struct work_struct reload_device;
         struct work_struct kick_validate;
+        struct work_struct suc_work;
         struct timer_list timer;
 
         debug_info_t *debug_area;
@@ -542,6 +543,7 @@ struct dasd_attention_data {
 #define DASD_FLAG_SAFE_OFFLINE_RUNNING  11      /* safe offline running */
 #define DASD_FLAG_ABORTALL      12      /* Abort all noretry requests */
 #define DASD_FLAG_PATH_VERIFY   13      /* Path verification worker running */
+#define DASD_FLAG_SUC           14      /* unhandled summary unit check */
 
 #define DASD_SLEEPON_START_TAG  ((void *) 1)
 #define DASD_SLEEPON_END_TAG    ((void *) 2)
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 21a67ed047e8..ff6caab8cc8b 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -452,10 +452,11 @@ static int aac_slave_configure(struct scsi_device *sdev)
                 else if (depth < 2)
                         depth = 2;
                 scsi_change_queue_depth(sdev, depth);
-        } else
+        } else {
                 scsi_change_queue_depth(sdev, 1);
 
                 sdev->tagged_supported = 1;
+        }
 
         return 0;
 }
diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c
index 35968bdb4866..8fb9643fe6e3 100644
--- a/drivers/scsi/cxlflash/main.c
+++ b/drivers/scsi/cxlflash/main.c
@@ -289,7 +289,7 @@ static void context_reset(struct afu_cmd *cmd)
                 atomic64_set(&afu->room, room);
                 if (room)
                         goto write_rrin;
-                udelay(nretry);
+                udelay(1 << nretry);
         } while (nretry++ < MC_ROOM_RETRY_CNT);
 
         pr_err("%s: no cmd_room to send reset\n", __func__);
@@ -303,7 +303,7 @@ write_rrin:
                 if (rrin != 0x1)
                         break;
                 /* Double delay each time */
-                udelay(2 << nretry);
+                udelay(1 << nretry);
         } while (nretry++ < MC_ROOM_RETRY_CNT);
 }
 
@@ -338,7 +338,7 @@ retry:
                         atomic64_set(&afu->room, room);
                         if (room)
                                 goto write_ioarrin;
-                        udelay(nretry);
+                        udelay(1 << nretry);
                 } while (nretry++ < MC_ROOM_RETRY_CNT);
 
                 dev_err(dev, "%s: no cmd_room to send 0x%X\n",
@@ -352,7 +352,7 @@ retry:
                  * afu->room.
                  */
                 if (nretry++ < MC_ROOM_RETRY_CNT) {
-                        udelay(nretry);
+                        udelay(1 << nretry);
                         goto retry;
                 }
 
@@ -683,28 +683,23 @@ static void stop_afu(struct cxlflash_cfg *cfg)
 }
 
 /**
- * term_mc() - terminates the master context
+ * term_intr() - disables all AFU interrupts
  * @cfg:        Internal structure associated with the host.
  * @level:      Depth of allocation, where to begin waterfall tear down.
  *
  * Safe to call with AFU/MC in partially allocated/initialized state.
  */
-static void term_mc(struct cxlflash_cfg *cfg, enum undo_level level)
+static void term_intr(struct cxlflash_cfg *cfg, enum undo_level level)
 {
-        int rc = 0;
         struct afu *afu = cfg->afu;
         struct device *dev = &cfg->dev->dev;
 
         if (!afu || !cfg->mcctx) {
-                dev_err(dev, "%s: returning from term_mc with NULL afu or MC\n",
-                       __func__);
+                dev_err(dev, "%s: returning with NULL afu or MC\n", __func__);
                 return;
         }
 
         switch (level) {
-        case UNDO_START:
-                rc = cxl_stop_context(cfg->mcctx);
-                BUG_ON(rc);
         case UNMAP_THREE:
                 cxl_unmap_afu_irq(cfg->mcctx, 3, afu);
         case UNMAP_TWO:
@@ -713,9 +708,34 @@ static void term_mc(struct cxlflash_cfg *cfg, enum undo_level level)
                 cxl_unmap_afu_irq(cfg->mcctx, 1, afu);
         case FREE_IRQ:
                 cxl_free_afu_irqs(cfg->mcctx);
-        case RELEASE_CONTEXT:
-                cfg->mcctx = NULL;
+                /* fall through */
+        case UNDO_NOOP:
+                /* No action required */
+                break;
+        }
+}
+
+/**
+ * term_mc() - terminates the master context
+ * @cfg:        Internal structure associated with the host.
+ * @level:      Depth of allocation, where to begin waterfall tear down.
+ *
+ * Safe to call with AFU/MC in partially allocated/initialized state.
+ */
+static void term_mc(struct cxlflash_cfg *cfg)
+{
+        int rc = 0;
+        struct afu *afu = cfg->afu;
+        struct device *dev = &cfg->dev->dev;
+
+        if (!afu || !cfg->mcctx) {
+                dev_err(dev, "%s: returning with NULL afu or MC\n", __func__);
+                return;
         }
+
+        rc = cxl_stop_context(cfg->mcctx);
+        WARN_ON(rc);
+        cfg->mcctx = NULL;
 }
 
 /**
@@ -726,10 +746,20 @@ static void term_mc(struct cxlflash_cfg *cfg, enum undo_level level)
  */
 static void term_afu(struct cxlflash_cfg *cfg)
 {
+        /*
+         * Tear down is carefully orchestrated to ensure
+         * no interrupts can come in when the problem state
+         * area is unmapped.
+         *
+         * 1) Disable all AFU interrupts
+         * 2) Unmap the problem state area
+         * 3) Stop the master context
+         */
+        term_intr(cfg, UNMAP_THREE);
         if (cfg->afu)
                 stop_afu(cfg);
 
-        term_mc(cfg, UNDO_START);
+        term_mc(cfg);
 
         pr_debug("%s: returning\n", __func__);
 }
@@ -1597,41 +1627,24 @@ static int start_afu(struct cxlflash_cfg *cfg)
 }
 
 /**
- * init_mc() - create and register as the master context
+ * init_intr() - setup interrupt handlers for the master context
  * @cfg:        Internal structure associated with the host.
  *
  * Return: 0 on success, -errno on failure
  */
-static int init_mc(struct cxlflash_cfg *cfg)
+static enum undo_level init_intr(struct cxlflash_cfg *cfg,
+                                 struct cxl_context *ctx)
 {
-        struct cxl_context *ctx;
-        struct device *dev = &cfg->dev->dev;
         struct afu *afu = cfg->afu;
+        struct device *dev = &cfg->dev->dev;
         int rc = 0;
-        enum undo_level level;
-
-        ctx = cxl_get_context(cfg->dev);
-        if (unlikely(!ctx))
-                return -ENOMEM;
-        cfg->mcctx = ctx;
-
-        /* Set it up as a master with the CXL */
-        cxl_set_master(ctx);
-
-        /* During initialization reset the AFU to start from a clean slate */
-        rc = cxl_afu_reset(cfg->mcctx);
-        if (unlikely(rc)) {
-                dev_err(dev, "%s: initial AFU reset failed rc=%d\n",
-                        __func__, rc);
-                level = RELEASE_CONTEXT;
-                goto out;
-        }
+        enum undo_level level = UNDO_NOOP;
 
         rc = cxl_allocate_afu_irqs(ctx, 3);
         if (unlikely(rc)) {
                 dev_err(dev, "%s: call to allocate_afu_irqs failed rc=%d!\n",
                         __func__, rc);
-                level = RELEASE_CONTEXT;
+                level = UNDO_NOOP;
                 goto out;
         }
 
@@ -1661,8 +1674,47 @@ static int init_mc(struct cxlflash_cfg *cfg)
                 level = UNMAP_TWO;
                 goto out;
         }
+out:
+        return level;
+}
 
-        rc = 0;
+/**
+ * init_mc() - create and register as the master context
+ * @cfg:        Internal structure associated with the host.
+ *
+ * Return: 0 on success, -errno on failure
+ */
+static int init_mc(struct cxlflash_cfg *cfg)
+{
+        struct cxl_context *ctx;
+        struct device *dev = &cfg->dev->dev;
+        int rc = 0;
+        enum undo_level level;
+
+        ctx = cxl_get_context(cfg->dev);
+        if (unlikely(!ctx)) {
+                rc = -ENOMEM;
+                goto ret;
+        }
+        cfg->mcctx = ctx;
+
+        /* Set it up as a master with the CXL */
+        cxl_set_master(ctx);
+
+        /* During initialization reset the AFU to start from a clean slate */
+        rc = cxl_afu_reset(cfg->mcctx);
+        if (unlikely(rc)) {
+                dev_err(dev, "%s: initial AFU reset failed rc=%d\n",
+                        __func__, rc);
+                goto ret;
+        }
+
+        level = init_intr(cfg, ctx);
+        if (unlikely(level)) {
+                dev_err(dev, "%s: setting up interrupts failed rc=%d\n",
+                        __func__, rc);
+                goto out;
+        }
 
         /* This performs the equivalent of the CXL_IOCTL_START_WORK.
          * The CXL_IOCTL_GET_PROCESS_ELEMENT is implicit in the process
@@ -1678,7 +1730,7 @@ ret:
         pr_debug("%s: returning rc=%d\n", __func__, rc);
         return rc;
 out:
-        term_mc(cfg, level);
+        term_intr(cfg, level);
         goto ret;
 }
 
@@ -1751,7 +1803,8 @@ out:
 err2:
         kref_put(&afu->mapcount, afu_unmap);
 err1:
-        term_mc(cfg, UNDO_START);
+        term_intr(cfg, UNMAP_THREE);
+        term_mc(cfg);
         goto out;
 }
 
@@ -2488,8 +2541,7 @@ static pci_ers_result_t cxlflash_pci_error_detected(struct pci_dev *pdev,
                 if (unlikely(rc))
                         dev_err(dev, "%s: Failed to mark user contexts!(%d)\n",
                                 __func__, rc);
-                stop_afu(cfg);
-                term_mc(cfg, UNDO_START);
+                term_afu(cfg);
                 return PCI_ERS_RESULT_NEED_RESET;
         case pci_channel_io_perm_failure:
                 cfg->state = STATE_FAILTERM;
diff --git a/drivers/scsi/cxlflash/main.h b/drivers/scsi/cxlflash/main.h
index 0faed422c7f4..eb9d8f730b38 100644
--- a/drivers/scsi/cxlflash/main.h
+++ b/drivers/scsi/cxlflash/main.h
@@ -79,12 +79,11 @@
 #define WWPN_BUF_LEN    (WWPN_LEN + 1)
 
 enum undo_level {
-        RELEASE_CONTEXT = 0,
+        UNDO_NOOP = 0,
         FREE_IRQ,
         UNMAP_ONE,
         UNMAP_TWO,
-        UNMAP_THREE,
-        UNDO_START
+        UNMAP_THREE
 };
 
 struct dev_dependent_vals {
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index a404a41e871c..8eaed0522aa3 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -1112,9 +1112,9 @@ static void alua_bus_detach(struct scsi_device *sdev)
         h->sdev = NULL;
         spin_unlock(&h->pg_lock);
         if (pg) {
-                spin_lock(&pg->lock);
+                spin_lock_irq(&pg->lock);
                 list_del_rcu(&h->node);
-                spin_unlock(&pg->lock);
+                spin_unlock_irq(&pg->lock);
                 kref_put(&pg->kref, release_port_group);
         }
         sdev->handler_data = NULL;
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index e4db5fb3239a..8c44b9c424af 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -5030,7 +5030,7 @@ _base_make_ioc_ready(struct MPT3SAS_ADAPTER *ioc, int sleep_flag,
 static int
 _base_make_ioc_operational(struct MPT3SAS_ADAPTER *ioc, int sleep_flag)
 {
-        int r, i;
+        int r, i, index;
         unsigned long   flags;
         u32 reply_address;
         u16 smid;
@@ -5039,8 +5039,7 @@ _base_make_ioc_operational(struct MPT3SAS_ADAPTER *ioc, int sleep_flag)
         struct _event_ack_list *delayed_event_ack, *delayed_event_ack_next;
         u8 hide_flag;
         struct adapter_reply_queue *reply_q;
-        long reply_post_free;
-        u32 reply_post_free_sz, index = 0;
+        Mpi2ReplyDescriptorsUnion_t *reply_post_free_contig;
 
         dinitprintk(ioc, pr_info(MPT3SAS_FMT "%s\n", ioc->name,
             __func__));
@@ -5124,27 +5123,27 @@ _base_make_ioc_operational(struct MPT3SAS_ADAPTER *ioc, int sleep_flag)
                 _base_assign_reply_queues(ioc);
 
         /* initialize Reply Post Free Queue */
-        reply_post_free_sz = ioc->reply_post_queue_depth *
-            sizeof(Mpi2DefaultReplyDescriptor_t);
-        reply_post_free = (long)ioc->reply_post[index].reply_post_free;
+        index = 0;
+        reply_post_free_contig = ioc->reply_post[0].reply_post_free;
         list_for_each_entry(reply_q, &ioc->reply_queue_list, list) {
+                /*
+                 * If RDPQ is enabled, switch to the next allocation.
+                 * Otherwise advance within the contiguous region.
+                 */
+                if (ioc->rdpq_array_enable) {
+                        reply_q->reply_post_free =
+                                ioc->reply_post[index++].reply_post_free;
+                } else {
+                        reply_q->reply_post_free = reply_post_free_contig;
+                        reply_post_free_contig += ioc->reply_post_queue_depth;
+                }
+
                 reply_q->reply_post_host_index = 0;
-                reply_q->reply_post_free = (Mpi2ReplyDescriptorsUnion_t *)
-                    reply_post_free;
                 for (i = 0; i < ioc->reply_post_queue_depth; i++)
                         reply_q->reply_post_free[i].Words =
                             cpu_to_le64(ULLONG_MAX);
                 if (!_base_is_controller_msix_enabled(ioc))
                         goto skip_init_reply_post_free_queue;
-                /*
-                 * If RDPQ is enabled, switch to the next allocation.
-                 * Otherwise advance within the contiguous region.
-                 */
-                if (ioc->rdpq_array_enable)
-                        reply_post_free = (long)
-                            ioc->reply_post[++index].reply_post_free;
-                else
-                        reply_post_free += reply_post_free_sz;
         }
  skip_init_reply_post_free_queue:
 
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index b1bf42b93fcc..1deb6adc411f 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -784,8 +784,9 @@ void scsi_attach_vpd(struct scsi_device *sdev)
         int pg83_supported = 0;
         unsigned char __rcu *vpd_buf, *orig_vpd_buf = NULL;
 
-        if (sdev->skip_vpd_pages)
+        if (!scsi_device_supports_vpd(sdev))
                 return;
+
 retry_pg0:
         vpd_buf = kmalloc(vpd_len, GFP_KERNEL);
         if (!vpd_buf)
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 92ffd2406f97..2b642b145be1 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -81,6 +81,7 @@ const char *scsi_host_state_name(enum scsi_host_state state)
         return name;
 }
 
+#ifdef CONFIG_SCSI_DH
 static const struct {
         unsigned char   value;
         char            *name;
@@ -94,7 +95,7 @@ static const struct {
         { SCSI_ACCESS_STATE_TRANSITIONING, "transitioning" },
 };
 
-const char *scsi_access_state_name(unsigned char state)
+static const char *scsi_access_state_name(unsigned char state)
 {
         int i;
         char *name = NULL;
@@ -107,6 +108,7 @@ const char *scsi_access_state_name(unsigned char state)
         }
         return name;
 }
+#endif
 
 static int check_set(unsigned long long *val, char *src)
 {
@@ -226,7 +228,7 @@ show_shost_state(struct device *dev, struct device_attribute *attr, char *buf)
 }
 
 /* DEVICE_ATTR(state) clashes with dev_attr_state for sdev */
-struct device_attribute dev_attr_hstate =
+static struct device_attribute dev_attr_hstate =
         __ATTR(state, S_IRUGO | S_IWUSR, show_shost_state, store_shost_state);
 
 static ssize_t
@@ -401,7 +403,7 @@ static struct attribute *scsi_sysfs_shost_attrs[] = {
         NULL
 };
 
-struct attribute_group scsi_shost_attr_group = {
+static struct attribute_group scsi_shost_attr_group = {
         .attrs =        scsi_sysfs_shost_attrs,
 };
 
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 5a5457ac9cdb..f52b74cf8d1e 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1275,18 +1275,19 @@ static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
         struct scsi_disk *sdkp = scsi_disk(bdev->bd_disk);
         struct scsi_device *sdp = sdkp->device;
         struct Scsi_Host *host = sdp->host;
+        sector_t capacity = logical_to_sectors(sdp, sdkp->capacity);
         int diskinfo[4];
 
         /* default to most commonly used values */
-        diskinfo[0] = 0x40;     /* 1 << 6 */
-        diskinfo[1] = 0x20;     /* 1 << 5 */
-        diskinfo[2] = sdkp->capacity >> 11;
-        
+        diskinfo[0] = 0x40;     /* 1 << 6 */
+        diskinfo[1] = 0x20;     /* 1 << 5 */
+        diskinfo[2] = capacity >> 11;
+
         /* override with calculated, extended default, or driver values */
         if (host->hostt->bios_param)
-                host->hostt->bios_param(sdp, bdev, sdkp->capacity, diskinfo);
+                host->hostt->bios_param(sdp, bdev, capacity, diskinfo);
         else
-                scsicam_bios_param(bdev, sdkp->capacity, diskinfo);
+                scsicam_bios_param(bdev, capacity, diskinfo);
 
         geo->heads = diskinfo[0];
         geo->sectors = diskinfo[1];
@@ -2337,14 +2338,6 @@ got_data:
         if (sdkp->capacity > 0xffffffff)
                 sdp->use_16_for_rw = 1;
 
-        /* Rescale capacity to 512-byte units */
-        if (sector_size == 4096)
-                sdkp->capacity <<= 3;
-        else if (sector_size == 2048)
-                sdkp->capacity <<= 2;
-        else if (sector_size == 1024)
-                sdkp->capacity <<= 1;
-
         blk_queue_physical_block_size(sdp->request_queue,
                                       sdkp->physical_block_size);
         sdkp->device->sector_size = sector_size;
@@ -2795,28 +2788,6 @@ static void sd_read_write_same(struct scsi_disk *sdkp, unsigned char *buffer)
                 sdkp->ws10 = 1;
 }
 
-static int sd_try_extended_inquiry(struct scsi_device *sdp)
-{
-        /* Attempt VPD inquiry if the device blacklist explicitly calls
-         * for it.
-         */
-        if (sdp->try_vpd_pages)
-                return 1;
-        /*
-         * Although VPD inquiries can go to SCSI-2 type devices,
-         * some USB ones crash on receiving them, and the pages
-         * we currently ask for are for SPC-3 and beyond
-         */
-        if (sdp->scsi_level > SCSI_SPC_2 && !sdp->skip_vpd_pages)
-                return 1;
-        return 0;
-}
-
-static inline u32 logical_to_sectors(struct scsi_device *sdev, u32 blocks)
-{
-        return blocks << (ilog2(sdev->sector_size) - 9);
-}
-
 /**
  *      sd_revalidate_disk - called the first time a new disk is seen,
  *      performs disk spin up, read_capacity, etc.
@@ -2856,7 +2827,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
         if (sdkp->media_present) {
                 sd_read_capacity(sdkp, buffer);
 
-                if (sd_try_extended_inquiry(sdp)) {
+                if (scsi_device_supports_vpd(sdp)) {
                         sd_read_block_provisioning(sdkp);
                         sd_read_block_limits(sdkp);
                         sd_read_block_characteristics(sdkp);
@@ -2891,7 +2862,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
@@ -2900,7 +2871,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
         /* Combine with controller limits */
         q->limits.max_sectors = min(rw_max, queue_max_hw_sectors(q));
 
-        set_capacity(disk, sdkp->capacity);
+        set_capacity(disk, logical_to_sectors(sdp, sdkp->capacity));
         sd_config_write_same(sdkp);
         kfree(buffer);
 
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h
index 5f2a84aff29f..654630bb7d0e 100644
--- a/drivers/scsi/sd.h
+++ b/drivers/scsi/sd.h
@@ -65,7 +65,7 @@ struct scsi_disk {
         struct device   dev;
         struct gendisk  *disk;
         atomic_t        openers;
-        sector_t        capacity;       /* size in 512-byte sectors */
+        sector_t        capacity;       /* size in logical blocks */
         u32             max_xfer_blocks;
         u32             opt_xfer_blocks;
         u32             max_ws_blocks;
@@ -146,6 +146,11 @@ static inline int scsi_medium_access_command(struct scsi_cmnd *scmd)
         return 0;
 }
 
+static inline sector_t logical_to_sectors(struct scsi_device *sdev, sector_t blocks)
+{
+        return blocks << (ilog2(sdev->sector_size) - 9);
+}
+
 /*
  * A DIF-capable target device can be formatted with different
  * protection schemes.  Currently 0 through 3 are defined:
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 71c5138ddf94..dbf1882cfbac 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -4941,7 +4941,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);
@@ -4963,7 +4963,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/spi/spi-imx.c b/drivers/spi/spi-imx.c
index e7a19be87c38..50769078e72e 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -211,11 +211,15 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi,
                          struct spi_transfer *transfer)
 {
         struct spi_imx_data *spi_imx = spi_master_get_devdata(master);
-        unsigned int bpw = transfer->bits_per_word;
+        unsigned int bpw;
 
         if (!master->dma_rx)
                 return false;
 
+        if (!transfer)
+                return false;
+
+        bpw = transfer->bits_per_word;
         if (!bpw)
                 bpw = spi->bits_per_word;
 
@@ -333,8 +337,9 @@ static void __maybe_unused mx51_ecspi_trigger(struct spi_imx_data *spi_imx)
 static int __maybe_unused mx51_ecspi_config(struct spi_imx_data *spi_imx,
                 struct spi_imx_config *config)
 {
-        u32 ctrl = MX51_ECSPI_CTRL_ENABLE, cfg = 0;
+        u32 ctrl = MX51_ECSPI_CTRL_ENABLE;
         u32 clk = config->speed_hz, delay, reg;
+        u32 cfg = readl(spi_imx->base + MX51_ECSPI_CONFIG);
 
         /*
          * The hardware seems to have a race condition when changing modes. The
@@ -358,13 +363,20 @@ static int __maybe_unused mx51_ecspi_config(struct spi_imx_data *spi_imx,
 
         if (config->mode & SPI_CPHA)
                 cfg |= MX51_ECSPI_CONFIG_SCLKPHA(config->cs);
+        else
+                cfg &= ~MX51_ECSPI_CONFIG_SCLKPHA(config->cs);
 
         if (config->mode & SPI_CPOL) {
                 cfg |= MX51_ECSPI_CONFIG_SCLKPOL(config->cs);
                 cfg |= MX51_ECSPI_CONFIG_SCLKCTL(config->cs);
+        } else {
+                cfg &= ~MX51_ECSPI_CONFIG_SCLKPOL(config->cs);
+                cfg &= ~MX51_ECSPI_CONFIG_SCLKCTL(config->cs);
         }
         if (config->mode & SPI_CS_HIGH)
                 cfg |= MX51_ECSPI_CONFIG_SSBPOL(config->cs);
+        else
+                cfg &= ~MX51_ECSPI_CONFIG_SSBPOL(config->cs);
 
         if (spi_imx->usedma)
                 ctrl |= MX51_ECSPI_CTRL_SMC;
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 0caa3c8bef46..43a02e377b3b 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -423,16 +423,12 @@ static void omap2_mcspi_tx_dma(struct spi_device *spi,
 
         if (mcspi_dma->dma_tx) {
                 struct dma_async_tx_descriptor *tx;
-                struct scatterlist sg;
 
                 dmaengine_slave_config(mcspi_dma->dma_tx, &cfg);
 
-                sg_init_table(&sg, 1);
-                sg_dma_address(&sg) = xfer->tx_dma;
-                sg_dma_len(&sg) = xfer->len;
-
-                tx = dmaengine_prep_slave_sg(mcspi_dma->dma_tx, &sg, 1,
-                DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+                tx = dmaengine_prep_slave_sg(mcspi_dma->dma_tx, xfer->tx_sg.sgl,
+                                             xfer->tx_sg.nents, DMA_MEM_TO_DEV,
+                                             DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
                 if (tx) {
                         tx->callback = omap2_mcspi_tx_callback;
                         tx->callback_param = spi;
@@ -478,20 +474,15 @@ omap2_mcspi_rx_dma(struct spi_device *spi, struct spi_transfer *xfer,
 
         if (mcspi_dma->dma_rx) {
                 struct dma_async_tx_descriptor *tx;
-                struct scatterlist sg;
 
                 dmaengine_slave_config(mcspi_dma->dma_rx, &cfg);
 
                 if ((l & OMAP2_MCSPI_CHCONF_TURBO) && mcspi->fifo_depth == 0)
                         dma_count -= es;
 
-                sg_init_table(&sg, 1);
-                sg_dma_address(&sg) = xfer->rx_dma;
-                sg_dma_len(&sg) = dma_count;
-
-                tx = dmaengine_prep_slave_sg(mcspi_dma->dma_rx, &sg, 1,
-                                DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT |
-                                DMA_CTRL_ACK);
+                tx = dmaengine_prep_slave_sg(mcspi_dma->dma_rx, xfer->rx_sg.sgl,
+                                             xfer->rx_sg.nents, DMA_DEV_TO_MEM,
+                                             DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
                 if (tx) {
                         tx->callback = omap2_mcspi_rx_callback;
                         tx->callback_param = spi;
@@ -505,8 +496,6 @@ omap2_mcspi_rx_dma(struct spi_device *spi, struct spi_transfer *xfer,
         omap2_mcspi_set_dma_req(spi, 1, 1);
 
         wait_for_completion(&mcspi_dma->dma_rx_completion);
-        dma_unmap_single(mcspi->dev, xfer->rx_dma, count,
-                         DMA_FROM_DEVICE);
 
         if (mcspi->fifo_depth > 0)
                 return count;
@@ -619,8 +608,6 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer)
 
         if (tx != NULL) {
                 wait_for_completion(&mcspi_dma->dma_tx_completion);
-                dma_unmap_single(mcspi->dev, xfer->tx_dma, xfer->len,
-                                 DMA_TO_DEVICE);
 
                 if (mcspi->fifo_depth > 0) {
                         irqstat_reg = mcspi->base + OMAP2_MCSPI_IRQSTATUS;
@@ -1087,6 +1074,16 @@ static void omap2_mcspi_cleanup(struct spi_device *spi)
                 gpio_free(spi->cs_gpio);
 }
 
+static bool omap2_mcspi_can_dma(struct spi_master *master,
+                                struct spi_device *spi,
+                                struct spi_transfer *xfer)
+{
+        if (xfer->len < DMA_MIN_BYTES)
+                return false;
+
+        return true;
+}
+
 static int omap2_mcspi_work_one(struct omap2_mcspi *mcspi,
                 struct spi_device *spi, struct spi_transfer *t)
 {
@@ -1268,32 +1265,6 @@ static int omap2_mcspi_transfer_one(struct spi_master *master,
                 return -EINVAL;
         }
 
-        if (len < DMA_MIN_BYTES)
-                goto skip_dma_map;
-
-        if (mcspi_dma->dma_tx && tx_buf != NULL) {
-                t->tx_dma = dma_map_single(mcspi->dev, (void *) tx_buf,
-                                len, DMA_TO_DEVICE);
-                if (dma_mapping_error(mcspi->dev, t->tx_dma)) {
-                        dev_dbg(mcspi->dev, "dma %cX %d bytes error\n",
-                                        'T', len);
-                        return -EINVAL;
-                }
-        }
-        if (mcspi_dma->dma_rx && rx_buf != NULL) {
-                t->rx_dma = dma_map_single(mcspi->dev, rx_buf, t->len,
-                                DMA_FROM_DEVICE);
-                if (dma_mapping_error(mcspi->dev, t->rx_dma)) {
-                        dev_dbg(mcspi->dev, "dma %cX %d bytes error\n",
-                                        'R', len);
-                        if (tx_buf != NULL)
-                                dma_unmap_single(mcspi->dev, t->tx_dma,
-                                                len, DMA_TO_DEVICE);
-                        return -EINVAL;
-                }
-        }
-
-skip_dma_map:
         return omap2_mcspi_work_one(mcspi, spi, t);
 }
 
@@ -1377,6 +1348,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
         master->transfer_one = omap2_mcspi_transfer_one;
         master->set_cs = omap2_mcspi_set_cs;
         master->cleanup = omap2_mcspi_cleanup;
+        master->can_dma = omap2_mcspi_can_dma;
         master->dev.of_node = node;
         master->max_speed_hz = OMAP2_MCSPI_MAX_FREQ;
         master->min_speed_hz = OMAP2_MCSPI_MAX_FREQ >> 15;
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index 8f50a4020f6f..6c6c0013ec7a 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -534,7 +534,7 @@ static void rockchip_spi_config(struct rockchip_spi *rs)
         if (WARN_ON(rs->speed > MAX_SCLK_OUT))
                 rs->speed = MAX_SCLK_OUT;
 
-        /* the minimum divsor is 2 */
+        /* the minimum divisor is 2 */
         if (rs->max_freq < 2 * rs->speed) {
                 clk_set_rate(rs->spiclk, 2 * rs->speed);
                 rs->max_freq = clk_get_rate(rs->spiclk);
@@ -730,23 +730,27 @@ static int rockchip_spi_probe(struct platform_device *pdev)
         master->transfer_one = rockchip_spi_transfer_one;
         master->handle_err = rockchip_spi_handle_err;
 
-        rs->dma_tx.ch = dma_request_slave_channel(rs->dev, "tx");
-        if (IS_ERR_OR_NULL(rs->dma_tx.ch)) {
+        rs->dma_tx.ch = dma_request_chan(rs->dev, "tx");
+        if (IS_ERR(rs->dma_tx.ch)) {
                 /* Check tx to see if we need defer probing driver */
                 if (PTR_ERR(rs->dma_tx.ch) == -EPROBE_DEFER) {
                         ret = -EPROBE_DEFER;
                         goto err_get_fifo_len;
                 }
                 dev_warn(rs->dev, "Failed to request TX DMA channel\n");
+                rs->dma_tx.ch = NULL;
         }
 
-        rs->dma_rx.ch = dma_request_slave_channel(rs->dev, "rx");
-        if (!rs->dma_rx.ch) {
-                if (rs->dma_tx.ch) {
+        rs->dma_rx.ch = dma_request_chan(rs->dev, "rx");
+        if (IS_ERR(rs->dma_rx.ch)) {
+                if (PTR_ERR(rs->dma_rx.ch) == -EPROBE_DEFER) {
                         dma_release_channel(rs->dma_tx.ch);
                         rs->dma_tx.ch = NULL;
+                        ret = -EPROBE_DEFER;
+                        goto err_get_fifo_len;
                 }
                 dev_warn(rs->dev, "Failed to request RX DMA channel\n");
+                rs->dma_rx.ch = NULL;
         }
 
         if (rs->dma_tx.ch && rs->dma_rx.ch) {
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index de2f2f90d799..0239b45eed92 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1209,7 +1209,7 @@ static void spi_pump_messages(struct kthread_work *work)
         struct spi_master *master =
                 container_of(work, struct spi_master, pump_messages);
 
-        __spi_pump_messages(master, true, false);
+        __spi_pump_messages(master, true, master->bus_lock_flag);
 }
 
 static int spi_init_queue(struct spi_master *master)
@@ -2853,7 +2853,7 @@ static int __spi_sync(struct spi_device *spi, struct spi_message *message,
  */
 int spi_sync(struct spi_device *spi, struct spi_message *message)
 {
-        return __spi_sync(spi, message, 0);
+        return __spi_sync(spi, message, spi->master->bus_lock_flag);
 }
 EXPORT_SYMBOL_GPL(spi_sync);
 
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index cf84581287b9..5bac28a3944e 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -30,6 +30,8 @@ source "drivers/staging/wlan-ng/Kconfig"
 
 source "drivers/staging/comedi/Kconfig"
 
+source "drivers/staging/olpc_dcon/Kconfig"
+
 source "drivers/staging/rtl8192u/Kconfig"
 
 source "drivers/staging/rtl8192e/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 7d6448d20464..a954242b0f2c 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -4,6 +4,7 @@ obj-y				+= media/
 obj-$(CONFIG_SLICOSS)           += slicoss/
 obj-$(CONFIG_PRISM2_USB)        += wlan-ng/
 obj-$(CONFIG_COMEDI)            += comedi/
+obj-$(CONFIG_FB_OLPC_DCON)      += olpc_dcon/
 obj-$(CONFIG_RTL8192U)          += rtl8192u/
 obj-$(CONFIG_RTL8192E)          += rtl8192e/
 obj-$(CONFIG_R8712U)            += rtl8712/
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
index 98430e7108c1..455c54d0d17c 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
@@ -85,7 +85,6 @@ struct ptldebug_header {
 #define PH_FLAG_FIRST_RECORD 1
 
 /* Debugging subsystems (32 bits, non-overlapping) */
-/* keep these in sync with lnet/utils/debug.c and lnet/libcfs/debug.c */
 #define S_UNDEFINED     0x00000001
 #define S_MDC           0x00000002
 #define S_MDS           0x00000004
@@ -118,10 +117,14 @@ struct ptldebug_header {
 #define S_MGS           0x20000000
 #define S_FID           0x40000000 /* b_new_cmd */
 #define S_FLD           0x80000000 /* b_new_cmd */
-/* keep these in sync with lnet/utils/debug.c and lnet/libcfs/debug.c */
+
+#define LIBCFS_DEBUG_SUBSYS_NAMES {                                     \
+        "undefined", "mdc", "mds", "osc", "ost", "class", "log",        \
+        "llite", "rpc", "mgmt", "lnet", "lnd", "pinger", "filter", "",  \
+        "echo", "ldlm", "lov", "lquota", "osd", "lfsck", "", "", "lmv", \
+        "", "sec", "gss", "", "mgc", "mgs", "fid", "fld", NULL }
 
 /* Debugging masks (32 bits, non-overlapping) */
-/* keep these in sync with lnet/utils/debug.c and lnet/libcfs/debug.c */
 #define D_TRACE         0x00000001 /* ENTRY/EXIT markers */
 #define D_INODE         0x00000002
 #define D_SUPER         0x00000004
@@ -151,9 +154,14 @@ struct ptldebug_header {
 #define D_QUOTA         0x04000000
 #define D_SEC           0x08000000
 #define D_LFSCK         0x10000000 /* For both OI scrub and LFSCK */
-/* keep these in sync with lnet/{utils,libcfs}/debug.c */
+#define D_HSM           0x20000000
 
-#define D_HSM    D_TRACE
+#define LIBCFS_DEBUG_MASKS_NAMES {                                      \
+        "trace", "inode", "super", "ext2", "malloc", "cache", "info",   \
+        "ioctl", "neterror", "net", "warning", "buffs", "other",        \
+        "dentry", "nettrace", "page", "dlmtrace", "error", "emerg",     \
+        "ha", "rpctrace", "vfstrace", "reada", "mmap", "config",        \
+        "console", "quota", "sec", "lfsck", "hsm", NULL }
 
 #define D_CANTMASK   (D_ERROR | D_EMERG | D_WARNING | D_CONSOLE)
 
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h
index 6f7a276b87b7..ac4e8cfe6c8c 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h
@@ -46,7 +46,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/libcfs/libcfs_private.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
index e18b57b5c64e..2fd2a9690a34 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/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 acebc6fe0dbe..964b4e338fe0 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..8c260c3d5da4 100644
--- a/drivers/staging/lustre/lnet/libcfs/debug.c
+++ b/drivers/staging/lustre/lnet/libcfs/debug.c
@@ -232,130 +232,24 @@ int libcfs_panic_in_progress;
 static const char *
 libcfs_debug_subsys2str(int subsys)
 {
-        switch (1 << subsys) {
-        default:
+        static const char *libcfs_debug_subsystems[] = LIBCFS_DEBUG_SUBSYS_NAMES;
+
+        if (subsys >= ARRAY_SIZE(libcfs_debug_subsystems))
                 return NULL;
-        case S_UNDEFINED:
-                return "undefined";
-        case S_MDC:
-                return "mdc";
-        case S_MDS:
-                return "mds";
-        case S_OSC:
-                return "osc";
-        case S_OST:
-                return "ost";
-        case S_CLASS:
-                return "class";
-        case S_LOG:
-                return "log";
-        case S_LLITE:
-                return "llite";
-        case S_RPC:
-                return "rpc";
-        case S_LNET:
-                return "lnet";
-        case S_LND:
-                return "lnd";
-        case S_PINGER:
-                return "pinger";
-        case S_FILTER:
-                return "filter";
-        case S_ECHO:
-                return "echo";
-        case S_LDLM:
-                return "ldlm";
-        case S_LOV:
-                return "lov";
-        case S_LQUOTA:
-                return "lquota";
-        case S_OSD:
-                return "osd";
-        case S_LFSCK:
-                return "lfsck";
-        case S_LMV:
-                return "lmv";
-        case S_SEC:
-                return "sec";
-        case S_GSS:
-                return "gss";
-        case S_MGC:
-                return "mgc";
-        case S_MGS:
-                return "mgs";
-        case S_FID:
-                return "fid";
-        case S_FLD:
-                return "fld";
-        }
+
+        return libcfs_debug_subsystems[subsys];
 }
 
 /* libcfs_debug_token2mask() expects the returned string in lower-case */
 static const char *
 libcfs_debug_dbg2str(int debug)
 {
-        switch (1 << debug) {
-        default:
+        static const char *libcfs_debug_masks[] = LIBCFS_DEBUG_MASKS_NAMES;
+
+        if (debug >= ARRAY_SIZE(libcfs_debug_masks))
                 return NULL;
-        case D_TRACE:
-                return "trace";
-        case D_INODE:
-                return "inode";
-        case D_SUPER:
-                return "super";
-        case D_EXT2:
-                return "ext2";
-        case D_MALLOC:
-                return "malloc";
-        case D_CACHE:
-                return "cache";
-        case D_INFO:
-                return "info";
-        case D_IOCTL:
-                return "ioctl";
-        case D_NETERROR:
-                return "neterror";
-        case D_NET:
-                return "net";
-        case D_WARNING:
-                return "warning";
-        case D_BUFFS:
-                return "buffs";
-        case D_OTHER:
-                return "other";
-        case D_DENTRY:
-                return "dentry";
-        case D_NETTRACE:
-                return "nettrace";
-        case D_PAGE:
-                return "page";
-        case D_DLMTRACE:
-                return "dlmtrace";
-        case D_ERROR:
-                return "error";
-        case D_EMERG:
-                return "emerg";
-        case D_HA:
-                return "ha";
-        case D_RPCTRACE:
-                return "rpctrace";
-        case D_VFSTRACE:
-                return "vfstrace";
-        case D_READA:
-                return "reada";
-        case D_MMAP:
-                return "mmap";
-        case D_CONFIG:
-                return "config";
-        case D_CONSOLE:
-                return "console";
-        case D_QUOTA:
-                return "quota";
-        case D_SEC:
-                return "sec";
-        case D_LFSCK:
-                return "lfsck";
-        }
+
+        return libcfs_debug_masks[debug];
 }
 
 int
@@ -517,7 +411,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 5169597e2c34..7739b9469c5a 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 44e2bd6dba63..c5d5bedb3128 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 1988cee36751..7f539f92321c 100644
--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
@@ -49,10 +49,10 @@ module_param(brw_inject_errors, int, 0644);
 MODULE_PARM_DESC(brw_inject_errors, "# data errors to inject randomly, zero by default");
 
 static void
-brw_client_fini(sfw_test_instance_t *tsi)
+brw_client_fini(struct sfw_test_instance *tsi)
 {
-        srpc_bulk_t *bulk;
-        sfw_test_unit_t *tsu;
+        struct srpc_bulk *bulk;
+        struct sfw_test_unit    *tsu;
 
         LASSERT(tsi->tsi_is_client);
 
@@ -67,15 +67,15 @@ brw_client_fini(sfw_test_instance_t *tsi)
 }
 
 static int
-brw_client_init(sfw_test_instance_t *tsi)
+brw_client_init(struct sfw_test_instance *tsi)
 {
-        sfw_session_t *sn = tsi->tsi_batch->bat_session;
+        struct sfw_session *sn = tsi->tsi_batch->bat_session;
         int flags;
         int npg;
         int len;
         int opc;
-        srpc_bulk_t *bulk;
-        sfw_test_unit_t *tsu;
+        struct srpc_bulk *bulk;
+        struct sfw_test_unit *tsu;
 
         LASSERT(sn);
         LASSERT(tsi->tsi_is_client);
@@ -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;
 
@@ -103,7 +103,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)
@@ -166,13 +166,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;
         }
@@ -197,7 +197,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;
@@ -206,7 +206,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;
@@ -224,7 +224,7 @@ bad_data:
 }
 
 static void
-brw_fill_bulk(srpc_bulk_t *bk, int pattern, __u64 magic)
+brw_fill_bulk(struct srpc_bulk *bk, int pattern, __u64 magic)
 {
         int i;
         struct page *pg;
@@ -236,7 +236,7 @@ brw_fill_bulk(srpc_bulk_t *bk, int pattern, __u64 magic)
 }
 
 static int
-brw_check_bulk(srpc_bulk_t *bk, int pattern, __u64 magic)
+brw_check_bulk(struct srpc_bulk *bk, int pattern, __u64 magic)
 {
         int i;
         struct page *pg;
@@ -254,13 +254,13 @@ brw_check_bulk(srpc_bulk_t *bk, int pattern, __u64 magic)
 }
 
 static int
-brw_client_prep_rpc(sfw_test_unit_t *tsu,
-                    lnet_process_id_t dest, srpc_client_rpc_t **rpcpp)
+brw_client_prep_rpc(struct sfw_test_unit *tsu,
+                    lnet_process_id_t dest, struct srpc_client_rpc **rpcpp)
 {
-        srpc_bulk_t *bulk = tsu->tsu_private;
-        sfw_test_instance_t *tsi = tsu->tsu_instance;
-        sfw_session_t *sn = tsi->tsi_batch->bat_session;
-        srpc_client_rpc_t *rpc;
+        struct srpc_bulk *bulk = tsu->tsu_private;
+        struct sfw_test_instance *tsi = tsu->tsu_instance;
+        struct sfw_session *sn = tsi->tsi_batch->bat_session;
+        struct srpc_client_rpc *rpc;
         srpc_brw_reqst_t *req;
         int flags;
         int npg;
@@ -277,7 +277,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;
 
@@ -290,14 +290,14 @@ 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);
         if (rc)
                 return rc;
 
-        memcpy(&rpc->crpc_bulk, bulk, offsetof(srpc_bulk_t, bk_iovs[npg]));
+        memcpy(&rpc->crpc_bulk, bulk, offsetof(struct srpc_bulk, bk_iovs[npg]));
         if (opc == LST_BRW_WRITE)
                 brw_fill_bulk(&rpc->crpc_bulk, flags, BRW_MAGIC);
         else
@@ -313,12 +313,12 @@ brw_client_prep_rpc(sfw_test_unit_t *tsu,
 }
 
 static void
-brw_client_done_rpc(sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
+brw_client_done_rpc(struct sfw_test_unit *tsu, struct srpc_client_rpc *rpc)
 {
         __u64 magic = BRW_MAGIC;
-        sfw_test_instance_t *tsi = tsu->tsu_instance;
-        sfw_session_t *sn = tsi->tsi_batch->bat_session;
-        srpc_msg_t *msg = &rpc->crpc_replymsg;
+        struct sfw_test_instance *tsi = tsu->tsu_instance;
+        struct sfw_session *sn = tsi->tsi_batch->bat_session;
+        struct srpc_msg *msg = &rpc->crpc_replymsg;
         srpc_brw_reply_t *reply = &msg->msg_body.brw_reply;
         srpc_brw_reqst_t *reqst = &rpc->crpc_reqstmsg.msg_body.brw_reqst;
 
@@ -361,7 +361,7 @@ brw_client_done_rpc(sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
 static void
 brw_server_rpc_done(struct srpc_server_rpc *rpc)
 {
-        srpc_bulk_t *blk = rpc->srpc_bulk;
+        struct srpc_bulk *blk = rpc->srpc_bulk;
 
         if (!blk)
                 return;
@@ -384,7 +384,7 @@ brw_bulk_ready(struct srpc_server_rpc *rpc, int status)
         __u64 magic = BRW_MAGIC;
         srpc_brw_reply_t *reply = &rpc->srpc_replymsg.msg_body.brw_reply;
         srpc_brw_reqst_t *reqst;
-        srpc_msg_t *reqstmsg;
+        struct srpc_msg *reqstmsg;
 
         LASSERT(rpc->srpc_bulk);
         LASSERT(rpc->srpc_reqstbuf);
@@ -418,8 +418,8 @@ static int
 brw_server_handle(struct srpc_server_rpc *rpc)
 {
         struct srpc_service *sv = rpc->srpc_scd->scd_svc;
-        srpc_msg_t *replymsg = &rpc->srpc_replymsg;
-        srpc_msg_t *reqstmsg = &rpc->srpc_reqstbuf->buf_msg;
+        struct srpc_msg *replymsg = &rpc->srpc_replymsg;
+        struct srpc_msg *reqstmsg = &rpc->srpc_reqstbuf->buf_msg;
         srpc_brw_reply_t *reply = &replymsg->msg_body.brw_reply;
         srpc_brw_reqst_t *reqst = &reqstmsg->msg_body.brw_reqst;
         int npg;
@@ -461,10 +461,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;
@@ -488,7 +488,8 @@ brw_server_handle(struct srpc_server_rpc *rpc)
         return 0;
 }
 
-sfw_test_client_ops_t brw_test_client;
+struct sfw_test_client_ops brw_test_client;
+
 void brw_init_test_client(void)
 {
         brw_test_client.tso_init = brw_client_init;
@@ -497,7 +498,8 @@ void brw_init_test_client(void)
         brw_test_client.tso_done_rpc = brw_client_done_rpc;
 };
 
-srpc_service_t brw_test_service;
+struct srpc_service brw_test_service;
+
 void brw_init_test_service(void)
 {
         brw_test_service.sv_id = SRPC_SERVICE_BRW;
diff --git a/drivers/staging/lustre/lnet/selftest/conctl.c b/drivers/staging/lustre/lnet/selftest/conctl.c
index 6e2a81d8e730..a76f1c3b86df 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 3908c100ccb2..31d7b4f4a9e4 100644
--- a/drivers/staging/lustre/lnet/selftest/conrpc.c
+++ b/drivers/staging/lustre/lnet/selftest/conrpc.c
@@ -46,13 +46,13 @@
 #include "conrpc.h"
 #include "console.h"
 
-void lstcon_rpc_stat_reply(lstcon_rpc_trans_t *, srpc_msg_t *,
-                           lstcon_node_t *, lstcon_trans_stat_t *);
+void lstcon_rpc_stat_reply(struct lstcon_rpc_trans *, struct srpc_msg *,
+                           struct lstcon_node *, lstcon_trans_stat_t *);
 
 static void
-lstcon_rpc_done(srpc_client_rpc_t *rpc)
+lstcon_rpc_done(struct srpc_client_rpc *rpc)
 {
-        lstcon_rpc_t *crpc = (lstcon_rpc_t *)rpc->crpc_priv;
+        struct lstcon_rpc *crpc = (struct lstcon_rpc *)rpc->crpc_priv;
 
         LASSERT(crpc && rpc == crpc->crp_rpc);
         LASSERT(crpc->crp_posted && !crpc->crp_finished);
@@ -90,8 +90,8 @@ lstcon_rpc_done(srpc_client_rpc_t *rpc)
 }
 
 static int
-lstcon_rpc_init(lstcon_node_t *nd, int service, unsigned feats,
-                int bulk_npg, int bulk_len, int embedded, lstcon_rpc_t *crpc)
+lstcon_rpc_init(struct lstcon_node *nd, int service, unsigned feats,
+                int bulk_npg, int bulk_len, int embedded, struct lstcon_rpc *crpc)
 {
         crpc->crp_rpc = sfw_create_rpc(nd->nd_id, service,
                                        feats, bulk_npg, bulk_len,
@@ -115,16 +115,16 @@ lstcon_rpc_init(lstcon_node_t *nd, int service, unsigned feats,
 }
 
 static int
-lstcon_rpc_prep(lstcon_node_t *nd, int service, unsigned feats,
-                int bulk_npg, int bulk_len, lstcon_rpc_t **crpcpp)
+lstcon_rpc_prep(struct lstcon_node *nd, int service, unsigned feats,
+                int bulk_npg, int bulk_len, struct lstcon_rpc **crpcpp)
 {
-        lstcon_rpc_t *crpc = NULL;
+        struct lstcon_rpc *crpc = NULL;
         int rc;
 
         spin_lock(&console_session.ses_rpc_lock);
 
         crpc = list_first_entry_or_null(&console_session.ses_rpc_freelist,
-                                        lstcon_rpc_t, crp_link);
+                                        struct lstcon_rpc, crp_link);
         if (crpc)
                 list_del_init(&crpc->crp_link);
 
@@ -148,9 +148,9 @@ lstcon_rpc_prep(lstcon_node_t *nd, int service, unsigned feats,
 }
 
 void
-lstcon_rpc_put(lstcon_rpc_t *crpc)
+lstcon_rpc_put(struct lstcon_rpc *crpc)
 {
-        srpc_bulk_t *bulk = &crpc->crp_rpc->crpc_bulk;
+        struct srpc_bulk *bulk = &crpc->crp_rpc->crpc_bulk;
         int i;
 
         LASSERT(list_empty(&crpc->crp_link));
@@ -183,9 +183,9 @@ lstcon_rpc_put(lstcon_rpc_t *crpc)
 }
 
 static void
-lstcon_rpc_post(lstcon_rpc_t *crpc)
+lstcon_rpc_post(struct lstcon_rpc *crpc)
 {
-        lstcon_rpc_trans_t *trans = crpc->crp_trans;
+        struct lstcon_rpc_trans *trans = crpc->crp_trans;
 
         LASSERT(trans);
 
@@ -236,9 +236,9 @@ lstcon_rpc_trans_name(int transop)
 
 int
 lstcon_rpc_trans_prep(struct list_head *translist, int transop,
-                      lstcon_rpc_trans_t **transpp)
+                      struct lstcon_rpc_trans **transpp)
 {
-        lstcon_rpc_trans_t *trans;
+        struct lstcon_rpc_trans *trans;
 
         if (translist) {
                 list_for_each_entry(trans, translist, tas_link) {
@@ -278,18 +278,18 @@ lstcon_rpc_trans_prep(struct list_head *translist, int transop,
 }
 
 void
-lstcon_rpc_trans_addreq(lstcon_rpc_trans_t *trans, lstcon_rpc_t *crpc)
+lstcon_rpc_trans_addreq(struct lstcon_rpc_trans *trans, struct lstcon_rpc *crpc)
 {
         list_add_tail(&crpc->crp_link, &trans->tas_rpcs_list);
         crpc->crp_trans = trans;
 }
 
 void
-lstcon_rpc_trans_abort(lstcon_rpc_trans_t *trans, int error)
+lstcon_rpc_trans_abort(struct lstcon_rpc_trans *trans, int error)
 {
-        srpc_client_rpc_t *rpc;
-        lstcon_rpc_t *crpc;
-        lstcon_node_t *nd;
+        struct srpc_client_rpc *rpc;
+        struct lstcon_rpc *crpc;
+        struct lstcon_node *nd;
 
         list_for_each_entry(crpc, &trans->tas_rpcs_list, crp_link) {
                 rpc = crpc->crp_rpc;
@@ -326,7 +326,7 @@ lstcon_rpc_trans_abort(lstcon_rpc_trans_t *trans, int error)
 }
 
 static int
-lstcon_rpc_trans_check(lstcon_rpc_trans_t *trans)
+lstcon_rpc_trans_check(struct lstcon_rpc_trans *trans)
 {
         if (console_session.ses_shutdown &&
             !list_empty(&trans->tas_olink)) /* Not an end session RPC */
@@ -336,9 +336,9 @@ lstcon_rpc_trans_check(lstcon_rpc_trans_t *trans)
 }
 
 int
-lstcon_rpc_trans_postwait(lstcon_rpc_trans_t *trans, int timeout)
+lstcon_rpc_trans_postwait(struct lstcon_rpc_trans *trans, int timeout)
 {
-        lstcon_rpc_t *crpc;
+        struct lstcon_rpc *crpc;
         int rc;
 
         if (list_empty(&trans->tas_rpcs_list))
@@ -386,10 +386,10 @@ lstcon_rpc_trans_postwait(lstcon_rpc_trans_t *trans, int timeout)
 }
 
 static int
-lstcon_rpc_get_reply(lstcon_rpc_t *crpc, srpc_msg_t **msgpp)
+lstcon_rpc_get_reply(struct lstcon_rpc *crpc, struct srpc_msg **msgpp)
 {
-        lstcon_node_t *nd = crpc->crp_node;
-        srpc_client_rpc_t *rpc = crpc->crp_rpc;
+        struct lstcon_node *nd = crpc->crp_node;
+        struct srpc_client_rpc *rpc = crpc->crp_rpc;
         srpc_generic_reply_t *rep;
 
         LASSERT(nd && rpc);
@@ -423,10 +423,10 @@ lstcon_rpc_get_reply(lstcon_rpc_t *crpc, srpc_msg_t **msgpp)
 }
 
 void
-lstcon_rpc_trans_stat(lstcon_rpc_trans_t *trans, lstcon_trans_stat_t *stat)
+lstcon_rpc_trans_stat(struct lstcon_rpc_trans *trans, lstcon_trans_stat_t *stat)
 {
-        lstcon_rpc_t *crpc;
-        srpc_msg_t *rep;
+        struct lstcon_rpc *crpc;
+        struct srpc_msg *rep;
         int error;
 
         LASSERT(stat);
@@ -466,7 +466,7 @@ lstcon_rpc_trans_stat(lstcon_rpc_trans_t *trans, lstcon_trans_stat_t *stat)
 }
 
 int
-lstcon_rpc_trans_interpreter(lstcon_rpc_trans_t *trans,
+lstcon_rpc_trans_interpreter(struct lstcon_rpc_trans *trans,
                              struct list_head __user *head_up,
                              lstcon_rpc_readent_func_t readent)
 {
@@ -474,9 +474,9 @@ lstcon_rpc_trans_interpreter(lstcon_rpc_trans_t *trans,
         struct list_head __user *next;
         lstcon_rpc_ent_t *ent;
         srpc_generic_reply_t *rep;
-        lstcon_rpc_t *crpc;
-        srpc_msg_t *msg;
-        lstcon_node_t *nd;
+        struct lstcon_rpc *crpc;
+        struct srpc_msg *msg;
+        struct lstcon_node *nd;
         long dur;
         struct timeval tv;
         int error;
@@ -539,11 +539,11 @@ lstcon_rpc_trans_interpreter(lstcon_rpc_trans_t *trans,
 }
 
 void
-lstcon_rpc_trans_destroy(lstcon_rpc_trans_t *trans)
+lstcon_rpc_trans_destroy(struct lstcon_rpc_trans *trans)
 {
-        srpc_client_rpc_t *rpc;
-        lstcon_rpc_t *crpc;
-        lstcon_rpc_t *tmp;
+        struct srpc_client_rpc *rpc;
+        struct lstcon_rpc *crpc;
+        struct lstcon_rpc *tmp;
         int count = 0;
 
         list_for_each_entry_safe(crpc, tmp, &trans->tas_rpcs_list, crp_link) {
@@ -592,8 +592,8 @@ lstcon_rpc_trans_destroy(lstcon_rpc_trans_t *trans)
 }
 
 int
-lstcon_sesrpc_prep(lstcon_node_t *nd, int transop,
-                   unsigned feats, lstcon_rpc_t **crpc)
+lstcon_sesrpc_prep(struct lstcon_node *nd, int transop,
+                   unsigned feats, struct lstcon_rpc **crpc)
 {
         srpc_mksn_reqst_t *msrq;
         srpc_rmsn_reqst_t *rsrq;
@@ -631,7 +631,7 @@ lstcon_sesrpc_prep(lstcon_node_t *nd, int transop,
 }
 
 int
-lstcon_dbgrpc_prep(lstcon_node_t *nd, unsigned feats, lstcon_rpc_t **crpc)
+lstcon_dbgrpc_prep(struct lstcon_node *nd, unsigned feats, struct lstcon_rpc **crpc)
 {
         srpc_debug_reqst_t *drq;
         int rc;
@@ -649,10 +649,10 @@ lstcon_dbgrpc_prep(lstcon_node_t *nd, unsigned feats, lstcon_rpc_t **crpc)
 }
 
 int
-lstcon_batrpc_prep(lstcon_node_t *nd, int transop, unsigned feats,
-                   lstcon_tsb_hdr_t *tsb, lstcon_rpc_t **crpc)
+lstcon_batrpc_prep(struct lstcon_node *nd, int transop, unsigned feats,
+                   struct lstcon_tsb_hdr *tsb, struct lstcon_rpc **crpc)
 {
-        lstcon_batch_t *batch;
+        struct lstcon_batch *batch;
         srpc_batch_reqst_t *brq;
         int rc;
 
@@ -675,14 +675,14 @@ lstcon_batrpc_prep(lstcon_node_t *nd, int transop, unsigned feats,
 
         LASSERT(!tsb->tsb_index);
 
-        batch = (lstcon_batch_t *)tsb;
+        batch = (struct lstcon_batch *)tsb;
         brq->bar_arg = batch->bat_arg;
 
         return 0;
 }
 
 int
-lstcon_statrpc_prep(lstcon_node_t *nd, unsigned feats, lstcon_rpc_t **crpc)
+lstcon_statrpc_prep(struct lstcon_node *nd, unsigned feats, struct lstcon_rpc **crpc)
 {
         srpc_stat_reqst_t *srq;
         int rc;
@@ -715,12 +715,12 @@ lstcon_next_id(int idx, int nkiov, lnet_kiov_t *kiov)
 }
 
 static int
-lstcon_dstnodes_prep(lstcon_group_t *grp, int idx,
+lstcon_dstnodes_prep(struct lstcon_group *grp, int idx,
                      int dist, int span, int nkiov, lnet_kiov_t *kiov)
 {
         lnet_process_id_packed_t *pid;
-        lstcon_ndlink_t *ndl;
-        lstcon_node_t *nd;
+        struct lstcon_ndlink *ndl;
+        struct lstcon_node *nd;
         int start;
         int end;
         int i = 0;
@@ -785,8 +785,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;
@@ -806,13 +806,13 @@ lstcon_bulkrpc_v1_prep(lst_test_bulk_param_t *param, srpc_test_reqst_t *req)
 }
 
 int
-lstcon_testrpc_prep(lstcon_node_t *nd, int transop, unsigned feats,
-                    lstcon_test_t *test, lstcon_rpc_t **crpc)
+lstcon_testrpc_prep(struct lstcon_node *nd, int transop, unsigned feats,
+                    lstcon_test_t *test, struct lstcon_rpc **crpc)
 {
-        lstcon_group_t *sgrp = test->tes_src_grp;
-        lstcon_group_t *dgrp = test->tes_dst_grp;
+        struct lstcon_group *sgrp = test->tes_src_grp;
+        struct lstcon_group *dgrp = test->tes_dst_grp;
         srpc_test_reqst_t *trq;
-        srpc_bulk_t *bulk;
+        struct srpc_bulk *bulk;
         int i;
         int npg = 0;
         int nob = 0;
@@ -821,7 +821,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;
         }
 
@@ -849,8 +849,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;
@@ -915,8 +915,8 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, unsigned feats,
 }
 
 static int
-lstcon_sesnew_stat_reply(lstcon_rpc_trans_t *trans,
-                         lstcon_node_t *nd, srpc_msg_t *reply)
+lstcon_sesnew_stat_reply(struct lstcon_rpc_trans *trans,
+                         struct lstcon_node *nd, struct srpc_msg *reply)
 {
         srpc_mksn_reply_t *mksn_rep = &reply->msg_body.mksn_reply;
         int status = mksn_rep->mksn_status;
@@ -962,8 +962,8 @@ lstcon_sesnew_stat_reply(lstcon_rpc_trans_t *trans,
 }
 
 void
-lstcon_rpc_stat_reply(lstcon_rpc_trans_t *trans, srpc_msg_t *msg,
-                      lstcon_node_t *nd, lstcon_trans_stat_t *stat)
+lstcon_rpc_stat_reply(struct lstcon_rpc_trans *trans, struct srpc_msg *msg,
+                      struct lstcon_node *nd, lstcon_trans_stat_t *stat)
 {
         srpc_rmsn_reply_t *rmsn_rep;
         srpc_debug_reply_t *dbg_rep;
@@ -1083,12 +1083,12 @@ int
 lstcon_rpc_trans_ndlist(struct list_head *ndlist,
                         struct list_head *translist, int transop,
                         void *arg, lstcon_rpc_cond_func_t condition,
-                        lstcon_rpc_trans_t **transpp)
+                        struct lstcon_rpc_trans **transpp)
 {
-        lstcon_rpc_trans_t *trans;
-        lstcon_ndlink_t *ndl;
-        lstcon_node_t *nd;
-        lstcon_rpc_t *rpc;
+        struct lstcon_rpc_trans *trans;
+        struct lstcon_ndlink *ndl;
+        struct lstcon_node *nd;
+        struct lstcon_rpc *rpc;
         unsigned feats;
         int rc;
 
@@ -1135,7 +1135,8 @@ lstcon_rpc_trans_ndlist(struct list_head *ndlist,
                 case LST_TRANS_TSBCLIQRY:
                 case LST_TRANS_TSBSRVQRY:
                         rc = lstcon_batrpc_prep(nd, transop, feats,
-                                                (lstcon_tsb_hdr_t *)arg, &rpc);
+                                                (struct lstcon_tsb_hdr *)arg,
+                                                &rpc);
                         break;
                 case LST_TRANS_STATQRY:
                         rc = lstcon_statrpc_prep(nd, feats, &rpc);
@@ -1168,12 +1169,12 @@ static void
 lstcon_rpc_pinger(void *arg)
 {
         struct stt_timer *ptimer = (struct stt_timer *)arg;
-        lstcon_rpc_trans_t *trans;
-        lstcon_rpc_t *crpc;
-        srpc_msg_t *rep;
+        struct lstcon_rpc_trans *trans;
+        struct lstcon_rpc *crpc;
+        struct srpc_msg *rep;
         srpc_debug_reqst_t *drq;
-        lstcon_ndlink_t *ndl;
-        lstcon_node_t *nd;
+        struct lstcon_ndlink *ndl;
+        struct lstcon_node *nd;
         int intv;
         int count = 0;
         int rc;
@@ -1325,9 +1326,9 @@ lstcon_rpc_pinger_stop(void)
 void
 lstcon_rpc_cleanup_wait(void)
 {
-        lstcon_rpc_trans_t *trans;
-        lstcon_rpc_t *crpc;
-        lstcon_rpc_t *temp;
+        struct lstcon_rpc_trans *trans;
+        struct lstcon_rpc *crpc;
+        struct lstcon_rpc *temp;
         struct list_head *pacer;
         struct list_head zlist;
 
@@ -1337,7 +1338,7 @@ lstcon_rpc_cleanup_wait(void)
 
         while (!list_empty(&console_session.ses_trans_list)) {
                 list_for_each(pacer, &console_session.ses_trans_list) {
-                        trans = list_entry(pacer, lstcon_rpc_trans_t,
+                        trans = list_entry(pacer, struct lstcon_rpc_trans,
                                            tas_link);
 
                         CDEBUG(D_NET, "Session closed, wakeup transaction %s\n",
@@ -1369,7 +1370,7 @@ lstcon_rpc_cleanup_wait(void)
 
         list_for_each_entry_safe(crpc, temp, &zlist, crp_link) {
                 list_del(&crpc->crp_link);
-                LIBCFS_FREE(crpc, sizeof(lstcon_rpc_t));
+                LIBCFS_FREE(crpc, sizeof(struct lstcon_rpc));
         }
 }
 
diff --git a/drivers/staging/lustre/lnet/selftest/conrpc.h b/drivers/staging/lustre/lnet/selftest/conrpc.h
index 3e7839dad5bb..90c3385a355c 100644
--- a/drivers/staging/lustre/lnet/selftest/conrpc.h
+++ b/drivers/staging/lustre/lnet/selftest/conrpc.h
@@ -63,9 +63,9 @@ struct lstcon_tsb_hdr;
 struct lstcon_test;
 struct lstcon_node;
 
-typedef struct lstcon_rpc {
+struct lstcon_rpc {
         struct list_head         crp_link;      /* chain on rpc transaction */
-        srpc_client_rpc_t       *crp_rpc;       /* client rpc */
+        struct srpc_client_rpc  *crp_rpc;       /* client rpc */
         struct lstcon_node      *crp_node;      /* destination node */
         struct lstcon_rpc_trans *crp_trans;     /* conrpc transaction */
 
@@ -76,9 +76,9 @@ typedef struct lstcon_rpc {
         unsigned int             crp_embedded:1;
         int                      crp_status;    /* console rpc errors */
         unsigned long            crp_stamp;     /* replied time stamp */
-} lstcon_rpc_t;
+};
 
-typedef struct lstcon_rpc_trans {
+struct lstcon_rpc_trans {
         struct list_head  tas_olink;         /* link chain on owner list */
         struct list_head  tas_link;          /* link chain on global list */
         int               tas_opc;           /* operation code of transaction */
@@ -87,7 +87,7 @@ typedef struct lstcon_rpc_trans {
         wait_queue_head_t tas_waitq;         /* wait queue head */
         atomic_t          tas_remaining;     /* # of un-scheduled rpcs */
         struct list_head  tas_rpcs_list;     /* queued requests */
-} lstcon_rpc_trans_t;
+};
 
 #define LST_TRANS_PRIVATE       0x1000
 
@@ -106,35 +106,35 @@ typedef struct lstcon_rpc_trans {
 #define LST_TRANS_STATQRY       0x21
 
 typedef int (*lstcon_rpc_cond_func_t)(int, struct lstcon_node *, void *);
-typedef int (*lstcon_rpc_readent_func_t)(int, srpc_msg_t *,
+typedef int (*lstcon_rpc_readent_func_t)(int, struct srpc_msg *,
                                          lstcon_rpc_ent_t __user *);
 
 int  lstcon_sesrpc_prep(struct lstcon_node *nd, int transop,
-                        unsigned version, lstcon_rpc_t **crpc);
+                        unsigned version, struct lstcon_rpc **crpc);
 int  lstcon_dbgrpc_prep(struct lstcon_node *nd,
-                        unsigned version, lstcon_rpc_t **crpc);
+                        unsigned version, struct lstcon_rpc **crpc);
 int  lstcon_batrpc_prep(struct lstcon_node *nd, int transop, unsigned version,
-                        struct lstcon_tsb_hdr *tsb, lstcon_rpc_t **crpc);
+                        struct lstcon_tsb_hdr *tsb, struct lstcon_rpc **crpc);
 int  lstcon_testrpc_prep(struct lstcon_node *nd, int transop, unsigned version,
-                         struct lstcon_test *test, lstcon_rpc_t **crpc);
+                         struct lstcon_test *test, struct lstcon_rpc **crpc);
 int  lstcon_statrpc_prep(struct lstcon_node *nd, unsigned version,
-                         lstcon_rpc_t **crpc);
-void lstcon_rpc_put(lstcon_rpc_t *crpc);
+                         struct lstcon_rpc **crpc);
+void lstcon_rpc_put(struct lstcon_rpc *crpc);
 int  lstcon_rpc_trans_prep(struct list_head *translist,
-                           int transop, lstcon_rpc_trans_t **transpp);
+                           int transop, struct lstcon_rpc_trans **transpp);
 int  lstcon_rpc_trans_ndlist(struct list_head *ndlist,
                              struct list_head *translist, int transop,
                              void *arg, lstcon_rpc_cond_func_t condition,
-                             lstcon_rpc_trans_t **transpp);
-void lstcon_rpc_trans_stat(lstcon_rpc_trans_t *trans,
+                             struct lstcon_rpc_trans **transpp);
+void lstcon_rpc_trans_stat(struct lstcon_rpc_trans *trans,
                            lstcon_trans_stat_t *stat);
-int  lstcon_rpc_trans_interpreter(lstcon_rpc_trans_t *trans,
+int  lstcon_rpc_trans_interpreter(struct lstcon_rpc_trans *trans,
                                   struct list_head __user *head_up,
                                   lstcon_rpc_readent_func_t readent);
-void lstcon_rpc_trans_abort(lstcon_rpc_trans_t *trans, int error);
-void lstcon_rpc_trans_destroy(lstcon_rpc_trans_t *trans);
-void lstcon_rpc_trans_addreq(lstcon_rpc_trans_t *trans, lstcon_rpc_t *req);
-int  lstcon_rpc_trans_postwait(lstcon_rpc_trans_t *trans, int timeout);
+void lstcon_rpc_trans_abort(struct lstcon_rpc_trans *trans, int error);
+void lstcon_rpc_trans_destroy(struct lstcon_rpc_trans *trans);
+void lstcon_rpc_trans_addreq(struct lstcon_rpc_trans *trans, struct lstcon_rpc *req);
+int  lstcon_rpc_trans_postwait(struct lstcon_rpc_trans *trans, int timeout);
 int  lstcon_rpc_pinger_start(void);
 void lstcon_rpc_pinger_stop(void);
 void lstcon_rpc_cleanup_wait(void);
diff --git a/drivers/staging/lustre/lnet/selftest/console.c b/drivers/staging/lustre/lnet/selftest/console.c
index dcfc83d0ad41..03c73b014b2c 100644
--- a/drivers/staging/lustre/lnet/selftest/console.c
+++ b/drivers/staging/lustre/lnet/selftest/console.c
@@ -61,7 +61,7 @@ do {							\
 struct lstcon_session console_session;
 
 static void
-lstcon_node_get(lstcon_node_t *nd)
+lstcon_node_get(struct lstcon_node *nd)
 {
         LASSERT(nd->nd_ref >= 1);
 
@@ -69,9 +69,9 @@ lstcon_node_get(lstcon_node_t *nd)
 }
 
 static int
-lstcon_node_find(lnet_process_id_t id, lstcon_node_t **ndpp, int create)
+lstcon_node_find(lnet_process_id_t id, struct lstcon_node **ndpp, int create)
 {
-        lstcon_ndlink_t *ndl;
+        struct lstcon_ndlink    *ndl;
         unsigned int idx = LNET_NIDADDR(id.nid) % LST_GLOBAL_HASHSIZE;
 
         LASSERT(id.nid != LNET_NID_ANY);
@@ -90,11 +90,11 @@ lstcon_node_find(lnet_process_id_t id, lstcon_node_t **ndpp, int create)
         if (!create)
                 return -ENOENT;
 
-        LIBCFS_ALLOC(*ndpp, sizeof(lstcon_node_t) + sizeof(lstcon_ndlink_t));
+        LIBCFS_ALLOC(*ndpp, sizeof(struct lstcon_node) + sizeof(struct lstcon_ndlink));
         if (!*ndpp)
                 return -ENOMEM;
 
-        ndl = (lstcon_ndlink_t *)(*ndpp + 1);
+        ndl = (struct lstcon_ndlink *)(*ndpp + 1);
 
         ndl->ndl_node = *ndpp;
 
@@ -103,7 +103,7 @@ lstcon_node_find(lnet_process_id_t id, lstcon_node_t **ndpp, int create)
         ndl->ndl_node->nd_stamp = cfs_time_current();
         ndl->ndl_node->nd_state = LST_NODE_UNKNOWN;
         ndl->ndl_node->nd_timeout = 0;
-        memset(&ndl->ndl_node->nd_ping, 0, sizeof(lstcon_rpc_t));
+        memset(&ndl->ndl_node->nd_ping, 0, sizeof(struct lstcon_rpc));
 
         /*
          * queued in global hash & list, no refcount is taken by
@@ -117,16 +117,16 @@ lstcon_node_find(lnet_process_id_t id, lstcon_node_t **ndpp, int create)
 }
 
 static void
-lstcon_node_put(lstcon_node_t *nd)
+lstcon_node_put(struct lstcon_node *nd)
 {
-        lstcon_ndlink_t *ndl;
+        struct lstcon_ndlink *ndl;
 
         LASSERT(nd->nd_ref > 0);
 
         if (--nd->nd_ref > 0)
                 return;
 
-        ndl = (lstcon_ndlink_t *)(nd + 1);
+        ndl = (struct lstcon_ndlink *)(nd + 1);
 
         LASSERT(!list_empty(&ndl->ndl_link));
         LASSERT(!list_empty(&ndl->ndl_hlink));
@@ -135,16 +135,16 @@ lstcon_node_put(lstcon_node_t *nd)
         list_del(&ndl->ndl_link);
         list_del(&ndl->ndl_hlink);
 
-        LIBCFS_FREE(nd, sizeof(lstcon_node_t) + sizeof(lstcon_ndlink_t));
+        LIBCFS_FREE(nd, sizeof(struct lstcon_node) + sizeof(struct lstcon_ndlink));
 }
 
 static int
 lstcon_ndlink_find(struct list_head *hash,
-                   lnet_process_id_t id, lstcon_ndlink_t **ndlpp, int create)
+                   lnet_process_id_t id, struct lstcon_ndlink **ndlpp, int create)
 {
         unsigned int idx = LNET_NIDADDR(id.nid) % LST_NODE_HASHSIZE;
-        lstcon_ndlink_t *ndl;
-        lstcon_node_t *nd;
+        struct lstcon_ndlink *ndl;
+        struct lstcon_node *nd;
         int rc;
 
         if (id.nid == LNET_NID_ANY)
@@ -168,7 +168,7 @@ lstcon_ndlink_find(struct list_head *hash,
         if (rc)
                 return rc;
 
-        LIBCFS_ALLOC(ndl, sizeof(lstcon_ndlink_t));
+        LIBCFS_ALLOC(ndl, sizeof(struct lstcon_ndlink));
         if (!ndl) {
                 lstcon_node_put(nd);
                 return -ENOMEM;
@@ -184,7 +184,7 @@ lstcon_ndlink_find(struct list_head *hash,
 }
 
 static void
-lstcon_ndlink_release(lstcon_ndlink_t *ndl)
+lstcon_ndlink_release(struct lstcon_ndlink *ndl)
 {
         LASSERT(list_empty(&ndl->ndl_link));
         LASSERT(!list_empty(&ndl->ndl_hlink));
@@ -196,12 +196,12 @@ lstcon_ndlink_release(lstcon_ndlink_t *ndl)
 }
 
 static int
-lstcon_group_alloc(char *name, lstcon_group_t **grpp)
+lstcon_group_alloc(char *name, struct lstcon_group **grpp)
 {
-        lstcon_group_t *grp;
+        struct lstcon_group *grp;
         int i;
 
-        LIBCFS_ALLOC(grp, offsetof(lstcon_group_t,
+        LIBCFS_ALLOC(grp, offsetof(struct lstcon_group,
                                    grp_ndl_hash[LST_NODE_HASHSIZE]));
         if (!grp)
                 return -ENOMEM;
@@ -209,7 +209,7 @@ lstcon_group_alloc(char *name, lstcon_group_t **grpp)
         grp->grp_ref = 1;
         if (name) {
                 if (strlen(name) > sizeof(grp->grp_name) - 1) {
-                        LIBCFS_FREE(grp, offsetof(lstcon_group_t,
+                        LIBCFS_FREE(grp, offsetof(struct lstcon_group,
                                     grp_ndl_hash[LST_NODE_HASHSIZE]));
                         return -E2BIG;
                 }
@@ -229,18 +229,18 @@ lstcon_group_alloc(char *name, lstcon_group_t **grpp)
 }
 
 static void
-lstcon_group_addref(lstcon_group_t *grp)
+lstcon_group_addref(struct lstcon_group *grp)
 {
         grp->grp_ref++;
 }
 
-static void lstcon_group_ndlink_release(lstcon_group_t *, lstcon_ndlink_t *);
+static void lstcon_group_ndlink_release(struct lstcon_group *, struct lstcon_ndlink *);
 
 static void
-lstcon_group_drain(lstcon_group_t *grp, int keep)
+lstcon_group_drain(struct lstcon_group *grp, int keep)
 {
-        lstcon_ndlink_t *ndl;
-        lstcon_ndlink_t *tmp;
+        struct lstcon_ndlink *ndl;
+        struct lstcon_ndlink *tmp;
 
         list_for_each_entry_safe(ndl, tmp, &grp->grp_ndl_list, ndl_link) {
                 if (!(ndl->ndl_node->nd_state & keep))
@@ -249,7 +249,7 @@ lstcon_group_drain(lstcon_group_t *grp, int keep)
 }
 
 static void
-lstcon_group_decref(lstcon_group_t *grp)
+lstcon_group_decref(struct lstcon_group *grp)
 {
         int i;
 
@@ -264,14 +264,14 @@ lstcon_group_decref(lstcon_group_t *grp)
         for (i = 0; i < LST_NODE_HASHSIZE; i++)
                 LASSERT(list_empty(&grp->grp_ndl_hash[i]));
 
-        LIBCFS_FREE(grp, offsetof(lstcon_group_t,
+        LIBCFS_FREE(grp, offsetof(struct lstcon_group,
                                   grp_ndl_hash[LST_NODE_HASHSIZE]));
 }
 
 static int
-lstcon_group_find(const char *name, lstcon_group_t **grpp)
+lstcon_group_find(const char *name, struct lstcon_group **grpp)
 {
-        lstcon_group_t *grp;
+        struct lstcon_group *grp;
 
         list_for_each_entry(grp, &console_session.ses_grp_list, grp_link) {
                 if (strncmp(grp->grp_name, name, LST_NAME_SIZE))
@@ -286,8 +286,8 @@ lstcon_group_find(const char *name, lstcon_group_t **grpp)
 }
 
 static int
-lstcon_group_ndlink_find(lstcon_group_t *grp, lnet_process_id_t id,
-                         lstcon_ndlink_t **ndlpp, int create)
+lstcon_group_ndlink_find(struct lstcon_group *grp, lnet_process_id_t id,
+                         struct lstcon_ndlink **ndlpp, int create)
 {
         int rc;
 
@@ -305,7 +305,7 @@ lstcon_group_ndlink_find(lstcon_group_t *grp, lnet_process_id_t id,
 }
 
 static void
-lstcon_group_ndlink_release(lstcon_group_t *grp, lstcon_ndlink_t *ndl)
+lstcon_group_ndlink_release(struct lstcon_group *grp, struct lstcon_ndlink *ndl)
 {
         list_del_init(&ndl->ndl_link);
         lstcon_ndlink_release(ndl);
@@ -313,8 +313,8 @@ lstcon_group_ndlink_release(lstcon_group_t *grp, lstcon_ndlink_t *ndl)
 }
 
 static void
-lstcon_group_ndlink_move(lstcon_group_t *old,
-                         lstcon_group_t *new, lstcon_ndlink_t *ndl)
+lstcon_group_ndlink_move(struct lstcon_group *old,
+                         struct lstcon_group *new, struct lstcon_ndlink *ndl)
 {
         unsigned int idx = LNET_NIDADDR(ndl->ndl_node->nd_id.nid) %
                                         LST_NODE_HASHSIZE;
@@ -329,21 +329,21 @@ lstcon_group_ndlink_move(lstcon_group_t *old,
 }
 
 static void
-lstcon_group_move(lstcon_group_t *old, lstcon_group_t *new)
+lstcon_group_move(struct lstcon_group *old, struct lstcon_group *new)
 {
-        lstcon_ndlink_t *ndl;
+        struct lstcon_ndlink *ndl;
 
         while (!list_empty(&old->grp_ndl_list)) {
                 ndl = list_entry(old->grp_ndl_list.next,
-                                 lstcon_ndlink_t, ndl_link);
+                                 struct lstcon_ndlink, ndl_link);
                 lstcon_group_ndlink_move(old, new, ndl);
         }
 }
 
 static int
-lstcon_sesrpc_condition(int transop, lstcon_node_t *nd, void *arg)
+lstcon_sesrpc_condition(int transop, struct lstcon_node *nd, void *arg)
 {
-        lstcon_group_t *grp = (lstcon_group_t *)arg;
+        struct lstcon_group *grp = (struct lstcon_group *)arg;
 
         switch (transop) {
         case LST_TRANS_SESNEW:
@@ -370,7 +370,7 @@ lstcon_sesrpc_condition(int transop, lstcon_node_t *nd, void *arg)
 }
 
 static int
-lstcon_sesrpc_readent(int transop, srpc_msg_t *msg,
+lstcon_sesrpc_readent(int transop, struct srpc_msg *msg,
                       lstcon_rpc_ent_t __user *ent_up)
 {
         srpc_debug_reply_t *rep;
@@ -399,13 +399,13 @@ lstcon_sesrpc_readent(int transop, srpc_msg_t *msg,
 }
 
 static int
-lstcon_group_nodes_add(lstcon_group_t *grp,
+lstcon_group_nodes_add(struct lstcon_group *grp,
                        int count, lnet_process_id_t __user *ids_up,
                        unsigned *featp, struct list_head __user *result_up)
 {
-        lstcon_rpc_trans_t *trans;
-        lstcon_ndlink_t *ndl;
-        lstcon_group_t *tmp;
+        struct lstcon_rpc_trans *trans;
+        struct lstcon_ndlink    *ndl;
+        struct lstcon_group *tmp;
         lnet_process_id_t id;
         int i;
         int rc;
@@ -466,13 +466,13 @@ lstcon_group_nodes_add(lstcon_group_t *grp,
 }
 
 static int
-lstcon_group_nodes_remove(lstcon_group_t *grp,
+lstcon_group_nodes_remove(struct lstcon_group *grp,
                           int count, lnet_process_id_t __user *ids_up,
                           struct list_head __user *result_up)
 {
-        lstcon_rpc_trans_t *trans;
-        lstcon_ndlink_t *ndl;
-        lstcon_group_t *tmp;
+        struct lstcon_rpc_trans *trans;
+        struct lstcon_ndlink *ndl;
+        struct lstcon_group *tmp;
         lnet_process_id_t id;
         int rc;
         int i;
@@ -523,7 +523,7 @@ error:
 int
 lstcon_group_add(char *name)
 {
-        lstcon_group_t *grp;
+        struct lstcon_group *grp;
         int rc;
 
         rc = lstcon_group_find(name, &grp) ? 0 : -EEXIST;
@@ -548,7 +548,7 @@ int
 lstcon_nodes_add(char *name, int count, lnet_process_id_t __user *ids_up,
                  unsigned *featp, struct list_head __user *result_up)
 {
-        lstcon_group_t *grp;
+        struct lstcon_group *grp;
         int rc;
 
         LASSERT(count > 0);
@@ -578,8 +578,8 @@ lstcon_nodes_add(char *name, int count, lnet_process_id_t __user *ids_up,
 int
 lstcon_group_del(char *name)
 {
-        lstcon_rpc_trans_t *trans;
-        lstcon_group_t *grp;
+        struct lstcon_rpc_trans *trans;
+        struct lstcon_group *grp;
         int rc;
 
         rc = lstcon_group_find(name, &grp);
@@ -621,7 +621,7 @@ lstcon_group_del(char *name)
 int
 lstcon_group_clean(char *name, int args)
 {
-        lstcon_group_t *grp = NULL;
+        struct lstcon_group *grp = NULL;
         int rc;
 
         rc = lstcon_group_find(name, &grp);
@@ -654,7 +654,7 @@ int
 lstcon_nodes_remove(char *name, int count, lnet_process_id_t __user *ids_up,
                     struct list_head __user *result_up)
 {
-        lstcon_group_t *grp = NULL;
+        struct lstcon_group *grp = NULL;
         int rc;
 
         rc = lstcon_group_find(name, &grp);
@@ -683,8 +683,8 @@ lstcon_nodes_remove(char *name, int count, lnet_process_id_t __user *ids_up,
 int
 lstcon_group_refresh(char *name, struct list_head __user *result_up)
 {
-        lstcon_rpc_trans_t *trans;
-        lstcon_group_t *grp;
+        struct lstcon_rpc_trans *trans;
+        struct lstcon_group *grp;
         int rc;
 
         rc = lstcon_group_find(name, &grp);
@@ -725,7 +725,7 @@ lstcon_group_refresh(char *name, struct list_head __user *result_up)
 int
 lstcon_group_list(int index, int len, char __user *name_up)
 {
-        lstcon_group_t *grp;
+        struct lstcon_group *grp;
 
         LASSERT(index >= 0);
         LASSERT(name_up);
@@ -744,8 +744,8 @@ static int
 lstcon_nodes_getent(struct list_head *head, int *index_p,
                     int *count_p, lstcon_node_ent_t __user *dents_up)
 {
-        lstcon_ndlink_t *ndl;
-        lstcon_node_t *nd;
+        struct lstcon_ndlink *ndl;
+        struct lstcon_node *nd;
         int count = 0;
         int index = 0;
 
@@ -786,8 +786,8 @@ lstcon_group_info(char *name, lstcon_ndlist_ent_t __user *gents_p,
                   lstcon_node_ent_t __user *dents_up)
 {
         lstcon_ndlist_ent_t *gentp;
-        lstcon_group_t *grp;
-        lstcon_ndlink_t *ndl;
+        struct lstcon_group *grp;
+        struct lstcon_ndlink *ndl;
         int rc;
 
         rc = lstcon_group_find(name, &grp);
@@ -828,9 +828,9 @@ lstcon_group_info(char *name, lstcon_ndlist_ent_t __user *gents_p,
 }
 
 static int
-lstcon_batch_find(const char *name, lstcon_batch_t **batpp)
+lstcon_batch_find(const char *name, struct lstcon_batch **batpp)
 {
-        lstcon_batch_t *bat;
+        struct lstcon_batch *bat;
 
         list_for_each_entry(bat, &console_session.ses_bat_list, bat_link) {
                 if (!strncmp(bat->bat_name, name, LST_NAME_SIZE)) {
@@ -845,7 +845,7 @@ lstcon_batch_find(const char *name, lstcon_batch_t **batpp)
 int
 lstcon_batch_add(char *name)
 {
-        lstcon_batch_t *bat;
+        struct lstcon_batch *bat;
         int i;
         int rc;
 
@@ -855,7 +855,7 @@ lstcon_batch_add(char *name)
                 return rc;
         }
 
-        LIBCFS_ALLOC(bat, sizeof(lstcon_batch_t));
+        LIBCFS_ALLOC(bat, sizeof(struct lstcon_batch));
         if (!bat) {
                 CERROR("Can't allocate descriptor for batch %s\n", name);
                 return -ENOMEM;
@@ -865,7 +865,7 @@ lstcon_batch_add(char *name)
                      sizeof(struct list_head) * LST_NODE_HASHSIZE);
         if (!bat->bat_cli_hash) {
                 CERROR("Can't allocate hash for batch %s\n", name);
-                LIBCFS_FREE(bat, sizeof(lstcon_batch_t));
+                LIBCFS_FREE(bat, sizeof(struct lstcon_batch));
 
                 return -ENOMEM;
         }
@@ -875,7 +875,7 @@ lstcon_batch_add(char *name)
         if (!bat->bat_srv_hash) {
                 CERROR("Can't allocate hash for batch %s\n", name);
                 LIBCFS_FREE(bat->bat_cli_hash, LST_NODE_HASHSIZE);
-                LIBCFS_FREE(bat, sizeof(lstcon_batch_t));
+                LIBCFS_FREE(bat, sizeof(struct lstcon_batch));
 
                 return -ENOMEM;
         }
@@ -883,7 +883,7 @@ lstcon_batch_add(char *name)
         if (strlen(name) > sizeof(bat->bat_name) - 1) {
                 LIBCFS_FREE(bat->bat_srv_hash, LST_NODE_HASHSIZE);
                 LIBCFS_FREE(bat->bat_cli_hash, LST_NODE_HASHSIZE);
-                LIBCFS_FREE(bat, sizeof(lstcon_batch_t));
+                LIBCFS_FREE(bat, sizeof(struct lstcon_batch));
                 return -E2BIG;
         }
         strncpy(bat->bat_name, name, sizeof(bat->bat_name));
@@ -911,7 +911,7 @@ lstcon_batch_add(char *name)
 int
 lstcon_batch_list(int index, int len, char __user *name_up)
 {
-        lstcon_batch_t *bat;
+        struct lstcon_batch *bat;
 
         LASSERT(name_up);
         LASSERT(index >= 0);
@@ -935,8 +935,8 @@ lstcon_batch_info(char *name, lstcon_test_batch_ent_t __user *ent_up,
         struct list_head *clilst;
         struct list_head *srvlst;
         lstcon_test_t *test = NULL;
-        lstcon_batch_t *bat;
-        lstcon_ndlink_t *ndl;
+        struct lstcon_batch *bat;
+        struct lstcon_ndlink    *ndl;
         int rc;
 
         rc = lstcon_batch_find(name, &bat);
@@ -998,7 +998,7 @@ lstcon_batch_info(char *name, lstcon_test_batch_ent_t __user *ent_up,
 }
 
 static int
-lstcon_batrpc_condition(int transop, lstcon_node_t *nd, void *arg)
+lstcon_batrpc_condition(int transop, struct lstcon_node *nd, void *arg)
 {
         switch (transop) {
         case LST_TRANS_TSBRUN:
@@ -1020,10 +1020,10 @@ lstcon_batrpc_condition(int transop, lstcon_node_t *nd, void *arg)
 }
 
 static int
-lstcon_batch_op(lstcon_batch_t *bat, int transop,
+lstcon_batch_op(struct lstcon_batch *bat, int transop,
                 struct list_head __user *result_up)
 {
-        lstcon_rpc_trans_t *trans;
+        struct lstcon_rpc_trans *trans;
         int rc;
 
         rc = lstcon_rpc_trans_ndlist(&bat->bat_cli_list,
@@ -1046,7 +1046,7 @@ lstcon_batch_op(lstcon_batch_t *bat, int transop,
 int
 lstcon_batch_run(char *name, int timeout, struct list_head __user *result_up)
 {
-        lstcon_batch_t *bat;
+        struct lstcon_batch *bat;
         int rc;
 
         if (lstcon_batch_find(name, &bat)) {
@@ -1068,7 +1068,7 @@ lstcon_batch_run(char *name, int timeout, struct list_head __user *result_up)
 int
 lstcon_batch_stop(char *name, int force, struct list_head __user *result_up)
 {
-        lstcon_batch_t *bat;
+        struct lstcon_batch *bat;
         int rc;
 
         if (lstcon_batch_find(name, &bat)) {
@@ -1088,9 +1088,9 @@ lstcon_batch_stop(char *name, int force, struct list_head __user *result_up)
 }
 
 static void
-lstcon_batch_destroy(lstcon_batch_t *bat)
+lstcon_batch_destroy(struct lstcon_batch *bat)
 {
-        lstcon_ndlink_t *ndl;
+        struct lstcon_ndlink *ndl;
         lstcon_test_t *test;
         int i;
 
@@ -1114,7 +1114,7 @@ lstcon_batch_destroy(lstcon_batch_t *bat)
 
         while (!list_empty(&bat->bat_cli_list)) {
                 ndl = list_entry(bat->bat_cli_list.next,
-                                 lstcon_ndlink_t, ndl_link);
+                                 struct lstcon_ndlink, ndl_link);
                 list_del_init(&ndl->ndl_link);
 
                 lstcon_ndlink_release(ndl);
@@ -1122,7 +1122,7 @@ lstcon_batch_destroy(lstcon_batch_t *bat)
 
         while (!list_empty(&bat->bat_srv_list)) {
                 ndl = list_entry(bat->bat_srv_list.next,
-                                 lstcon_ndlink_t, ndl_link);
+                                 struct lstcon_ndlink, ndl_link);
                 list_del_init(&ndl->ndl_link);
 
                 lstcon_ndlink_release(ndl);
@@ -1137,15 +1137,15 @@ lstcon_batch_destroy(lstcon_batch_t *bat)
                     sizeof(struct list_head) * LST_NODE_HASHSIZE);
         LIBCFS_FREE(bat->bat_srv_hash,
                     sizeof(struct list_head) * LST_NODE_HASHSIZE);
-        LIBCFS_FREE(bat, sizeof(lstcon_batch_t));
+        LIBCFS_FREE(bat, sizeof(struct lstcon_batch));
 }
 
 static int
-lstcon_testrpc_condition(int transop, lstcon_node_t *nd, void *arg)
+lstcon_testrpc_condition(int transop, struct lstcon_node *nd, void *arg)
 {
         lstcon_test_t *test;
-        lstcon_batch_t *batch;
-        lstcon_ndlink_t *ndl;
+        struct lstcon_batch *batch;
+        struct lstcon_ndlink *ndl;
         struct list_head *hash;
         struct list_head *head;
 
@@ -1187,8 +1187,8 @@ lstcon_testrpc_condition(int transop, lstcon_node_t *nd, void *arg)
 static int
 lstcon_test_nodes_add(lstcon_test_t *test, struct list_head __user *result_up)
 {
-        lstcon_rpc_trans_t *trans;
-        lstcon_group_t *grp;
+        struct lstcon_rpc_trans *trans;
+        struct lstcon_group *grp;
         int transop;
         int rc;
 
@@ -1236,7 +1236,7 @@ again:
 }
 
 static int
-lstcon_verify_batch(const char *name, lstcon_batch_t **batch)
+lstcon_verify_batch(const char *name, struct lstcon_batch **batch)
 {
         int rc;
 
@@ -1255,10 +1255,10 @@ lstcon_verify_batch(const char *name, lstcon_batch_t **batch)
 }
 
 static int
-lstcon_verify_group(const char *name, lstcon_group_t **grp)
+lstcon_verify_group(const char *name, struct lstcon_group **grp)
 {
         int rc;
-        lstcon_ndlink_t *ndl;
+        struct lstcon_ndlink    *ndl;
 
         rc = lstcon_group_find(name, grp);
         if (rc) {
@@ -1285,9 +1285,9 @@ lstcon_test_add(char *batch_name, int type, int loop,
 {
         lstcon_test_t *test = NULL;
         int rc;
-        lstcon_group_t *src_grp = NULL;
-        lstcon_group_t *dst_grp = NULL;
-        lstcon_batch_t *batch = NULL;
+        struct lstcon_group *src_grp = NULL;
+        struct lstcon_group *dst_grp = NULL;
+        struct lstcon_batch *batch = NULL;
 
         /*
          * verify that a batch of the given name exists, and the groups
@@ -1368,7 +1368,7 @@ out:
 }
 
 static int
-lstcon_test_find(lstcon_batch_t *batch, int idx, lstcon_test_t **testpp)
+lstcon_test_find(struct lstcon_batch *batch, int idx, lstcon_test_t **testpp)
 {
         lstcon_test_t *test;
 
@@ -1383,7 +1383,7 @@ lstcon_test_find(lstcon_batch_t *batch, int idx, lstcon_test_t **testpp)
 }
 
 static int
-lstcon_tsbrpc_readent(int transop, srpc_msg_t *msg,
+lstcon_tsbrpc_readent(int transop, struct srpc_msg *msg,
                       lstcon_rpc_ent_t __user *ent_up)
 {
         srpc_batch_reply_t *rep = &msg->msg_body.bat_reply;
@@ -1403,11 +1403,11 @@ int
 lstcon_test_batch_query(char *name, int testidx, int client,
                         int timeout, struct list_head __user *result_up)
 {
-        lstcon_rpc_trans_t *trans;
+        struct lstcon_rpc_trans *trans;
         struct list_head *translist;
         struct list_head *ndlist;
-        lstcon_tsb_hdr_t *hdr;
-        lstcon_batch_t *batch;
+        struct lstcon_tsb_hdr *hdr;
+        struct lstcon_batch *batch;
         lstcon_test_t *test = NULL;
         int transop;
         int rc;
@@ -1462,7 +1462,7 @@ lstcon_test_batch_query(char *name, int testidx, int client,
 }
 
 static int
-lstcon_statrpc_readent(int transop, srpc_msg_t *msg,
+lstcon_statrpc_readent(int transop, struct srpc_msg *msg,
                        lstcon_rpc_ent_t __user *ent_up)
 {
         srpc_stat_reply_t *rep = &msg->msg_body.stat_reply;
@@ -1490,7 +1490,7 @@ lstcon_ndlist_stat(struct list_head *ndlist,
                    int timeout, struct list_head __user *result_up)
 {
         struct list_head head;
-        lstcon_rpc_trans_t *trans;
+        struct lstcon_rpc_trans *trans;
         int rc;
 
         INIT_LIST_HEAD(&head);
@@ -1515,7 +1515,7 @@ int
 lstcon_group_stat(char *grp_name, int timeout,
                   struct list_head __user *result_up)
 {
-        lstcon_group_t *grp;
+        struct lstcon_group *grp;
         int rc;
 
         rc = lstcon_group_find(grp_name, &grp);
@@ -1535,8 +1535,8 @@ int
 lstcon_nodes_stat(int count, lnet_process_id_t __user *ids_up,
                   int timeout, struct list_head __user *result_up)
 {
-        lstcon_ndlink_t *ndl;
-        lstcon_group_t *tmp;
+        struct lstcon_ndlink    *ndl;
+        struct lstcon_group *tmp;
         lnet_process_id_t id;
         int i;
         int rc;
@@ -1580,7 +1580,7 @@ lstcon_debug_ndlist(struct list_head *ndlist,
                     struct list_head *translist,
                     int timeout, struct list_head __user *result_up)
 {
-        lstcon_rpc_trans_t *trans;
+        struct lstcon_rpc_trans *trans;
         int rc;
 
         rc = lstcon_rpc_trans_ndlist(ndlist, translist, LST_TRANS_SESQRY,
@@ -1610,7 +1610,7 @@ int
 lstcon_batch_debug(int timeout, char *name,
                    int client, struct list_head __user *result_up)
 {
-        lstcon_batch_t *bat;
+        struct lstcon_batch *bat;
         int rc;
 
         rc = lstcon_batch_find(name, &bat);
@@ -1628,7 +1628,7 @@ int
 lstcon_group_debug(int timeout, char *name,
                    struct list_head __user *result_up)
 {
-        lstcon_group_t *grp;
+        struct lstcon_group *grp;
         int rc;
 
         rc = lstcon_group_find(name, &grp);
@@ -1648,8 +1648,8 @@ lstcon_nodes_debug(int timeout,
                    struct list_head __user *result_up)
 {
         lnet_process_id_t id;
-        lstcon_ndlink_t *ndl;
-        lstcon_group_t *grp;
+        struct lstcon_ndlink *ndl;
+        struct lstcon_group *grp;
         int i;
         int rc;
 
@@ -1757,7 +1757,7 @@ lstcon_session_new(char *name, int key, unsigned feats,
 
         rc = lstcon_rpc_pinger_start();
         if (rc) {
-                lstcon_batch_t *bat = NULL;
+                struct lstcon_batch *bat = NULL;
 
                 lstcon_batch_find(LST_DEFAULT_BATCH, &bat);
                 lstcon_batch_destroy(bat);
@@ -1781,7 +1781,7 @@ lstcon_session_info(lst_sid_t __user *sid_up, int __user *key_up,
                     char __user *name_up, int len)
 {
         lstcon_ndlist_ent_t *entp;
-        lstcon_ndlink_t *ndl;
+        struct lstcon_ndlink *ndl;
         int rc = 0;
 
         if (console_session.ses_state != LST_SESSION_ACTIVE)
@@ -1812,9 +1812,9 @@ lstcon_session_info(lst_sid_t __user *sid_up, int __user *key_up,
 int
 lstcon_session_end(void)
 {
-        lstcon_rpc_trans_t *trans;
-        lstcon_group_t *grp;
-        lstcon_batch_t *bat;
+        struct lstcon_rpc_trans *trans;
+        struct lstcon_group *grp;
+        struct lstcon_batch *bat;
         int rc = 0;
 
         LASSERT(console_session.ses_state == LST_SESSION_ACTIVE);
@@ -1848,7 +1848,7 @@ lstcon_session_end(void)
         /* destroy all batches */
         while (!list_empty(&console_session.ses_bat_list)) {
                 bat = list_entry(console_session.ses_bat_list.next,
-                                 lstcon_batch_t, bat_link);
+                                 struct lstcon_batch, bat_link);
 
                 lstcon_batch_destroy(bat);
         }
@@ -1856,7 +1856,7 @@ lstcon_session_end(void)
         /* destroy all groups */
         while (!list_empty(&console_session.ses_grp_list)) {
                 grp = list_entry(console_session.ses_grp_list.next,
-                                 lstcon_group_t, grp_link);
+                                 struct lstcon_group, grp_link);
                 LASSERT(grp->grp_ref == 1);
 
                 lstcon_group_decref(grp);
@@ -1905,12 +1905,12 @@ lstcon_session_feats_check(unsigned feats)
 static int
 lstcon_acceptor_handle(struct srpc_server_rpc *rpc)
 {
-        srpc_msg_t *rep = &rpc->srpc_replymsg;
-        srpc_msg_t *req = &rpc->srpc_reqstbuf->buf_msg;
+        struct srpc_msg *rep    = &rpc->srpc_replymsg;
+        struct srpc_msg *req    = &rpc->srpc_reqstbuf->buf_msg;
         srpc_join_reqst_t *jreq = &req->msg_body.join_reqst;
         srpc_join_reply_t *jrep = &rep->msg_body.join_reply;
-        lstcon_group_t *grp = NULL;
-        lstcon_ndlink_t *ndl;
+        struct lstcon_group *grp = NULL;
+        struct lstcon_ndlink *ndl;
         int rc = 0;
 
         sfw_unpack_message(req);
@@ -1986,7 +1986,8 @@ out:
         return rc;
 }
 
-static srpc_service_t lstcon_acceptor_service;
+static struct srpc_service lstcon_acceptor_service;
+
 static void lstcon_init_acceptor_service(void)
 {
         /* initialize selftest console acceptor service table */
diff --git a/drivers/staging/lustre/lnet/selftest/console.h b/drivers/staging/lustre/lnet/selftest/console.h
index 554f582441f1..ccd4982b0cd6 100644
--- a/drivers/staging/lustre/lnet/selftest/console.h
+++ b/drivers/staging/lustre/lnet/selftest/console.h
@@ -50,22 +50,25 @@
 #include "selftest.h"
 #include "conrpc.h"
 
-typedef struct lstcon_node {
+/* node descriptor */
+struct lstcon_node {
         lnet_process_id_t nd_id;      /* id of the node */
         int               nd_ref;     /* reference count */
         int               nd_state;   /* state of the node */
         int               nd_timeout; /* session timeout */
         unsigned long     nd_stamp;   /* timestamp of last replied RPC */
         struct lstcon_rpc nd_ping;    /* ping rpc */
-} lstcon_node_t; /* node descriptor */
+};
 
-typedef struct {
+/* node link descriptor */
+struct lstcon_ndlink {
         struct list_head ndl_link;    /* chain on list */
         struct list_head ndl_hlink;   /* chain on hash */
-        lstcon_node_t    *ndl_node;   /* pointer to node */
-} lstcon_ndlink_t; /* node link descriptor */
+        struct lstcon_node      *ndl_node;      /* pointer to node */
+};
 
-typedef struct {
+/* (alias of nodes) group descriptor */
+struct lstcon_group {
         struct list_head grp_link;                /* chain on global group list
                                                    */
         int              grp_ref;                 /* reference count */
@@ -76,18 +79,19 @@ typedef struct {
         struct list_head grp_trans_list;          /* transaction list */
         struct list_head grp_ndl_list;            /* nodes list */
         struct list_head grp_ndl_hash[0];         /* hash table for nodes */
-} lstcon_group_t; /* (alias of nodes) group descriptor */
+};
 
 #define LST_BATCH_IDLE    0xB0      /* idle batch */
 #define LST_BATCH_RUNNING 0xB1      /* running batch */
 
-typedef struct lstcon_tsb_hdr {
+struct lstcon_tsb_hdr {
         lst_bid_t        tsb_id;         /* batch ID */
         int              tsb_index;      /* test index */
-} lstcon_tsb_hdr_t;
+};
 
-typedef struct {
-        lstcon_tsb_hdr_t bat_hdr;         /* test_batch header */
+/* (tests ) batch descriptor */
+struct lstcon_batch {
+        struct lstcon_tsb_hdr   bat_hdr;        /* test_batch header */
         struct list_head bat_link;        /* chain on session's batches list */
         int              bat_ntest;       /* # of test */
         int              bat_state;       /* state of the batch */
@@ -99,16 +103,16 @@ typedef struct {
                                            */
         struct list_head bat_trans_list;  /* list head of transaction */
         struct list_head bat_cli_list;    /* list head of client nodes
-                                           * (lstcon_node_t) */
+                                           * (struct lstcon_node) */
         struct list_head *bat_cli_hash;   /* hash table of client nodes */
         struct list_head bat_srv_list;    /* list head of server nodes */
         struct list_head *bat_srv_hash;   /* hash table of server nodes */
-} lstcon_batch_t; /* (tests ) batch descriptor */
+};
 
 typedef struct lstcon_test {
-        lstcon_tsb_hdr_t tes_hdr;        /* test batch header */
+        struct lstcon_tsb_hdr   tes_hdr;        /* test batch header */
         struct list_head tes_link;       /* chain on batch's tests list */
-        lstcon_batch_t   *tes_batch;     /* pointer to batch */
+        struct lstcon_batch     *tes_batch;      /* pointer to batch */
 
         int              tes_type;       /* type of the test, i.e: bulk, ping */
         int              tes_stop_onerr; /* stop on error */
@@ -120,8 +124,8 @@ typedef struct lstcon_test {
         int              tes_cliidx;     /* client index, used for RPC creating */
 
         struct list_head tes_trans_list; /* transaction list */
-        lstcon_group_t   *tes_src_grp;   /* group run the test */
-        lstcon_group_t   *tes_dst_grp;   /* target group */
+        struct lstcon_group     *tes_src_grp;   /* group run the test */
+        struct lstcon_group     *tes_dst_grp;   /* target group */
 
         int              tes_paramlen;   /* test parameter length */
         char             tes_param[0];   /* test parameter */
@@ -152,7 +156,7 @@ struct lstcon_session {
         unsigned            ses_expired:1;    /* console is timedout */
         __u64               ses_id_cookie;    /* batch id cookie */
         char                ses_name[LST_NAME_SIZE];/* session name */
-        lstcon_rpc_trans_t  *ses_ping;        /* session pinger */
+        struct lstcon_rpc_trans *ses_ping;              /* session pinger */
         struct stt_timer         ses_ping_timer;   /* timer for pinger */
         lstcon_trans_stat_t ses_trans_stat;   /* transaction stats */
 
diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
index aa646a780f58..ef3cc8264daa 100644
--- a/drivers/staging/lustre/lnet/selftest/framework.c
+++ b/drivers/staging/lustre/lnet/selftest/framework.c
@@ -109,19 +109,19 @@ static struct smoketest_framework {
         struct list_head  fw_tests;           /* registered test cases */
         atomic_t          fw_nzombies;        /* # zombie sessions */
         spinlock_t        fw_lock;            /* serialise */
-        sfw_session_t     *fw_session;        /* _the_ session */
+        struct sfw_session        *fw_session;        /* _the_ session */
         int               fw_shuttingdown;    /* shutdown in progress */
         struct srpc_server_rpc *fw_active_srpc;/* running RPC */
 } sfw_data;
 
 /* forward ref's */
-int sfw_stop_batch(sfw_batch_t *tsb, int force);
-void sfw_destroy_session(sfw_session_t *sn);
+int sfw_stop_batch(struct sfw_batch *tsb, int force);
+void sfw_destroy_session(struct sfw_session *sn);
 
-static inline sfw_test_case_t *
+static inline struct sfw_test_case *
 sfw_find_test_case(int id)
 {
-        sfw_test_case_t *tsc;
+        struct sfw_test_case *tsc;
 
         LASSERT(id <= SRPC_SERVICE_MAX_ID);
         LASSERT(id > SRPC_FRAMEWORK_SERVICE_MAX_ID);
@@ -135,9 +135,9 @@ sfw_find_test_case(int id)
 }
 
 static int
-sfw_register_test(srpc_service_t *service, sfw_test_client_ops_t *cliops)
+sfw_register_test(struct srpc_service *service, struct sfw_test_client_ops *cliops)
 {
-        sfw_test_case_t *tsc;
+        struct sfw_test_case *tsc;
 
         if (sfw_find_test_case(service->sv_id)) {
                 CERROR("Failed to register test %s (%d)\n",
@@ -145,7 +145,7 @@ sfw_register_test(srpc_service_t *service, sfw_test_client_ops_t *cliops)
                 return -EEXIST;
         }
 
-        LIBCFS_ALLOC(tsc, sizeof(sfw_test_case_t));
+        LIBCFS_ALLOC(tsc, sizeof(struct sfw_test_case));
         if (!tsc)
                 return -ENOMEM;
 
@@ -159,7 +159,7 @@ sfw_register_test(srpc_service_t *service, sfw_test_client_ops_t *cliops)
 static void
 sfw_add_session_timer(void)
 {
-        sfw_session_t *sn = sfw_data.fw_session;
+        struct sfw_session *sn = sfw_data.fw_session;
         struct stt_timer *timer = &sn->sn_timer;
 
         LASSERT(!sfw_data.fw_shuttingdown);
@@ -177,7 +177,7 @@ sfw_add_session_timer(void)
 static int
 sfw_del_session_timer(void)
 {
-        sfw_session_t *sn = sfw_data.fw_session;
+        struct sfw_session *sn = sfw_data.fw_session;
 
         if (!sn || !sn->sn_timer_active)
                 return 0;
@@ -196,10 +196,10 @@ static void
 sfw_deactivate_session(void)
 __must_hold(&sfw_data.fw_lock)
 {
-        sfw_session_t *sn = sfw_data.fw_session;
+        struct sfw_session *sn = sfw_data.fw_session;
         int nactive = 0;
-        sfw_batch_t *tsb;
-        sfw_test_case_t *tsc;
+        struct sfw_batch *tsb;
+        struct sfw_test_case *tsc;
 
         if (!sn)
                 return;
@@ -239,7 +239,7 @@ __must_hold(&sfw_data.fw_lock)
 static void
 sfw_session_expired(void *data)
 {
-        sfw_session_t *sn = data;
+        struct sfw_session *sn = data;
 
         spin_lock(&sfw_data.fw_lock);
 
@@ -257,12 +257,12 @@ sfw_session_expired(void *data)
 }
 
 static inline void
-sfw_init_session(sfw_session_t *sn, lst_sid_t sid,
+sfw_init_session(struct sfw_session *sn, lst_sid_t sid,
                  unsigned features, const char *name)
 {
         struct stt_timer *timer = &sn->sn_timer;
 
-        memset(sn, 0, sizeof(sfw_session_t));
+        memset(sn, 0, sizeof(struct sfw_session));
         INIT_LIST_HEAD(&sn->sn_list);
         INIT_LIST_HEAD(&sn->sn_batches);
         atomic_set(&sn->sn_refcount, 1);        /* +1 for caller */
@@ -298,7 +298,7 @@ sfw_server_rpc_done(struct srpc_server_rpc *rpc)
 }
 
 static void
-sfw_client_rpc_fini(srpc_client_rpc_t *rpc)
+sfw_client_rpc_fini(struct srpc_client_rpc *rpc)
 {
         LASSERT(!rpc->crpc_bulk.bk_niov);
         LASSERT(list_empty(&rpc->crpc_list));
@@ -318,11 +318,11 @@ sfw_client_rpc_fini(srpc_client_rpc_t *rpc)
         spin_unlock(&sfw_data.fw_lock);
 }
 
-static sfw_batch_t *
+static struct sfw_batch *
 sfw_find_batch(lst_bid_t bid)
 {
-        sfw_session_t *sn = sfw_data.fw_session;
-        sfw_batch_t *bat;
+        struct sfw_session *sn = sfw_data.fw_session;
+        struct sfw_batch *bat;
 
         LASSERT(sn);
 
@@ -334,11 +334,11 @@ sfw_find_batch(lst_bid_t bid)
         return NULL;
 }
 
-static sfw_batch_t *
+static struct sfw_batch *
 sfw_bid2batch(lst_bid_t bid)
 {
-        sfw_session_t *sn = sfw_data.fw_session;
-        sfw_batch_t *bat;
+        struct sfw_session *sn = sfw_data.fw_session;
+        struct sfw_batch *bat;
 
         LASSERT(sn);
 
@@ -346,7 +346,7 @@ sfw_bid2batch(lst_bid_t bid)
         if (bat)
                 return bat;
 
-        LIBCFS_ALLOC(bat, sizeof(sfw_batch_t));
+        LIBCFS_ALLOC(bat, sizeof(struct sfw_batch));
         if (!bat)
                 return NULL;
 
@@ -363,9 +363,9 @@ sfw_bid2batch(lst_bid_t bid)
 static int
 sfw_get_stats(srpc_stat_reqst_t *request, srpc_stat_reply_t *reply)
 {
-        sfw_session_t *sn = sfw_data.fw_session;
+        struct sfw_session *sn = sfw_data.fw_session;
         sfw_counters_t *cnt = &reply->str_fw;
-        sfw_batch_t *bat;
+        struct sfw_batch *bat;
 
         reply->str_sid = !sn ? LST_INVALID_SID : sn->sn_id;
 
@@ -404,8 +404,8 @@ sfw_get_stats(srpc_stat_reqst_t *request, srpc_stat_reply_t *reply)
 int
 sfw_make_session(srpc_mksn_reqst_t *request, srpc_mksn_reply_t *reply)
 {
-        sfw_session_t *sn = sfw_data.fw_session;
-        srpc_msg_t *msg = container_of(request, srpc_msg_t,
+        struct sfw_session *sn = sfw_data.fw_session;
+        struct srpc_msg *msg = container_of(request, struct srpc_msg,
                                        msg_body.mksn_reqst);
         int cplen = 0;
 
@@ -438,7 +438,7 @@ sfw_make_session(srpc_mksn_reqst_t *request, srpc_mksn_reply_t *reply)
         /*
          * reject the request if it requires unknown features
          * NB: old version will always accept all features because it's not
-         * aware of srpc_msg_t::msg_ses_feats, it's a defect but it's also
+         * aware of srpc_msg::msg_ses_feats, it's a defect but it's also
          * harmless because it will return zero feature to console, and it's
          * console's responsibility to make sure all nodes in a session have
          * same feature mask.
@@ -449,7 +449,7 @@ sfw_make_session(srpc_mksn_reqst_t *request, srpc_mksn_reply_t *reply)
         }
 
         /* brand new or create by force */
-        LIBCFS_ALLOC(sn, sizeof(sfw_session_t));
+        LIBCFS_ALLOC(sn, sizeof(struct sfw_session));
         if (!sn) {
                 CERROR("dropping RPC mksn under memory pressure\n");
                 return -ENOMEM;
@@ -475,7 +475,7 @@ sfw_make_session(srpc_mksn_reqst_t *request, srpc_mksn_reply_t *reply)
 static int
 sfw_remove_session(srpc_rmsn_reqst_t *request, srpc_rmsn_reply_t *reply)
 {
-        sfw_session_t *sn = sfw_data.fw_session;
+        struct sfw_session *sn = sfw_data.fw_session;
 
         reply->rmsn_sid = !sn ? LST_INVALID_SID : sn->sn_id;
 
@@ -507,7 +507,7 @@ sfw_remove_session(srpc_rmsn_reqst_t *request, srpc_rmsn_reply_t *reply)
 static int
 sfw_debug_session(srpc_debug_reqst_t *request, srpc_debug_reply_t *reply)
 {
-        sfw_session_t *sn = sfw_data.fw_session;
+        struct sfw_session *sn = sfw_data.fw_session;
 
         if (!sn) {
                 reply->dbg_status = ESRCH;
@@ -526,10 +526,10 @@ sfw_debug_session(srpc_debug_reqst_t *request, srpc_debug_reply_t *reply)
 }
 
 static void
-sfw_test_rpc_fini(srpc_client_rpc_t *rpc)
+sfw_test_rpc_fini(struct srpc_client_rpc *rpc)
 {
-        sfw_test_unit_t *tsu = rpc->crpc_priv;
-        sfw_test_instance_t *tsi = tsu->tsu_instance;
+        struct sfw_test_unit *tsu = rpc->crpc_priv;
+        struct sfw_test_instance *tsi = tsu->tsu_instance;
 
         /* Called with hold of tsi->tsi_lock */
         LASSERT(list_empty(&rpc->crpc_list));
@@ -537,7 +537,7 @@ sfw_test_rpc_fini(srpc_client_rpc_t *rpc)
 }
 
 static inline int
-sfw_test_buffers(sfw_test_instance_t *tsi)
+sfw_test_buffers(struct sfw_test_instance *tsi)
 {
         struct sfw_test_case *tsc;
         struct srpc_service *svc;
@@ -614,10 +614,10 @@ sfw_unload_test(struct sfw_test_instance *tsi)
 }
 
 static void
-sfw_destroy_test_instance(sfw_test_instance_t *tsi)
+sfw_destroy_test_instance(struct sfw_test_instance *tsi)
 {
-        srpc_client_rpc_t *rpc;
-        sfw_test_unit_t *tsu;
+        struct srpc_client_rpc *rpc;
+        struct sfw_test_unit *tsu;
 
         if (!tsi->tsi_is_client)
                 goto clean;
@@ -630,14 +630,14 @@ sfw_destroy_test_instance(sfw_test_instance_t *tsi)
 
         while (!list_empty(&tsi->tsi_units)) {
                 tsu = list_entry(tsi->tsi_units.next,
-                                 sfw_test_unit_t, tsu_list);
+                                 struct sfw_test_unit, tsu_list);
                 list_del(&tsu->tsu_list);
                 LIBCFS_FREE(tsu, sizeof(*tsu));
         }
 
         while (!list_empty(&tsi->tsi_free_rpcs)) {
                 rpc = list_entry(tsi->tsi_free_rpcs.next,
-                                 srpc_client_rpc_t, crpc_list);
+                                 struct srpc_client_rpc, crpc_list);
                 list_del(&rpc->crpc_list);
                 LIBCFS_FREE(rpc, srpc_client_rpc_size(rpc));
         }
@@ -648,34 +648,34 @@ clean:
 }
 
 static void
-sfw_destroy_batch(sfw_batch_t *tsb)
+sfw_destroy_batch(struct sfw_batch *tsb)
 {
-        sfw_test_instance_t *tsi;
+        struct sfw_test_instance *tsi;
 
         LASSERT(!sfw_batch_active(tsb));
         LASSERT(list_empty(&tsb->bat_list));
 
         while (!list_empty(&tsb->bat_tests)) {
                 tsi = list_entry(tsb->bat_tests.next,
-                                 sfw_test_instance_t, tsi_list);
+                                 struct sfw_test_instance, tsi_list);
                 list_del_init(&tsi->tsi_list);
                 sfw_destroy_test_instance(tsi);
         }
 
-        LIBCFS_FREE(tsb, sizeof(sfw_batch_t));
+        LIBCFS_FREE(tsb, sizeof(struct sfw_batch));
 }
 
 void
-sfw_destroy_session(sfw_session_t *sn)
+sfw_destroy_session(struct sfw_session *sn)
 {
-        sfw_batch_t *batch;
+        struct sfw_batch *batch;
 
         LASSERT(list_empty(&sn->sn_list));
         LASSERT(sn != sfw_data.fw_session);
 
         while (!list_empty(&sn->sn_batches)) {
                 batch = list_entry(sn->sn_batches.next,
-                                   sfw_batch_t, bat_list);
+                                   struct sfw_batch, bat_list);
                 list_del_init(&batch->bat_list);
                 sfw_destroy_batch(batch);
         }
@@ -685,7 +685,7 @@ sfw_destroy_session(sfw_session_t *sn)
 }
 
 static void
-sfw_unpack_addtest_req(srpc_msg_t *msg)
+sfw_unpack_addtest_req(struct srpc_msg *msg)
 {
         srpc_test_reqst_t *req = &msg->msg_body.tes_reqst;
 
@@ -729,14 +729,14 @@ sfw_unpack_addtest_req(srpc_msg_t *msg)
 }
 
 static int
-sfw_add_test_instance(sfw_batch_t *tsb, struct srpc_server_rpc *rpc)
+sfw_add_test_instance(struct sfw_batch *tsb, struct srpc_server_rpc *rpc)
 {
-        srpc_msg_t *msg = &rpc->srpc_reqstbuf->buf_msg;
+        struct srpc_msg *msg = &rpc->srpc_reqstbuf->buf_msg;
         srpc_test_reqst_t *req = &msg->msg_body.tes_reqst;
-        srpc_bulk_t *bk = rpc->srpc_bulk;
+        struct srpc_bulk *bk = rpc->srpc_bulk;
         int ndest = req->tsr_ndest;
-        sfw_test_unit_t *tsu;
-        sfw_test_instance_t *tsi;
+        struct sfw_test_unit *tsu;
+        struct sfw_test_instance *tsi;
         int i;
         int rc;
 
@@ -795,7 +795,7 @@ sfw_add_test_instance(sfw_batch_t *tsb, struct srpc_server_rpc *rpc)
                         sfw_unpack_id(id);
 
                 for (j = 0; j < tsi->tsi_concur; j++) {
-                        LIBCFS_ALLOC(tsu, sizeof(sfw_test_unit_t));
+                        LIBCFS_ALLOC(tsu, sizeof(struct sfw_test_unit));
                         if (!tsu) {
                                 rc = -ENOMEM;
                                 CERROR("Can't allocate tsu for %d\n",
@@ -824,11 +824,11 @@ error:
 }
 
 static void
-sfw_test_unit_done(sfw_test_unit_t *tsu)
+sfw_test_unit_done(struct sfw_test_unit *tsu)
 {
-        sfw_test_instance_t *tsi = tsu->tsu_instance;
-        sfw_batch_t *tsb = tsi->tsi_batch;
-        sfw_session_t *sn = tsb->bat_session;
+        struct sfw_test_instance *tsi = tsu->tsu_instance;
+        struct sfw_batch *tsb = tsi->tsi_batch;
+        struct sfw_session *sn = tsb->bat_session;
 
         LASSERT(sfw_test_active(tsi));
 
@@ -866,10 +866,10 @@ sfw_test_unit_done(sfw_test_unit_t *tsu)
 }
 
 static void
-sfw_test_rpc_done(srpc_client_rpc_t *rpc)
+sfw_test_rpc_done(struct srpc_client_rpc *rpc)
 {
-        sfw_test_unit_t *tsu = rpc->crpc_priv;
-        sfw_test_instance_t *tsi = tsu->tsu_instance;
+        struct sfw_test_unit *tsu = rpc->crpc_priv;
+        struct sfw_test_instance *tsi = tsu->tsu_instance;
         int done = 0;
 
         tsi->tsi_ops->tso_done_rpc(tsu, rpc);
@@ -900,19 +900,19 @@ sfw_test_rpc_done(srpc_client_rpc_t *rpc)
 }
 
 int
-sfw_create_test_rpc(sfw_test_unit_t *tsu, lnet_process_id_t peer,
+sfw_create_test_rpc(struct sfw_test_unit *tsu, lnet_process_id_t peer,
                     unsigned features, int nblk, int blklen,
-                    srpc_client_rpc_t **rpcpp)
+                    struct srpc_client_rpc **rpcpp)
 {
-        srpc_client_rpc_t *rpc = NULL;
-        sfw_test_instance_t *tsi = tsu->tsu_instance;
+        struct srpc_client_rpc *rpc = NULL;
+        struct sfw_test_instance *tsi = tsu->tsu_instance;
 
         spin_lock(&tsi->tsi_lock);
 
         LASSERT(sfw_test_active(tsi));
                 /* pick request from buffer */
         rpc = list_first_entry_or_null(&tsi->tsi_free_rpcs,
-                                       srpc_client_rpc_t, crpc_list);
+                                       struct srpc_client_rpc, crpc_list);
         if (rpc) {
                 LASSERT(nblk == rpc->crpc_bulk.bk_niov);
                 list_del_init(&rpc->crpc_list);
@@ -942,11 +942,11 @@ sfw_create_test_rpc(sfw_test_unit_t *tsu, lnet_process_id_t peer,
 }
 
 static int
-sfw_run_test(swi_workitem_t *wi)
+sfw_run_test(struct swi_workitem *wi)
 {
-        sfw_test_unit_t *tsu = wi->swi_workitem.wi_data;
-        sfw_test_instance_t *tsi = tsu->tsu_instance;
-        srpc_client_rpc_t *rpc = NULL;
+        struct sfw_test_unit *tsu = wi->swi_workitem.wi_data;
+        struct sfw_test_instance *tsi = tsu->tsu_instance;
+        struct srpc_client_rpc *rpc = NULL;
 
         LASSERT(wi == &tsu->tsu_worker);
 
@@ -991,11 +991,11 @@ test_done:
 }
 
 static int
-sfw_run_batch(sfw_batch_t *tsb)
+sfw_run_batch(struct sfw_batch *tsb)
 {
-        swi_workitem_t *wi;
-        sfw_test_unit_t *tsu;
-        sfw_test_instance_t *tsi;
+        struct swi_workitem *wi;
+        struct sfw_test_unit *tsu;
+        struct sfw_test_instance *tsi;
 
         if (sfw_batch_active(tsb)) {
                 CDEBUG(D_NET, "Batch already active: %llu (%d)\n",
@@ -1026,10 +1026,10 @@ sfw_run_batch(sfw_batch_t *tsb)
 }
 
 int
-sfw_stop_batch(sfw_batch_t *tsb, int force)
+sfw_stop_batch(struct sfw_batch *tsb, int force)
 {
-        sfw_test_instance_t *tsi;
-        srpc_client_rpc_t *rpc;
+        struct sfw_test_instance *tsi;
+        struct srpc_client_rpc *rpc;
 
         if (!sfw_batch_active(tsb)) {
                 CDEBUG(D_NET, "Batch %llu inactive\n", tsb->bat_id.bat_id);
@@ -1068,9 +1068,9 @@ sfw_stop_batch(sfw_batch_t *tsb, int force)
 }
 
 static int
-sfw_query_batch(sfw_batch_t *tsb, int testidx, srpc_batch_reply_t *reply)
+sfw_query_batch(struct sfw_batch *tsb, int testidx, srpc_batch_reply_t *reply)
 {
-        sfw_test_instance_t *tsi;
+        struct sfw_test_instance *tsi;
 
         if (testidx < 0)
                 return -EINVAL;
@@ -1115,11 +1115,11 @@ sfw_alloc_pages(struct srpc_server_rpc *rpc, int cpt, int npages, int len,
 static int
 sfw_add_test(struct srpc_server_rpc *rpc)
 {
-        sfw_session_t *sn = sfw_data.fw_session;
+        struct sfw_session *sn = sfw_data.fw_session;
         srpc_test_reply_t *reply = &rpc->srpc_replymsg.msg_body.tes_reply;
         srpc_test_reqst_t *request;
         int rc;
-        sfw_batch_t *bat;
+        struct sfw_batch *bat;
 
         request = &rpc->srpc_reqstbuf->buf_msg.msg_body.tes_reqst;
         reply->tsr_sid = !sn ? LST_INVALID_SID : sn->sn_id;
@@ -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) *
@@ -1185,9 +1185,9 @@ sfw_add_test(struct srpc_server_rpc *rpc)
 static int
 sfw_control_batch(srpc_batch_reqst_t *request, srpc_batch_reply_t *reply)
 {
-        sfw_session_t *sn = sfw_data.fw_session;
+        struct sfw_session *sn = sfw_data.fw_session;
         int rc = 0;
-        sfw_batch_t *bat;
+        struct sfw_batch *bat;
 
         reply->bar_sid = !sn ? LST_INVALID_SID : sn->sn_id;
 
@@ -1227,8 +1227,8 @@ static int
 sfw_handle_server_rpc(struct srpc_server_rpc *rpc)
 {
         struct srpc_service *sv = rpc->srpc_scd->scd_svc;
-        srpc_msg_t *reply = &rpc->srpc_replymsg;
-        srpc_msg_t *request = &rpc->srpc_reqstbuf->buf_msg;
+        struct srpc_msg *reply = &rpc->srpc_replymsg;
+        struct srpc_msg *request = &rpc->srpc_reqstbuf->buf_msg;
         unsigned features = LST_FEATS_MASK;
         int rc = 0;
 
@@ -1261,7 +1261,7 @@ sfw_handle_server_rpc(struct srpc_server_rpc *rpc)
 
         if (sv->sv_id != SRPC_SERVICE_MAKE_SESSION &&
             sv->sv_id != SRPC_SERVICE_DEBUG) {
-                sfw_session_t *sn = sfw_data.fw_session;
+                struct sfw_session *sn = sfw_data.fw_session;
 
                 if (sn &&
                     sn->sn_features != request->msg_ses_feats) {
@@ -1377,12 +1377,12 @@ sfw_bulk_ready(struct srpc_server_rpc *rpc, int status)
         return rc;
 }
 
-srpc_client_rpc_t *
+struct srpc_client_rpc *
 sfw_create_rpc(lnet_process_id_t peer, int service,
                unsigned features, int nbulkiov, int bulklen,
-               void (*done)(srpc_client_rpc_t *), void *priv)
+               void (*done)(struct srpc_client_rpc *), void *priv)
 {
-        srpc_client_rpc_t *rpc = NULL;
+        struct srpc_client_rpc *rpc = NULL;
 
         spin_lock(&sfw_data.fw_lock);
 
@@ -1391,7 +1391,7 @@ sfw_create_rpc(lnet_process_id_t peer, int service,
 
         if (!nbulkiov && !list_empty(&sfw_data.fw_zombie_rpcs)) {
                 rpc = list_entry(sfw_data.fw_zombie_rpcs.next,
-                                 srpc_client_rpc_t, crpc_list);
+                                 struct srpc_client_rpc, crpc_list);
                 list_del(&rpc->crpc_list);
 
                 srpc_init_client_rpc(rpc, peer, service, 0, 0,
@@ -1415,7 +1415,7 @@ sfw_create_rpc(lnet_process_id_t peer, int service,
 }
 
 void
-sfw_unpack_message(srpc_msg_t *msg)
+sfw_unpack_message(struct srpc_msg *msg)
 {
         if (msg->msg_magic == SRPC_MSG_MAGIC)
                 return; /* no flipping needed */
@@ -1558,7 +1558,7 @@ sfw_unpack_message(srpc_msg_t *msg)
 }
 
 void
-sfw_abort_rpc(srpc_client_rpc_t *rpc)
+sfw_abort_rpc(struct srpc_client_rpc *rpc)
 {
         LASSERT(atomic_read(&rpc->crpc_refcount) > 0);
         LASSERT(rpc->crpc_service <= SRPC_FRAMEWORK_SERVICE_MAX_ID);
@@ -1569,7 +1569,7 @@ sfw_abort_rpc(srpc_client_rpc_t *rpc)
 }
 
 void
-sfw_post_rpc(srpc_client_rpc_t *rpc)
+sfw_post_rpc(struct srpc_client_rpc *rpc)
 {
         spin_lock(&rpc->crpc_lock);
 
@@ -1584,7 +1584,7 @@ sfw_post_rpc(srpc_client_rpc_t *rpc)
         spin_unlock(&rpc->crpc_lock);
 }
 
-static srpc_service_t sfw_services[] = {
+static struct srpc_service sfw_services[] = {
         {
                 /* sv_id */    SRPC_SERVICE_DEBUG,
                 /* sv_name */  "debug",
@@ -1628,8 +1628,8 @@ sfw_startup(void)
         int i;
         int rc;
         int error;
-        srpc_service_t *sv;
-        sfw_test_case_t *tsc;
+        struct srpc_service *sv;
+        struct sfw_test_case *tsc;
 
         if (session_timeout < 0) {
                 CERROR("Session timeout must be non-negative: %d\n",
@@ -1721,8 +1721,8 @@ sfw_startup(void)
 void
 sfw_shutdown(void)
 {
-        srpc_service_t *sv;
-        sfw_test_case_t *tsc;
+        struct srpc_service *sv;
+        struct sfw_test_case    *tsc;
         int i;
 
         spin_lock(&sfw_data.fw_lock);
@@ -1759,10 +1759,10 @@ sfw_shutdown(void)
         }
 
         while (!list_empty(&sfw_data.fw_zombie_rpcs)) {
-                srpc_client_rpc_t *rpc;
+                struct srpc_client_rpc *rpc;
 
                 rpc = list_entry(sfw_data.fw_zombie_rpcs.next,
-                                 srpc_client_rpc_t, crpc_list);
+                                 struct srpc_client_rpc, crpc_list);
                 list_del(&rpc->crpc_list);
 
                 LIBCFS_FREE(rpc, srpc_client_rpc_size(rpc));
@@ -1778,7 +1778,7 @@ sfw_shutdown(void)
 
         while (!list_empty(&sfw_data.fw_tests)) {
                 tsc = list_entry(sfw_data.fw_tests.next,
-                                 sfw_test_case_t, tsc_list);
+                                 struct sfw_test_case, tsc_list);
 
                 srpc_wait_service_shutdown(tsc->tsc_srv_service);
 
diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
index c7c50be6dab4..8a9d7a41f7de 100644
--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
@@ -56,9 +56,9 @@ struct lst_ping_data {
 static struct lst_ping_data  lst_ping_data;
 
 static int
-ping_client_init(sfw_test_instance_t *tsi)
+ping_client_init(struct sfw_test_instance *tsi)
 {
-        sfw_session_t *sn = tsi->tsi_batch->bat_session;
+        struct sfw_session *sn = tsi->tsi_batch->bat_session;
 
         LASSERT(tsi->tsi_is_client);
         LASSERT(sn && !(sn->sn_features & ~LST_FEATS_MASK));
@@ -70,9 +70,9 @@ ping_client_init(sfw_test_instance_t *tsi)
 }
 
 static void
-ping_client_fini(sfw_test_instance_t *tsi)
+ping_client_fini(struct sfw_test_instance *tsi)
 {
-        sfw_session_t *sn = tsi->tsi_batch->bat_session;
+        struct sfw_session *sn = tsi->tsi_batch->bat_session;
         int errors;
 
         LASSERT(sn);
@@ -86,12 +86,12 @@ ping_client_fini(sfw_test_instance_t *tsi)
 }
 
 static int
-ping_client_prep_rpc(sfw_test_unit_t *tsu, lnet_process_id_t dest,
-                     srpc_client_rpc_t **rpc)
+ping_client_prep_rpc(struct sfw_test_unit *tsu, lnet_process_id_t dest,
+                     struct srpc_client_rpc **rpc)
 {
         srpc_ping_reqst_t *req;
-        sfw_test_instance_t *tsi = tsu->tsu_instance;
-        sfw_session_t *sn = tsi->tsi_batch->bat_session;
+        struct sfw_test_instance *tsi = tsu->tsu_instance;
+        struct sfw_session *sn = tsi->tsi_batch->bat_session;
         struct timespec64 ts;
         int rc;
 
@@ -118,10 +118,10 @@ ping_client_prep_rpc(sfw_test_unit_t *tsu, lnet_process_id_t dest,
 }
 
 static void
-ping_client_done_rpc(sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
+ping_client_done_rpc(struct sfw_test_unit *tsu, struct srpc_client_rpc *rpc)
 {
-        sfw_test_instance_t *tsi = tsu->tsu_instance;
-        sfw_session_t *sn = tsi->tsi_batch->bat_session;
+        struct sfw_test_instance *tsi = tsu->tsu_instance;
+        struct sfw_session *sn = tsi->tsi_batch->bat_session;
         srpc_ping_reqst_t *reqst = &rpc->crpc_reqstmsg.msg_body.ping_reqst;
         srpc_ping_reply_t *reply = &rpc->crpc_replymsg.msg_body.ping_reply;
         struct timespec64 ts;
@@ -171,8 +171,8 @@ static int
 ping_server_handle(struct srpc_server_rpc *rpc)
 {
         struct srpc_service *sv = rpc->srpc_scd->scd_svc;
-        srpc_msg_t *reqstmsg = &rpc->srpc_reqstbuf->buf_msg;
-        srpc_msg_t *replymsg = &rpc->srpc_replymsg;
+        struct srpc_msg *reqstmsg = &rpc->srpc_reqstbuf->buf_msg;
+        struct srpc_msg *replymsg = &rpc->srpc_replymsg;
         srpc_ping_reqst_t *req = &reqstmsg->msg_body.ping_reqst;
         srpc_ping_reply_t *rep = &rpc->srpc_replymsg.msg_body.ping_reply;
 
@@ -210,7 +210,8 @@ ping_server_handle(struct srpc_server_rpc *rpc)
         return 0;
 }
 
-sfw_test_client_ops_t ping_test_client;
+struct sfw_test_client_ops ping_test_client;
+
 void ping_init_test_client(void)
 {
         ping_test_client.tso_init = ping_client_init;
@@ -219,7 +220,8 @@ void ping_init_test_client(void)
         ping_test_client.tso_done_rpc = ping_client_done_rpc;
 }
 
-srpc_service_t ping_test_service;
+struct srpc_service ping_test_service;
+
 void ping_init_test_service(void)
 {
         ping_test_service.sv_id = SRPC_SERVICE_PING;
diff --git a/drivers/staging/lustre/lnet/selftest/rpc.c b/drivers/staging/lustre/lnet/selftest/rpc.c
index 5d8908d258df..561e28c644b1 100644
--- a/drivers/staging/lustre/lnet/selftest/rpc.c
+++ b/drivers/staging/lustre/lnet/selftest/rpc.c
@@ -46,19 +46,19 @@
 
 #include "selftest.h"
 
-typedef enum {
+enum srpc_state {
         SRPC_STATE_NONE,
         SRPC_STATE_NI_INIT,
         SRPC_STATE_EQ_INIT,
         SRPC_STATE_RUNNING,
         SRPC_STATE_STOPPING,
-} srpc_state_t;
+};
 
 static struct smoketest_rpc {
         spinlock_t       rpc_glock;     /* global lock */
-        srpc_service_t  *rpc_services[SRPC_SERVICE_MAX_ID + 1];
+        struct srpc_service     *rpc_services[SRPC_SERVICE_MAX_ID + 1];
         lnet_handle_eq_t rpc_lnet_eq;   /* _the_ LNet event queue */
-        srpc_state_t     rpc_state;
+        enum srpc_state  rpc_state;
         srpc_counters_t  rpc_counters;
         __u64            rpc_matchbits; /* matchbits counter */
 } srpc_data;
@@ -71,7 +71,7 @@ srpc_serv_portal(int svc_id)
 }
 
 /* forward ref's */
-int srpc_handle_rpc(swi_workitem_t *wi);
+int srpc_handle_rpc(struct swi_workitem *wi);
 
 void srpc_get_counters(srpc_counters_t *cnt)
 {
@@ -88,9 +88,9 @@ 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)
+srpc_add_bulk_page(struct srpc_bulk *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);
@@ -102,7 +102,7 @@ srpc_add_bulk_page(srpc_bulk_t *bk, struct page *pg, int i, int nob)
 }
 
 void
-srpc_free_bulk(srpc_bulk_t *bk)
+srpc_free_bulk(struct srpc_bulk *bk)
 {
         int i;
         struct page *pg;
@@ -117,25 +117,25 @@ srpc_free_bulk(srpc_bulk_t *bk)
                 __free_page(pg);
         }
 
-        LIBCFS_FREE(bk, offsetof(srpc_bulk_t, bk_iovs[bk->bk_niov]));
+        LIBCFS_FREE(bk, offsetof(struct srpc_bulk, bk_iovs[bk->bk_niov]));
 }
 
-srpc_bulk_t *
+struct srpc_bulk *
 srpc_alloc_bulk(int cpt, unsigned bulk_npg, unsigned bulk_len, int sink)
 {
-        srpc_bulk_t *bk;
+        struct srpc_bulk *bk;
         int i;
 
         LASSERT(bulk_npg > 0 && bulk_npg <= LNET_MAX_IOV);
 
         LIBCFS_CPT_ALLOC(bk, lnet_cpt_table(), cpt,
-                         offsetof(srpc_bulk_t, bk_iovs[bulk_npg]));
+                         offsetof(struct srpc_bulk, bk_iovs[bulk_npg]));
         if (!bk) {
                 CERROR("Can't allocate descriptor for %d pages\n", bulk_npg);
                 return NULL;
         }
 
-        memset(bk, 0, offsetof(srpc_bulk_t, bk_iovs[bulk_npg]));
+        memset(bk, 0, offsetof(struct srpc_bulk, bk_iovs[bulk_npg]));
         bk->bk_sink = sink;
         bk->bk_len = bulk_len;
         bk->bk_niov = bulk_npg;
@@ -338,7 +338,7 @@ srpc_add_service(struct srpc_service *sv)
 }
 
 int
-srpc_remove_service(srpc_service_t *sv)
+srpc_remove_service(struct srpc_service *sv)
 {
         int id = sv->sv_id;
 
@@ -357,7 +357,7 @@ srpc_remove_service(srpc_service_t *sv)
 static int
 srpc_post_passive_rdma(int portal, int local, __u64 matchbits, void *buf,
                        int len, int options, lnet_process_id_t peer,
-                       lnet_handle_md_t *mdh, srpc_event_t *ev)
+                       lnet_handle_md_t *mdh, struct srpc_event *ev)
 {
         int rc;
         lnet_md_t md;
@@ -396,7 +396,7 @@ srpc_post_passive_rdma(int portal, int local, __u64 matchbits, void *buf,
 static int
 srpc_post_active_rdma(int portal, __u64 matchbits, void *buf, int len,
                       int options, lnet_process_id_t peer, lnet_nid_t self,
-                      lnet_handle_md_t *mdh, srpc_event_t *ev)
+                      lnet_handle_md_t *mdh, struct srpc_event *ev)
 {
         int rc;
         lnet_md_t md;
@@ -449,7 +449,7 @@ srpc_post_active_rdma(int portal, __u64 matchbits, void *buf, int len,
 
 static int
 srpc_post_passive_rqtbuf(int service, int local, void *buf, int len,
-                         lnet_handle_md_t *mdh, srpc_event_t *ev)
+                         lnet_handle_md_t *mdh, struct srpc_event *ev)
 {
         lnet_process_id_t any = { 0 };
 
@@ -697,7 +697,7 @@ srpc_finish_service(struct srpc_service *sv)
 
 /* called with sv->sv_lock held */
 static void
-srpc_service_recycle_buffer(struct srpc_service_cd *scd, srpc_buffer_t *buf)
+srpc_service_recycle_buffer(struct srpc_service_cd *scd, struct srpc_buffer *buf)
 __must_hold(&scd->scd_lock)
 {
         if (!scd->scd_svc->sv_shuttingdown && scd->scd_buf_adjust >= 0) {
@@ -755,11 +755,11 @@ srpc_abort_service(struct srpc_service *sv)
 }
 
 void
-srpc_shutdown_service(srpc_service_t *sv)
+srpc_shutdown_service(struct srpc_service *sv)
 {
         struct srpc_service_cd *scd;
         struct srpc_server_rpc *rpc;
-        srpc_buffer_t *buf;
+        struct srpc_buffer *buf;
         int i;
 
         CDEBUG(D_NET, "Shutting down service: id %d, name %s\n",
@@ -792,9 +792,9 @@ srpc_shutdown_service(srpc_service_t *sv)
 }
 
 static int
-srpc_send_request(srpc_client_rpc_t *rpc)
+srpc_send_request(struct srpc_client_rpc *rpc)
 {
-        srpc_event_t *ev = &rpc->crpc_reqstev;
+        struct srpc_event *ev = &rpc->crpc_reqstev;
         int rc;
 
         ev->ev_fired = 0;
@@ -803,7 +803,7 @@ srpc_send_request(srpc_client_rpc_t *rpc)
 
          rc = srpc_post_active_rdma(srpc_serv_portal(rpc->crpc_service),
                                     rpc->crpc_service, &rpc->crpc_reqstmsg,
-                                    sizeof(srpc_msg_t), LNET_MD_OP_PUT,
+                                    sizeof(struct srpc_msg), LNET_MD_OP_PUT,
                                     rpc->crpc_dest, LNET_NID_ANY,
                                     &rpc->crpc_reqstmdh, ev);
         if (rc) {
@@ -814,9 +814,9 @@ srpc_send_request(srpc_client_rpc_t *rpc)
 }
 
 static int
-srpc_prepare_reply(srpc_client_rpc_t *rpc)
+srpc_prepare_reply(struct srpc_client_rpc *rpc)
 {
-        srpc_event_t *ev = &rpc->crpc_replyev;
+        struct srpc_event *ev = &rpc->crpc_replyev;
         __u64 *id = &rpc->crpc_reqstmsg.msg_body.reqst.rpyid;
         int rc;
 
@@ -827,7 +827,8 @@ srpc_prepare_reply(srpc_client_rpc_t *rpc)
         *id = srpc_next_id();
 
         rc = srpc_post_passive_rdma(SRPC_RDMA_PORTAL, 0, *id,
-                                    &rpc->crpc_replymsg, sizeof(srpc_msg_t),
+                                    &rpc->crpc_replymsg,
+                                    sizeof(struct srpc_msg),
                                     LNET_MD_OP_PUT, rpc->crpc_dest,
                                     &rpc->crpc_replymdh, ev);
         if (rc) {
@@ -838,10 +839,10 @@ srpc_prepare_reply(srpc_client_rpc_t *rpc)
 }
 
 static int
-srpc_prepare_bulk(srpc_client_rpc_t *rpc)
+srpc_prepare_bulk(struct srpc_client_rpc *rpc)
 {
-        srpc_bulk_t *bk = &rpc->crpc_bulk;
-        srpc_event_t *ev = &rpc->crpc_bulkev;
+        struct srpc_bulk *bk = &rpc->crpc_bulk;
+        struct srpc_event *ev = &rpc->crpc_bulkev;
         __u64 *id = &rpc->crpc_reqstmsg.msg_body.reqst.bulkid;
         int rc;
         int opt;
@@ -873,8 +874,8 @@ srpc_prepare_bulk(srpc_client_rpc_t *rpc)
 static int
 srpc_do_bulk(struct srpc_server_rpc *rpc)
 {
-        srpc_event_t *ev = &rpc->srpc_ev;
-        srpc_bulk_t *bk = rpc->srpc_bulk;
+        struct srpc_event *ev = &rpc->srpc_ev;
+        struct srpc_bulk *bk = rpc->srpc_bulk;
         __u64 id = rpc->srpc_reqstbuf->buf_msg.msg_body.reqst.bulkid;
         int rc;
         int opt;
@@ -903,7 +904,7 @@ srpc_server_rpc_done(struct srpc_server_rpc *rpc, int status)
 {
         struct srpc_service_cd *scd = rpc->srpc_scd;
         struct srpc_service *sv = scd->scd_svc;
-        srpc_buffer_t *buffer;
+        struct srpc_buffer *buffer;
 
         LASSERT(status || rpc->srpc_wi.swi_state == SWI_STATE_DONE);
 
@@ -948,7 +949,7 @@ srpc_server_rpc_done(struct srpc_server_rpc *rpc, int status)
 
         if (!sv->sv_shuttingdown && !list_empty(&scd->scd_buf_blocked)) {
                 buffer = list_entry(scd->scd_buf_blocked.next,
-                                    srpc_buffer_t, buf_list);
+                                    struct srpc_buffer, buf_list);
                 list_del(&buffer->buf_list);
 
                 srpc_init_server_rpc(rpc, scd, buffer);
@@ -963,12 +964,12 @@ srpc_server_rpc_done(struct srpc_server_rpc *rpc, int status)
 
 /* handles an incoming RPC */
 int
-srpc_handle_rpc(swi_workitem_t *wi)
+srpc_handle_rpc(struct swi_workitem *wi)
 {
         struct srpc_server_rpc *rpc = wi->swi_workitem.wi_data;
         struct srpc_service_cd *scd = rpc->srpc_scd;
         struct srpc_service *sv = scd->scd_svc;
-        srpc_event_t *ev = &rpc->srpc_ev;
+        struct srpc_event *ev = &rpc->srpc_ev;
         int rc = 0;
 
         LASSERT(wi == &rpc->srpc_wi);
@@ -995,7 +996,7 @@ srpc_handle_rpc(swi_workitem_t *wi)
         default:
                 LBUG();
         case SWI_STATE_NEWBORN: {
-                srpc_msg_t *msg;
+                struct srpc_msg *msg;
                 srpc_generic_reply_t *reply;
 
                 msg = &rpc->srpc_reqstbuf->buf_msg;
@@ -1077,7 +1078,7 @@ srpc_handle_rpc(swi_workitem_t *wi)
 static void
 srpc_client_rpc_expired(void *data)
 {
-        srpc_client_rpc_t *rpc = data;
+        struct srpc_client_rpc *rpc = data;
 
         CWARN("Client RPC expired: service %d, peer %s, timeout %d.\n",
               rpc->crpc_service, libcfs_id2str(rpc->crpc_dest),
@@ -1096,7 +1097,7 @@ srpc_client_rpc_expired(void *data)
 }
 
 static void
-srpc_add_client_rpc_timer(srpc_client_rpc_t *rpc)
+srpc_add_client_rpc_timer(struct srpc_client_rpc *rpc)
 {
         struct stt_timer *timer = &rpc->crpc_timer;
 
@@ -1117,7 +1118,7 @@ srpc_add_client_rpc_timer(srpc_client_rpc_t *rpc)
  * running on any CPU.
  */
 static void
-srpc_del_client_rpc_timer(srpc_client_rpc_t *rpc)
+srpc_del_client_rpc_timer(struct srpc_client_rpc *rpc)
 {
         /* timer not planted or already exploded */
         if (!rpc->crpc_timeout)
@@ -1138,9 +1139,9 @@ srpc_del_client_rpc_timer(srpc_client_rpc_t *rpc)
 }
 
 static void
-srpc_client_rpc_done(srpc_client_rpc_t *rpc, int status)
+srpc_client_rpc_done(struct srpc_client_rpc *rpc, int status)
 {
-        swi_workitem_t *wi = &rpc->crpc_wi;
+        struct swi_workitem *wi = &rpc->crpc_wi;
 
         LASSERT(status || wi->swi_state == SWI_STATE_DONE);
 
@@ -1175,11 +1176,11 @@ srpc_client_rpc_done(srpc_client_rpc_t *rpc, int status)
 
 /* sends an outgoing RPC */
 int
-srpc_send_rpc(swi_workitem_t *wi)
+srpc_send_rpc(struct swi_workitem *wi)
 {
         int rc = 0;
-        srpc_client_rpc_t *rpc;
-        srpc_msg_t *reply;
+        struct srpc_client_rpc *rpc;
+        struct srpc_msg *reply;
         int do_bulk;
 
         LASSERT(wi);
@@ -1308,15 +1309,15 @@ abort:
         return 0;
 }
 
-srpc_client_rpc_t *
+struct srpc_client_rpc *
 srpc_create_client_rpc(lnet_process_id_t peer, int service,
                        int nbulkiov, int bulklen,
-                       void (*rpc_done)(srpc_client_rpc_t *),
-                       void (*rpc_fini)(srpc_client_rpc_t *), void *priv)
+                       void (*rpc_done)(struct srpc_client_rpc *),
+                       void (*rpc_fini)(struct srpc_client_rpc *), void *priv)
 {
-        srpc_client_rpc_t *rpc;
+        struct srpc_client_rpc *rpc;
 
-        LIBCFS_ALLOC(rpc, offsetof(srpc_client_rpc_t,
+        LIBCFS_ALLOC(rpc, offsetof(struct srpc_client_rpc,
                                    crpc_bulk.bk_iovs[nbulkiov]));
         if (!rpc)
                 return NULL;
@@ -1328,7 +1329,7 @@ srpc_create_client_rpc(lnet_process_id_t peer, int service,
 
 /* called with rpc->crpc_lock held */
 void
-srpc_abort_rpc(srpc_client_rpc_t *rpc, int why)
+srpc_abort_rpc(struct srpc_client_rpc *rpc, int why)
 {
         LASSERT(why);
 
@@ -1347,7 +1348,7 @@ srpc_abort_rpc(srpc_client_rpc_t *rpc, int why)
 
 /* called with rpc->crpc_lock held */
 void
-srpc_post_rpc(srpc_client_rpc_t *rpc)
+srpc_post_rpc(struct srpc_client_rpc *rpc)
 {
         LASSERT(!rpc->crpc_aborted);
         LASSERT(srpc_data.rpc_state == SRPC_STATE_RUNNING);
@@ -1363,7 +1364,7 @@ srpc_post_rpc(srpc_client_rpc_t *rpc)
 int
 srpc_send_reply(struct srpc_server_rpc *rpc)
 {
-        srpc_event_t *ev = &rpc->srpc_ev;
+        struct srpc_event *ev = &rpc->srpc_ev;
         struct srpc_msg *msg = &rpc->srpc_replymsg;
         struct srpc_buffer *buffer = rpc->srpc_reqstbuf;
         struct srpc_service_cd *scd = rpc->srpc_scd;
@@ -1410,12 +1411,12 @@ static void
 srpc_lnet_ev_handler(lnet_event_t *ev)
 {
         struct srpc_service_cd *scd;
-        srpc_event_t *rpcev = ev->md.user_ptr;
-        srpc_client_rpc_t *crpc;
+        struct srpc_event *rpcev = ev->md.user_ptr;
+        struct srpc_client_rpc *crpc;
         struct srpc_server_rpc *srpc;
-        srpc_buffer_t *buffer;
-        srpc_service_t *sv;
-        srpc_msg_t *msg;
+        struct srpc_buffer *buffer;
+        struct srpc_service *sv;
+        struct srpc_msg *msg;
         srpc_msg_type_t type;
 
         LASSERT(!in_interrupt());
@@ -1486,7 +1487,7 @@ srpc_lnet_ev_handler(lnet_event_t *ev)
                 LASSERT(ev->type != LNET_EVENT_UNLINK ||
                         sv->sv_shuttingdown);
 
-                buffer = container_of(ev->md.start, srpc_buffer_t, buf_msg);
+                buffer = container_of(ev->md.start, struct srpc_buffer, buf_msg);
                 buffer->buf_peer = ev->initiator;
                 buffer->buf_self = ev->target.nid;
 
@@ -1663,7 +1664,7 @@ srpc_shutdown(void)
                 spin_lock(&srpc_data.rpc_glock);
 
                 for (i = 0; i <= SRPC_SERVICE_MAX_ID; i++) {
-                        srpc_service_t *sv = srpc_data.rpc_services[i];
+                        struct srpc_service *sv = srpc_data.rpc_services[i];
 
                         LASSERTF(!sv, "service not empty: id %d, name %s\n",
                                  i, sv->sv_name);
diff --git a/drivers/staging/lustre/lnet/selftest/rpc.h b/drivers/staging/lustre/lnet/selftest/rpc.h
index a79c315f2ceb..fdf881ffd9ad 100644
--- a/drivers/staging/lustre/lnet/selftest/rpc.h
+++ b/drivers/staging/lustre/lnet/selftest/rpc.h
@@ -242,7 +242,7 @@ typedef struct {
 #define SRPC_MSG_MAGIC          0xeeb0f00d
 #define SRPC_MSG_VERSION        1
 
-typedef struct srpc_msg {
+struct srpc_msg {
         __u32   msg_magic;     /* magic number */
         __u32   msg_version;   /* message version number */
         __u32   msg_type;      /* type of message body: srpc_msg_type_t */
@@ -273,10 +273,10 @@ typedef struct srpc_msg {
                 srpc_brw_reqst_t     brw_reqst;
                 srpc_brw_reply_t     brw_reply;
         }     msg_body;
-} WIRE_ATTR srpc_msg_t;
+} WIRE_ATTR;
 
 static inline void
-srpc_unpack_msg_hdr(srpc_msg_t *msg)
+srpc_unpack_msg_hdr(struct srpc_msg *msg)
 {
         if (msg->msg_magic == SRPC_MSG_MAGIC)
                 return; /* no flipping needed */
diff --git a/drivers/staging/lustre/lnet/selftest/selftest.h b/drivers/staging/lustre/lnet/selftest/selftest.h
index f50580e5b02a..1dac777daf63 100644
--- a/drivers/staging/lustre/lnet/selftest/selftest.h
+++ b/drivers/staging/lustre/lnet/selftest/selftest.h
@@ -134,7 +134,7 @@ srpc_service2reply(int service)
         return srpc_service2request(service) + 1;
 }
 
-typedef enum {
+enum srpc_event_type {
         SRPC_BULK_REQ_RCVD   = 1, /* passive bulk request(PUT sink/GET source)
                                    * received */
         SRPC_BULK_PUT_SENT   = 2, /* active bulk PUT sent (source) */
@@ -143,57 +143,58 @@ typedef enum {
         SRPC_REPLY_SENT      = 5, /* outgoing reply sent */
         SRPC_REQUEST_RCVD    = 6, /* incoming request received */
         SRPC_REQUEST_SENT    = 7, /* outgoing request sent */
-} srpc_event_type_t;
+};
 
 /* RPC event */
-typedef struct {
-        srpc_event_type_t ev_type;   /* what's up */
+struct srpc_event {
+        enum srpc_event_type    ev_type;        /* what's up */
         lnet_event_kind_t ev_lnet;   /* LNet event type */
         int               ev_fired;  /* LNet event fired? */
         int               ev_status; /* LNet event status */
         void              *ev_data;  /* owning server/client RPC */
-} srpc_event_t;
+};
 
-typedef struct {
+/* bulk descriptor */
+struct srpc_bulk {
         int              bk_len;     /* len of bulk data */
         lnet_handle_md_t bk_mdh;
         int              bk_sink;    /* sink/source */
         int              bk_niov;    /* # iov in bk_iovs */
         lnet_kiov_t      bk_iovs[0];
-} srpc_bulk_t; /* bulk descriptor */
+};
 
 /* message buffer descriptor */
-typedef struct srpc_buffer {
+struct srpc_buffer {
         struct list_head  buf_list; /* chain on srpc_service::*_msgq */
-        srpc_msg_t        buf_msg;
+        struct srpc_msg   buf_msg;
         lnet_handle_md_t  buf_mdh;
         lnet_nid_t        buf_self;
         lnet_process_id_t buf_peer;
-} srpc_buffer_t;
+};
 
 struct swi_workitem;
 typedef int (*swi_action_t) (struct swi_workitem *);
 
-typedef struct swi_workitem {
+struct swi_workitem {
         struct cfs_wi_sched *swi_sched;
         struct cfs_workitem swi_workitem;
         swi_action_t        swi_action;
         int                 swi_state;
-} swi_workitem_t;
+};
 
 /* server-side state of a RPC */
 struct srpc_server_rpc {
         /* chain on srpc_service::*_rpcq */
         struct list_head       srpc_list;
         struct srpc_service_cd *srpc_scd;
-        swi_workitem_t         srpc_wi;
-        srpc_event_t           srpc_ev;      /* bulk/reply event */
+        struct swi_workitem     srpc_wi;
+        struct srpc_event       srpc_ev;        /* bulk/reply event */
         lnet_nid_t             srpc_self;
         lnet_process_id_t      srpc_peer;
-        srpc_msg_t             srpc_replymsg;
+        struct srpc_msg         srpc_replymsg;
         lnet_handle_md_t       srpc_replymdh;
-        srpc_buffer_t          *srpc_reqstbuf;
-        srpc_bulk_t            *srpc_bulk;
+        struct srpc_buffer      *srpc_reqstbuf;
+        struct srpc_bulk        *srpc_bulk;
 
         unsigned int           srpc_aborted; /* being given up */
         int                    srpc_status;
@@ -201,14 +202,14 @@ struct srpc_server_rpc {
 };
 
 /* client-side state of a RPC */
-typedef struct srpc_client_rpc {
+struct srpc_client_rpc {
         struct list_head  crpc_list;      /* chain on user's lists */
         spinlock_t        crpc_lock;      /* serialize */
         int               crpc_service;
         atomic_t          crpc_refcount;
         int               crpc_timeout;   /* # seconds to wait for reply */
         struct stt_timer       crpc_timer;
-        swi_workitem_t    crpc_wi;
+        struct swi_workitem     crpc_wi;
         lnet_process_id_t crpc_dest;
 
         void              (*crpc_done)(struct srpc_client_rpc *);
@@ -221,20 +222,20 @@ typedef struct srpc_client_rpc {
         unsigned int      crpc_closed:1;  /* completed */
 
         /* RPC events */
-        srpc_event_t      crpc_bulkev;    /* bulk event */
-        srpc_event_t      crpc_reqstev;   /* request event */
-        srpc_event_t      crpc_replyev;   /* reply event */
+        struct srpc_event       crpc_bulkev;    /* bulk event */
+        struct srpc_event       crpc_reqstev;   /* request event */
+        struct srpc_event       crpc_replyev;   /* reply event */
 
         /* bulk, request(reqst), and reply exchanged on wire */
-        srpc_msg_t        crpc_reqstmsg;
-        srpc_msg_t        crpc_replymsg;
+        struct srpc_msg         crpc_reqstmsg;
+        struct srpc_msg         crpc_replymsg;
         lnet_handle_md_t  crpc_reqstmdh;
         lnet_handle_md_t  crpc_replymdh;
-        srpc_bulk_t       crpc_bulk;
-} srpc_client_rpc_t;
+        struct srpc_bulk        crpc_bulk;
+};
 
 #define srpc_client_rpc_size(rpc)                                       \
-offsetof(srpc_client_rpc_t, crpc_bulk.bk_iovs[(rpc)->crpc_bulk.bk_niov])
+offsetof(struct srpc_client_rpc, crpc_bulk.bk_iovs[(rpc)->crpc_bulk.bk_niov])
 
 #define srpc_client_rpc_addref(rpc)                                     \
 do {                                                                    \
@@ -266,13 +267,13 @@ struct srpc_service_cd {
         /** backref to service */
         struct srpc_service     *scd_svc;
         /** event buffer */
-        srpc_event_t            scd_ev;
+        struct srpc_event       scd_ev;
         /** free RPC descriptors */
         struct list_head        scd_rpc_free;
         /** in-flight RPCs */
         struct list_head        scd_rpc_active;
         /** workitem for posting buffer */
-        swi_workitem_t          scd_buf_wi;
+        struct swi_workitem     scd_buf_wi;
         /** CPT id */
         int                     scd_cpt;
         /** error code for scd_buf_wi */
@@ -306,7 +307,7 @@ struct srpc_service_cd {
 #define SFW_FRWK_WI_MIN         16
 #define SFW_FRWK_WI_MAX         256
 
-typedef struct srpc_service {
+struct srpc_service {
         int                     sv_id;          /* service id */
         const char              *sv_name;       /* human readable name */
         int                     sv_wi_total;    /* total server workitems */
@@ -320,9 +321,9 @@ typedef struct srpc_service {
          */
         int (*sv_handler)(struct srpc_server_rpc *);
         int (*sv_bulk_ready)(struct srpc_server_rpc *, int);
-} srpc_service_t;
+};
 
-typedef struct {
+struct sfw_session {
         struct list_head sn_list;    /* chain on fw_zombie_sessions */
         lst_sid_t        sn_id;      /* unique identifier */
         unsigned int     sn_timeout; /* # seconds' inactivity to expire */
@@ -335,37 +336,37 @@ typedef struct {
         atomic_t         sn_brw_errors;
         atomic_t         sn_ping_errors;
         unsigned long    sn_started;
-} sfw_session_t;
+};
 
 #define sfw_sid_equal(sid0, sid1)     ((sid0).ses_nid == (sid1).ses_nid && \
                                        (sid0).ses_stamp == (sid1).ses_stamp)
 
-typedef struct {
+struct sfw_batch {
         struct list_head bat_list;      /* chain on sn_batches */
         lst_bid_t        bat_id;        /* batch id */
         int              bat_error;     /* error code of batch */
-        sfw_session_t    *bat_session;  /* batch's session */
+        struct sfw_session      *bat_session;   /* batch's session */
         atomic_t         bat_nactive;   /* # of active tests */
         struct list_head bat_tests;     /* test instances */
-} sfw_batch_t;
+};
 
-typedef struct {
+struct sfw_test_client_ops {
         int  (*tso_init)(struct sfw_test_instance *tsi); /* initialize test
                                                           * client */
         void (*tso_fini)(struct sfw_test_instance *tsi); /* finalize test
                                                           * client */
         int  (*tso_prep_rpc)(struct sfw_test_unit *tsu,
                              lnet_process_id_t dest,
-                             srpc_client_rpc_t **rpc);   /* prep a tests rpc */
+                             struct srpc_client_rpc **rpc);     /* prep a tests rpc */
         void (*tso_done_rpc)(struct sfw_test_unit *tsu,
-                             srpc_client_rpc_t *rpc);    /* done a test rpc */
-} sfw_test_client_ops_t;
+                             struct srpc_client_rpc *rpc);      /* done a test rpc */
+};
 
-typedef struct sfw_test_instance {
+struct sfw_test_instance {
         struct list_head           tsi_list;            /* chain on batch */
         int                        tsi_service;         /* test type */
-        sfw_batch_t                *tsi_batch;          /* batch */
-        sfw_test_client_ops_t      *tsi_ops;            /* test client operation
+        struct sfw_batch                *tsi_batch;     /* batch */
+        struct sfw_test_client_ops      *tsi_ops;       /* test client operation
                                                          */
 
         /* public parameter for all test units */
@@ -388,66 +389,66 @@ typedef struct sfw_test_instance {
                 test_bulk_req_t    bulk_v0; /* bulk parameter */
                 test_bulk_req_v1_t bulk_v1; /* bulk v1 parameter */
         } tsi_u;
-} sfw_test_instance_t;
+};
 
-/* XXX: trailing (PAGE_CACHE_SIZE % sizeof(lnet_process_id_t)) bytes at
- * the end of pages are not used */
+/* 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)
 
-typedef struct sfw_test_unit {
+struct sfw_test_unit {
         struct list_head    tsu_list;      /* chain on lst_test_instance */
         lnet_process_id_t   tsu_dest;      /* id of dest node */
         int                 tsu_loop;      /* loop count of the test */
-        sfw_test_instance_t *tsu_instance; /* pointer to test instance */
+        struct sfw_test_instance        *tsu_instance; /* pointer to test instance */
         void                *tsu_private;  /* private data */
-        swi_workitem_t      tsu_worker;    /* workitem of the test unit */
-} sfw_test_unit_t;
+        struct swi_workitem     tsu_worker;     /* workitem of the test unit */
+};
 
-typedef struct sfw_test_case {
+struct sfw_test_case {
         struct list_head      tsc_list;         /* chain on fw_tests */
-        srpc_service_t        *tsc_srv_service; /* test service */
-        sfw_test_client_ops_t *tsc_cli_ops;     /* ops of test client */
-} sfw_test_case_t;
+        struct srpc_service             *tsc_srv_service;       /* test service */
+        struct sfw_test_client_ops      *tsc_cli_ops;   /* ops of test client */
+};
 
-srpc_client_rpc_t *
+struct srpc_client_rpc *
 sfw_create_rpc(lnet_process_id_t peer, int service,
                unsigned features, int nbulkiov, int bulklen,
-               void (*done)(srpc_client_rpc_t *), void *priv);
-int sfw_create_test_rpc(sfw_test_unit_t *tsu,
+               void (*done)(struct srpc_client_rpc *), void *priv);
+int sfw_create_test_rpc(struct sfw_test_unit *tsu,
                         lnet_process_id_t peer, unsigned features,
-                        int nblk, int blklen, srpc_client_rpc_t **rpc);
-void sfw_abort_rpc(srpc_client_rpc_t *rpc);
-void sfw_post_rpc(srpc_client_rpc_t *rpc);
-void sfw_client_rpc_done(srpc_client_rpc_t *rpc);
-void sfw_unpack_message(srpc_msg_t *msg);
+                        int nblk, int blklen, struct srpc_client_rpc **rpc);
+void sfw_abort_rpc(struct srpc_client_rpc *rpc);
+void sfw_post_rpc(struct srpc_client_rpc *rpc);
+void sfw_client_rpc_done(struct srpc_client_rpc *rpc);
+void sfw_unpack_message(struct srpc_msg *msg);
 void sfw_free_pages(struct srpc_server_rpc *rpc);
-void sfw_add_bulk_page(srpc_bulk_t *bk, struct page *pg, int i);
+void sfw_add_bulk_page(struct srpc_bulk *bk, struct page *pg, int i);
 int sfw_alloc_pages(struct srpc_server_rpc *rpc, int cpt, int npages, int len,
                     int sink);
 int sfw_make_session(srpc_mksn_reqst_t *request, srpc_mksn_reply_t *reply);
 
-srpc_client_rpc_t *
+struct srpc_client_rpc *
 srpc_create_client_rpc(lnet_process_id_t peer, int service,
                        int nbulkiov, int bulklen,
-                       void (*rpc_done)(srpc_client_rpc_t *),
-                       void (*rpc_fini)(srpc_client_rpc_t *), void *priv);
-void srpc_post_rpc(srpc_client_rpc_t *rpc);
-void srpc_abort_rpc(srpc_client_rpc_t *rpc, int why);
-void srpc_free_bulk(srpc_bulk_t *bk);
-srpc_bulk_t *srpc_alloc_bulk(int cpt, unsigned bulk_npg, unsigned bulk_len,
-                             int sink);
-int srpc_send_rpc(swi_workitem_t *wi);
+                       void (*rpc_done)(struct srpc_client_rpc *),
+                       void (*rpc_fini)(struct srpc_client_rpc *), void *priv);
+void srpc_post_rpc(struct srpc_client_rpc *rpc);
+void srpc_abort_rpc(struct srpc_client_rpc *rpc, int why);
+void srpc_free_bulk(struct srpc_bulk *bk);
+struct srpc_bulk *srpc_alloc_bulk(int cpt, unsigned bulk_npg,
+                                  unsigned bulk_len, int sink);
+int srpc_send_rpc(struct swi_workitem *wi);
 int srpc_send_reply(struct srpc_server_rpc *rpc);
-int srpc_add_service(srpc_service_t *sv);
-int srpc_remove_service(srpc_service_t *sv);
-void srpc_shutdown_service(srpc_service_t *sv);
-void srpc_abort_service(srpc_service_t *sv);
-int srpc_finish_service(srpc_service_t *sv);
-int srpc_service_add_buffers(srpc_service_t *sv, int nbuffer);
-void srpc_service_remove_buffers(srpc_service_t *sv, int nbuffer);
+int srpc_add_service(struct srpc_service *sv);
+int srpc_remove_service(struct srpc_service *sv);
+void srpc_shutdown_service(struct srpc_service *sv);
+void srpc_abort_service(struct srpc_service *sv);
+int srpc_finish_service(struct srpc_service *sv);
+int srpc_service_add_buffers(struct srpc_service *sv, int nbuffer);
+void srpc_service_remove_buffers(struct srpc_service *sv, int nbuffer);
 void srpc_get_counters(srpc_counters_t *cnt);
 void srpc_set_counters(const srpc_counters_t *cnt);
 
@@ -463,13 +464,15 @@ srpc_serv_is_framework(struct srpc_service *svc)
 static inline int
 swi_wi_action(struct cfs_workitem *wi)
 {
-        swi_workitem_t *swi = container_of(wi, swi_workitem_t, swi_workitem);
+        struct swi_workitem *swi;
+
+        swi = container_of(wi, struct swi_workitem, swi_workitem);
 
         return swi->swi_action(swi);
 }
 
 static inline void
-swi_init_workitem(swi_workitem_t *swi, void *data,
+swi_init_workitem(struct swi_workitem *swi, void *data,
                   swi_action_t action, struct cfs_wi_sched *sched)
 {
         swi->swi_sched = sched;
@@ -479,19 +482,19 @@ swi_init_workitem(swi_workitem_t *swi, void *data,
 }
 
 static inline void
-swi_schedule_workitem(swi_workitem_t *wi)
+swi_schedule_workitem(struct swi_workitem *wi)
 {
         cfs_wi_schedule(wi->swi_sched, &wi->swi_workitem);
 }
 
 static inline void
-swi_exit_workitem(swi_workitem_t *swi)
+swi_exit_workitem(struct swi_workitem *swi)
 {
         cfs_wi_exit(swi->swi_sched, &swi->swi_workitem);
 }
 
 static inline int
-swi_deschedule_workitem(swi_workitem_t *swi)
+swi_deschedule_workitem(struct swi_workitem *swi)
 {
         return cfs_wi_deschedule(swi->swi_sched, &swi->swi_workitem);
 }
@@ -502,7 +505,7 @@ void sfw_shutdown(void);
 void srpc_shutdown(void);
 
 static inline void
-srpc_destroy_client_rpc(srpc_client_rpc_t *rpc)
+srpc_destroy_client_rpc(struct srpc_client_rpc *rpc)
 {
         LASSERT(rpc);
         LASSERT(!srpc_event_pending(rpc));
@@ -515,14 +518,14 @@ srpc_destroy_client_rpc(srpc_client_rpc_t *rpc)
 }
 
 static inline void
-srpc_init_client_rpc(srpc_client_rpc_t *rpc, lnet_process_id_t peer,
+srpc_init_client_rpc(struct srpc_client_rpc *rpc, lnet_process_id_t peer,
                      int service, int nbulkiov, int bulklen,
-                     void (*rpc_done)(srpc_client_rpc_t *),
-                     void (*rpc_fini)(srpc_client_rpc_t *), void *priv)
+                     void (*rpc_done)(struct srpc_client_rpc *),
+                     void (*rpc_fini)(struct srpc_client_rpc *), void *priv)
 {
         LASSERT(nbulkiov <= LNET_MAX_IOV);
 
-        memset(rpc, 0, offsetof(srpc_client_rpc_t,
+        memset(rpc, 0, offsetof(struct srpc_client_rpc,
                                 crpc_bulk.bk_iovs[nbulkiov]));
 
         INIT_LIST_HEAD(&rpc->crpc_list);
@@ -592,7 +595,7 @@ do {									\
 } while (0)
 
 static inline void
-srpc_wait_service_shutdown(srpc_service_t *sv)
+srpc_wait_service_shutdown(struct srpc_service *sv)
 {
         int i = 2;
 
@@ -607,16 +610,16 @@ srpc_wait_service_shutdown(srpc_service_t *sv)
         }
 }
 
-extern sfw_test_client_ops_t brw_test_client;
+extern struct sfw_test_client_ops brw_test_client;
 void brw_init_test_client(void);
 
-extern srpc_service_t brw_test_service;
+extern struct srpc_service brw_test_service;
 void brw_init_test_service(void);
 
-extern sfw_test_client_ops_t ping_test_client;
+extern struct sfw_test_client_ops ping_test_client;
 void ping_init_test_client(void);
 
-extern srpc_service_t ping_test_service;
+extern struct srpc_service ping_test_service;
 void ping_init_test_service(void);
 
 #endif /* __SELFTEST_SELFTEST_H__ */
diff --git a/drivers/staging/lustre/lustre/fld/fld_cache.c b/drivers/staging/lustre/lustre/fld/fld_cache.c
index 062f388cf38a..5a04e99d9249 100644
--- a/drivers/staging/lustre/lustre/fld/fld_cache.c
+++ b/drivers/staging/lustre/lustre/fld/fld_cache.c
@@ -178,8 +178,9 @@ restart_fixup:
                                 if (n_range->lsr_end <= c_range->lsr_end) {
                                         *n_range = *c_range;
                                         fld_cache_entry_delete(cache, f_curr);
-                                } else
+                                } else {
                                         n_range->lsr_start = c_range->lsr_end;
+                                }
                         }
 
                         /* we could have overlap over next
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 fcb9db6e1f1a..0f70acd1a750 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 12e6718f2adb..c3565bf0e1fb 100644
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
@@ -1001,8 +1001,9 @@ static inline int lu_dirent_calc_size(int namelen, __u16 attr)
 
                 size = (sizeof(struct lu_dirent) + namelen + align) & ~align;
                 size += sizeof(struct luda_type);
-        } else
+        } else {
                 size = sizeof(struct lu_dirent) + namelen;
+        }
 
         return (size + 7) & ~7;
 }
@@ -1022,16 +1023,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 */
 
@@ -1428,6 +1429,7 @@ enum obdo_flags {
                                            */
         OBD_FL_RECOV_RESEND = 0x00080000, /* recoverable resent */
         OBD_FL_NOSPC_BLK    = 0x00100000, /* no more block space on OST */
+        OBD_FL_FLUSH        = 0x00200000, /* flush pages on the OST */
 
         /* Note that while these checksum values are currently separate bits,
          * in 2.x we can actually allow all values from 1-31 if we wanted.
diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_user.h b/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
index 19f2271cc6b9..59ba48ac31a7 100644
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
@@ -676,7 +676,12 @@ static inline const char *changelog_type2str(int type)
 #define CLF_UNLINK_HSM_EXISTS 0x0002 /* File has something in HSM */
                                      /* HSM cleaning needed */
 /* Flags for rename */
-#define CLF_RENAME_LAST       0x0001 /* rename unlink last hardlink of target */
+#define CLF_RENAME_LAST         0x0001  /* rename unlink last hardlink of
+                                         * target
+                                         */
+#define CLF_RENAME_LAST_EXISTS  0x0002  /* rename unlink last hardlink of target
+                                         * has an archive in backend
+                                         */
 
 /* Flags for HSM */
 /* 12b used (from high weight to low weight):
@@ -833,9 +838,8 @@ struct ioc_data_version {
         __u64 idv_flags;     /* See LL_DV_xxx */
 };
 
-#define LL_DV_NOFLUSH 0x01   /* Do not take READ EXTENT LOCK before sampling
-                              * version. Dirty caches are left unchanged.
-                              */
+#define LL_DV_RD_FLUSH  BIT(0)  /* Flush dirty pages from clients */
+#define LL_DV_WR_FLUSH  BIT(1)  /* Flush all caching pages from clients */
 
 #ifndef offsetof
 # define offsetof(typ, memb)     ((unsigned long)((char *)&(((typ *)0)->memb)))
@@ -1095,7 +1099,7 @@ struct hsm_action_list {
         __u32 padding1;
         char  hal_fsname[0];   /* null-terminated */
         /* struct hsm_action_item[hal_count] follows, aligned on 8-byte
-         * boundaries. See hai_zero
+         * boundaries. See hai_first
          */
 } __packed;
 
@@ -1109,7 +1113,7 @@ static inline int cfs_size_round(int val)
 #endif
 
 /* Return pointer to first hai in action list */
-static inline struct hsm_action_item *hai_zero(struct hsm_action_list *hal)
+static inline struct hsm_action_item *hai_first(struct hsm_action_list *hal)
 {
         return (struct hsm_action_item *)(hal->hal_fsname +
                                           cfs_size_round(strlen(hal-> \
@@ -1131,7 +1135,7 @@ static inline int hal_size(struct hsm_action_list *hal)
         struct hsm_action_item *hai;
 
         sz = sizeof(*hal) + cfs_size_round(strlen(hal->hal_fsname) + 1);
-        hai = hai_zero(hal);
+        hai = hai_first(hal);
         for (i = 0; i < hal->hal_count; i++, hai = hai_next(hai))
                 sz += cfs_size_round(hai->hai_len);
 
diff --git a/drivers/staging/lustre/lustre/include/lustre_mdc.h b/drivers/staging/lustre/lustre/include/lustre_mdc.h
index df94f9f3bef2..f267ff8a6ec8 100644
--- a/drivers/staging/lustre/lustre/include/lustre_mdc.h
+++ b/drivers/staging/lustre/lustre/include/lustre_mdc.h
@@ -64,9 +64,27 @@ struct obd_export;
 struct ptlrpc_request;
 struct obd_device;
 
+/**
+ * Serializes in-flight MDT-modifying RPC requests to preserve idempotency.
+ *
+ * This mutex is used to implement execute-once semantics on the MDT.
+ * The MDT stores the last transaction ID and result for every client in
+ * its last_rcvd file. If the client doesn't get a reply, it can safely
+ * resend the request and the MDT will reconstruct the reply being aware
+ * that the request has already been executed. Without this lock,
+ * execution status of concurrent in-flight requests would be
+ * overwritten.
+ *
+ * This design limits the extent to which we can keep a full pipeline of
+ * in-flight requests from a single client.  This limitation could be
+ * overcome by allowing multiple slots per client in the last_rcvd file.
+ */
 struct mdc_rpc_lock {
+        /** Lock protecting in-flight RPC concurrency. */
         struct mutex            rpcl_mutex;
+        /** Intent associated with currently executing request. */
         struct lookup_intent    *rpcl_it;
+        /** Used for MDS/RPC load testing purposes. */
         int                     rpcl_fakes;
 };
 
@@ -155,12 +173,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 ded7b106ac8a..e97e25bbcd2d 100644
--- a/drivers/staging/lustre/lustre/include/obd.h
+++ b/drivers/staging/lustre/lustre/include/obd.h
@@ -273,7 +273,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;
@@ -1316,7 +1316,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_class.h b/drivers/staging/lustre/lustre/include/obd_class.h
index 706869f8c98f..40f7a2374865 100644
--- a/drivers/staging/lustre/lustre/include/obd_class.h
+++ b/drivers/staging/lustre/lustre/include/obd_class.h
@@ -490,8 +490,9 @@ static inline int obd_setup(struct obd_device *obd, struct lustre_cfg *cfg)
                                 obd->obd_lu_dev = d;
                                 d->ld_obd = obd;
                                 rc = 0;
-                        } else
+                        } else {
                                 rc = PTR_ERR(d);
+                        }
                 }
                 lu_context_exit(&session_ctx);
                 lu_context_fini(&session_ctx);
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/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
index b88b78606aee..3f97e1ca7192 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
@@ -530,12 +530,6 @@ granted:
                 return -EIO;
         }
 
-        if (rc) {
-                LDLM_DEBUG(lock, "client-side enqueue waking up: failed (%d)",
-                           rc);
-                return rc;
-        }
-
         LDLM_DEBUG(lock, "client-side enqueue granted");
 
         lock_res_and_lock(lock);
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h b/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h
index 351f8b44947f..ba643e68dd2d 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h
@@ -218,8 +218,6 @@ enum ldlm_policy_res {
         LDLM_POLICY_SKIP_LOCK
 };
 
-typedef enum ldlm_policy_res ldlm_policy_res_t;
-
 #define LDLM_POOL_SYSFS_PRINT_int(v) sprintf(buf, "%d\n", v)
 #define LDLM_POOL_SYSFS_SET_int(a, b) { a = b; }
 #define LDLM_POOL_SYSFS_PRINT_u64(v) sprintf(buf, "%lld\n", v)
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
index 7fedbec43ebf..9e58b1c7177b 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 5b0e396a9908..880efdc2fa96 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
@@ -1131,12 +1131,11 @@ EXPORT_SYMBOL(ldlm_cli_cancel_list_local);
  * dirty data, to close a file, ...) or waiting for any RPCs in-flight (e.g.
  * readahead requests, ...)
  */
-static ldlm_policy_res_t ldlm_cancel_no_wait_policy(struct ldlm_namespace *ns,
-                                                    struct ldlm_lock *lock,
-                                                    int unused, int added,
-                                                    int count)
+static enum ldlm_policy_res
+ldlm_cancel_no_wait_policy(struct ldlm_namespace *ns, struct ldlm_lock *lock,
+                           int unused, int added, int count)
 {
-        ldlm_policy_res_t result = LDLM_POLICY_CANCEL_LOCK;
+        enum ldlm_policy_res result = LDLM_POLICY_CANCEL_LOCK;
 
         /* don't check added & count since we want to process all locks
          * from unused list.
@@ -1168,10 +1167,10 @@ static ldlm_policy_res_t ldlm_cancel_no_wait_policy(struct ldlm_namespace *ns,
  *
  * \retval LDLM_POLICY_CANCEL_LOCK cancel lock from LRU
  */
-static ldlm_policy_res_t ldlm_cancel_lrur_policy(struct ldlm_namespace *ns,
-                                                 struct ldlm_lock *lock,
-                                                 int unused, int added,
-                                                 int count)
+static enum ldlm_policy_res ldlm_cancel_lrur_policy(struct ldlm_namespace *ns,
+                                                    struct ldlm_lock *lock,
+                                                    int unused, int added,
+                                                    int count)
 {
         unsigned long cur = cfs_time_current();
         struct ldlm_pool *pl = &ns->ns_pool;
@@ -1214,10 +1213,10 @@ static ldlm_policy_res_t ldlm_cancel_lrur_policy(struct ldlm_namespace *ns,
  *
  * \retval LDLM_POLICY_CANCEL_LOCK cancel lock from LRU
  */
-static ldlm_policy_res_t ldlm_cancel_passed_policy(struct ldlm_namespace *ns,
-                                                   struct ldlm_lock *lock,
-                                                   int unused, int added,
-                                                   int count)
+static enum ldlm_policy_res ldlm_cancel_passed_policy(struct ldlm_namespace *ns,
+                                                      struct ldlm_lock *lock,
+                                                      int unused, int added,
+                                                      int count)
 {
         /* Stop LRU processing when we reach past @count or have checked all
          * locks in LRU.
@@ -1235,10 +1234,10 @@ static ldlm_policy_res_t ldlm_cancel_passed_policy(struct ldlm_namespace *ns,
  *
  * \retval LDLM_POLICY_CANCEL_LOCK cancel lock from LRU
  */
-static ldlm_policy_res_t ldlm_cancel_aged_policy(struct ldlm_namespace *ns,
-                                                 struct ldlm_lock *lock,
-                                                 int unused, int added,
-                                                 int count)
+static enum ldlm_policy_res ldlm_cancel_aged_policy(struct ldlm_namespace *ns,
+                                                    struct ldlm_lock *lock,
+                                                    int unused, int added,
+                                                    int count)
 {
         if ((added >= count) &&
             time_before(cfs_time_current(),
@@ -1251,13 +1250,13 @@ static ldlm_policy_res_t ldlm_cancel_aged_policy(struct ldlm_namespace *ns,
         return LDLM_POLICY_CANCEL_LOCK;
 }
 
-static ldlm_policy_res_t
+static enum ldlm_policy_res
 ldlm_cancel_lrur_no_wait_policy(struct ldlm_namespace *ns,
                                 struct ldlm_lock *lock,
                                 int unused, int added,
                                 int count)
 {
-        ldlm_policy_res_t result;
+        enum ldlm_policy_res result;
 
         result = ldlm_cancel_lrur_policy(ns, lock, unused, added, count);
         if (result == LDLM_POLICY_KEEP_LOCK)
@@ -1275,10 +1274,9 @@ ldlm_cancel_lrur_no_wait_policy(struct ldlm_namespace *ns,
  *
  * \retval LDLM_POLICY_CANCEL_LOCK cancel lock from LRU
  */
-static ldlm_policy_res_t ldlm_cancel_default_policy(struct ldlm_namespace *ns,
-                                                    struct ldlm_lock *lock,
-                                                    int unused, int added,
-                                                    int count)
+static enum ldlm_policy_res
+ldlm_cancel_default_policy(struct ldlm_namespace *ns, struct ldlm_lock *lock,
+                           int unused, int added, int count)
 {
         /* Stop LRU processing when we reach past count or have checked all
          * locks in LRU.
@@ -1287,7 +1285,8 @@ static ldlm_policy_res_t ldlm_cancel_default_policy(struct ldlm_namespace *ns,
                 LDLM_POLICY_KEEP_LOCK : LDLM_POLICY_CANCEL_LOCK;
 }
 
-typedef ldlm_policy_res_t (*ldlm_cancel_lru_policy_t)(struct ldlm_namespace *,
+typedef enum ldlm_policy_res (*ldlm_cancel_lru_policy_t)(
+                                                      struct ldlm_namespace *,
                                                       struct ldlm_lock *, int,
                                                       int, int);
 
@@ -1368,7 +1367,7 @@ static int ldlm_prepare_lru_list(struct ldlm_namespace *ns,
         LASSERT(pf);
 
         while (!list_empty(&ns->ns_unused_list)) {
-                ldlm_policy_res_t result;
+                enum ldlm_policy_res result;
                 time_t last_use = 0;
 
                 /* all unused locks */
diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
index b085fb4ffc56..2f0873ee7824 100644
--- a/drivers/staging/lustre/lustre/llite/dir.c
+++ b/drivers/staging/lustre/lustre/llite/dir.c
@@ -134,9 +134,8 @@
  * 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
- * lu_dirpage for this integrated page will be adjusted. See
- * lmv_adjust_dirpages().
+ * 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 +152,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 +192,8 @@ static int ll_dir_filler(void *_hash, struct page *page0)
                 if (body->valid & OBD_MD_FLSIZE)
                         i_size_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 +208,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 +229,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 +246,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 +272,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 +312,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);
                 }
 
@@ -612,15 +611,16 @@ static int ll_readdir(struct file *filp, struct dir_context *ctx)
         struct inode            *inode  = file_inode(filp);
         struct ll_file_data     *lfd    = LUSTRE_FPRIVATE(filp);
         struct ll_sb_info       *sbi    = ll_i2sbi(inode);
+        __u64 pos = lfd ? lfd->lfd_pos : 0;
         int                     hash64  = sbi->ll_flags & LL_SBI_64BIT_HASH;
         int                     api32   = ll_need_32bit_api(sbi);
         int                     rc;
 
         CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p) pos %lu/%llu 32bit_api %d\n",
                inode->i_ino, inode->i_generation,
-               inode, (unsigned long)lfd->lfd_pos, i_size_read(inode), api32);
+               inode, (unsigned long)pos, i_size_read(inode), api32);
 
-        if (lfd->lfd_pos == MDS_DIR_END_OFF) {
+        if (pos == MDS_DIR_END_OFF) {
                 /*
                  * end-of-file.
                  */
@@ -628,9 +628,10 @@ static int ll_readdir(struct file *filp, struct dir_context *ctx)
                 goto out;
         }
 
-        ctx->pos = lfd->lfd_pos;
+        ctx->pos = pos;
         rc = ll_dir_read(inode, ctx);
-        lfd->lfd_pos = ctx->pos;
+        if (lfd)
+                lfd->lfd_pos = ctx->pos;
         if (ctx->pos == MDS_DIR_END_OFF) {
                 if (api32)
                         ctx->pos = LL_DIR_END_OFF_32BIT;
@@ -939,7 +940,7 @@ static int ll_ioc_copy_start(struct super_block *sb, struct hsm_copy *copy)
                 }
 
                 /* Read current file data version */
-                rc = ll_data_version(inode, &data_version, 1);
+                rc = ll_data_version(inode, &data_version, LL_DV_RD_FLUSH);
                 iput(inode);
                 if (rc != 0) {
                         CDEBUG(D_HSM, "Could not read file data version of "
@@ -959,6 +960,9 @@ static int ll_ioc_copy_start(struct super_block *sb, struct hsm_copy *copy)
         }
 
 progress:
+        /* On error, the request should be considered as completed */
+        if (hpk.hpk_errval > 0)
+                hpk.hpk_flags |= HP_FLAG_COMPLETED;
         rc = obd_iocontrol(LL_IOC_HSM_PROGRESS, sbi->ll_md_exp, sizeof(hpk),
                            &hpk, NULL);
 
@@ -1020,8 +1024,7 @@ static int ll_ioc_copy_end(struct super_block *sb, struct hsm_copy *copy)
                         goto progress;
                 }
 
-                rc = ll_data_version(inode, &data_version,
-                                     copy->hc_hai.hai_action == HSMA_ARCHIVE);
+                rc = ll_data_version(inode, &data_version, LL_DV_RD_FLUSH);
                 iput(inode);
                 if (rc) {
                         CDEBUG(D_HSM, "Could not read file data version. Request could not be confirmed.\n");
@@ -1497,8 +1500,9 @@ free_lmv:
                                                cmd == LL_IOC_MDC_GETINFO)) {
                                 rc = 0;
                                 goto skip_lmm;
-                        } else
+                        } else {
                                 goto out_req;
+                        }
                 }
 
                 if (cmd == IOC_MDC_GETFILESTRIPE ||
@@ -1529,7 +1533,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;
@@ -1711,15 +1715,16 @@ out_quotactl:
                 return ll_flush_ctx(inode);
 #ifdef CONFIG_FS_POSIX_ACL
         case LL_IOC_RMTACL: {
-            if (sbi->ll_flags & LL_SBI_RMT_CLIENT && is_root_inode(inode)) {
-                struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
+                if (sbi->ll_flags & LL_SBI_RMT_CLIENT && is_root_inode(inode)) {
+                        struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
 
-                rc = rct_add(&sbi->ll_rct, current_pid(), arg);
-                if (!rc)
-                        fd->fd_flags |= LL_FILE_RMTACL;
-                return rc;
-            } else
-                return 0;
+                        rc = rct_add(&sbi->ll_rct, current_pid(), arg);
+                        if (!rc)
+                                fd->fd_flags |= LL_FILE_RMTACL;
+                        return rc;
+                } else {
+                        return 0;
+                }
         }
 #endif
         case LL_IOC_GETOBDCOUNT: {
diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c
index 69b56a816fcb..9b553d2ab336 100644
--- a/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@ -875,16 +875,19 @@ ll_lease_open(struct inode *inode, struct file *file, fmode_t fmode,
         return och;
 
 out_close:
-        rc2 = ll_close_inode_openhandle(sbi->ll_md_exp, inode, och, NULL);
-        if (rc2)
-                CERROR("Close openhandle returned %d\n", rc2);
-
-        /* cancel open lock */
+        /* Cancel open lock */
         if (it.d.lustre.it_lock_mode != 0) {
                 ldlm_lock_decref_and_cancel(&och->och_lease_handle,
                                             it.d.lustre.it_lock_mode);
                 it.d.lustre.it_lock_mode = 0;
+                och->och_lease_handle.cookie = 0ULL;
         }
+        rc2 = ll_close_inode_openhandle(sbi->ll_md_exp, inode, och, NULL);
+        if (rc2 < 0)
+                CERROR("%s: error closing file "DFID": %d\n",
+                       ll_get_fsname(inode->i_sb, NULL, 0),
+                       PFID(&ll_i2info(inode)->lli_fid), rc2);
+        och = NULL; /* och has been freed in ll_close_inode_openhandle() */
 out_release_it:
         ll_intent_release(&it);
 out:
@@ -908,7 +911,7 @@ static int ll_lease_close(struct obd_client_handle *och, struct inode *inode,
                 lock_res_and_lock(lock);
                 cancelled = ldlm_is_cancel(lock);
                 unlock_res_and_lock(lock);
-                ldlm_lock_put(lock);
+                LDLM_LOCK_PUT(lock);
         }
 
         CDEBUG(D_INODE, "lease for " DFID " broken? %d\n",
@@ -926,7 +929,7 @@ static int ll_lease_close(struct obd_client_handle *och, struct inode *inode,
 
 /* Fills the obdo with the attributes for the lsm */
 static int ll_lsm_getattr(struct lov_stripe_md *lsm, struct obd_export *exp,
-                          struct obdo *obdo, __u64 ioepoch, int sync)
+                          struct obdo *obdo, __u64 ioepoch, int dv_flags)
 {
         struct ptlrpc_request_set *set;
         struct obd_info     oinfo = { };
@@ -945,9 +948,11 @@ static int ll_lsm_getattr(struct lov_stripe_md *lsm, struct obd_export *exp,
                                OBD_MD_FLMTIME | OBD_MD_FLCTIME |
                                OBD_MD_FLGROUP | OBD_MD_FLEPOCH |
                                OBD_MD_FLDATAVERSION;
-        if (sync) {
+        if (dv_flags & (LL_DV_WR_FLUSH | LL_DV_RD_FLUSH)) {
                 oinfo.oi_oa->o_valid |= OBD_MD_FLFLAGS;
                 oinfo.oi_oa->o_flags |= OBD_FL_SRVLOCK;
+                if (dv_flags & LL_DV_WR_FLUSH)
+                        oinfo.oi_oa->o_flags |= OBD_FL_FLUSH;
         }
 
         set = ptlrpc_prep_set();
@@ -960,11 +965,16 @@ static int ll_lsm_getattr(struct lov_stripe_md *lsm, struct obd_export *exp,
                         rc = ptlrpc_set_wait(set);
                 ptlrpc_set_destroy(set);
         }
-        if (rc == 0)
+        if (rc == 0) {
                 oinfo.oi_oa->o_valid &= (OBD_MD_FLBLOCKS | OBD_MD_FLBLKSZ |
                                          OBD_MD_FLATIME | OBD_MD_FLMTIME |
                                          OBD_MD_FLCTIME | OBD_MD_FLSIZE |
-                                         OBD_MD_FLDATAVERSION);
+                                         OBD_MD_FLDATAVERSION | OBD_MD_FLFLAGS);
+                if (dv_flags & LL_DV_WR_FLUSH &&
+                    !(oinfo.oi_oa->o_valid & OBD_MD_FLFLAGS &&
+                      oinfo.oi_oa->o_flags & OBD_FL_FLUSH))
+                        return -ENOTSUPP;
+        }
         return rc;
 }
 
@@ -980,7 +990,7 @@ int ll_inode_getattr(struct inode *inode, struct obdo *obdo,
 
         lsm = ccc_inode_lsm_get(inode);
         rc = ll_lsm_getattr(lsm, ll_i2dtexp(inode),
-                            obdo, ioepoch, sync);
+                            obdo, ioepoch, sync ? LL_DV_RD_FLUSH : 0);
         if (rc == 0) {
                 struct ost_id *oi = lsm ? &lsm->lsm_oi : &obdo->o_oi;
 
@@ -1363,7 +1373,8 @@ static int ll_lov_recreate_fid(struct inode *inode, unsigned long arg)
 }
 
 int ll_lov_setstripe_ea_info(struct inode *inode, struct dentry *dentry,
-                             int flags, struct lov_user_md *lum, int lum_size)
+                             __u64 flags, struct lov_user_md *lum,
+                             int lum_size)
 {
         struct lov_stripe_md *lsm = NULL;
         struct lookup_intent oit = {.it_op = IT_OPEN, .it_flags = flags};
@@ -1487,7 +1498,7 @@ out:
 static int ll_lov_setea(struct inode *inode, struct file *file,
                         unsigned long arg)
 {
-        int                      flags = MDS_OPEN_HAS_OBJS | FMODE_WRITE;
+        __u64                    flags = MDS_OPEN_HAS_OBJS | FMODE_WRITE;
         struct lov_user_md      *lump;
         int                      lum_size = sizeof(struct lov_user_md) +
                                             sizeof(struct lov_user_ost_data);
@@ -1521,7 +1532,7 @@ static int ll_lov_setstripe(struct inode *inode, struct file *file,
         struct lov_user_md_v1 __user *lumv1p = (void __user *)arg;
         struct lov_user_md_v3 __user *lumv3p = (void __user *)arg;
         int lum_size, rc;
-        int flags = FMODE_WRITE;
+        __u64 flags = FMODE_WRITE;
 
         /* first try with v1 which is smaller than v3 */
         lum_size = sizeof(struct lov_user_md_v1);
@@ -1870,11 +1881,12 @@ error:
  * This value is computed using stripe object version on OST.
  * Version is computed using server side locking.
  *
- * @param extent_lock  Take extent lock. Not needed if a process is already
- *                     holding the OST object group locks.
+ * @param sync  if do sync on the OST side;
+ *              0: no sync
+ *              LL_DV_RD_FLUSH: flush dirty pages, LCK_PR on OSTs
+ *              LL_DV_WR_FLUSH: drop all caching pages, LCK_PW on OSTs
  */
-int ll_data_version(struct inode *inode, __u64 *data_version,
-                    int extent_lock)
+int ll_data_version(struct inode *inode, __u64 *data_version, int flags)
 {
         struct lov_stripe_md    *lsm = NULL;
         struct ll_sb_info       *sbi = ll_i2sbi(inode);
@@ -1896,7 +1908,7 @@ int ll_data_version(struct inode *inode, __u64 *data_version,
                 goto out;
         }
 
-        rc = ll_lsm_getattr(lsm, sbi->ll_dt_exp, obdo, 0, extent_lock);
+        rc = ll_lsm_getattr(lsm, sbi->ll_dt_exp, obdo, 0, flags);
         if (rc == 0) {
                 if (!(obdo->o_valid & OBD_MD_FLDATAVERSION))
                         rc = -EOPNOTSUPP;
@@ -1932,7 +1944,7 @@ int ll_hsm_release(struct inode *inode)
         }
 
         /* Grab latest data_version and [am]time values */
-        rc = ll_data_version(inode, &data_version, 1);
+        rc = ll_data_version(inode, &data_version, LL_DV_WR_FLUSH);
         if (rc != 0)
                 goto out;
 
@@ -2340,9 +2352,8 @@ ll_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 if (copy_from_user(&idv, (char __user *)arg, sizeof(idv)))
                         return -EFAULT;
 
-                rc = ll_data_version(inode, &idv.idv_version,
-                                     !(idv.idv_flags & LL_DV_NOFLUSH));
-
+                idv.idv_flags &= LL_DV_RD_FLUSH | LL_DV_WR_FLUSH;
+                rc = ll_data_version(inode, &idv.idv_version, idv.idv_flags);
                 if (rc == 0 && copy_to_user((char __user *)arg, &idv,
                                             sizeof(idv)))
                         return -EFAULT;
@@ -2508,7 +2519,7 @@ ll_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                         rc = och->och_flags &
                                                 (FMODE_READ | FMODE_WRITE);
                                 unlock_res_and_lock(lock);
-                                ldlm_lock_put(lock);
+                                LDLM_LOCK_PUT(lock);
                         }
                 }
                 mutex_unlock(&lli->lli_och_mutex);
diff --git a/drivers/staging/lustre/lustre/llite/llite_close.c b/drivers/staging/lustre/lustre/llite/llite_close.c
index 8d2398003c5a..92b73ef3222c 100644
--- a/drivers/staging/lustre/lustre/llite/llite_close.c
+++ b/drivers/staging/lustre/lustre/llite/llite_close.c
@@ -323,8 +323,9 @@ static struct ll_inode_info *ll_close_next_lli(struct ll_close_queue *lcq)
                 lli = list_entry(lcq->lcq_head.next, struct ll_inode_info,
                                  lli_close_list);
                 list_del_init(&lli->lli_close_list);
-        } else if (atomic_read(&lcq->lcq_stop))
+        } else if (atomic_read(&lcq->lcq_stop)) {
                 lli = ERR_PTR(-EALREADY);
+        }
 
         spin_unlock(&lcq->lcq_lock);
         return lli;
diff --git a/drivers/staging/lustre/lustre/llite/llite_internal.h b/drivers/staging/lustre/lustre/llite/llite_internal.h
index ba24f09ba1f9..2a11664325ef 100644
--- a/drivers/staging/lustre/lustre/llite/llite_internal.h
+++ b/drivers/staging/lustre/lustre/llite/llite_internal.h
@@ -319,10 +319,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,
@@ -745,7 +745,7 @@ struct posix_acl *ll_get_acl(struct inode *inode, int type);
 int ll_inode_permission(struct inode *inode, int mask);
 
 int ll_lov_setstripe_ea_info(struct inode *inode, struct dentry *dentry,
-                             int flags, struct lov_user_md *lum,
+                             __u64 flags, struct lov_user_md *lum,
                              int lum_size);
 int ll_lov_getstripe_ea_info(struct inode *inode, const char *filename,
                              struct lov_mds_md **lmm, int *lmm_size,
@@ -757,7 +757,7 @@ int ll_dir_getstripe(struct inode *inode, struct lov_mds_md **lmmp,
 int ll_fsync(struct file *file, loff_t start, loff_t end, int data);
 int ll_merge_attr(const struct lu_env *env, struct inode *inode);
 int ll_fid2path(struct inode *inode, void __user *arg);
-int ll_data_version(struct inode *inode, __u64 *data_version, int extent_lock);
+int ll_data_version(struct inode *inode, __u64 *data_version, int flags);
 int ll_hsm_release(struct inode *inode);
 
 /* llite/dcache.c */
@@ -901,7 +901,7 @@ 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)
@@ -911,7 +911,7 @@ static inline void ll_invalidate_page(struct page *vmpage)
          * truncate_complete_page() calls
          * a_ops->invalidatepage()->cl_page_delete()->vvp_page_delete().
          */
-        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 95c55c316ec0..b0948a7b860b 100644
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -166,12 +166,6 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
                 return -ENOMEM;
         }
 
-        if (llite_root) {
-                err = ldebugfs_register_mountpoint(llite_root, sb, dt, md);
-                if (err < 0)
-                        CERROR("could not register mount in <debugfs>/lustre/llite\n");
-        }
-
         /* indicate the features supported by this client */
         data->ocd_connect_flags = OBD_CONNECT_IBITS    | OBD_CONNECT_NODEVOH  |
                                   OBD_CONNECT_ATTRFID  |
@@ -269,12 +263,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);
@@ -332,7 +326,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");
@@ -552,6 +546,15 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
         kfree(data);
         kfree(osfs);
 
+        if (llite_root) {
+                err = ldebugfs_register_mountpoint(llite_root, sb, dt, md);
+                if (err < 0) {
+                        CERROR("%s: could not register mount in debugfs: "
+                               "rc = %d\n", ll_get_fsname(sb, NULL, 0), err);
+                        err = 0;
+                }
+        }
+
         return err;
 out_root:
         iput(root);
@@ -570,7 +573,6 @@ out_md:
 out:
         kfree(data);
         kfree(osfs);
-        ldebugfs_unregister_mountpoint(sbi);
         return err;
 }
 
@@ -1596,8 +1598,9 @@ void ll_update_inode(struct inode *inode, struct lustre_md *md)
                                  " to the "DFID", inode %lu/%u(%p)\n",
                                  PFID(&lli->lli_fid), PFID(&body->fid1),
                                  inode->i_ino, inode->i_generation, inode);
-                } else
+                } else {
                         lli->lli_fid = body->fid1;
+                }
         }
 
         LASSERT(fid_seq(&lli->lli_fid) != 0);
@@ -2065,11 +2068,11 @@ int ll_obd_statfs(struct inode *inode, void __user *arg)
         }
 
         memcpy(&type, data->ioc_inlbuf1, sizeof(__u32));
-        if (type & LL_STATFS_LMV)
+        if (type & LL_STATFS_LMV) {
                 exp = sbi->ll_md_exp;
-        else if (type & LL_STATFS_LOV)
+        } else if (type & LL_STATFS_LOV) {
                 exp = sbi->ll_dt_exp;
-        else {
+        } else {
                 rc = -ENODEV;
                 goto out_statfs;
         }
diff --git a/drivers/staging/lustre/lustre/llite/llite_mmap.c b/drivers/staging/lustre/lustre/llite/llite_mmap.c
index 5b4382cca0d7..4f6697a599d7 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) & PAGE_MASK) +
-                                 (vma->vm_pgoff << PAGE_CACHE_SHIFT);
+                                 (vma->vm_pgoff << PAGE_SHIFT);
         policy->l_extent.end = (policy->l_extent.start + count - 1) |
                                ~PAGE_MASK;
 }
@@ -325,7 +325,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;
                 }
         }
@@ -364,7 +364,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) {
@@ -461,7 +461,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..813a9a354e5f 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
@@ -274,8 +274,9 @@ static void loop_add_bio(struct lloop_device *lo, struct bio *bio)
         if (lo->lo_biotail) {
                 lo->lo_biotail->bi_next = bio;
                 lo->lo_biotail = bio;
-        } else
+        } else {
                 lo->lo_bio = lo->lo_biotail = bio;
+        }
         spin_unlock_irqrestore(&lo->lo_lock, flags);
 
         atomic_inc(&lo->lo_pending);
@@ -507,7 +508,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 +526,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 091144fa97dd..d99d8c3d602a 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;
 
@@ -407,7 +407,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);
@@ -417,7 +417,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/namei.c b/drivers/staging/lustre/lustre/llite/namei.c
index f8f98e4e8258..856170762ef7 100644
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@ -128,10 +128,12 @@ struct inode *ll_iget(struct super_block *sb, ino_t hash,
                         if (rc != 0) {
                                 iget_failed(inode);
                                 inode = NULL;
-                        } else
+                        } else {
                                 unlock_new_inode(inode);
-                } else if (!(inode->i_state & (I_FREEING | I_CLEAR)))
+                        }
+                } else if (!(inode->i_state & (I_FREEING | I_CLEAR))) {
                         ll_update_inode(inode, md);
+                }
                 CDEBUG(D_VFSTRACE, "got inode: %p for "DFID"\n",
                        inode, PFID(&md->body->fid1));
         }
diff --git a/drivers/staging/lustre/lustre/llite/rw.c b/drivers/staging/lustre/lustre/llite/rw.c
index 7d5dd3848552..fee319ce472d 100644
--- a/drivers/staging/lustre/lustre/llite/rw.c
+++ b/drivers/staging/lustre/lustre/llite/rw.c
@@ -132,8 +132,9 @@ struct ll_cl_context *ll_cl_init(struct file *file, struct page *vmpage)
                         lcc->lcc_page = page;
                         lu_ref_add(&page->cp_reference, "cl_io", io);
                         result = 0;
-                } else
+                } else {
                         result = PTR_ERR(page);
+                }
         }
         if (result) {
                 ll_cl_fini(lcc);
@@ -350,7 +351,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";
@@ -373,13 +374,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)
 {
@@ -488,8 +489,9 @@ static int ll_read_ahead_pages(const struct lu_env *env,
                         if (rc == 1) {
                                 (*reserved_pages)--;
                                 count++;
-                        } else if (rc == -ENOLCK)
+                        } else if (rc == -ENOLCK) {
                                 break;
+                        }
                 } else if (stride_ria) {
                         /* If it is not in the read-ahead window, and it is
                          * read-ahead mode, then check whether it should skip
@@ -587,7 +589,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);
@@ -643,7 +645,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(inode, RA_STAT_EOF);
 
         /* if we didn't get to the end of the region we reserved from
@@ -852,8 +854,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);
@@ -1043,7 +1045,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.
@@ -1081,7 +1083,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;
@@ -1111,7 +1113,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 65baeebead72..cad6aa935bb2 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;
@@ -98,8 +98,9 @@ static void ll_invalidatepage(struct page *vmpage, unsigned int offset,
                                         cl_page_delete(env, page);
                                         cl_page_put(env, page);
                                 }
-                        } else
+                        } else {
                                 LASSERT(vmpage->private == 0);
+                        }
                         cl_env_put(env, &refcheck);
                 }
         }
@@ -178,8 +179,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) {
@@ -202,7 +203,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);
 }
@@ -342,7 +343,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)
 {
@@ -367,8 +368,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) & ~PAGE_MASK)
@@ -417,8 +418,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) |
                                          ~PAGE_MASK) + 1) &
                                         PAGE_MASK;
@@ -493,9 +494,9 @@ static int ll_write_begin(struct file *file, struct address_space *mapping,
         struct cl_io   *io;
         struct cl_page *page;
         struct cl_object *clob = ll_i2info(mapping->host)->lli_clob;
-        pgoff_t index = pos >> PAGE_CACHE_SHIFT;
+        pgoff_t index = pos >> PAGE_SHIFT;
         struct page *vmpage = NULL;
-        unsigned int from = pos & (PAGE_CACHE_SIZE - 1);
+        unsigned int from = pos & (PAGE_SIZE - 1);
         unsigned int to = from + len;
         int result = 0;
 
@@ -524,7 +525,7 @@ static int ll_write_begin(struct file *file, struct address_space *mapping,
                  */
                 if (vmpage && plist->pl_nr > 0) {
                         unlock_page(vmpage);
-                        page_cache_release(vmpage);
+                        put_page(vmpage);
                         vmpage = NULL;
                 }
 
@@ -577,7 +578,7 @@ out:
         if (result < 0) {
                 if (vmpage) {
                         unlock_page(vmpage);
-                        page_cache_release(vmpage);
+                        put_page(vmpage);
                 }
                 if (!IS_ERR(lcc))
                         ll_cl_fini(lcc);
@@ -597,11 +598,11 @@ static int ll_write_end(struct file *file, struct address_space *mapping,
         struct cl_io *io;
         struct vvp_io *vio;
         struct cl_page *page;
-        unsigned from = pos & (PAGE_CACHE_SIZE - 1);
+        unsigned from = pos & (PAGE_SIZE - 1);
         bool unplug = false;
         int result = 0;
 
-        page_cache_release(vmpage);
+        put_page(vmpage);
 
         env  = lcc->lcc_env;
         page = lcc->lcc_page;
diff --git a/drivers/staging/lustre/lustre/llite/vvp_dev.c b/drivers/staging/lustre/lustre/llite/vvp_dev.c
index e35c1a1f272e..644a31f62464 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_dev.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_dev.c
@@ -342,8 +342,9 @@ int cl_sb_init(struct super_block *sb)
                         sbi->ll_site = cl2lu_dev(cl)->ld_site;
                 }
                 cl_env_put(env, &refcheck);
-        } else
+        } else {
                 rc = PTR_ERR(env);
+        }
         return rc;
 }
 
@@ -498,7 +499,7 @@ static loff_t vvp_pgcache_find(const struct lu_env *env,
                                 id.vpi_index = vmpage->index;
                                 /* Cant support over 16T file */
                                 nr = !(vmpage->index > 0xffffffff);
-                                page_cache_release(vmpage);
+                                put_page(vmpage);
                         }
 
                         lu_object_ref_del(&clob->co_lu, "dump", current);
@@ -580,8 +581,7 @@ static int vvp_pgcache_show(struct seq_file *f, void *v)
                                 lock_page(vmpage);
                                 page = cl_vmpage_page(vmpage, clob);
                                 unlock_page(vmpage);
-
-                                page_cache_release(vmpage);
+                                put_page(vmpage);
                         }
 
                         seq_printf(f, "%8x@" DFID ": ", id.vpi_index,
@@ -589,16 +589,19 @@ static int vvp_pgcache_show(struct seq_file *f, void *v)
                         if (page) {
                                 vvp_pgcache_page_show(env, f, page);
                                 cl_page_put(env, page);
-                        } else
+                        } else {
                                 seq_puts(f, "missing\n");
+                        }
                         lu_object_ref_del(&clob->co_lu, "dump", current);
                         cl_object_put(env, clob);
-                } else
+                } else {
                         seq_printf(f, "%llx missing\n", pos);
+                }
                 cl_env_put(env, &refcheck);
                 result = 0;
-        } else
+        } else {
                 result = PTR_ERR(env);
+        }
         return result;
 }
 
diff --git a/drivers/staging/lustre/lustre/llite/vvp_io.c b/drivers/staging/lustre/lustre/llite/vvp_io.c
index aed7b8e41a51..26dfbf1d2345 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_io.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_io.c
@@ -180,9 +180,8 @@ static int vvp_prep_size(const struct lu_env *env, struct cl_object *obj,
                                  * --bug 17336
                                  */
                                 loff_t size = i_size_read(inode);
-                                loff_t cur_index = start >> PAGE_CACHE_SHIFT;
-                                loff_t size_index = (size - 1) >>
-                                                    PAGE_CACHE_SHIFT;
+                                loff_t cur_index = start >> PAGE_SHIFT;
+                                loff_t size_index = (size - 1) >> PAGE_SHIFT;
 
                                 if ((size == 0 && cur_index != 0) ||
                                     size_index < cur_index)
@@ -714,7 +713,7 @@ static int vvp_io_read_start(const struct lu_env *env,
         if (!vio->vui_ra_valid) {
                 vio->vui_ra_valid = true;
                 vio->vui_ra_start = cl_index(obj, pos);
-                vio->vui_ra_count = cl_index(obj, tot + PAGE_CACHE_SIZE - 1);
+                vio->vui_ra_count = cl_index(obj, tot + PAGE_SIZE - 1);
                 ll_ras_enter(file);
         }
 
@@ -1179,8 +1178,9 @@ static int vvp_io_fault_start(const struct lu_env *env,
                                 if (result == -EDQUOT)
                                         result = -ENOSPC;
                                 goto out;
-                        } else
+                        } else {
                                 cl_page_disown(env, io, page);
+                        }
                 }
         }
 
diff --git a/drivers/staging/lustre/lustre/llite/vvp_page.c b/drivers/staging/lustre/lustre/llite/vvp_page.c
index 0c92293dbf2e..6cd2af7a958f 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_page.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_page.c
@@ -64,7 +64,7 @@ static void vvp_page_fini_common(struct vvp_page *vpg)
         struct page *vmpage = vpg->vpg_page;
 
         LASSERT(vmpage);
-        page_cache_release(vmpage);
+        put_page(vmpage);
 }
 
 static void vvp_page_fini(const struct lu_env *env,
@@ -561,7 +561,7 @@ int vvp_page_init(const struct lu_env *env, struct cl_object *obj,
         CLOBINVRNT(env, obj, vvp_object_invariant(obj));
 
         vpg->vpg_page = vmpage;
-        page_cache_get(vmpage);
+        get_page(vmpage);
 
         INIT_LIST_HEAD(&vpg->vpg_pending_linkage);
         if (page->cp_type == CPT_CACHEABLE) {
diff --git a/drivers/staging/lustre/lustre/llite/xattr.c b/drivers/staging/lustre/lustre/llite/xattr.c
index b68dcc921ca2..9f6fcfe8b988 100644
--- a/drivers/staging/lustre/lustre/llite/xattr.c
+++ b/drivers/staging/lustre/lustre/llite/xattr.c
@@ -181,8 +181,9 @@ int ll_setxattr_common(struct inode *inode, const char *name,
                         size = rc;
 
                         pv = (const char *)new_value;
-                } else
+                } else {
                         return -EOPNOTSUPP;
+                }
 
                 valid |= rce_ops2valid(rce->rce_ops);
         }
@@ -243,12 +244,12 @@ int ll_setxattr(struct dentry *dentry, const char *name,
                         lump->lmm_stripe_offset = -1;
 
                 if (lump && S_ISREG(inode->i_mode)) {
-                        int flags = FMODE_WRITE;
+                        __u64 it_flags = FMODE_WRITE;
                         int lum_size = (lump->lmm_magic == LOV_USER_MAGIC_V1) ?
                                 sizeof(*lump) : sizeof(struct lov_user_md_v3);
 
-                        rc = ll_lov_setstripe_ea_info(inode, dentry, flags, lump,
-                                                      lum_size);
+                        rc = ll_lov_setstripe_ea_info(inode, dentry, it_flags,
+                                                      lump, lum_size);
                         /* b10667: rc always be 0 here for now */
                         rc = 0;
                 } else if (S_ISDIR(inode->i_mode)) {
@@ -423,8 +424,7 @@ getxattr_nocache:
         if (rce && rce->rce_ops == RMT_LSETFACL) {
                 ext_acl_xattr_header *acl;
 
-                acl = lustre_posix_acl_xattr_2ext(
-                                        (posix_acl_xattr_header *)buffer, rc);
+                acl = lustre_posix_acl_xattr_2ext(buffer, rc);
                 if (IS_ERR(acl)) {
                         rc = PTR_ERR(acl);
                         goto out;
diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
index 8bd2dc577bf8..2f6457f5e98c 100644
--- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c
+++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
@@ -926,7 +926,7 @@ static int lmv_iocontrol(unsigned int cmd, struct obd_export *exp,
                 struct obd_quotactl *oqctl;
 
                 if (qctl->qc_valid == QC_MDTIDX) {
-                        if (qctl->qc_idx < 0 || count <= qctl->qc_idx)
+                        if (count <= qctl->qc_idx)
                                 return -EINVAL;
 
                         tgt = lmv->tgts[qctl->qc_idx];
@@ -1122,8 +1122,9 @@ static int lmv_iocontrol(unsigned int cmd, struct obd_export *exp,
                                         if (!rc)
                                                 rc = err;
                                 }
-                        } else
+                        } else {
                                 set = 1;
+                        }
                 }
                 if (!set && !rc)
                         rc = -EIO;
@@ -2017,7 +2018,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 +2049,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 +2102,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 +2111,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 +2130,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/lov/lov_dev.c b/drivers/staging/lustre/lustre/lov/lov_dev.c
index dccc63496982..dae8e89bcf6d 100644
--- a/drivers/staging/lustre/lustre/lov/lov_dev.c
+++ b/drivers/staging/lustre/lustre/lov/lov_dev.c
@@ -262,8 +262,9 @@ static int lov_req_init(const struct lu_env *env, struct cl_device *dev,
         if (lr) {
                 cl_req_slice_add(req, &lr->lr_cl, dev, &lov_req_ops);
                 result = 0;
-        } else
+        } else {
                 result = -ENOMEM;
+        }
         return result;
 }
 
@@ -332,14 +333,15 @@ static struct lov_device_emerg **lov_emerg_alloc(int nr)
                         cl_page_list_init(&em->emrg_page_list);
                         em->emrg_env = cl_env_alloc(&em->emrg_refcheck,
                                                     LCT_REMEMBER | LCT_NOREF);
-                        if (!IS_ERR(em->emrg_env))
+                        if (!IS_ERR(em->emrg_env)) {
                                 em->emrg_env->le_ctx.lc_cookie = 0x2;
-                        else {
+                        } else {
                                 result = PTR_ERR(em->emrg_env);
                                 em->emrg_env = NULL;
                         }
-                } else
+                } else {
                         result = -ENOMEM;
+                }
         }
         if (result != 0) {
                 lov_emerg_free(emerg, nr);
diff --git a/drivers/staging/lustre/lustre/lov/lov_io.c b/drivers/staging/lustre/lustre/lov/lov_io.c
index 41512372c472..da4784b474e4 100644
--- a/drivers/staging/lustre/lustre/lov/lov_io.c
+++ b/drivers/staging/lustre/lustre/lov/lov_io.c
@@ -225,8 +225,9 @@ struct lov_io_sub *lov_sub_get(const struct lu_env *env,
         if (!sub->sub_io_initialized) {
                 sub->sub_stripe = stripe;
                 rc = lov_io_sub_init(env, lio, sub);
-        } else
+        } else {
                 rc = 0;
+        }
         if (rc == 0)
                 lov_sub_enter(sub);
         else
@@ -276,10 +277,11 @@ struct lov_io_sub *lov_page_subio(const struct lu_env *env, struct lov_io *lio,
 static int lov_io_subio_init(const struct lu_env *env, struct lov_io *lio,
                              struct cl_io *io)
 {
-        struct lov_stripe_md *lsm = lio->lis_object->lo_lsm;
+        struct lov_stripe_md *lsm;
         int result;
 
         LASSERT(lio->lis_object);
+        lsm = lio->lis_object->lo_lsm;
 
         /*
          * Need to be optimized, we can't afford to allocate a piece of memory
@@ -294,8 +296,9 @@ static int lov_io_subio_init(const struct lu_env *env, struct lov_io *lio,
                 lio->lis_single_subio_index = -1;
                 lio->lis_active_subios = 0;
                 result = 0;
-        } else
+        } else {
                 result = -ENOMEM;
+        }
         return result;
 }
 
@@ -413,8 +416,9 @@ static int lov_io_iter_init(const struct lu_env *env,
                         lov_sub_put(sub);
                         CDEBUG(D_VFSTRACE, "shrink: %d [%llu, %llu)\n",
                                stripe, start, end);
-                } else
+                } else {
                         rc = PTR_ERR(sub);
+                }
 
                 if (!rc)
                         list_add_tail(&sub->sub_linkage, &lio->lis_active);
diff --git a/drivers/staging/lustre/lustre/lov/lov_merge.c b/drivers/staging/lustre/lustre/lov/lov_merge.c
index 029cd4d62796..56ef41d17ad7 100644
--- a/drivers/staging/lustre/lustre/lov/lov_merge.c
+++ b/drivers/staging/lustre/lustre/lov/lov_merge.c
@@ -154,6 +154,7 @@ void lov_merge_attrs(struct obdo *tgt, struct obdo *src, u64 valid,
         valid &= src->o_valid;
 
         if (*set) {
+                tgt->o_valid &= valid;
                 if (valid & OBD_MD_FLSIZE) {
                         /* this handles sparse files properly */
                         u64 lov_size;
@@ -172,12 +173,22 @@ void lov_merge_attrs(struct obdo *tgt, struct obdo *src, u64 valid,
                         tgt->o_mtime = src->o_mtime;
                 if (valid & OBD_MD_FLDATAVERSION)
                         tgt->o_data_version += src->o_data_version;
+
+                /* handle flags */
+                if (valid & OBD_MD_FLFLAGS)
+                        tgt->o_flags &= src->o_flags;
+                else
+                        tgt->o_flags = 0;
         } else {
                 memcpy(tgt, src, sizeof(*tgt));
                 tgt->o_oi = lsm->lsm_oi;
+                tgt->o_valid = valid;
                 if (valid & OBD_MD_FLSIZE)
                         tgt->o_size = lov_stripe_size(lsm, src->o_size,
                                                       stripeno);
+                tgt->o_flags = 0;
+                if (valid & OBD_MD_FLFLAGS)
+                        tgt->o_flags = src->o_flags;
         }
 
         /* data_version needs to be valid on all stripes to be correct! */
diff --git a/drivers/staging/lustre/lustre/lov/lov_object.c b/drivers/staging/lustre/lustre/lov/lov_object.c
index 6a353d18eefe..561d493b2cdf 100644
--- a/drivers/staging/lustre/lustre/lov/lov_object.c
+++ b/drivers/staging/lustre/lustre/lov/lov_object.c
@@ -283,8 +283,9 @@ static int lov_init_raid0(const struct lu_env *env,
                 }
                 if (result == 0)
                         cl_object_header(&lov->lo_cl)->coh_page_bufsize += psz;
-        } else
+        } else {
                 result = -ENOMEM;
+        }
 out:
         return result;
 }
@@ -935,8 +936,9 @@ struct lu_object *lov_object_alloc(const struct lu_env *env,
                  * for object with different layouts.
                  */
                 obj->lo_ops = &lov_lu_obj_ops;
-        } else
+        } else {
                 obj = NULL;
+        }
         return obj;
 }
 
diff --git a/drivers/staging/lustre/lustre/lov/lov_offset.c b/drivers/staging/lustre/lustre/lov/lov_offset.c
index cb7b51617498..9302f06c34ef 100644
--- a/drivers/staging/lustre/lustre/lov/lov_offset.c
+++ b/drivers/staging/lustre/lustre/lov/lov_offset.c
@@ -74,9 +74,8 @@ pgoff_t lov_stripe_pgoff(struct lov_stripe_md *lsm, pgoff_t stripe_index,
 {
         loff_t offset;
 
-        offset = lov_stripe_size(lsm, stripe_index << PAGE_CACHE_SHIFT,
-                                 stripe);
-        return offset >> PAGE_CACHE_SHIFT;
+        offset = lov_stripe_size(lsm, stripe_index << PAGE_SHIFT, stripe);
+        return offset >> PAGE_SHIFT;
 }
 
 /* we have an offset in file backed by an lov and want to find out where
diff --git a/drivers/staging/lustre/lustre/lov/lov_pack.c b/drivers/staging/lustre/lustre/lov/lov_pack.c
index 3925633a99ec..d983a30b1e3a 100644
--- a/drivers/staging/lustre/lustre/lov/lov_pack.c
+++ b/drivers/staging/lustre/lustre/lov/lov_pack.c
@@ -444,8 +444,7 @@ int lov_getstripe(struct obd_export *exp, struct lov_stripe_md *lsm,
         if (lum.lmm_magic == LOV_USER_MAGIC) {
                 /* User request for v1, we need skip lmm_pool_name */
                 if (lmmk->lmm_magic == LOV_MAGIC_V3) {
-                        memmove((char *)(&lmmk->lmm_stripe_count) +
-                                sizeof(lmmk->lmm_stripe_count),
+                        memmove(((struct lov_mds_md_v1 *)lmmk)->lmm_objects,
                                 ((struct lov_mds_md_v3 *)lmmk)->lmm_objects,
                                 lmmk->lmm_stripe_count *
                                 sizeof(struct lov_ost_data_v1));
@@ -457,9 +456,9 @@ int lov_getstripe(struct obd_export *exp, struct lov_stripe_md *lsm,
         }
 
         /* User wasn't expecting this many OST entries */
-        if (lum.lmm_stripe_count == 0)
+        if (lum.lmm_stripe_count == 0) {
                 lmm_size = lum_size;
-        else if (lum.lmm_stripe_count < lmmk->lmm_stripe_count) {
+        } else if (lum.lmm_stripe_count < lmmk->lmm_stripe_count) {
                 rc = -EOVERFLOW;
                 goto out_set;
         }
diff --git a/drivers/staging/lustre/lustre/lov/lov_page.c b/drivers/staging/lustre/lustre/lov/lov_page.c
index 9634c13a574d..0306f00c3f33 100644
--- a/drivers/staging/lustre/lustre/lov/lov_page.c
+++ b/drivers/staging/lustre/lustre/lov/lov_page.c
@@ -83,7 +83,7 @@ static int lov_raid0_page_is_under_lock(const struct lu_env *env,
         }
 
         /* calculate the end of current stripe */
-        pps = loo->lo_lsm->lsm_stripe_size >> PAGE_CACHE_SHIFT;
+        pps = loo->lo_lsm->lsm_stripe_size >> PAGE_SHIFT;
         index = ((slice->cpl_index + pps) & ~(pps - 1)) - 1;
 
         /* never exceed the end of the stripe */
diff --git a/drivers/staging/lustre/lustre/lov/lovsub_dev.c b/drivers/staging/lustre/lustre/lov/lovsub_dev.c
index c335c020f4f4..35f6b1d66ff4 100644
--- a/drivers/staging/lustre/lustre/lov/lovsub_dev.c
+++ b/drivers/staging/lustre/lustre/lov/lovsub_dev.c
@@ -151,8 +151,9 @@ static int lovsub_req_init(const struct lu_env *env, struct cl_device *dev,
         if (lsr) {
                 cl_req_slice_add(req, &lsr->lsrq_cl, dev, &lovsub_req_ops);
                 result = 0;
-        } else
+        } else {
                 result = -ENOMEM;
+        }
         return result;
 }
 
@@ -182,10 +183,12 @@ static struct lu_device *lovsub_device_alloc(const struct lu_env *env,
                         d = lovsub2lu_dev(lsd);
                         d->ld_ops        = &lovsub_lu_ops;
                         lsd->acid_cl.cd_ops = &lovsub_cl_ops;
-                } else
+                } else {
                         d = ERR_PTR(result);
-        } else
+                }
+        } else {
                 d = ERR_PTR(-ENOMEM);
+        }
         return d;
 }
 
diff --git a/drivers/staging/lustre/lustre/lov/lovsub_lock.c b/drivers/staging/lustre/lustre/lov/lovsub_lock.c
index 670d203ab77e..e92edfb618b7 100644
--- a/drivers/staging/lustre/lustre/lov/lovsub_lock.c
+++ b/drivers/staging/lustre/lustre/lov/lovsub_lock.c
@@ -77,8 +77,9 @@ int lovsub_lock_init(const struct lu_env *env, struct cl_object *obj,
                 INIT_LIST_HEAD(&lsk->lss_parents);
                 cl_lock_slice_add(lock, &lsk->lss_cl, obj, &lovsub_lock_ops);
                 result = 0;
-        } else
+        } else {
                 result = -ENOMEM;
+        }
         return result;
 }
 
diff --git a/drivers/staging/lustre/lustre/lov/lovsub_object.c b/drivers/staging/lustre/lustre/lov/lovsub_object.c
index 6c5430d938d0..3f51f0db02ad 100644
--- a/drivers/staging/lustre/lustre/lov/lovsub_object.c
+++ b/drivers/staging/lustre/lustre/lov/lovsub_object.c
@@ -67,8 +67,9 @@ int lovsub_object_init(const struct lu_env *env, struct lu_object *obj,
                 lu_object_add(obj, below);
                 cl_object_page_init(lu2cl(obj), sizeof(struct lovsub_page));
                 result = 0;
-        } else
+        } else {
                 result = -ENOMEM;
+        }
         return result;
 
 }
@@ -154,8 +155,9 @@ struct lu_object *lovsub_object_alloc(const struct lu_env *env,
                 lu_object_add_top(&hdr->coh_lu, obj);
                 los->lso_cl.co_ops = &lovsub_ops;
                 obj->lo_ops = &lovsub_lu_obj_ops;
-        } else
+        } else {
                 obj = NULL;
+        }
         return obj;
 }
 
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_lib.c b/drivers/staging/lustre/lustre/mdc/mdc_lib.c
index be0acf7feee3..53cd56f286b7 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_lib.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_lib.c
@@ -454,7 +454,7 @@ static void mdc_hsm_release_pack(struct ptlrpc_request *req,
                 lock = ldlm_handle2lock(&op_data->op_lease_handle);
                 if (lock) {
                         data->cd_handle = lock->l_remote_handle;
-                        ldlm_lock_put(lock);
+                        LDLM_LOCK_PUT(lock);
                 }
                 ldlm_cli_cancel(&op_data->op_lease_handle, LCF_LOCAL);
 
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c
index 98b27f1f9915..6023c2c1386b 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;
         }
@@ -1952,7 +1952,7 @@ static void lustre_swab_hal(struct hsm_action_list *h)
         __swab32s(&h->hal_count);
         __swab32s(&h->hal_archive_id);
         __swab64s(&h->hal_flags);
-        hai = hai_zero(h);
+        hai = hai_first(h);
         for (i = 0; i < h->hal_count; i++, hai = hai_next(hai))
                 lustre_swab_hai(hai);
 }
diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c
index b7dc87248032..3924b095bfb0 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_io.c b/drivers/staging/lustre/lustre/obdclass/cl_io.c
index f4b3178ec043..583fb5f33889 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_io.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_io.c
@@ -504,9 +504,9 @@ int cl_io_lock_add(const struct lu_env *env, struct cl_io *io,
 {
         int result;
 
-        if (cl_lockset_merge(&io->ci_lockset, &link->cill_descr))
+        if (cl_lockset_merge(&io->ci_lockset, &link->cill_descr)) {
                 result = 1;
-        else {
+        } else {
                 list_add(&link->cill_linkage, &io->ci_lockset.cls_todo);
                 result = 0;
         }
@@ -536,8 +536,9 @@ int cl_io_lock_alloc_add(const struct lu_env *env, struct cl_io *io,
                 result = cl_io_lock_add(env, io, link);
                 if (result) /* lock match */
                         link->cill_fini(env, link);
-        } else
+        } else {
                 result = -ENOMEM;
+        }
 
         return result;
 }
@@ -1202,14 +1203,16 @@ struct cl_req *cl_req_alloc(const struct lu_env *env, struct cl_page *page,
                 if (req->crq_o) {
                         req->crq_nrobjs = nr_objects;
                         result = cl_req_init(env, req, page);
-                } else
+                } else {
                         result = -ENOMEM;
+                }
                 if (result != 0) {
                         cl_req_completion(env, req, result);
                         req = ERR_PTR(result);
                 }
-        } else
+        } else {
                 req = ERR_PTR(-ENOMEM);
+        }
         return req;
 }
 EXPORT_SYMBOL(cl_req_alloc);
diff --git a/drivers/staging/lustre/lustre/obdclass/cl_object.c b/drivers/staging/lustre/lustre/obdclass/cl_object.c
index 395b92c6480d..5940f30318ec 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_object.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_object.c
@@ -654,8 +654,9 @@ static struct lu_env *cl_env_new(__u32 ctx_tags, __u32 ses_tags, void *debug)
                                 lu_context_enter(&cle->ce_ses);
                                 env->le_ses = &cle->ce_ses;
                                 cl_env_init0(cle, debug);
-                        } else
+                        } else {
                                 lu_env_fini(env);
+                        }
                 }
                 if (rc != 0) {
                         kmem_cache_free(cl_env_kmem, cle);
@@ -664,8 +665,9 @@ static struct lu_env *cl_env_new(__u32 ctx_tags, __u32 ses_tags, void *debug)
                         CL_ENV_INC(create);
                         CL_ENV_INC(total);
                 }
-        } else
+        } else {
                 env = ERR_PTR(-ENOMEM);
+        }
         return env;
 }
 
@@ -1053,7 +1055,7 @@ void cl_env_percpu_put(struct lu_env *env)
 }
 EXPORT_SYMBOL(cl_env_percpu_put);
 
-struct lu_env *cl_env_percpu_get()
+struct lu_env *cl_env_percpu_get(void)
 {
         struct cl_env *cle;
 
@@ -1095,8 +1097,9 @@ struct cl_device *cl_type_setup(const struct lu_env *env, struct lu_site *site,
                         CERROR("can't init device '%s', %d\n", typename, rc);
                         d = ERR_PTR(rc);
                 }
-        } else
+        } else {
                 CERROR("Cannot allocate device: '%s'\n", typename);
+        }
         return lu2cl_dev(d);
 }
 EXPORT_SYMBOL(cl_type_setup);
diff --git a/drivers/staging/lustre/lustre/obdclass/cl_page.c b/drivers/staging/lustre/lustre/obdclass/cl_page.c
index 8df39ced1725..39095e7a0a9d 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_page.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_page.c
@@ -1033,7 +1033,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);
 
@@ -1045,13 +1045,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 d9844ba8b9be..799e5585b64d 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 & ~PAGE_MASK) >= PAGE_CACHE_SIZE) {
+        if ((u64val & ~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/lprocfs_status.c b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
index d93f42fee420..9824c8868cdf 100644
--- a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
+++ b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
@@ -694,8 +694,9 @@ int lprocfs_rd_import(struct seq_file *m, void *data)
 
                 do_div(sum, ret.lc_count);
                 ret.lc_sum = sum;
-        } else
+        } else {
                 ret.lc_sum = 0;
+        }
         seq_printf(m,
                    "    rpcs:\n"
                    "       inflight: %u\n"
diff --git a/drivers/staging/lustre/lustre/obdclass/lu_object.c b/drivers/staging/lustre/lustre/obdclass/lu_object.c
index 770d5bd742d8..990e9394c8f1 100644
--- a/drivers/staging/lustre/lustre/obdclass/lu_object.c
+++ b/drivers/staging/lustre/lustre/obdclass/lu_object.c
@@ -716,8 +716,9 @@ struct lu_object *lu_object_find_slice(const struct lu_env *env,
                 obj = lu_object_locate(top->lo_header, dev->ld_type);
                 if (!obj)
                         lu_object_put(env, top);
-        } else
+        } else {
                 obj = top;
+        }
         return obj;
 }
 EXPORT_SYMBOL(lu_object_find_slice);
@@ -841,8 +842,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. */
@@ -854,7 +855,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/obdclass/lustre_peer.c b/drivers/staging/lustre/lustre/obdclass/lustre_peer.c
index 5f812460b3ea..b1abe023bb35 100644
--- a/drivers/staging/lustre/lustre/obdclass/lustre_peer.c
+++ b/drivers/staging/lustre/lustre/obdclass/lustre_peer.c
@@ -163,8 +163,9 @@ int class_del_uuid(const char *uuid)
                                 break;
                         }
                 }
-        } else
+        } else {
                 list_splice_init(&g_uuid_list, &deathrow);
+        }
         spin_unlock(&g_uuid_lock);
 
         if (uuid && list_empty(&deathrow)) {
diff --git a/drivers/staging/lustre/lustre/obdecho/echo_client.c b/drivers/staging/lustre/lustre/obdecho/echo_client.c
index a752bb4e946b..b271895d4395 100644
--- a/drivers/staging/lustre/lustre/obdecho/echo_client.c
+++ b/drivers/staging/lustre/lustre/obdecho/echo_client.c
@@ -269,7 +269,7 @@ static void echo_page_fini(const struct lu_env *env,
         struct echo_object *eco = cl2echo_obj(slice->cpl_obj);
 
         atomic_dec(&eco->eo_npages);
-        page_cache_release(slice->cpl_page->cp_vmpage);
+        put_page(slice->cpl_page->cp_vmpage);
 }
 
 static int echo_page_prep(const struct lu_env *env,
@@ -345,7 +345,7 @@ static int echo_page_init(const struct lu_env *env, struct cl_object *obj,
         struct echo_page *ep = cl_object_page_slice(obj, page);
         struct echo_object *eco = cl2echo_obj(obj);
 
-        page_cache_get(page->cp_vmpage);
+        get_page(page->cp_vmpage);
         mutex_init(&ep->ep_lock);
         cl_page_slice_add(page, &ep->ep_cl, obj, index, &echo_page_ops);
         atomic_inc(&eco->eo_npages);
@@ -668,8 +668,7 @@ static struct lu_device *echo_device_alloc(const struct lu_env *env,
         struct obd_device  *obd = NULL; /* to keep compiler happy */
         struct obd_device  *tgt;
         const char *tgt_type_name;
-        int rc;
-        int cleanup = 0;
+        int rc, err;
 
         ed = kzalloc(sizeof(*ed), GFP_NOFS);
         if (!ed) {
@@ -677,16 +676,14 @@ static struct lu_device *echo_device_alloc(const struct lu_env *env,
                 goto out;
         }
 
-        cleanup = 1;
         cd = &ed->ed_cl;
         rc = cl_device_init(cd, t);
         if (rc)
-                goto out;
+                goto out_free;
 
         cd->cd_lu_dev.ld_ops = &echo_device_lu_ops;
         cd->cd_ops = &echo_device_cl_ops;
 
-        cleanup = 2;
         obd = class_name2obd(lustre_cfg_string(cfg, 0));
         LASSERT(obd);
         LASSERT(env);
@@ -696,28 +693,25 @@ static struct lu_device *echo_device_alloc(const struct lu_env *env,
                 CERROR("Can not find tgt device %s\n",
                        lustre_cfg_string(cfg, 1));
                 rc = -ENODEV;
-                goto out;
+                goto out_device_fini;
         }
 
         next = tgt->obd_lu_dev;
         if (!strcmp(tgt->obd_type->typ_name, LUSTRE_MDT_NAME)) {
                 CERROR("echo MDT client must be run on server\n");
                 rc = -EOPNOTSUPP;
-                goto out;
+                goto out_device_fini;
         }
 
         rc = echo_site_init(env, ed);
         if (rc)
-                goto out;
-
-        cleanup = 3;
+                goto out_device_fini;
 
         rc = echo_client_setup(env, obd, cfg);
         if (rc)
-                goto out;
+                goto out_site_fini;
 
         ed->ed_ec = &obd->u.echo_client;
-        cleanup = 4;
 
         /* if echo client is to be stacked upon ost device, the next is
          * NULL since ost is not a clio device so far
@@ -729,7 +723,7 @@ static struct lu_device *echo_device_alloc(const struct lu_env *env,
         if (next) {
                 if (next->ld_site) {
                         rc = -EBUSY;
-                        goto out;
+                        goto out_cleanup;
                 }
 
                 next->ld_site = &ed->ed_site->cs_lu;
@@ -737,7 +731,7 @@ static struct lu_device *echo_device_alloc(const struct lu_env *env,
                                                 next->ld_type->ldt_name,
                                                               NULL);
                 if (rc)
-                        goto out;
+                        goto out_cleanup;
 
         } else {
                 LASSERT(strcmp(tgt_type_name, LUSTRE_OST_NAME) == 0);
@@ -745,27 +739,19 @@ static struct lu_device *echo_device_alloc(const struct lu_env *env,
 
         ed->ed_next = next;
         return &cd->cd_lu_dev;
-out:
-        switch (cleanup) {
-        case 4: {
-                int rc2;
-
-                rc2 = echo_client_cleanup(obd);
-                if (rc2)
-                        CERROR("Cleanup obd device %s error(%d)\n",
-                               obd->obd_name, rc2);
-        }
 
-        case 3:
-                echo_site_fini(env, ed);
-        case 2:
-                cl_device_fini(&ed->ed_cl);
-        case 1:
-                kfree(ed);
-        case 0:
-        default:
-                break;
-        }
+out_cleanup:
+        err = echo_client_cleanup(obd);
+        if (err)
+                CERROR("Cleanup obd device %s error(%d)\n",
+                       obd->obd_name, err);
+out_site_fini:
+        echo_site_fini(env, ed);
+out_device_fini:
+        cl_device_fini(&ed->ed_cl);
+out_free:
+        kfree(ed);
+out:
         return ERR_PTR(rc);
 }
 
@@ -1095,7 +1081,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)
@@ -1270,11 +1256,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;
@@ -1300,11 +1286,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;
 
@@ -1350,7 +1336,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;
@@ -1367,7 +1353,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 */
 
@@ -1377,7 +1363,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;
 
@@ -1432,8 +1418,8 @@ static int echo_client_prep_commit(const struct lu_env *env,
         if (count <= 0 || (count & (~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);
@@ -1456,9 +1442,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;
                 }
 
@@ -1837,7 +1823,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 911e5054a9c4..6e57f534117b 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;
 
         spin_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);
         spin_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);
@@ -577,12 +577,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;
         }
         spin_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 d01f2a207a91..ef6882107e93 100644
--- a/drivers/staging/lustre/lustre/osc/osc_cache.c
+++ b/drivers/staging/lustre/lustre/osc/osc_cache.c
@@ -557,7 +557,7 @@ static int osc_extent_merge(const struct lu_env *env, struct osc_extent *cur,
                 return -ERANGE;
 
         LASSERT(cur->oe_dlmlock == victim->oe_dlmlock);
-        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 &&
@@ -664,8 +664,8 @@ static struct osc_extent *osc_extent_find(const struct lu_env *env,
         descr = &olck->ols_cl.cls_lock->cll_descr;
         LASSERT(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;
@@ -894,8 +894,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.
@@ -906,7 +906,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);
@@ -989,7 +989,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;
@@ -1146,7 +1146,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;
         }
 
@@ -1155,7 +1155,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;
                 }
         }
@@ -1179,7 +1179,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;
@@ -1314,9 +1314,9 @@ static int osc_refresh_count(const struct lu_env *env,
                 return 0;
         else if (cl_offset(obj, 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,
@@ -1397,10 +1397,10 @@ static void osc_consume_write_grant(struct client_obd *cli,
         assert_spin_locked(&cli->cl_loi_list_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);
 }
 
@@ -1417,11 +1417,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;
         }
 }
 
@@ -1477,7 +1477,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.
@@ -1490,7 +1490,7 @@ static void osc_free_grant(struct client_obd *cli, unsigned int nr_pages,
 
         spin_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
@@ -1533,11 +1533,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;
                 }
@@ -1583,7 +1583,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;
@@ -1653,7 +1653,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_io.c b/drivers/staging/lustre/lustre/osc/osc_io.c
index cf7743d2f148..c1efcb306f24 100644
--- a/drivers/staging/lustre/lustre/osc/osc_io.c
+++ b/drivers/staging/lustre/lustre/osc/osc_io.c
@@ -321,7 +321,7 @@ static int osc_io_rw_iter_init(const struct lu_env *env,
         if (cl_io_is_append(io))
                 return 0;
 
-        npages = io->u.ci_rw.crw_count >> PAGE_CACHE_SHIFT;
+        npages = io->u.ci_rw.crw_count >> PAGE_SHIFT;
         if (io->u.ci_rw.crw_pos & ~PAGE_MASK)
                 ++npages;
 
@@ -842,8 +842,9 @@ int osc_req_init(const struct lu_env *env, struct cl_device *dev,
         if (or) {
                 cl_req_slice_add(req, &or->or_cl, dev, &osc_req_ops);
                 result = 0;
-        } else
+        } else {
                 result = -ENOMEM;
+        }
         return result;
 }
 
diff --git a/drivers/staging/lustre/lustre/osc/osc_lock.c b/drivers/staging/lustre/lustre/osc/osc_lock.c
index 49dfe9f8bc4b..7ea64896a4f6 100644
--- a/drivers/staging/lustre/lustre/osc/osc_lock.c
+++ b/drivers/staging/lustre/lustre/osc/osc_lock.c
@@ -624,8 +624,9 @@ static int osc_ldlm_glimpse_ast(struct ldlm_lock *dlmlock, void *data)
                         result = -ELDLM_NO_LOCK_DATA;
                 }
                 cl_env_nested_put(&nest, env);
-        } else
+        } else {
                 result = PTR_ERR(env);
+        }
         req->rq_status = result;
         return result;
 }
diff --git a/drivers/staging/lustre/lustre/osc/osc_object.c b/drivers/staging/lustre/lustre/osc/osc_object.c
index a06bdf10b6ff..738ab10ab274 100644
--- a/drivers/staging/lustre/lustre/osc/osc_object.c
+++ b/drivers/staging/lustre/lustre/osc/osc_object.c
@@ -292,8 +292,9 @@ struct lu_object *osc_object_alloc(const struct lu_env *env,
                 lu_object_init(obj, NULL, dev);
                 osc->oo_cl.co_ops = &osc_ops;
                 obj->lo_ops = &osc_lu_obj_ops;
-        } else
+        } else {
                 obj = NULL;
+        }
         return obj;
 }
 
diff --git a/drivers/staging/lustre/lustre/osc/osc_page.c b/drivers/staging/lustre/lustre/osc/osc_page.c
index 82979f4039c1..b55f46739dfa 100644
--- a/drivers/staging/lustre/lustre/osc/osc_page.c
+++ b/drivers/staging/lustre/lustre/osc/osc_page.c
@@ -309,7 +309,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, page->cp_vmpage,
                                      cl_offset(obj, index));
@@ -395,9 +395,9 @@ static DECLARE_WAIT_QUEUE_HEAD(osc_lru_waitq);
 /* 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 = 8 << (20 - PAGE_CACHE_SHIFT); /* 8M */
+static const int lru_shrink_max = 8 << (20 - PAGE_SHIFT); /* 8M */
 
 /* 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
@@ -421,8 +421,9 @@ static int osc_cache_too_much(struct client_obd *cli)
                         return lru_shrink_max;
                 else if (pages >= budget / 2)
                         return lru_shrink_min;
-        } else if (pages >= budget * 2)
+        } else if (pages >= budget * 2) {
                 return lru_shrink_min;
+        }
         return 0;
 }
 
diff --git a/drivers/staging/lustre/lustre/osc/osc_request.c b/drivers/staging/lustre/lustre/osc/osc_request.c
index 547539c74a7b..4d0f831990f2 100644
--- a/drivers/staging/lustre/lustre/osc/osc_request.c
+++ b/drivers/staging/lustre/lustre/osc/osc_request.c
@@ -827,7 +827,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);
         }
@@ -910,11 +910,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);
 
         spin_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;
         spin_unlock(&cli->cl_loi_list_lock);
 
         return osc_shrink_grant_to_target(cli, target_bytes);
@@ -930,8 +930,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) {
                 spin_unlock(&cli->cl_loi_list_lock);
@@ -979,7 +979,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)
@@ -1053,7 +1053,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);
         spin_unlock(&cli->cl_loi_list_lock);
 
         CDEBUG(D_CACHE, "%s, setting cl_avail_grant: %ld cl_lost_grant: %ld chunk bits: %d\n",
@@ -1315,9 +1315,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);
@@ -1891,7 +1891,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);
                 }
         }
 
@@ -2007,7 +2007,7 @@ int osc_build_rpc(const struct lu_env *env, struct client_obd *cli,
                 tmp->oap_request = ptlrpc_request_addref(req);
 
         spin_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);
@@ -2782,12 +2782,12 @@ out:
                                                 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) & PAGE_MASK;
+                                PAGE_SIZE - 1) & PAGE_MASK;
 
                 ostid_build_res_name(&fm_key->oa.o_oi, &res_id);
                 mode = ldlm_lock_match(exp->exp_obd->obd_namespace,
@@ -3065,8 +3065,9 @@ static int osc_import_event(struct obd_device *obd,
 
                         ldlm_namespace_cleanup(ns, LDLM_FL_LOCAL_ONLY);
                         cl_env_put(env, &refcheck);
-                } else
+                } else {
                         rc = PTR_ERR(env);
+                }
                 break;
         }
         case IMP_EVENT_ACTIVE: {
diff --git a/drivers/staging/lustre/lustre/ptlrpc/client.c b/drivers/staging/lustre/lustre/ptlrpc/client.c
index 32a7c8710119..e02d95d1d537 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);
@@ -595,9 +595,9 @@ static int __ptlrpc_request_bufs_pack(struct ptlrpc_request *request,
         struct obd_import *imp = request->rq_import;
         int rc;
 
-        if (unlikely(ctx))
+        if (unlikely(ctx)) {
                 request->rq_cli_ctx = sptlrpc_cli_ctx_get(ctx);
-        else {
+        } else {
                 rc = sptlrpc_req_get_ctx(request);
                 if (rc)
                         goto out_free;
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..a35b56ec687e 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;
 
@@ -679,11 +679,11 @@ static ssize_t ptlrpc_lprocfs_nrs_seq_write(struct file *file,
         /**
          * The second token is either NULL, or an optional [reg|hp] string
          */
-        if (strcmp(cmd, "reg") == 0)
+        if (strcmp(cmd, "reg") == 0) {
                 queue = PTLRPC_NRS_QUEUE_REG;
-        else if (strcmp(cmd, "hp") == 0)
+        } else if (strcmp(cmd, "hp") == 0) {
                 queue = PTLRPC_NRS_QUEUE_HP;
-        else {
+        } else {
                 rc = -EINVAL;
                 goto out;
         }
@@ -693,8 +693,9 @@ default_queue:
         if (queue == PTLRPC_NRS_QUEUE_HP && !nrs_svc_has_hp(svc)) {
                 rc = -ENODEV;
                 goto out;
-        } else if (queue == PTLRPC_NRS_QUEUE_BOTH && !nrs_svc_has_hp(svc))
+        } else if (queue == PTLRPC_NRS_QUEUE_BOTH && !nrs_svc_has_hp(svc)) {
                 queue = PTLRPC_NRS_QUEUE_REG;
+        }
 
         /**
          * Serialize NRS core lprocfs operations with policy registration/
@@ -1226,7 +1227,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 33d141149afd..02e6cda4c995 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
@@ -57,7 +57,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/staging/olpc_dcon/Kconfig b/drivers/staging/olpc_dcon/Kconfig
new file mode 100644
index 000000000000..d277f048789e
--- /dev/null
+++ b/drivers/staging/olpc_dcon/Kconfig
@@ -0,0 +1,35 @@
+config FB_OLPC_DCON
+        tristate "One Laptop Per Child Display CONtroller support"
+        depends on OLPC && FB
+        depends on I2C
+        depends on (GPIO_CS5535 || GPIO_CS5535=n)
+        select BACKLIGHT_CLASS_DEVICE
+        ---help---
+          In order to support very low power operation, the XO laptop uses a
+          secondary Display CONtroller, or DCON.  This secondary controller
+          is present in the video pipeline between the primary display
+          controller (integrate into the processor or chipset) and the LCD
+          panel.  It allows the main processor/display controller to be
+          completely powered off while still retaining an image on the display.
+          This controller is only available on OLPC platforms.  Unless you have
+          one of these platforms, you will want to say 'N'.
+
+config FB_OLPC_DCON_1
+        bool "OLPC XO-1 DCON support"
+        depends on FB_OLPC_DCON && GPIO_CS5535
+        default y
+        ---help---
+          Enable support for the DCON in XO-1 model laptops.  The kernel
+          communicates with the DCON using model-specific code.  If you
+          have an XO-1 (or if you're unsure what model you have), you should
+          say 'Y'.
+
+config FB_OLPC_DCON_1_5
+        bool "OLPC XO-1.5 DCON support"
+        depends on FB_OLPC_DCON && ACPI
+        default y
+        ---help---
+          Enable support for the DCON in XO-1.5 model laptops.  The kernel
+          communicates with the DCON using model-specific code.  If you
+          have an XO-1.5 (or if you're unsure what model you have), you
+          should say 'Y'.
diff --git a/drivers/staging/olpc_dcon/Makefile b/drivers/staging/olpc_dcon/Makefile
new file mode 100644
index 000000000000..36c7e67fec20
--- /dev/null
+++ b/drivers/staging/olpc_dcon/Makefile
@@ -0,0 +1,6 @@
+olpc-dcon-objs += olpc_dcon.o
+olpc-dcon-$(CONFIG_FB_OLPC_DCON_1)      += olpc_dcon_xo_1.o
+olpc-dcon-$(CONFIG_FB_OLPC_DCON_1_5)    += olpc_dcon_xo_1_5.o
+obj-$(CONFIG_FB_OLPC_DCON)      += olpc-dcon.o
+
+
diff --git a/drivers/staging/olpc_dcon/TODO b/drivers/staging/olpc_dcon/TODO
new file mode 100644
index 000000000000..61c2e65ac354
--- /dev/null
+++ b/drivers/staging/olpc_dcon/TODO
@@ -0,0 +1,9 @@
+TODO:
+        - see if vx855 gpio API can be made similar enough to cs5535 so we can
+          share more code
+        - allow simultaneous XO-1 and XO-1.5 support
+
+Please send patches to Greg Kroah-Hartman <greg@kroah.com> and
+copy:
+        Daniel Drake <dsd@laptop.org>
+        Jens Frederich <jfrederich@gmail.com>
diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c
new file mode 100644
index 000000000000..f45b2ef05f48
--- /dev/null
+++ b/drivers/staging/olpc_dcon/olpc_dcon.c
@@ -0,0 +1,813 @@
+/*
+ * Mainly by David Woodhouse, somewhat modified by Jordan Crouse
+ *
+ * Copyright © 2006-2007  Red Hat, Inc.
+ * Copyright © 2006-2007  Advanced Micro Devices, Inc.
+ * Copyright © 2009       VIA Technology, Inc.
+ * Copyright (c) 2010-2011  Andres Salomon <dilinger@queued.net>
+ *
+ * This program is free software.  You can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/kernel.h>
+#include <linux/fb.h>
+#include <linux/console.h>
+#include <linux/i2c.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/module.h>
+#include <linux/backlight.h>
+#include <linux/device.h>
+#include <linux/uaccess.h>
+#include <linux/ctype.h>
+#include <linux/reboot.h>
+#include <linux/olpc-ec.h>
+#include <asm/tsc.h>
+#include <asm/olpc.h>
+
+#include "olpc_dcon.h"
+
+/* Module definitions */
+
+static ushort resumeline = 898;
+module_param(resumeline, ushort, 0444);
+
+static struct dcon_platform_data *pdata;
+
+/* I2C structures */
+
+/* Platform devices */
+static struct platform_device *dcon_device;
+
+static unsigned short normal_i2c[] = { 0x0d, I2C_CLIENT_END };
+
+static s32 dcon_write(struct dcon_priv *dcon, u8 reg, u16 val)
+{
+        return i2c_smbus_write_word_data(dcon->client, reg, val);
+}
+
+static s32 dcon_read(struct dcon_priv *dcon, u8 reg)
+{
+        return i2c_smbus_read_word_data(dcon->client, reg);
+}
+
+/* ===== API functions - these are called by a variety of users ==== */
+
+static int dcon_hw_init(struct dcon_priv *dcon, int is_init)
+{
+        u16 ver;
+        int rc = 0;
+
+        ver = dcon_read(dcon, DCON_REG_ID);
+        if ((ver >> 8) != 0xDC) {
+                pr_err("DCON ID not 0xDCxx: 0x%04x instead.\n", ver);
+                rc = -ENXIO;
+                goto err;
+        }
+
+        if (is_init) {
+                pr_info("Discovered DCON version %x\n", ver & 0xFF);
+                rc = pdata->init(dcon);
+                if (rc != 0) {
+                        pr_err("Unable to init.\n");
+                        goto err;
+                }
+        }
+
+        if (ver < 0xdc02) {
+                dev_err(&dcon->client->dev,
+                                "DCON v1 is unsupported, giving up..\n");
+                rc = -ENODEV;
+                goto err;
+        }
+
+        /* SDRAM setup/hold time */
+        dcon_write(dcon, 0x3a, 0xc040);
+        dcon_write(dcon, DCON_REG_MEM_OPT_A, 0x0000);  /* clear option bits */
+        dcon_write(dcon, DCON_REG_MEM_OPT_A,
+                                MEM_DLL_CLOCK_DELAY | MEM_POWER_DOWN);
+        dcon_write(dcon, DCON_REG_MEM_OPT_B, MEM_SOFT_RESET);
+
+        /* Colour swizzle, AA, no passthrough, backlight */
+        if (is_init) {
+                dcon->disp_mode = MODE_PASSTHRU | MODE_BL_ENABLE |
+                                MODE_CSWIZZLE | MODE_COL_AA;
+        }
+        dcon_write(dcon, DCON_REG_MODE, dcon->disp_mode);
+
+        /* Set the scanline to interrupt on during resume */
+        dcon_write(dcon, DCON_REG_SCAN_INT, resumeline);
+
+err:
+        return rc;
+}
+
+/*
+ * The smbus doesn't always come back due to what is believed to be
+ * hardware (power rail) bugs.  For older models where this is known to
+ * occur, our solution is to attempt to wait for the bus to stabilize;
+ * if it doesn't happen, cut power to the dcon, repower it, and wait
+ * for the bus to stabilize.  Rinse, repeat until we have a working
+ * smbus.  For newer models, we simply BUG(); we want to know if this
+ * still happens despite the power fixes that have been made!
+ */
+static int dcon_bus_stabilize(struct dcon_priv *dcon, int is_powered_down)
+{
+        unsigned long timeout;
+        u8 pm;
+        int x;
+
+power_up:
+        if (is_powered_down) {
+                pm = 1;
+                x = olpc_ec_cmd(EC_DCON_POWER_MODE, &pm, 1, NULL, 0);
+                if (x) {
+                        pr_warn("unable to force dcon to power up: %d!\n", x);
+                        return x;
+                }
+                usleep_range(10000, 11000);  /* we'll be conservative */
+        }
+
+        pdata->bus_stabilize_wiggle();
+
+        for (x = -1, timeout = 50; timeout && x < 0; timeout--) {
+                usleep_range(1000, 1100);
+                x = dcon_read(dcon, DCON_REG_ID);
+        }
+        if (x < 0) {
+                pr_err("unable to stabilize dcon's smbus, reasserting power and praying.\n");
+                BUG_ON(olpc_board_at_least(olpc_board(0xc2)));
+                pm = 0;
+                olpc_ec_cmd(EC_DCON_POWER_MODE, &pm, 1, NULL, 0);
+                msleep(100);
+                is_powered_down = 1;
+                goto power_up;  /* argh, stupid hardware.. */
+        }
+
+        if (is_powered_down)
+                return dcon_hw_init(dcon, 0);
+        return 0;
+}
+
+static void dcon_set_backlight(struct dcon_priv *dcon, u8 level)
+{
+        dcon->bl_val = level;
+        dcon_write(dcon, DCON_REG_BRIGHT, dcon->bl_val);
+
+        /* Purposely turn off the backlight when we go to level 0 */
+        if (dcon->bl_val == 0) {
+                dcon->disp_mode &= ~MODE_BL_ENABLE;
+                dcon_write(dcon, DCON_REG_MODE, dcon->disp_mode);
+        } else if (!(dcon->disp_mode & MODE_BL_ENABLE)) {
+                dcon->disp_mode |= MODE_BL_ENABLE;
+                dcon_write(dcon, DCON_REG_MODE, dcon->disp_mode);
+        }
+}
+
+/* Set the output type to either color or mono */
+static int dcon_set_mono_mode(struct dcon_priv *dcon, bool enable_mono)
+{
+        if (dcon->mono == enable_mono)
+                return 0;
+
+        dcon->mono = enable_mono;
+
+        if (enable_mono) {
+                dcon->disp_mode &= ~(MODE_CSWIZZLE | MODE_COL_AA);
+                dcon->disp_mode |= MODE_MONO_LUMA;
+        } else {
+                dcon->disp_mode &= ~(MODE_MONO_LUMA);
+                dcon->disp_mode |= MODE_CSWIZZLE | MODE_COL_AA;
+        }
+
+        dcon_write(dcon, DCON_REG_MODE, dcon->disp_mode);
+        return 0;
+}
+
+/* For now, this will be really stupid - we need to address how
+ * DCONLOAD works in a sleep and account for it accordingly
+ */
+
+static void dcon_sleep(struct dcon_priv *dcon, bool sleep)
+{
+        int x;
+
+        /* Turn off the backlight and put the DCON to sleep */
+
+        if (dcon->asleep == sleep)
+                return;
+
+        if (!olpc_board_at_least(olpc_board(0xc2)))
+                return;
+
+        if (sleep) {
+                u8 pm = 0;
+
+                x = olpc_ec_cmd(EC_DCON_POWER_MODE, &pm, 1, NULL, 0);
+                if (x)
+                        pr_warn("unable to force dcon to power down: %d!\n", x);
+                else
+                        dcon->asleep = sleep;
+        } else {
+                /* Only re-enable the backlight if the backlight value is set */
+                if (dcon->bl_val != 0)
+                        dcon->disp_mode |= MODE_BL_ENABLE;
+                x = dcon_bus_stabilize(dcon, 1);
+                if (x)
+                        pr_warn("unable to reinit dcon hardware: %d!\n", x);
+                else
+                        dcon->asleep = sleep;
+
+                /* Restore backlight */
+                dcon_set_backlight(dcon, dcon->bl_val);
+        }
+
+        /* We should turn off some stuff in the framebuffer - but what? */
+}
+
+/* the DCON seems to get confused if we change DCONLOAD too
+ * frequently -- i.e., approximately faster than frame time.
+ * normally we don't change it this fast, so in general we won't
+ * delay here.
+ */
+static void dcon_load_holdoff(struct dcon_priv *dcon)
+{
+        ktime_t delta_t, now;
+
+        while (1) {
+                now = ktime_get();
+                delta_t = ktime_sub(now, dcon->load_time);
+                if (ktime_to_ns(delta_t) > NSEC_PER_MSEC * 20)
+                        break;
+                mdelay(4);
+        }
+}
+
+static bool dcon_blank_fb(struct dcon_priv *dcon, bool blank)
+{
+        int err;
+
+        console_lock();
+        if (!lock_fb_info(dcon->fbinfo)) {
+                console_unlock();
+                dev_err(&dcon->client->dev, "unable to lock framebuffer\n");
+                return false;
+        }
+
+        dcon->ignore_fb_events = true;
+        err = fb_blank(dcon->fbinfo,
+                        blank ? FB_BLANK_POWERDOWN : FB_BLANK_UNBLANK);
+        dcon->ignore_fb_events = false;
+        unlock_fb_info(dcon->fbinfo);
+        console_unlock();
+
+        if (err) {
+                dev_err(&dcon->client->dev, "couldn't %sblank framebuffer\n",
+                                blank ? "" : "un");
+                return false;
+        }
+        return true;
+}
+
+/* Set the source of the display (CPU or DCON) */
+static void dcon_source_switch(struct work_struct *work)
+{
+        struct dcon_priv *dcon = container_of(work, struct dcon_priv,
+                        switch_source);
+        int source = dcon->pending_src;
+
+        if (dcon->curr_src == source)
+                return;
+
+        dcon_load_holdoff(dcon);
+
+        dcon->switched = false;
+
+        switch (source) {
+        case DCON_SOURCE_CPU:
+                pr_info("dcon_source_switch to CPU\n");
+                /* Enable the scanline interrupt bit */
+                if (dcon_write(dcon, DCON_REG_MODE,
+                                dcon->disp_mode | MODE_SCAN_INT))
+                        pr_err("couldn't enable scanline interrupt!\n");
+                else
+                        /* Wait up to one second for the scanline interrupt */
+                        wait_event_timeout(dcon->waitq, dcon->switched, HZ);
+
+                if (!dcon->switched)
+                        pr_err("Timeout entering CPU mode; expect a screen glitch.\n");
+
+                /* Turn off the scanline interrupt */
+                if (dcon_write(dcon, DCON_REG_MODE, dcon->disp_mode))
+                        pr_err("couldn't disable scanline interrupt!\n");
+
+                /*
+                 * Ideally we'd like to disable interrupts here so that the
+                 * fb unblanking and DCON turn on happen at a known time value;
+                 * however, we can't do that right now with fb_blank
+                 * messing with semaphores.
+                 *
+                 * For now, we just hope..
+                 */
+                if (!dcon_blank_fb(dcon, false)) {
+                        pr_err("Failed to enter CPU mode\n");
+                        dcon->pending_src = DCON_SOURCE_DCON;
+                        return;
+                }
+
+                /* And turn off the DCON */
+                pdata->set_dconload(1);
+                dcon->load_time = ktime_get();
+
+                pr_info("The CPU has control\n");
+                break;
+        case DCON_SOURCE_DCON:
+        {
+                ktime_t delta_t;
+
+                pr_info("dcon_source_switch to DCON\n");
+
+                /* Clear DCONLOAD - this implies that the DCON is in control */
+                pdata->set_dconload(0);
+                dcon->load_time = ktime_get();
+
+                wait_event_timeout(dcon->waitq, dcon->switched, HZ/2);
+
+                if (!dcon->switched) {
+                        pr_err("Timeout entering DCON mode; expect a screen glitch.\n");
+                } else {
+                        /* sometimes the DCON doesn't follow its own rules,
+                         * and doesn't wait for two vsync pulses before
+                         * ack'ing the frame load with an IRQ.  the result
+                         * is that the display shows the *previously*
+                         * loaded frame.  we can detect this by looking at
+                         * the time between asserting DCONLOAD and the IRQ --
+                         * if it's less than 20msec, then the DCON couldn't
+                         * have seen two VSYNC pulses.  in that case we
+                         * deassert and reassert, and hope for the best.
+                         * see http://dev.laptop.org/ticket/9664
+                         */
+                        delta_t = ktime_sub(dcon->irq_time, dcon->load_time);
+                        if (dcon->switched && ktime_to_ns(delta_t)
+                            < NSEC_PER_MSEC * 20) {
+                                pr_err("missed loading, retrying\n");
+                                pdata->set_dconload(1);
+                                mdelay(41);
+                                pdata->set_dconload(0);
+                                dcon->load_time = ktime_get();
+                                mdelay(41);
+                        }
+                }
+
+                dcon_blank_fb(dcon, true);
+                pr_info("The DCON has control\n");
+                break;
+        }
+        default:
+                BUG();
+        }
+
+        dcon->curr_src = source;
+}
+
+static void dcon_set_source(struct dcon_priv *dcon, int arg)
+{
+        if (dcon->pending_src == arg)
+                return;
+
+        dcon->pending_src = arg;
+
+        if (dcon->curr_src != arg)
+                schedule_work(&dcon->switch_source);
+}
+
+static void dcon_set_source_sync(struct dcon_priv *dcon, int arg)
+{
+        dcon_set_source(dcon, arg);
+        flush_scheduled_work();
+}
+
+static ssize_t dcon_mode_show(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        struct dcon_priv *dcon = dev_get_drvdata(dev);
+
+        return sprintf(buf, "%4.4X\n", dcon->disp_mode);
+}
+
+static ssize_t dcon_sleep_show(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        struct dcon_priv *dcon = dev_get_drvdata(dev);
+
+        return sprintf(buf, "%d\n", dcon->asleep);
+}
+
+static ssize_t dcon_freeze_show(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        struct dcon_priv *dcon = dev_get_drvdata(dev);
+
+        return sprintf(buf, "%d\n", dcon->curr_src == DCON_SOURCE_DCON ? 1 : 0);
+}
+
+static ssize_t dcon_mono_show(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        struct dcon_priv *dcon = dev_get_drvdata(dev);
+
+        return sprintf(buf, "%d\n", dcon->mono);
+}
+
+static ssize_t dcon_resumeline_show(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        return sprintf(buf, "%d\n", resumeline);
+}
+
+static ssize_t dcon_mono_store(struct device *dev,
+        struct device_attribute *attr, const char *buf, size_t count)
+{
+        unsigned long enable_mono;
+        int rc;
+
+        rc = kstrtoul(buf, 10, &enable_mono);
+        if (rc)
+                return rc;
+
+        dcon_set_mono_mode(dev_get_drvdata(dev), enable_mono ? true : false);
+
+        return count;
+}
+
+static ssize_t dcon_freeze_store(struct device *dev,
+        struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct dcon_priv *dcon = dev_get_drvdata(dev);
+        unsigned long output;
+        int ret;
+
+        ret = kstrtoul(buf, 10, &output);
+        if (ret)
+                return ret;
+
+        pr_info("dcon_freeze_store: %lu\n", output);
+
+        switch (output) {
+        case 0:
+                dcon_set_source(dcon, DCON_SOURCE_CPU);
+                break;
+        case 1:
+                dcon_set_source_sync(dcon, DCON_SOURCE_DCON);
+                break;
+        case 2:  /* normally unused */
+                dcon_set_source(dcon, DCON_SOURCE_DCON);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return count;
+}
+
+static ssize_t dcon_resumeline_store(struct device *dev,
+        struct device_attribute *attr, const char *buf, size_t count)
+{
+        unsigned short rl;
+        int rc;
+
+        rc = kstrtou16(buf, 10, &rl);
+        if (rc)
+                return rc;
+
+        resumeline = rl;
+        dcon_write(dev_get_drvdata(dev), DCON_REG_SCAN_INT, resumeline);
+
+        return count;
+}
+
+static ssize_t dcon_sleep_store(struct device *dev,
+        struct device_attribute *attr, const char *buf, size_t count)
+{
+        unsigned long output;
+        int ret;
+
+        ret = kstrtoul(buf, 10, &output);
+        if (ret)
+                return ret;
+
+        dcon_sleep(dev_get_drvdata(dev), output ? true : false);
+        return count;
+}
+
+static struct device_attribute dcon_device_files[] = {
+        __ATTR(mode, 0444, dcon_mode_show, NULL),
+        __ATTR(sleep, 0644, dcon_sleep_show, dcon_sleep_store),
+        __ATTR(freeze, 0644, dcon_freeze_show, dcon_freeze_store),
+        __ATTR(monochrome, 0644, dcon_mono_show, dcon_mono_store),
+        __ATTR(resumeline, 0644, dcon_resumeline_show, dcon_resumeline_store),
+};
+
+static int dcon_bl_update(struct backlight_device *dev)
+{
+        struct dcon_priv *dcon = bl_get_data(dev);
+        u8 level = dev->props.brightness & 0x0F;
+
+        if (dev->props.power != FB_BLANK_UNBLANK)
+                level = 0;
+
+        if (level != dcon->bl_val)
+                dcon_set_backlight(dcon, level);
+
+        /* power down the DCON when the screen is blanked */
+        if (!dcon->ignore_fb_events)
+                dcon_sleep(dcon, !!(dev->props.state & BL_CORE_FBBLANK));
+
+        return 0;
+}
+
+static int dcon_bl_get(struct backlight_device *dev)
+{
+        struct dcon_priv *dcon = bl_get_data(dev);
+
+        return dcon->bl_val;
+}
+
+static const struct backlight_ops dcon_bl_ops = {
+        .update_status = dcon_bl_update,
+        .get_brightness = dcon_bl_get,
+};
+
+static struct backlight_properties dcon_bl_props = {
+        .max_brightness = 15,
+        .type = BACKLIGHT_RAW,
+        .power = FB_BLANK_UNBLANK,
+};
+
+static int dcon_reboot_notify(struct notifier_block *nb,
+                              unsigned long foo, void *bar)
+{
+        struct dcon_priv *dcon = container_of(nb, struct dcon_priv, reboot_nb);
+
+        if (!dcon || !dcon->client)
+                return NOTIFY_DONE;
+
+        /* Turn off the DCON. Entirely. */
+        dcon_write(dcon, DCON_REG_MODE, 0x39);
+        dcon_write(dcon, DCON_REG_MODE, 0x32);
+        return NOTIFY_DONE;
+}
+
+static int unfreeze_on_panic(struct notifier_block *nb,
+                             unsigned long e, void *p)
+{
+        pdata->set_dconload(1);
+        return NOTIFY_DONE;
+}
+
+static struct notifier_block dcon_panic_nb = {
+        .notifier_call = unfreeze_on_panic,
+};
+
+static int dcon_detect(struct i2c_client *client, struct i2c_board_info *info)
+{
+        strlcpy(info->type, "olpc_dcon", I2C_NAME_SIZE);
+
+        return 0;
+}
+
+static int dcon_probe(struct i2c_client *client, const struct i2c_device_id *id)
+{
+        struct dcon_priv *dcon;
+        int rc, i, j;
+
+        if (!pdata)
+                return -ENXIO;
+
+        dcon = kzalloc(sizeof(*dcon), GFP_KERNEL);
+        if (!dcon)
+                return -ENOMEM;
+
+        dcon->client = client;
+        init_waitqueue_head(&dcon->waitq);
+        INIT_WORK(&dcon->switch_source, dcon_source_switch);
+        dcon->reboot_nb.notifier_call = dcon_reboot_notify;
+        dcon->reboot_nb.priority = -1;
+
+        i2c_set_clientdata(client, dcon);
+
+        if (num_registered_fb < 1) {
+                dev_err(&client->dev, "DCON driver requires a registered fb\n");
+                rc = -EIO;
+                goto einit;
+        }
+        dcon->fbinfo = registered_fb[0];
+
+        rc = dcon_hw_init(dcon, 1);
+        if (rc)
+                goto einit;
+
+        /* Add the DCON device */
+
+        dcon_device = platform_device_alloc("dcon", -1);
+
+        if (!dcon_device) {
+                pr_err("Unable to create the DCON device\n");
+                rc = -ENOMEM;
+                goto eirq;
+        }
+        rc = platform_device_add(dcon_device);
+        platform_set_drvdata(dcon_device, dcon);
+
+        if (rc) {
+                pr_err("Unable to add the DCON device\n");
+                goto edev;
+        }
+
+        for (i = 0; i < ARRAY_SIZE(dcon_device_files); i++) {
+                rc = device_create_file(&dcon_device->dev,
+                                        &dcon_device_files[i]);
+                if (rc) {
+                        dev_err(&dcon_device->dev, "Cannot create sysfs file\n");
+                        goto ecreate;
+                }
+        }
+
+        dcon->bl_val = dcon_read(dcon, DCON_REG_BRIGHT) & 0x0F;
+
+        /* Add the backlight device for the DCON */
+        dcon_bl_props.brightness = dcon->bl_val;
+        dcon->bl_dev = backlight_device_register("dcon-bl", &dcon_device->dev,
+                dcon, &dcon_bl_ops, &dcon_bl_props);
+        if (IS_ERR(dcon->bl_dev)) {
+                dev_err(&client->dev, "cannot register backlight dev (%ld)\n",
+                                PTR_ERR(dcon->bl_dev));
+                dcon->bl_dev = NULL;
+        }
+
+        register_reboot_notifier(&dcon->reboot_nb);
+        atomic_notifier_chain_register(&panic_notifier_list, &dcon_panic_nb);
+
+        return 0;
+
+ ecreate:
+        for (j = 0; j < i; j++)
+                device_remove_file(&dcon_device->dev, &dcon_device_files[j]);
+ edev:
+        platform_device_unregister(dcon_device);
+        dcon_device = NULL;
+ eirq:
+        free_irq(DCON_IRQ, dcon);
+ einit:
+        kfree(dcon);
+        return rc;
+}
+
+static int dcon_remove(struct i2c_client *client)
+{
+        struct dcon_priv *dcon = i2c_get_clientdata(client);
+
+        unregister_reboot_notifier(&dcon->reboot_nb);
+        atomic_notifier_chain_unregister(&panic_notifier_list, &dcon_panic_nb);
+
+        free_irq(DCON_IRQ, dcon);
+
+        backlight_device_unregister(dcon->bl_dev);
+
+        if (dcon_device)
+                platform_device_unregister(dcon_device);
+        cancel_work_sync(&dcon->switch_source);
+
+        kfree(dcon);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int dcon_suspend(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct dcon_priv *dcon = i2c_get_clientdata(client);
+
+        if (!dcon->asleep) {
+                /* Set up the DCON to have the source */
+                dcon_set_source_sync(dcon, DCON_SOURCE_DCON);
+        }
+
+        return 0;
+}
+
+static int dcon_resume(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct dcon_priv *dcon = i2c_get_clientdata(client);
+
+        if (!dcon->asleep) {
+                dcon_bus_stabilize(dcon, 0);
+                dcon_set_source(dcon, DCON_SOURCE_CPU);
+        }
+
+        return 0;
+}
+
+#else
+
+#define dcon_suspend NULL
+#define dcon_resume NULL
+
+#endif /* CONFIG_PM */
+
+irqreturn_t dcon_interrupt(int irq, void *id)
+{
+        struct dcon_priv *dcon = id;
+        u8 status;
+
+        if (pdata->read_status(&status))
+                return IRQ_NONE;
+
+        switch (status & 3) {
+        case 3:
+                pr_debug("DCONLOAD_MISSED interrupt\n");
+                break;
+
+        case 2: /* switch to DCON mode */
+        case 1: /* switch to CPU mode */
+                dcon->switched = true;
+                dcon->irq_time = ktime_get();
+                wake_up(&dcon->waitq);
+                break;
+
+        case 0:
+                /* workaround resume case:  the DCON (on 1.5) doesn't
+                 * ever assert status 0x01 when switching to CPU mode
+                 * during resume.  this is because DCONLOAD is de-asserted
+                 * _immediately_ upon exiting S3, so the actual release
+                 * of the DCON happened long before this point.
+                 * see http://dev.laptop.org/ticket/9869
+                 */
+                if (dcon->curr_src != dcon->pending_src && !dcon->switched) {
+                        dcon->switched = true;
+                        dcon->irq_time = ktime_get();
+                        wake_up(&dcon->waitq);
+                        pr_debug("switching w/ status 0/0\n");
+                } else {
+                        pr_debug("scanline interrupt w/CPU\n");
+                }
+        }
+
+        return IRQ_HANDLED;
+}
+
+static const struct dev_pm_ops dcon_pm_ops = {
+        .suspend = dcon_suspend,
+        .resume = dcon_resume,
+};
+
+static const struct i2c_device_id dcon_idtable[] = {
+        { "olpc_dcon",  0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, dcon_idtable);
+
+static struct i2c_driver dcon_driver = {
+        .driver = {
+                .name   = "olpc_dcon",
+                .pm = &dcon_pm_ops,
+        },
+        .class = I2C_CLASS_DDC | I2C_CLASS_HWMON,
+        .id_table = dcon_idtable,
+        .probe = dcon_probe,
+        .remove = dcon_remove,
+        .detect = dcon_detect,
+        .address_list = normal_i2c,
+};
+
+static int __init olpc_dcon_init(void)
+{
+#ifdef CONFIG_FB_OLPC_DCON_1_5
+        /* XO-1.5 */
+        if (olpc_board_at_least(olpc_board(0xd0)))
+                pdata = &dcon_pdata_xo_1_5;
+#endif
+#ifdef CONFIG_FB_OLPC_DCON_1
+        if (!pdata)
+                pdata = &dcon_pdata_xo_1;
+#endif
+
+        return i2c_add_driver(&dcon_driver);
+}
+
+static void __exit olpc_dcon_exit(void)
+{
+        i2c_del_driver(&dcon_driver);
+}
+
+module_init(olpc_dcon_init);
+module_exit(olpc_dcon_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/olpc_dcon/olpc_dcon.h b/drivers/staging/olpc_dcon/olpc_dcon.h
new file mode 100644
index 000000000000..215e7ec4dea2
--- /dev/null
+++ b/drivers/staging/olpc_dcon/olpc_dcon.h
@@ -0,0 +1,111 @@
+#ifndef OLPC_DCON_H_
+#define OLPC_DCON_H_
+
+#include <linux/notifier.h>
+#include <linux/workqueue.h>
+
+/* DCON registers */
+
+#define DCON_REG_ID              0
+#define DCON_REG_MODE            1
+
+#define MODE_PASSTHRU   (1<<0)
+#define MODE_SLEEP      (1<<1)
+#define MODE_SLEEP_AUTO (1<<2)
+#define MODE_BL_ENABLE  (1<<3)
+#define MODE_BLANK      (1<<4)
+#define MODE_CSWIZZLE   (1<<5)
+#define MODE_COL_AA     (1<<6)
+#define MODE_MONO_LUMA  (1<<7)
+#define MODE_SCAN_INT   (1<<8)
+#define MODE_CLOCKDIV   (1<<9)
+#define MODE_DEBUG      (1<<14)
+#define MODE_SELFTEST   (1<<15)
+
+#define DCON_REG_HRES           0x2
+#define DCON_REG_HTOTAL         0x3
+#define DCON_REG_HSYNC_WIDTH    0x4
+#define DCON_REG_VRES           0x5
+#define DCON_REG_VTOTAL         0x6
+#define DCON_REG_VSYNC_WIDTH    0x7
+#define DCON_REG_TIMEOUT        0x8
+#define DCON_REG_SCAN_INT       0x9
+#define DCON_REG_BRIGHT         0xa
+#define DCON_REG_MEM_OPT_A      0x41
+#define DCON_REG_MEM_OPT_B      0x42
+
+/* Load Delay Locked Loop (DLL) settings for clock delay */
+#define MEM_DLL_CLOCK_DELAY     (1<<0)
+/* Memory controller power down function */
+#define MEM_POWER_DOWN          (1<<8)
+/* Memory controller software reset */
+#define MEM_SOFT_RESET          (1<<0)
+
+/* Status values */
+
+#define DCONSTAT_SCANINT        0
+#define DCONSTAT_SCANINT_DCON   1
+#define DCONSTAT_DISPLAYLOAD    2
+#define DCONSTAT_MISSED         3
+
+/* Source values */
+
+#define DCON_SOURCE_DCON        0
+#define DCON_SOURCE_CPU         1
+
+/* Interrupt */
+#define DCON_IRQ                6
+
+struct dcon_priv {
+        struct i2c_client *client;
+        struct fb_info *fbinfo;
+        struct backlight_device *bl_dev;
+
+        wait_queue_head_t waitq;
+        struct work_struct switch_source;
+        struct notifier_block reboot_nb;
+
+        /* Shadow register for the DCON_REG_MODE register */
+        u8 disp_mode;
+
+        /* The current backlight value - this saves us some smbus traffic */
+        u8 bl_val;
+
+        /* Current source, initialized at probe time */
+        int curr_src;
+
+        /* Desired source */
+        int pending_src;
+
+        /* Variables used during switches */
+        bool switched;
+        ktime_t irq_time;
+        ktime_t load_time;
+
+        /* Current output type; true == mono, false == color */
+        bool mono;
+        bool asleep;
+        /* This get set while controlling fb blank state from the driver */
+        bool ignore_fb_events;
+};
+
+struct dcon_platform_data {
+        int (*init)(struct dcon_priv *);
+        void (*bus_stabilize_wiggle)(void);
+        void (*set_dconload)(int);
+        int (*read_status)(u8 *);
+};
+
+#include <linux/interrupt.h>
+
+irqreturn_t dcon_interrupt(int irq, void *id);
+
+#ifdef CONFIG_FB_OLPC_DCON_1
+extern struct dcon_platform_data dcon_pdata_xo_1;
+#endif
+
+#ifdef CONFIG_FB_OLPC_DCON_1_5
+extern struct dcon_platform_data dcon_pdata_xo_1_5;
+#endif
+
+#endif
diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
new file mode 100644
index 000000000000..0c5a10c69401
--- /dev/null
+++ b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
@@ -0,0 +1,205 @@
+/*
+ * Mainly by David Woodhouse, somewhat modified by Jordan Crouse
+ *
+ * Copyright © 2006-2007  Red Hat, Inc.
+ * Copyright © 2006-2007  Advanced Micro Devices, Inc.
+ * Copyright © 2009       VIA Technology, Inc.
+ * Copyright (c) 2010  Andres Salomon <dilinger@queued.net>
+ *
+ * This program is free software.  You can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/cs5535.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <asm/olpc.h>
+
+#include "olpc_dcon.h"
+
+static int dcon_init_xo_1(struct dcon_priv *dcon)
+{
+        unsigned char lob;
+
+        if (gpio_request(OLPC_GPIO_DCON_STAT0, "OLPC-DCON")) {
+                pr_err("failed to request STAT0 GPIO\n");
+                return -EIO;
+        }
+        if (gpio_request(OLPC_GPIO_DCON_STAT1, "OLPC-DCON")) {
+                pr_err("failed to request STAT1 GPIO\n");
+                goto err_gp_stat1;
+        }
+        if (gpio_request(OLPC_GPIO_DCON_IRQ, "OLPC-DCON")) {
+                pr_err("failed to request IRQ GPIO\n");
+                goto err_gp_irq;
+        }
+        if (gpio_request(OLPC_GPIO_DCON_LOAD, "OLPC-DCON")) {
+                pr_err("failed to request LOAD GPIO\n");
+                goto err_gp_load;
+        }
+        if (gpio_request(OLPC_GPIO_DCON_BLANK, "OLPC-DCON")) {
+                pr_err("failed to request BLANK GPIO\n");
+                goto err_gp_blank;
+        }
+
+        /* Turn off the event enable for GPIO7 just to be safe */
+        cs5535_gpio_clear(OLPC_GPIO_DCON_IRQ, GPIO_EVENTS_ENABLE);
+
+        /*
+         * Determine the current state by reading the GPIO bit; earlier
+         * stages of the boot process have established the state.
+         *
+         * Note that we read GPIO_OUTPUT_VAL rather than GPIO_READ_BACK here;
+         * this is because OFW will disable input for the pin and set a value..
+         * READ_BACK will only contain a valid value if input is enabled and
+         * then a value is set.  So, future readings of the pin can use
+         * READ_BACK, but the first one cannot.  Awesome, huh?
+         */
+        dcon->curr_src = cs5535_gpio_isset(OLPC_GPIO_DCON_LOAD, GPIO_OUTPUT_VAL)
+                ? DCON_SOURCE_CPU
+                : DCON_SOURCE_DCON;
+        dcon->pending_src = dcon->curr_src;
+
+        /* Set the directions for the GPIO pins */
+        gpio_direction_input(OLPC_GPIO_DCON_STAT0);
+        gpio_direction_input(OLPC_GPIO_DCON_STAT1);
+        gpio_direction_input(OLPC_GPIO_DCON_IRQ);
+        gpio_direction_input(OLPC_GPIO_DCON_BLANK);
+        gpio_direction_output(OLPC_GPIO_DCON_LOAD,
+                        dcon->curr_src == DCON_SOURCE_CPU);
+
+        /* Set up the interrupt mappings */
+
+        /* Set the IRQ to pair 2 */
+        cs5535_gpio_setup_event(OLPC_GPIO_DCON_IRQ, 2, 0);
+
+        /* Enable group 2 to trigger the DCON interrupt */
+        cs5535_gpio_set_irq(2, DCON_IRQ);
+
+        /* Select edge level for interrupt (in PIC) */
+        lob = inb(0x4d0);
+        lob &= ~(1 << DCON_IRQ);
+        outb(lob, 0x4d0);
+
+        /* Register the interrupt handler */
+        if (request_irq(DCON_IRQ, &dcon_interrupt, 0, "DCON", dcon)) {
+                pr_err("failed to request DCON's irq\n");
+                goto err_req_irq;
+        }
+
+        /* Clear INV_EN for GPIO7 (DCONIRQ) */
+        cs5535_gpio_clear(OLPC_GPIO_DCON_IRQ, GPIO_INPUT_INVERT);
+
+        /* Enable filter for GPIO12 (DCONBLANK) */
+        cs5535_gpio_set(OLPC_GPIO_DCON_BLANK, GPIO_INPUT_FILTER);
+
+        /* Disable filter for GPIO7 */
+        cs5535_gpio_clear(OLPC_GPIO_DCON_IRQ, GPIO_INPUT_FILTER);
+
+        /* Disable event counter for GPIO7 (DCONIRQ) and GPIO12 (DCONBLANK) */
+        cs5535_gpio_clear(OLPC_GPIO_DCON_IRQ, GPIO_INPUT_EVENT_COUNT);
+        cs5535_gpio_clear(OLPC_GPIO_DCON_BLANK, GPIO_INPUT_EVENT_COUNT);
+
+        /* Add GPIO12 to the Filter Event Pair #7 */
+        cs5535_gpio_set(OLPC_GPIO_DCON_BLANK, GPIO_FE7_SEL);
+
+        /* Turn off negative Edge Enable for GPIO12 */
+        cs5535_gpio_clear(OLPC_GPIO_DCON_BLANK, GPIO_NEGATIVE_EDGE_EN);
+
+        /* Enable negative Edge Enable for GPIO7 */
+        cs5535_gpio_set(OLPC_GPIO_DCON_IRQ, GPIO_NEGATIVE_EDGE_EN);
+
+        /* Zero the filter amount for Filter Event Pair #7 */
+        cs5535_gpio_set(0, GPIO_FLTR7_AMOUNT);
+
+        /* Clear the negative edge status for GPIO7 and GPIO12 */
+        cs5535_gpio_set(OLPC_GPIO_DCON_IRQ, GPIO_NEGATIVE_EDGE_STS);
+        cs5535_gpio_set(OLPC_GPIO_DCON_BLANK, GPIO_NEGATIVE_EDGE_STS);
+
+        /* FIXME:  Clear the positive status as well, just to be sure */
+        cs5535_gpio_set(OLPC_GPIO_DCON_IRQ, GPIO_POSITIVE_EDGE_STS);
+        cs5535_gpio_set(OLPC_GPIO_DCON_BLANK, GPIO_POSITIVE_EDGE_STS);
+
+        /* Enable events for GPIO7 (DCONIRQ) and GPIO12 (DCONBLANK) */
+        cs5535_gpio_set(OLPC_GPIO_DCON_IRQ, GPIO_EVENTS_ENABLE);
+        cs5535_gpio_set(OLPC_GPIO_DCON_BLANK, GPIO_EVENTS_ENABLE);
+
+        return 0;
+
+err_req_irq:
+        gpio_free(OLPC_GPIO_DCON_BLANK);
+err_gp_blank:
+        gpio_free(OLPC_GPIO_DCON_LOAD);
+err_gp_load:
+        gpio_free(OLPC_GPIO_DCON_IRQ);
+err_gp_irq:
+        gpio_free(OLPC_GPIO_DCON_STAT1);
+err_gp_stat1:
+        gpio_free(OLPC_GPIO_DCON_STAT0);
+        return -EIO;
+}
+
+static void dcon_wiggle_xo_1(void)
+{
+        int x;
+
+        /*
+         * According to HiMax, when powering the DCON up we should hold
+         * SMB_DATA high for 8 SMB_CLK cycles.  This will force the DCON
+         * state machine to reset to a (sane) initial state.  Mitch Bradley
+         * did some testing and discovered that holding for 16 SMB_CLK cycles
+         * worked a lot more reliably, so that's what we do here.
+         *
+         * According to the cs5536 spec, to set GPIO14 to SMB_CLK we must
+         * simultaneously set AUX1 IN/OUT to GPIO14; ditto for SMB_DATA and
+         * GPIO15.
+         */
+        cs5535_gpio_set(OLPC_GPIO_SMB_CLK, GPIO_OUTPUT_VAL);
+        cs5535_gpio_set(OLPC_GPIO_SMB_DATA, GPIO_OUTPUT_VAL);
+        cs5535_gpio_set(OLPC_GPIO_SMB_CLK, GPIO_OUTPUT_ENABLE);
+        cs5535_gpio_set(OLPC_GPIO_SMB_DATA, GPIO_OUTPUT_ENABLE);
+        cs5535_gpio_clear(OLPC_GPIO_SMB_CLK, GPIO_OUTPUT_AUX1);
+        cs5535_gpio_clear(OLPC_GPIO_SMB_DATA, GPIO_OUTPUT_AUX1);
+        cs5535_gpio_clear(OLPC_GPIO_SMB_CLK, GPIO_OUTPUT_AUX2);
+        cs5535_gpio_clear(OLPC_GPIO_SMB_DATA, GPIO_OUTPUT_AUX2);
+        cs5535_gpio_clear(OLPC_GPIO_SMB_CLK, GPIO_INPUT_AUX1);
+        cs5535_gpio_clear(OLPC_GPIO_SMB_DATA, GPIO_INPUT_AUX1);
+
+        for (x = 0; x < 16; x++) {
+                udelay(5);
+                cs5535_gpio_clear(OLPC_GPIO_SMB_CLK, GPIO_OUTPUT_VAL);
+                udelay(5);
+                cs5535_gpio_set(OLPC_GPIO_SMB_CLK, GPIO_OUTPUT_VAL);
+        }
+        udelay(5);
+        cs5535_gpio_set(OLPC_GPIO_SMB_CLK, GPIO_OUTPUT_AUX1);
+        cs5535_gpio_set(OLPC_GPIO_SMB_DATA, GPIO_OUTPUT_AUX1);
+        cs5535_gpio_set(OLPC_GPIO_SMB_CLK, GPIO_INPUT_AUX1);
+        cs5535_gpio_set(OLPC_GPIO_SMB_DATA, GPIO_INPUT_AUX1);
+}
+
+static void dcon_set_dconload_1(int val)
+{
+        gpio_set_value(OLPC_GPIO_DCON_LOAD, val);
+}
+
+static int dcon_read_status_xo_1(u8 *status)
+{
+        *status = gpio_get_value(OLPC_GPIO_DCON_STAT0);
+        *status |= gpio_get_value(OLPC_GPIO_DCON_STAT1) << 1;
+
+        /* Clear the negative edge status for GPIO7 */
+        cs5535_gpio_set(OLPC_GPIO_DCON_IRQ, GPIO_NEGATIVE_EDGE_STS);
+
+        return 0;
+}
+
+struct dcon_platform_data dcon_pdata_xo_1 = {
+        .init = dcon_init_xo_1,
+        .bus_stabilize_wiggle = dcon_wiggle_xo_1,
+        .set_dconload = dcon_set_dconload_1,
+        .read_status = dcon_read_status_xo_1,
+};
diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c b/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
new file mode 100644
index 000000000000..6a4d379c16a3
--- /dev/null
+++ b/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2009,2010       One Laptop per Child
+ *
+ * This program is free software.  You can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/acpi.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
+#include <asm/olpc.h>
+
+/* TODO: this eventually belongs in linux/vx855.h */
+#define NR_VX855_GPI    14
+#define NR_VX855_GPO    13
+#define NR_VX855_GPIO   15
+
+#define VX855_GPI(n)    (n)
+#define VX855_GPO(n)    (NR_VX855_GPI + (n))
+#define VX855_GPIO(n)   (NR_VX855_GPI + NR_VX855_GPO + (n))
+
+#include "olpc_dcon.h"
+
+/* Hardware setup on the XO 1.5:
+ *      DCONLOAD connects to VX855_GPIO1 (not SMBCK2)
+ *      DCONBLANK connects to VX855_GPIO8 (not SSPICLK)  unused in driver
+ *      DCONSTAT0 connects to VX855_GPI10 (not SSPISDI)
+ *      DCONSTAT1 connects to VX855_GPI11 (not nSSPISS)
+ *      DCONIRQ connects to VX855_GPIO12
+ *      DCONSMBDATA connects to VX855 graphics CRTSPD
+ *      DCONSMBCLK connects to VX855 graphics CRTSPCLK
+ */
+
+#define VX855_GENL_PURPOSE_OUTPUT 0x44c /* PMIO_Rx4c-4f */
+#define VX855_GPI_STATUS_CHG 0x450  /* PMIO_Rx50 */
+#define VX855_GPI_SCI_SMI 0x452  /* PMIO_Rx52 */
+#define BIT_GPIO12 0x40
+
+#define PREFIX "OLPC DCON:"
+
+static void dcon_clear_irq(void)
+{
+        /* irq status will appear in PMIO_Rx50[6] (RW1C) on gpio12 */
+        outb(BIT_GPIO12, VX855_GPI_STATUS_CHG);
+}
+
+static int dcon_was_irq(void)
+{
+        u_int8_t tmp;
+
+        /* irq status will appear in PMIO_Rx50[6] on gpio12 */
+        tmp = inb(VX855_GPI_STATUS_CHG);
+        return !!(tmp & BIT_GPIO12);
+
+        return 0;
+}
+
+static int dcon_init_xo_1_5(struct dcon_priv *dcon)
+{
+        unsigned int irq;
+
+        dcon_clear_irq();
+
+        /* set   PMIO_Rx52[6] to enable SCI/SMI on gpio12 */
+        outb(inb(VX855_GPI_SCI_SMI)|BIT_GPIO12, VX855_GPI_SCI_SMI);
+
+        /* Determine the current state of DCONLOAD, likely set by firmware */
+        /* GPIO1 */
+        dcon->curr_src = (inl(VX855_GENL_PURPOSE_OUTPUT) & 0x1000) ?
+                        DCON_SOURCE_CPU : DCON_SOURCE_DCON;
+        dcon->pending_src = dcon->curr_src;
+
+        /* we're sharing the IRQ with ACPI */
+        irq = acpi_gbl_FADT.sci_interrupt;
+        if (request_irq(irq, &dcon_interrupt, IRQF_SHARED, "DCON", dcon)) {
+                pr_err("DCON (IRQ%d) allocation failed\n", irq);
+                return 1;
+        }
+
+        return 0;
+}
+
+static void set_i2c_line(int sda, int scl)
+{
+        unsigned char tmp;
+        unsigned int port = 0x26;
+
+        /* FIXME: This directly accesses the CRT GPIO controller !!! */
+        outb(port, 0x3c4);
+        tmp = inb(0x3c5);
+
+        if (scl)
+                tmp |= 0x20;
+        else
+                tmp &= ~0x20;
+
+        if (sda)
+                tmp |= 0x10;
+        else
+                tmp &= ~0x10;
+
+        tmp |= 0x01;
+
+        outb(port, 0x3c4);
+        outb(tmp, 0x3c5);
+}
+
+
+static void dcon_wiggle_xo_1_5(void)
+{
+        int x;
+
+        /*
+         * According to HiMax, when powering the DCON up we should hold
+         * SMB_DATA high for 8 SMB_CLK cycles.  This will force the DCON
+         * state machine to reset to a (sane) initial state.  Mitch Bradley
+         * did some testing and discovered that holding for 16 SMB_CLK cycles
+         * worked a lot more reliably, so that's what we do here.
+         */
+        set_i2c_line(1, 1);
+
+        for (x = 0; x < 16; x++) {
+                udelay(5);
+                set_i2c_line(1, 0);
+                udelay(5);
+                set_i2c_line(1, 1);
+        }
+        udelay(5);
+
+        /* set   PMIO_Rx52[6] to enable SCI/SMI on gpio12 */
+        outb(inb(VX855_GPI_SCI_SMI)|BIT_GPIO12, VX855_GPI_SCI_SMI);
+}
+
+static void dcon_set_dconload_xo_1_5(int val)
+{
+        gpio_set_value(VX855_GPIO(1), val);
+}
+
+static int dcon_read_status_xo_1_5(u8 *status)
+{
+        if (!dcon_was_irq())
+                return -1;
+
+        /* i believe this is the same as "inb(0x44b) & 3" */
+        *status = gpio_get_value(VX855_GPI(10));
+        *status |= gpio_get_value(VX855_GPI(11)) << 1;
+
+        dcon_clear_irq();
+
+        return 0;
+}
+
+struct dcon_platform_data dcon_pdata_xo_1_5 = {
+        .init = dcon_init_xo_1_5,
+        .bus_stabilize_wiggle = dcon_wiggle_xo_1_5,
+        .set_dconload = dcon_set_dconload_xo_1_5,
+        .read_status = dcon_read_status_xo_1_5,
+};
diff --git a/drivers/staging/rdma/hfi1/Kconfig b/drivers/staging/rdma/hfi1/Kconfig
index 3e668d852f03..a925fb0db706 100644
--- a/drivers/staging/rdma/hfi1/Kconfig
+++ b/drivers/staging/rdma/hfi1/Kconfig
@@ -2,6 +2,7 @@ config INFINIBAND_HFI1
         tristate "Intel OPA Gen1 support"
         depends on X86_64 && INFINIBAND_RDMAVT
         select MMU_NOTIFIER
+        select CRC32
         default m
         ---help---
         This is a low-level driver for Intel OPA Gen1 adapter.
diff --git a/drivers/staging/unisys/include/visorbus.h b/drivers/staging/unisys/include/visorbus.h
index 3788d167b3c6..db59d9731ec2 100644
--- a/drivers/staging/unisys/include/visorbus.h
+++ b/drivers/staging/unisys/include/visorbus.h
@@ -134,7 +134,6 @@ struct visor_device {
         struct list_head list_all;
         struct periodic_work *periodic_work;
         bool being_removed;
-        bool responded_to_device_create;
         /* the code will detect and behave appropriately) */
         struct semaphore visordriver_callback_lock;
         bool pausing;
diff --git a/drivers/staging/unisys/visorbus/visorchannel.c b/drivers/staging/unisys/visorbus/visorchannel.c
index b68a904ac617..43373582cf1d 100644
--- a/drivers/staging/unisys/visorbus/visorchannel.c
+++ b/drivers/staging/unisys/visorbus/visorchannel.c
@@ -40,7 +40,6 @@ struct visorchannel {
         bool requested;
         struct channel_header chan_hdr;
         uuid_le guid;
-        ulong size;
         bool needs_lock;        /* channel creator knows if more than one */
                                 /* thread will be inserting or removing */
         spinlock_t insert_lock; /* protect head writes in chan_hdr */
@@ -134,8 +133,6 @@ visorchannel_create_guts(u64 physaddr, unsigned long channel_bytes,
         }
 
         channel->nbytes = channel_bytes;
-
-        channel->size = channel_bytes;
         channel->guid = guid;
         return channel;
 
@@ -186,7 +183,7 @@ EXPORT_SYMBOL_GPL(visorchannel_get_physaddr);
 ulong
 visorchannel_get_nbytes(struct visorchannel *channel)
 {
-        return channel->size;
+        return channel->nbytes;
 }
 EXPORT_SYMBOL_GPL(visorchannel_get_nbytes);
 
diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c
index 61877722b1da..c1b872c02974 100644
--- a/drivers/staging/unisys/visorbus/visorchipset.c
+++ b/drivers/staging/unisys/visorbus/visorchipset.c
@@ -66,7 +66,7 @@ static u32 dump_vhba_bus;
 static int
 visorchipset_open(struct inode *inode, struct file *file)
 {
-        unsigned minor_number = iminor(inode);
+        unsigned int minor_number = iminor(inode);
 
         if (minor_number)
                 return -ENODEV;
@@ -530,10 +530,11 @@ static ssize_t toolaction_store(struct device *dev,
         if (kstrtou8(buf, 10, &tool_action))
                 return -EINVAL;
 
-        ret = visorchannel_write(controlvm_channel,
-                offsetof(struct spar_controlvm_channel_protocol,
-                         tool_action),
-                &tool_action, sizeof(u8));
+        ret = visorchannel_write
+                (controlvm_channel,
+                 offsetof(struct spar_controlvm_channel_protocol,
+                          tool_action),
+                 &tool_action, sizeof(u8));
 
         if (ret)
                 return ret;
@@ -565,10 +566,11 @@ static ssize_t boottotool_store(struct device *dev,
                 return -EINVAL;
 
         efi_spar_indication.boot_to_tool = val;
-        ret = visorchannel_write(controlvm_channel,
-                        offsetof(struct spar_controlvm_channel_protocol,
-                                 efi_spar_ind), &(efi_spar_indication),
-                                 sizeof(struct efi_spar_indication));
+        ret = visorchannel_write
+                (controlvm_channel,
+                 offsetof(struct spar_controlvm_channel_protocol,
+                          efi_spar_ind), &(efi_spar_indication),
+                 sizeof(struct efi_spar_indication));
 
         if (ret)
                 return ret;
@@ -596,10 +598,11 @@ static ssize_t error_store(struct device *dev, struct device_attribute *attr,
         if (kstrtou32(buf, 10, &error))
                 return -EINVAL;
 
-        ret = visorchannel_write(controlvm_channel,
-                offsetof(struct spar_controlvm_channel_protocol,
-                         installation_error),
-                &error, sizeof(u32));
+        ret = visorchannel_write
+                (controlvm_channel,
+                 offsetof(struct spar_controlvm_channel_protocol,
+                          installation_error),
+                 &error, sizeof(u32));
         if (ret)
                 return ret;
         return count;
@@ -610,10 +613,11 @@ static ssize_t textid_show(struct device *dev, struct device_attribute *attr,
 {
         u32 text_id;
 
-        visorchannel_read(controlvm_channel,
-                          offsetof(struct spar_controlvm_channel_protocol,
-                                   installation_text_id),
-                          &text_id, sizeof(u32));
+        visorchannel_read
+                (controlvm_channel,
+                 offsetof(struct spar_controlvm_channel_protocol,
+                          installation_text_id),
+                 &text_id, sizeof(u32));
         return scnprintf(buf, PAGE_SIZE, "%i\n", text_id);
 }
 
@@ -626,10 +630,11 @@ static ssize_t textid_store(struct device *dev, struct device_attribute *attr,
         if (kstrtou32(buf, 10, &text_id))
                 return -EINVAL;
 
-        ret = visorchannel_write(controlvm_channel,
-                offsetof(struct spar_controlvm_channel_protocol,
-                         installation_text_id),
-                &text_id, sizeof(u32));
+        ret = visorchannel_write
+                (controlvm_channel,
+                 offsetof(struct spar_controlvm_channel_protocol,
+                          installation_text_id),
+                 &text_id, sizeof(u32));
         if (ret)
                 return ret;
         return count;
@@ -657,10 +662,11 @@ static ssize_t remaining_steps_store(struct device *dev,
         if (kstrtou16(buf, 10, &remaining_steps))
                 return -EINVAL;
 
-        ret = visorchannel_write(controlvm_channel,
-                offsetof(struct spar_controlvm_channel_protocol,
-                         installation_remaining_steps),
-                &remaining_steps, sizeof(u16));
+        ret = visorchannel_write
+                (controlvm_channel,
+                 offsetof(struct spar_controlvm_channel_protocol,
+                          installation_remaining_steps),
+                 &remaining_steps, sizeof(u16));
         if (ret)
                 return ret;
         return count;
@@ -959,7 +965,6 @@ bus_epilog(struct visor_device *bus_info,
            u32 cmd, struct controlvm_message_header *msg_hdr,
            int response, bool need_response)
 {
-        bool notified = false;
         struct controlvm_message_header *pmsg_hdr = NULL;
 
         down(&notifier_lock);
@@ -997,32 +1002,20 @@ bus_epilog(struct visor_device *bus_info,
                 case CONTROLVM_BUS_CREATE:
                         if (busdev_notifiers.bus_create) {
                                 (*busdev_notifiers.bus_create) (bus_info);
-                                notified = true;
+                                goto out_unlock;
                         }
                         break;
                 case CONTROLVM_BUS_DESTROY:
                         if (busdev_notifiers.bus_destroy) {
                                 (*busdev_notifiers.bus_destroy) (bus_info);
-                                notified = true;
+                                goto out_unlock;
                         }
                         break;
                 }
         }
 
 out_respond_and_unlock:
-        if (notified)
-                /* The callback function just called above is responsible
-                 * for calling the appropriate visorchipset_busdev_responders
-                 * function, which will call bus_responder()
-                 */
-                ;
-        else
-                /*
-                 * Do not kfree(pmsg_hdr) as this is the failure path.
-                 * The success path ('notified') will call the responder
-                 * directly and kfree() there.
-                 */
-                bus_responder(cmd, pmsg_hdr, response);
+        bus_responder(cmd, pmsg_hdr, response);
 
 out_unlock:
         up(&notifier_lock);
@@ -1035,30 +1028,30 @@ device_epilog(struct visor_device *dev_info,
               bool need_response, bool for_visorbus)
 {
         struct visorchipset_busdev_notifiers *notifiers;
-        bool notified = false;
         struct controlvm_message_header *pmsg_hdr = NULL;
 
         notifiers = &busdev_notifiers;
 
+        down(&notifier_lock);
         if (!dev_info) {
                 /* relying on a valid passed in response code */
                 /* be lazy and re-use msg_hdr for this failure, is this ok?? */
                 pmsg_hdr = msg_hdr;
-                goto away;
+                goto out_respond_and_unlock;
         }
 
         if (dev_info->pending_msg_hdr) {
                 /* only non-NULL if dev is still waiting on a response */
                 response = -CONTROLVM_RESP_ERROR_MESSAGE_ID_INVALID_FOR_CLIENT;
                 pmsg_hdr = dev_info->pending_msg_hdr;
-                goto away;
+                goto out_respond_and_unlock;
         }
 
         if (need_response) {
                 pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL);
                 if (!pmsg_hdr) {
                         response = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
-                        goto away;
+                        goto out_respond_and_unlock;
                 }
 
                 memcpy(pmsg_hdr, msg_hdr,
@@ -1066,13 +1059,12 @@ device_epilog(struct visor_device *dev_info,
                 dev_info->pending_msg_hdr = pmsg_hdr;
         }
 
-        down(&notifier_lock);
         if (response >= 0) {
                 switch (cmd) {
                 case CONTROLVM_DEVICE_CREATE:
                         if (notifiers->device_create) {
                                 (*notifiers->device_create) (dev_info);
-                                notified = true;
+                                goto out_unlock;
                         }
                         break;
                 case CONTROLVM_DEVICE_CHANGESTATE:
@@ -1082,7 +1074,7 @@ device_epilog(struct visor_device *dev_info,
                                 segment_state_running.operating) {
                                 if (notifiers->device_resume) {
                                         (*notifiers->device_resume) (dev_info);
-                                        notified = true;
+                                        goto out_unlock;
                                 }
                         }
                         /* ServerNotReady / ServerLost / SegmentStateStandby */
@@ -1094,32 +1086,23 @@ device_epilog(struct visor_device *dev_info,
                                  */
                                 if (notifiers->device_pause) {
                                         (*notifiers->device_pause) (dev_info);
-                                        notified = true;
+                                        goto out_unlock;
                                 }
                         }
                         break;
                 case CONTROLVM_DEVICE_DESTROY:
                         if (notifiers->device_destroy) {
                                 (*notifiers->device_destroy) (dev_info);
-                                notified = true;
+                                goto out_unlock;
                         }
                         break;
                 }
         }
-away:
-        if (notified)
-                /* The callback function just called above is responsible
-                 * for calling the appropriate visorchipset_busdev_responders
-                 * function, which will call device_responder()
-                 */
-                ;
-        else
-                /*
-                 * Do not kfree(pmsg_hdr) as this is the failure path.
-                 * The success path ('notified') will call the responder
-                 * directly and kfree() there.
-                 */
-                device_responder(cmd, pmsg_hdr, response);
+
+out_respond_and_unlock:
+        device_responder(cmd, pmsg_hdr, response);
+
+out_unlock:
         up(&notifier_lock);
 }
 
@@ -1226,8 +1209,9 @@ bus_configure(struct controlvm_message *inmsg,
                                  POSTCODE_SEVERITY_ERR);
                 rc = -CONTROLVM_RESP_ERROR_MESSAGE_ID_INVALID_FOR_CLIENT;
         } else {
-                visorchannel_set_clientpartition(bus_info->visorchannel,
-                                cmd->configure_bus.guest_handle);
+                visorchannel_set_clientpartition
+                        (bus_info->visorchannel,
+                         cmd->configure_bus.guest_handle);
                 bus_info->partition_uuid = parser_id_get(parser_ctx);
                 parser_param_start(parser_ctx, PARSERSTRING_NAME);
                 bus_info->name = parser_string_get(parser_ctx);
@@ -1709,9 +1693,10 @@ parahotplug_process_message(struct controlvm_message *inmsg)
                 * initialization.
                 */
                 parahotplug_request_kickoff(req);
-                controlvm_respond_physdev_changestate(&inmsg->hdr,
-                        CONTROLVM_RESP_SUCCESS,
-                        inmsg->cmd.device_change_state.state);
+                controlvm_respond_physdev_changestate
+                        (&inmsg->hdr,
+                         CONTROLVM_RESP_SUCCESS,
+                         inmsg->cmd.device_change_state.state);
                 parahotplug_request_destroy(req);
         } else {
                 /* For disable messages, add the request to the
@@ -1823,8 +1808,9 @@ handle_command(struct controlvm_message inmsg, u64 channel_addr)
                 break;
         default:
                 if (inmsg.hdr.flags.response_expected)
-                        controlvm_respond(&inmsg.hdr,
-                                -CONTROLVM_RESP_ERROR_MESSAGE_ID_UNKNOWN);
+                        controlvm_respond
+                                (&inmsg.hdr,
+                                 -CONTROLVM_RESP_ERROR_MESSAGE_ID_UNKNOWN);
                 break;
         }
 
@@ -2177,10 +2163,11 @@ visorchipset_mmap(struct file *file, struct vm_area_struct *vma)
                 if (!*file_controlvm_channel)
                         return -ENXIO;
 
-                visorchannel_read(*file_controlvm_channel,
-                        offsetof(struct spar_controlvm_channel_protocol,
-                                 gp_control_channel),
-                        &addr, sizeof(addr));
+                visorchannel_read
+                        (*file_controlvm_channel,
+                         offsetof(struct spar_controlvm_channel_protocol,
+                                  gp_control_channel),
+                         &addr, sizeof(addr));
                 if (!addr)
                         return -ENXIO;
 
@@ -2280,16 +2267,25 @@ visorchipset_file_init(dev_t major_dev, struct visorchannel **controlvm_channel)
         return 0;
 }
 
+static void
+visorchipset_file_cleanup(dev_t major_dev)
+{
+        if (file_cdev.ops)
+                cdev_del(&file_cdev);
+        file_cdev.ops = NULL;
+        unregister_chrdev_region(major_dev, 1);
+}
+
 static int
 visorchipset_init(struct acpi_device *acpi_device)
 {
-        int rc = 0;
+        int err = -ENODEV;
         u64 addr;
         uuid_le uuid = SPAR_CONTROLVM_CHANNEL_PROTOCOL_UUID;
 
         addr = controlvm_get_channel_address();
         if (!addr)
-                return -ENODEV;
+                goto error;
 
         memset(&busdev_notifiers, 0, sizeof(busdev_notifiers));
         memset(&controlvm_payload_info, 0, sizeof(controlvm_payload_info));
@@ -2297,22 +2293,19 @@ visorchipset_init(struct acpi_device *acpi_device)
         controlvm_channel = visorchannel_create_with_lock(addr, 0,
                                                           GFP_KERNEL, uuid);
         if (!controlvm_channel)
-                return -ENODEV;
+                goto error;
+
         if (SPAR_CONTROLVM_CHANNEL_OK_CLIENT(
                     visorchannel_get_header(controlvm_channel))) {
                 initialize_controlvm_payload();
         } else {
-                visorchannel_destroy(controlvm_channel);
-                controlvm_channel = NULL;
-                return -ENODEV;
+                goto error_destroy_channel;
         }
 
         major_dev = MKDEV(visorchipset_major, 0);
-        rc = visorchipset_file_init(major_dev, &controlvm_channel);
-        if (rc < 0) {
-                POSTCODE_LINUX_2(CHIPSET_INIT_FAILURE_PC, DIAG_SEVERITY_ERR);
-                goto cleanup;
-        }
+        err = visorchipset_file_init(major_dev, &controlvm_channel);
+        if (err < 0)
+                goto error_destroy_payload;
 
         memset(&g_chipset_msg_hdr, 0, sizeof(struct controlvm_message_header));
 
@@ -2331,27 +2324,33 @@ visorchipset_init(struct acpi_device *acpi_device)
         visorchipset_platform_device.dev.devt = major_dev;
         if (platform_device_register(&visorchipset_platform_device) < 0) {
                 POSTCODE_LINUX_2(DEVICE_REGISTER_FAILURE_PC, DIAG_SEVERITY_ERR);
-                rc = -ENODEV;
-                goto cleanup;
+                err = -ENODEV;
+                goto error_cancel_work;
         }
         POSTCODE_LINUX_2(CHIPSET_INIT_SUCCESS_PC, POSTCODE_SEVERITY_INFO);
 
-        rc = visorbus_init();
-cleanup:
-        if (rc) {
-                POSTCODE_LINUX_3(CHIPSET_INIT_FAILURE_PC, rc,
-                                 POSTCODE_SEVERITY_ERR);
-        }
-        return rc;
-}
+        err = visorbus_init();
+        if (err < 0)
+                goto error_unregister;
 
-static void
-visorchipset_file_cleanup(dev_t major_dev)
-{
-        if (file_cdev.ops)
-                cdev_del(&file_cdev);
-        file_cdev.ops = NULL;
-        unregister_chrdev_region(major_dev, 1);
+        return 0;
+
+error_unregister:
+        platform_device_unregister(&visorchipset_platform_device);
+
+error_cancel_work:
+        cancel_delayed_work_sync(&periodic_controlvm_work);
+        visorchipset_file_cleanup(major_dev);
+
+error_destroy_payload:
+        destroy_controlvm_payload_info(&controlvm_payload_info);
+
+error_destroy_channel:
+        visorchannel_destroy(controlvm_channel);
+
+error:
+        POSTCODE_LINUX_3(CHIPSET_INIT_FAILURE_PC, err, POSTCODE_SEVERITY_ERR);
+        return err;
 }
 
 static int
diff --git a/drivers/staging/unisys/visorinput/visorinput.c b/drivers/staging/unisys/visorinput/visorinput.c
index 3299cf502aa0..dc94261b31f9 100644
--- a/drivers/staging/unisys/visorinput/visorinput.c
+++ b/drivers/staging/unisys/visorinput/visorinput.c
@@ -123,9 +123,9 @@ static const unsigned char visorkbd_keycode[KEYCODE_TABLE_BYTES] = {
         [38] = KEY_L,
         [39] = KEY_SEMICOLON,
         [40] = KEY_APOSTROPHE,
-        [41] = KEY_GRAVE,       /* FIXME, '#' */
+        [41] = KEY_GRAVE,
         [42] = KEY_LEFTSHIFT,
-        [43] = KEY_BACKSLASH,   /* FIXME, '~' */
+        [43] = KEY_BACKSLASH,
         [44] = KEY_Z,
         [45] = KEY_X,
         [46] = KEY_C,
@@ -173,7 +173,7 @@ static const unsigned char visorkbd_keycode[KEYCODE_TABLE_BYTES] = {
         [88] = KEY_F12,
         [90] = KEY_KPLEFTPAREN,
         [91] = KEY_KPRIGHTPAREN,
-        [92] = KEY_KPASTERISK,  /* FIXME */
+        [92] = KEY_KPASTERISK,
         [93] = KEY_KPASTERISK,
         [94] = KEY_KPPLUS,
         [95] = KEY_HELP,
diff --git a/drivers/staging/unisys/visornic/visornic_main.c b/drivers/staging/unisys/visornic/visornic_main.c
index be0d057346c3..0ec952ac0dac 100644
--- a/drivers/staging/unisys/visornic/visornic_main.c
+++ b/drivers/staging/unisys/visornic/visornic_main.c
@@ -356,28 +356,38 @@ visornic_serverdown(struct visornic_devdata *devdata,
                     visorbus_state_complete_func complete_func)
 {
         unsigned long flags;
+        int err;
 
         spin_lock_irqsave(&devdata->priv_lock, flags);
-        if (!devdata->server_down && !devdata->server_change_state) {
-                if (devdata->going_away) {
-                        spin_unlock_irqrestore(&devdata->priv_lock, flags);
-                        dev_dbg(&devdata->dev->device,
-                                "%s aborting because device removal pending\n",
-                                __func__);
-                        return -ENODEV;
-                }
-                devdata->server_change_state = true;
-                devdata->server_down_complete_func = complete_func;
-                spin_unlock_irqrestore(&devdata->priv_lock, flags);
-                visornic_serverdown_complete(devdata);
-        } else if (devdata->server_change_state) {
+        if (devdata->server_change_state) {
                 dev_dbg(&devdata->dev->device, "%s changing state\n",
                         __func__);
-                spin_unlock_irqrestore(&devdata->priv_lock, flags);
-                return -EINVAL;
+                err = -EINVAL;
+                goto err_unlock;
+        }
+        if (devdata->server_down) {
+                dev_dbg(&devdata->dev->device, "%s already down\n",
+                        __func__);
+                err = -EINVAL;
+                goto err_unlock;
         }
+        if (devdata->going_away) {
+                dev_dbg(&devdata->dev->device,
+                        "%s aborting because device removal pending\n",
+                        __func__);
+                err = -ENODEV;
+                goto err_unlock;
+        }
+        devdata->server_change_state = true;
+        devdata->server_down_complete_func = complete_func;
         spin_unlock_irqrestore(&devdata->priv_lock, flags);
+
+        visornic_serverdown_complete(devdata);
         return 0;
+
+err_unlock:
+        spin_unlock_irqrestore(&devdata->priv_lock, flags);
+        return err;
 }
 
 /**
@@ -436,8 +446,8 @@ post_skb(struct uiscmdrsp *cmdrsp,
                 cmdrsp->net.type = NET_RCV_POST;
                 cmdrsp->cmdtype = CMD_NET_TYPE;
                 if (visorchannel_signalinsert(devdata->dev->visorchannel,
-                                          IOCHAN_TO_IOPART,
-                                          cmdrsp)) {
+                                              IOCHAN_TO_IOPART,
+                                              cmdrsp)) {
                         atomic_inc(&devdata->num_rcvbuf_in_iovm);
                         devdata->chstat.sent_post++;
                 } else {
@@ -465,8 +475,8 @@ send_enbdis(struct net_device *netdev, int state,
         devdata->cmdrsp_rcv->net.type = NET_RCV_ENBDIS;
         devdata->cmdrsp_rcv->cmdtype = CMD_NET_TYPE;
         if (visorchannel_signalinsert(devdata->dev->visorchannel,
-                                  IOCHAN_TO_IOPART,
-                                  devdata->cmdrsp_rcv))
+                                      IOCHAN_TO_IOPART,
+                                      devdata->cmdrsp_rcv))
                 devdata->chstat.sent_enbdis++;
 }
 
@@ -1647,8 +1657,9 @@ service_resp_queue(struct uiscmdrsp *cmdrsp, struct visornic_devdata *devdata,
                                  * the lower watermark for
                                  * netif_wake_queue()
                                  */
-                                if (vnic_hit_low_watermark(devdata,
-                                        devdata->lower_threshold_net_xmits)) {
+                                if (vnic_hit_low_watermark
+                                    (devdata,
+                                     devdata->lower_threshold_net_xmits)) {
                                         /* enough NET_XMITs completed
                                          * so can restart netif queue
                                          */
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index a24443ba59ea..97e5b69e0668 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -779,14 +779,6 @@ static int lio_target_init_nodeacl(struct se_node_acl *se_nacl,
         return 0;
 }
 
-static void lio_target_cleanup_nodeacl( struct se_node_acl *se_nacl)
-{
-        struct iscsi_node_acl *acl = container_of(se_nacl,
-                        struct iscsi_node_acl, se_node_acl);
-
-        configfs_remove_default_groups(&acl->se_node_acl.acl_fabric_stat_group);
-}
-
 /* End items for lio_target_acl_cit */
 
 /* Start items for lio_target_tpg_attrib_cit */
@@ -1247,6 +1239,16 @@ static struct se_wwn *lio_target_call_coreaddtiqn(
         if (IS_ERR(tiqn))
                 return ERR_CAST(tiqn);
 
+        pr_debug("LIO_Target_ConfigFS: REGISTER -> %s\n", tiqn->tiqn);
+        pr_debug("LIO_Target_ConfigFS: REGISTER -> Allocated Node:"
+                        " %s\n", name);
+        return &tiqn->tiqn_wwn;
+}
+
+static void lio_target_add_wwn_groups(struct se_wwn *wwn)
+{
+        struct iscsi_tiqn *tiqn = container_of(wwn, struct iscsi_tiqn, tiqn_wwn);
+
         config_group_init_type_name(&tiqn->tiqn_stat_grps.iscsi_instance_group,
                         "iscsi_instance", &iscsi_stat_instance_cit);
         configfs_add_default_group(&tiqn->tiqn_stat_grps.iscsi_instance_group,
@@ -1271,12 +1273,6 @@ static struct se_wwn *lio_target_call_coreaddtiqn(
                         "iscsi_logout_stats", &iscsi_stat_logout_cit);
         configfs_add_default_group(&tiqn->tiqn_stat_grps.iscsi_logout_stats_group,
                         &tiqn->tiqn_wwn.fabric_stat_group);
-
-
-        pr_debug("LIO_Target_ConfigFS: REGISTER -> %s\n", tiqn->tiqn);
-        pr_debug("LIO_Target_ConfigFS: REGISTER -> Allocated Node:"
-                        " %s\n", name);
-        return &tiqn->tiqn_wwn;
 }
 
 static void lio_target_call_coredeltiqn(
@@ -1284,8 +1280,6 @@ static void lio_target_call_coredeltiqn(
 {
         struct iscsi_tiqn *tiqn = container_of(wwn, struct iscsi_tiqn, tiqn_wwn);
 
-        configfs_remove_default_groups(&tiqn->tiqn_wwn.fabric_stat_group);
-
         pr_debug("LIO_Target_ConfigFS: DEREGISTER -> %s\n",
                         tiqn->tiqn);
         iscsit_del_tiqn(tiqn);
@@ -1660,12 +1654,12 @@ const struct target_core_fabric_ops iscsi_ops = {
         .aborted_task                   = lio_aborted_task,
         .fabric_make_wwn                = lio_target_call_coreaddtiqn,
         .fabric_drop_wwn                = lio_target_call_coredeltiqn,
+        .add_wwn_groups                 = lio_target_add_wwn_groups,
         .fabric_make_tpg                = lio_target_tiqn_addtpg,
         .fabric_drop_tpg                = lio_target_tiqn_deltpg,
         .fabric_make_np                 = lio_target_call_addnptotpg,
         .fabric_drop_np                 = lio_target_call_delnpfromtpg,
         .fabric_init_nodeacl            = lio_target_init_nodeacl,
-        .fabric_cleanup_nodeacl         = lio_target_cleanup_nodeacl,
 
         .tfc_discovery_attrs            = lio_target_discovery_auth_attrs,
         .tfc_wwn_attrs                  = lio_target_wwn_attrs,
diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
index 1bd5c72b663e..31a096aa16ab 100644
--- a/drivers/target/target_core_fabric_configfs.c
+++ b/drivers/target/target_core_fabric_configfs.c
@@ -338,10 +338,8 @@ static void target_fabric_nacl_base_release(struct config_item *item)
 {
         struct se_node_acl *se_nacl = container_of(to_config_group(item),
                         struct se_node_acl, acl_group);
-        struct target_fabric_configfs *tf = se_nacl->se_tpg->se_tpg_wwn->wwn_tf;
 
-        if (tf->tf_ops->fabric_cleanup_nodeacl)
-                tf->tf_ops->fabric_cleanup_nodeacl(se_nacl);
+        configfs_remove_default_groups(&se_nacl->acl_fabric_stat_group);
         core_tpg_del_initiator_node_acl(se_nacl);
 }
 
@@ -383,14 +381,6 @@ static struct config_group *target_fabric_make_nodeacl(
         if (IS_ERR(se_nacl))
                 return ERR_CAST(se_nacl);
 
-        if (tf->tf_ops->fabric_init_nodeacl) {
-                int ret = tf->tf_ops->fabric_init_nodeacl(se_nacl, name);
-                if (ret) {
-                        core_tpg_del_initiator_node_acl(se_nacl);
-                        return ERR_PTR(ret);
-                }
-        }
-
         config_group_init_type_name(&se_nacl->acl_group, name,
                         &tf->tf_tpg_nacl_base_cit);
 
@@ -414,6 +404,15 @@ static struct config_group *target_fabric_make_nodeacl(
         configfs_add_default_group(&se_nacl->acl_fabric_stat_group,
                         &se_nacl->acl_group);
 
+        if (tf->tf_ops->fabric_init_nodeacl) {
+                int ret = tf->tf_ops->fabric_init_nodeacl(se_nacl, name);
+                if (ret) {
+                        configfs_remove_default_groups(&se_nacl->acl_fabric_stat_group);
+                        core_tpg_del_initiator_node_acl(se_nacl);
+                        return ERR_PTR(ret);
+                }
+        }
+
         return &se_nacl->acl_group;
 }
 
@@ -892,6 +891,7 @@ static void target_fabric_release_wwn(struct config_item *item)
                                 struct se_wwn, wwn_group);
         struct target_fabric_configfs *tf = wwn->wwn_tf;
 
+        configfs_remove_default_groups(&wwn->fabric_stat_group);
         tf->tf_ops->fabric_drop_wwn(wwn);
 }
 
@@ -945,6 +945,8 @@ static struct config_group *target_fabric_make_wwn(
                         &tf->tf_wwn_fabric_stats_cit);
         configfs_add_default_group(&wwn->fabric_stat_group, &wwn->wwn_group);
 
+        if (tf->tf_ops->add_wwn_groups)
+                tf->tf_ops->add_wwn_groups(wwn);
         return &wwn->wwn_group;
 }
 
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 8d26ed79bb4c..9b04d72e752e 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -2049,14 +2049,13 @@ static struct tty_struct *tty_open_by_driver(dev_t device, struct inode *inode,
         if (tty) {
                 mutex_unlock(&tty_mutex);
                 retval = tty_lock_interruptible(tty);
+                tty_kref_put(tty);  /* drop kref from tty_driver_lookup_tty() */
                 if (retval) {
                         if (retval == -EINTR)
                                 retval = -ERESTARTSYS;
                         tty = ERR_PTR(retval);
                         goto out;
                 }
-                /* safe to drop the kref from tty_driver_lookup_tty() */
-                tty_kref_put(tty);
                 retval = tty_reopen(tty);
                 if (retval < 0) {
                         tty_unlock(tty);
@@ -2158,7 +2157,7 @@ retry_open:
         read_lock(&tasklist_lock);
         spin_lock_irq(&current->sighand->siglock);
         noctty = (filp->f_flags & O_NOCTTY) ||
-                        device == MKDEV(TTY_MAJOR, 0) ||
+                        (IS_ENABLED(CONFIG_VT) && device == MKDEV(TTY_MAJOR, 0)) ||
                         device == MKDEV(TTYAUX_MAJOR, 1) ||
                         (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
                          tty->driver->subtype == PTY_TYPE_MASTER);
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index 5eb1a87228b4..31ccdccd7a04 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -75,8 +75,6 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno,
          * be the first thing immediately following the endpoint descriptor.
          */
         desc = (struct usb_ss_ep_comp_descriptor *) buffer;
-        buffer += desc->bLength;
-        size -= desc->bLength;
 
         if (desc->bDescriptorType != USB_DT_SS_ENDPOINT_COMP ||
                         size < USB_DT_SS_EP_COMP_SIZE) {
@@ -100,7 +98,8 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno,
                                         ep->desc.wMaxPacketSize;
                 return;
         }
-
+        buffer += desc->bLength;
+        size -= desc->bLength;
         memcpy(&ep->ss_ep_comp, desc, USB_DT_SS_EP_COMP_SIZE);
 
         /* Check the various values */
@@ -146,12 +145,6 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno,
                 ep->ss_ep_comp.bmAttributes = 2;
         }
 
-        /* Parse a possible SuperSpeedPlus isoc ep companion descriptor */
-        if (usb_endpoint_xfer_isoc(&ep->desc) &&
-            USB_SS_SSP_ISOC_COMP(desc->bmAttributes))
-                usb_parse_ssp_isoc_endpoint_companion(ddev, cfgno, inum, asnum,
-                                                        ep, buffer, size);
-
         if (usb_endpoint_xfer_isoc(&ep->desc))
                 max_tx = (desc->bMaxBurst + 1) *
                         (USB_SS_MULT(desc->bmAttributes)) *
@@ -171,6 +164,11 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno,
                                 max_tx);
                 ep->ss_ep_comp.wBytesPerInterval = cpu_to_le16(max_tx);
         }
+        /* Parse a possible SuperSpeedPlus isoc ep companion descriptor */
+        if (usb_endpoint_xfer_isoc(&ep->desc) &&
+            USB_SS_SSP_ISOC_COMP(desc->bmAttributes))
+                usb_parse_ssp_isoc_endpoint_companion(ddev, cfgno, inum, asnum,
+                                                        ep, buffer, size);
 }
 
 static int usb_parse_endpoint(struct device *ddev, int cfgno, int inum,
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index e9940dd004e4..818f158232bb 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -2254,6 +2254,7 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
 {
         u32 intmsk;
         u32 val;
+        u32 usbcfg;
 
         /* Kill any ep0 requests as controller will be reinitialized */
         kill_all_requests(hsotg, hsotg->eps_out[0], -ECONNRESET);
@@ -2267,10 +2268,16 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
          * set configuration.
          */
 
+        /* keep other bits untouched (so e.g. forced modes are not lost) */
+        usbcfg = dwc2_readl(hsotg->regs + GUSBCFG);
+        usbcfg &= ~(GUSBCFG_TOUTCAL_MASK | GUSBCFG_PHYIF16 | GUSBCFG_SRPCAP |
+                GUSBCFG_HNPCAP);
+
         /* set the PLL on, remove the HNP/SRP and set the PHY */
         val = (hsotg->phyif == GUSBCFG_PHYIF8) ? 9 : 5;
-        dwc2_writel(hsotg->phyif | GUSBCFG_TOUTCAL(7) |
-               (val << GUSBCFG_USBTRDTIM_SHIFT), hsotg->regs + GUSBCFG);
+        usbcfg |= hsotg->phyif | GUSBCFG_TOUTCAL(7) |
+                (val << GUSBCFG_USBTRDTIM_SHIFT);
+        dwc2_writel(usbcfg, hsotg->regs + GUSBCFG);
 
         dwc2_hsotg_init_fifo(hsotg);
 
@@ -3031,6 +3038,7 @@ static struct usb_ep_ops dwc2_hsotg_ep_ops = {
 static void dwc2_hsotg_init(struct dwc2_hsotg *hsotg)
 {
         u32 trdtim;
+        u32 usbcfg;
         /* unmask subset of endpoint interrupts */
 
         dwc2_writel(DIEPMSK_TIMEOUTMSK | DIEPMSK_AHBERRMSK |
@@ -3054,11 +3062,16 @@ static void dwc2_hsotg_init(struct dwc2_hsotg *hsotg)
 
         dwc2_hsotg_init_fifo(hsotg);
 
+        /* keep other bits untouched (so e.g. forced modes are not lost) */
+        usbcfg = dwc2_readl(hsotg->regs + GUSBCFG);
+        usbcfg &= ~(GUSBCFG_TOUTCAL_MASK | GUSBCFG_PHYIF16 | GUSBCFG_SRPCAP |
+                GUSBCFG_HNPCAP);
+
         /* set the PLL on, remove the HNP/SRP and set the PHY */
         trdtim = (hsotg->phyif == GUSBCFG_PHYIF8) ? 9 : 5;
-        dwc2_writel(hsotg->phyif | GUSBCFG_TOUTCAL(7) |
-                (trdtim << GUSBCFG_USBTRDTIM_SHIFT),
-                hsotg->regs + GUSBCFG);
+        usbcfg |= hsotg->phyif | GUSBCFG_TOUTCAL(7) |
+                (trdtim << GUSBCFG_USBTRDTIM_SHIFT);
+        dwc2_writel(usbcfg, hsotg->regs + GUSBCFG);
 
         if (using_dma(hsotg))
                 __orr32(hsotg->regs + GAHBCFG, GAHBCFG_DMA_EN);
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 17fd81447c9f..fa20f5a99d12 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -67,23 +67,9 @@ void dwc3_set_mode(struct dwc3 *dwc, u32 mode)
 static int dwc3_core_soft_reset(struct dwc3 *dwc)
 {
         u32             reg;
+        int             retries = 1000;
         int             ret;
 
-        /* Before Resetting PHY, put Core in Reset */
-        reg = dwc3_readl(dwc->regs, DWC3_GCTL);
-        reg |= DWC3_GCTL_CORESOFTRESET;
-        dwc3_writel(dwc->regs, DWC3_GCTL, reg);
-
-        /* Assert USB3 PHY reset */
-        reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0));
-        reg |= DWC3_GUSB3PIPECTL_PHYSOFTRST;
-        dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg);
-
-        /* Assert USB2 PHY reset */
-        reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0));
-        reg |= DWC3_GUSB2PHYCFG_PHYSOFTRST;
-        dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);
-
         usb_phy_init(dwc->usb2_phy);
         usb_phy_init(dwc->usb3_phy);
         ret = phy_init(dwc->usb2_generic_phy);
@@ -95,26 +81,28 @@ static int dwc3_core_soft_reset(struct dwc3 *dwc)
                 phy_exit(dwc->usb2_generic_phy);
                 return ret;
         }
-        mdelay(100);
 
-        /* Clear USB3 PHY reset */
-        reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0));
-        reg &= ~DWC3_GUSB3PIPECTL_PHYSOFTRST;
-        dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg);
+        /*
+         * We're resetting only the device side because, if we're in host mode,
+         * XHCI driver will reset the host block. If dwc3 was configured for
+         * host-only mode, then we can return early.
+         */
+        if (dwc->dr_mode == USB_DR_MODE_HOST)
+                return 0;
 
-        /* Clear USB2 PHY reset */
-        reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0));
-        reg &= ~DWC3_GUSB2PHYCFG_PHYSOFTRST;
-        dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);
+        reg = dwc3_readl(dwc->regs, DWC3_DCTL);
+        reg |= DWC3_DCTL_CSFTRST;
+        dwc3_writel(dwc->regs, DWC3_DCTL, reg);
 
-        mdelay(100);
+        do {
+                reg = dwc3_readl(dwc->regs, DWC3_DCTL);
+                if (!(reg & DWC3_DCTL_CSFTRST))
+                        return 0;
 
-        /* After PHYs are stable we can take Core out of reset state */
-        reg = dwc3_readl(dwc->regs, DWC3_GCTL);
-        reg &= ~DWC3_GCTL_CORESOFTRESET;
-        dwc3_writel(dwc->regs, DWC3_GCTL, reg);
+                udelay(1);
+        } while (--retries);
 
-        return 0;
+        return -ETIMEDOUT;
 }
 
 /**
diff --git a/drivers/usb/dwc3/dwc3-keystone.c b/drivers/usb/dwc3/dwc3-keystone.c
index 2be268d2423d..72664700b8a2 100644
--- a/drivers/usb/dwc3/dwc3-keystone.c
+++ b/drivers/usb/dwc3/dwc3-keystone.c
@@ -39,8 +39,6 @@
 #define USBSS_IRQ_COREIRQ_EN    BIT(0)
 #define USBSS_IRQ_COREIRQ_CLR   BIT(0)
 
-static u64 kdwc3_dma_mask;
-
 struct dwc3_keystone {
         struct device                   *dev;
         struct clk                      *clk;
@@ -108,9 +106,6 @@ static int kdwc3_probe(struct platform_device *pdev)
         if (IS_ERR(kdwc->usbss))
                 return PTR_ERR(kdwc->usbss);
 
-        kdwc3_dma_mask = dma_get_mask(dev);
-        dev->dma_mask = &kdwc3_dma_mask;
-
         kdwc->clk = devm_clk_get(kdwc->dev, "usb");
 
         error = clk_prepare_enable(kdwc->clk);
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 009d83048c8c..adc1e8a624cb 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -35,6 +35,7 @@
 #define PCI_DEVICE_ID_INTEL_SPTLP               0x9d30
 #define PCI_DEVICE_ID_INTEL_SPTH                0xa130
 #define PCI_DEVICE_ID_INTEL_BXT                 0x0aaa
+#define PCI_DEVICE_ID_INTEL_BXT_M               0x1aaa
 #define PCI_DEVICE_ID_INTEL_APL                 0x5aaa
 
 static const struct acpi_gpio_params reset_gpios = { 0, 0, false };
@@ -213,6 +214,7 @@ static const struct pci_device_id dwc3_pci_id_table[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SPTLP), },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SPTH), },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BXT), },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BXT_M), },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_APL), },
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_NL_USB), },
         {  }    /* Terminating Entry */
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 3ac170f9d94d..d54a028cdfeb 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -568,7 +568,7 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
                 dwc3_writel(dwc->regs, DWC3_DALEPENA, reg);
 
                 if (!usb_endpoint_xfer_isoc(desc))
-                        return 0;
+                        goto out;
 
                 /* Link TRB for ISOC. The HWO bit is never reset */
                 trb_st_hw = &dep->trb_pool[0];
@@ -582,9 +582,10 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
                 trb_link->ctrl |= DWC3_TRB_CTRL_HWO;
         }
 
+out:
         switch (usb_endpoint_type(desc)) {
         case USB_ENDPOINT_XFER_CONTROL:
-                strlcat(dep->name, "-control", sizeof(dep->name));
+                /* don't change name */
                 break;
         case USB_ENDPOINT_XFER_ISOC:
                 strlcat(dep->name, "-isoc", sizeof(dep->name));
@@ -2487,7 +2488,11 @@ static void dwc3_gadget_wakeup_interrupt(struct dwc3 *dwc)
          * implemented.
          */
 
-        dwc->gadget_driver->resume(&dwc->gadget);
+        if (dwc->gadget_driver && dwc->gadget_driver->resume) {
+                spin_unlock(&dwc->lock);
+                dwc->gadget_driver->resume(&dwc->gadget);
+                spin_lock(&dwc->lock);
+        }
 }
 
 static void dwc3_gadget_linksts_change_interrupt(struct dwc3 *dwc,
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index a5c62093c26c..de9ffd60fcfa 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -656,7 +656,8 @@ static int bos_desc(struct usb_composite_dev *cdev)
                 ssp_cap->bmAttributes = cpu_to_le32(1);
 
                 /* Min RX/TX Lane Count = 1 */
-                ssp_cap->wFunctionalitySupport = (1 << 8) | (1 << 12);
+                ssp_cap->wFunctionalitySupport =
+                        cpu_to_le16((1 << 8) | (1 << 12));
 
                 /*
                  * bmSublinkSpeedAttr[0]:
@@ -666,7 +667,7 @@ static int bos_desc(struct usb_composite_dev *cdev)
                  *   LSM = 10 (10 Gbps)
                  */
                 ssp_cap->bmSublinkSpeedAttr[0] =
-                        (3 << 4) | (1 << 14) | (0xa << 16);
+                        cpu_to_le32((3 << 4) | (1 << 14) | (0xa << 16));
                 /*
                  * bmSublinkSpeedAttr[1] =
                  *   ST  = Symmetric, TX
@@ -675,7 +676,8 @@ static int bos_desc(struct usb_composite_dev *cdev)
                  *   LSM = 10 (10 Gbps)
                  */
                 ssp_cap->bmSublinkSpeedAttr[1] =
-                        (3 << 4) | (1 << 14) | (0xa << 16) | (1 << 7);
+                        cpu_to_le32((3 << 4) | (1 << 14) |
+                                    (0xa << 16) | (1 << 7));
         }
 
         return le16_to_cpu(bos->wTotalLength);
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/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c
index 84c0ee5ebd1e..58fc199a18ec 100644
--- a/drivers/usb/gadget/function/f_midi.c
+++ b/drivers/usb/gadget/function/f_midi.c
@@ -24,6 +24,7 @@
 #include <linux/slab.h>
 #include <linux/device.h>
 #include <linux/kfifo.h>
+#include <linux/spinlock.h>
 
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -89,6 +90,7 @@ struct f_midi {
         unsigned int buflen, qlen;
         /* This fifo is used as a buffer ring for pre-allocated IN usb_requests */
         DECLARE_KFIFO_PTR(in_req_fifo, struct usb_request *);
+        spinlock_t transmit_lock;
         unsigned int in_last_port;
 
         struct gmidi_in_port    in_ports_array[/* in_ports */];
@@ -358,7 +360,9 @@ static int f_midi_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
         /* allocate a bunch of read buffers and queue them all at once. */
         for (i = 0; i < midi->qlen && err == 0; i++) {
                 struct usb_request *req =
-                        midi_alloc_ep_req(midi->out_ep, midi->buflen);
+                        midi_alloc_ep_req(midi->out_ep,
+                                max_t(unsigned, midi->buflen,
+                                        bulk_out_desc.wMaxPacketSize));
                 if (req == NULL)
                         return -ENOMEM;
 
@@ -597,17 +601,24 @@ static void f_midi_transmit(struct f_midi *midi)
 {
         struct usb_ep *ep = midi->in_ep;
         int ret;
+        unsigned long flags;
 
         /* We only care about USB requests if IN endpoint is enabled */
         if (!ep || !ep->enabled)
                 goto drop_out;
 
+        spin_lock_irqsave(&midi->transmit_lock, flags);
+
         do {
                 ret = f_midi_do_transmit(midi, ep);
-                if (ret < 0)
+                if (ret < 0) {
+                        spin_unlock_irqrestore(&midi->transmit_lock, flags);
                         goto drop_out;
+                }
         } while (ret);
 
+        spin_unlock_irqrestore(&midi->transmit_lock, flags);
+
         return;
 
 drop_out:
@@ -1201,6 +1212,8 @@ static struct usb_function *f_midi_alloc(struct usb_function_instance *fi)
         if (status)
                 goto setup_fail;
 
+        spin_lock_init(&midi->transmit_lock);
+
         ++opts->refcnt;
         mutex_unlock(&opts->lock);
 
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/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 81d42cce885a..18569de06b04 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -1045,20 +1045,6 @@ static void reset_all_endpoints(struct usba_udc *udc)
                 list_del_init(&req->queue);
                 request_complete(ep, req, -ECONNRESET);
         }
-
-        /* NOTE:  normally, the next call to the gadget driver is in
-         * charge of disabling endpoints... usually disconnect().
-         * The exception would be entering a high speed test mode.
-         *
-         * FIXME remove this code ... and retest thoroughly.
-         */
-        list_for_each_entry(ep, &udc->gadget.ep_list, ep.ep_list) {
-                if (ep->ep.desc) {
-                        spin_unlock(&udc->lock);
-                        usba_ep_disable(&ep->ep);
-                        spin_lock(&udc->lock);
-                }
-        }
 }
 
 static struct usba_ep *get_ep_by_addr(struct usba_udc *udc, u16 wIndex)
diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c
index 4151597e9d28..e4e70e11d0f6 100644
--- a/drivers/usb/gadget/udc/udc-core.c
+++ b/drivers/usb/gadget/udc/udc-core.c
@@ -371,12 +371,6 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget,
         INIT_WORK(&gadget->work, usb_gadget_state_work);
         gadget->dev.parent = parent;
 
-#ifdef  CONFIG_HAS_DMA
-        dma_set_coherent_mask(&gadget->dev, parent->coherent_dma_mask);
-        gadget->dev.dma_parms = parent->dma_parms;
-        gadget->dev.dma_mask = parent->dma_mask;
-#endif
-
         if (release)
                 gadget->dev.release = release;
         else
diff --git a/drivers/usb/phy/phy-qcom-8x16-usb.c b/drivers/usb/phy/phy-qcom-8x16-usb.c
index 579587d97217..3d7af85aecb9 100644
--- a/drivers/usb/phy/phy-qcom-8x16-usb.c
+++ b/drivers/usb/phy/phy-qcom-8x16-usb.c
@@ -65,9 +65,7 @@ struct phy_8x16 {
         void __iomem                    *regs;
         struct clk                      *core_clk;
         struct clk                      *iface_clk;
-        struct regulator                *v3p3;
-        struct regulator                *v1p8;
-        struct regulator                *vdd;
+        struct regulator_bulk_data      regulator[3];
 
         struct reset_control            *phy_reset;
 
@@ -78,51 +76,6 @@ struct phy_8x16 {
         struct notifier_block           reboot_notify;
 };
 
-static int phy_8x16_regulators_enable(struct phy_8x16 *qphy)
-{
-        int ret;
-
-        ret = regulator_set_voltage(qphy->vdd, HSPHY_VDD_MIN, HSPHY_VDD_MAX);
-        if (ret)
-                return ret;
-
-        ret = regulator_enable(qphy->vdd);
-        if (ret)
-                return ret;
-
-        ret = regulator_set_voltage(qphy->v3p3, HSPHY_3P3_MIN, HSPHY_3P3_MAX);
-        if (ret)
-                goto off_vdd;
-
-        ret = regulator_enable(qphy->v3p3);
-        if (ret)
-                goto off_vdd;
-
-        ret = regulator_set_voltage(qphy->v1p8, HSPHY_1P8_MIN, HSPHY_1P8_MAX);
-        if (ret)
-                goto off_3p3;
-
-        ret = regulator_enable(qphy->v1p8);
-        if (ret)
-                goto off_3p3;
-
-        return 0;
-
-off_3p3:
-        regulator_disable(qphy->v3p3);
-off_vdd:
-        regulator_disable(qphy->vdd);
-
-        return ret;
-}
-
-static void phy_8x16_regulators_disable(struct phy_8x16 *qphy)
-{
-        regulator_disable(qphy->v1p8);
-        regulator_disable(qphy->v3p3);
-        regulator_disable(qphy->vdd);
-}
-
 static int phy_8x16_notify_connect(struct usb_phy *phy,
                                    enum usb_device_speed speed)
 {
@@ -261,7 +214,6 @@ static void phy_8x16_shutdown(struct usb_phy *phy)
 
 static int phy_8x16_read_devicetree(struct phy_8x16 *qphy)
 {
-        struct regulator_bulk_data regs[3];
         struct device *dev = qphy->phy.dev;
         int ret;
 
@@ -273,18 +225,15 @@ static int phy_8x16_read_devicetree(struct phy_8x16 *qphy)
         if (IS_ERR(qphy->iface_clk))
                 return PTR_ERR(qphy->iface_clk);
 
-        regs[0].supply = "v3p3";
-        regs[1].supply = "v1p8";
-        regs[2].supply = "vddcx";
+        qphy->regulator[0].supply = "v3p3";
+        qphy->regulator[1].supply = "v1p8";
+        qphy->regulator[2].supply = "vddcx";
 
-        ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(regs), regs);
+        ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(qphy->regulator),
+                                      qphy->regulator);
         if (ret)
                 return ret;
 
-        qphy->v3p3 = regs[0].consumer;
-        qphy->v1p8 = regs[1].consumer;
-        qphy->vdd  = regs[2].consumer;
-
         qphy->phy_reset = devm_reset_control_get(dev, "phy");
         if (IS_ERR(qphy->phy_reset))
                 return PTR_ERR(qphy->phy_reset);
@@ -364,8 +313,9 @@ static int phy_8x16_probe(struct platform_device *pdev)
         if (ret < 0)
                 goto off_core;
 
-        ret = phy_8x16_regulators_enable(qphy);
-        if (0 && ret)
+        ret = regulator_bulk_enable(ARRAY_SIZE(qphy->regulator),
+                                    qphy->regulator);
+        if (WARN_ON(ret))
                 goto off_clks;
 
         qphy->vbus_notify.notifier_call = phy_8x16_vbus_notify;
@@ -387,7 +337,7 @@ off_extcon:
         extcon_unregister_notifier(qphy->vbus_edev, EXTCON_USB,
                                    &qphy->vbus_notify);
 off_power:
-        phy_8x16_regulators_disable(qphy);
+        regulator_bulk_disable(ARRAY_SIZE(qphy->regulator), qphy->regulator);
 off_clks:
         clk_disable_unprepare(qphy->iface_clk);
 off_core:
@@ -413,7 +363,7 @@ static int phy_8x16_remove(struct platform_device *pdev)
 
         clk_disable_unprepare(qphy->iface_clk);
         clk_disable_unprepare(qphy->core_clk);
-        phy_8x16_regulators_disable(qphy);
+        regulator_bulk_disable(ARRAY_SIZE(qphy->regulator), qphy->regulator);
         return 0;
 }
 
diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
index b4de70ee16d3..000f9750149f 100644
--- a/drivers/usb/renesas_usbhs/fifo.c
+++ b/drivers/usb/renesas_usbhs/fifo.c
@@ -190,7 +190,8 @@ static int usbhsf_pkt_handler(struct usbhs_pipe *pipe, int type)
                 goto __usbhs_pkt_handler_end;
         }
 
-        ret = func(pkt, &is_done);
+        if (likely(func))
+                ret = func(pkt, &is_done);
 
         if (is_done)
                 __usbhsf_pkt_del(pkt);
@@ -889,6 +890,7 @@ static int usbhsf_dma_prepare_push(struct usbhs_pkt *pkt, int *is_done)
 
         pkt->trans = len;
 
+        usbhsf_tx_irq_ctrl(pipe, 0);
         INIT_WORK(&pkt->work, xfer_work);
         schedule_work(&pkt->work);
 
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
index 664b263e4b20..53d104b56ef1 100644
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -158,10 +158,14 @@ static void usbhsg_queue_done(struct usbhs_priv *priv, struct usbhs_pkt *pkt)
         struct usbhs_pipe *pipe = pkt->pipe;
         struct usbhsg_uep *uep = usbhsg_pipe_to_uep(pipe);
         struct usbhsg_request *ureq = usbhsg_pkt_to_ureq(pkt);
+        unsigned long flags;
 
         ureq->req.actual = pkt->actual;
 
-        usbhsg_queue_pop(uep, ureq, 0);
+        usbhs_lock(priv, flags);
+        if (uep)
+                __usbhsg_queue_pop(uep, ureq, 0);
+        usbhs_unlock(priv, flags);
 }
 
 static void usbhsg_queue_push(struct usbhsg_uep *uep,
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index fbfe761c7fba..dd47823bb014 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -165,6 +165,7 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x18EF, 0xE025) }, /* ELV Marble Sound Board 1 */
         { USB_DEVICE(0x1901, 0x0190) }, /* GE B850 CP2105 Recorder interface */
         { USB_DEVICE(0x1901, 0x0193) }, /* GE B650 CP2104 PMC interface */
+        { USB_DEVICE(0x1901, 0x0194) }, /* GE Healthcare Remote Alarm Box */
         { USB_DEVICE(0x19CF, 0x3000) }, /* Parrot NMEA GPS Flight Recorder */
         { USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */
         { USB_DEVICE(0x1B1C, 0x1C00) }, /* Corsair USB Dongle */
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index b283eb8b86d6..bbeeb2bd55a8 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -447,6 +447,11 @@ static int cypress_generic_port_probe(struct usb_serial_port *port)
         struct usb_serial *serial = port->serial;
         struct cypress_private *priv;
 
+        if (!port->interrupt_out_urb || !port->interrupt_in_urb) {
+                dev_err(&port->dev, "required endpoint is missing\n");
+                return -ENODEV;
+        }
+
         priv = kzalloc(sizeof(struct cypress_private), GFP_KERNEL);
         if (!priv)
                 return -ENOMEM;
@@ -606,12 +611,6 @@ static int cypress_open(struct tty_struct *tty, struct usb_serial_port *port)
                 cypress_set_termios(tty, port, &priv->tmp_termios);
 
         /* setup the port and start reading from the device */
-        if (!port->interrupt_in_urb) {
-                dev_err(&port->dev, "%s - interrupt_in_urb is empty!\n",
-                        __func__);
-                return -1;
-        }
-
         usb_fill_int_urb(port->interrupt_in_urb, serial->dev,
                 usb_rcvintpipe(serial->dev, port->interrupt_in_endpointAddress),
                 port->interrupt_in_urb->transfer_buffer,
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index 010a42a92688..16e8e37b3b36 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -1251,8 +1251,27 @@ static int digi_port_init(struct usb_serial_port *port, unsigned port_num)
 
 static int digi_startup(struct usb_serial *serial)
 {
+        struct device *dev = &serial->interface->dev;
         struct digi_serial *serial_priv;
         int ret;
+        int i;
+
+        /* check whether the device has the expected number of endpoints */
+        if (serial->num_port_pointers < serial->type->num_ports + 1) {
+                dev_err(dev, "OOB endpoints missing\n");
+                return -ENODEV;
+        }
+
+        for (i = 0; i < serial->type->num_ports + 1 ; i++) {
+                if (!serial->port[i]->read_urb) {
+                        dev_err(dev, "bulk-in endpoint missing\n");
+                        return -ENODEV;
+                }
+                if (!serial->port[i]->write_urb) {
+                        dev_err(dev, "bulk-out endpoint missing\n");
+                        return -ENODEV;
+                }
+        }
 
         serial_priv = kzalloc(sizeof(*serial_priv), GFP_KERNEL);
         if (!serial_priv)
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 427ae43ee898..3a814e802dee 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1004,6 +1004,10 @@ static const struct usb_device_id id_table_combined[] = {
         { USB_DEVICE(FTDI_VID, CHETCO_SEASMART_DISPLAY_PID) },
         { USB_DEVICE(FTDI_VID, CHETCO_SEASMART_LITE_PID) },
         { USB_DEVICE(FTDI_VID, CHETCO_SEASMART_ANALOG_PID) },
+        /* ICP DAS I-756xU devices */
+        { USB_DEVICE(ICPDAS_VID, ICPDAS_I7560U_PID) },
+        { USB_DEVICE(ICPDAS_VID, ICPDAS_I7561U_PID) },
+        { USB_DEVICE(ICPDAS_VID, ICPDAS_I7563U_PID) },
         { }                                     /* Terminating entry */
 };
 
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index a84df2513994..c5d6c1e73e8e 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -872,6 +872,14 @@
 #define NOVITUS_BONO_E_PID              0x6010
 
 /*
+ * ICPDAS I-756*U devices
+ */
+#define ICPDAS_VID                      0x1b5c
+#define ICPDAS_I7560U_PID               0x0103
+#define ICPDAS_I7561U_PID               0x0104
+#define ICPDAS_I7563U_PID               0x0105
+
+/*
  * RT Systems programming cables for various ham radios
  */
 #define RTSYSTEMS_VID           0x2100  /* Vendor ID */
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index 4446b8d70ac2..885655315de1 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -376,14 +376,21 @@ static void mct_u232_msr_to_state(struct usb_serial_port *port,
 
 static int mct_u232_port_probe(struct usb_serial_port *port)
 {
+        struct usb_serial *serial = port->serial;
         struct mct_u232_private *priv;
 
+        /* check first to simplify error handling */
+        if (!serial->port[1] || !serial->port[1]->interrupt_in_urb) {
+                dev_err(&port->dev, "expected endpoint missing\n");
+                return -ENODEV;
+        }
+
         priv = kzalloc(sizeof(*priv), GFP_KERNEL);
         if (!priv)
                 return -ENOMEM;
 
         /* Use second interrupt-in endpoint for reading. */
-        priv->read_urb = port->serial->port[1]->interrupt_in_urb;
+        priv->read_urb = serial->port[1]->interrupt_in_urb;
         priv->read_urb->context = port;
 
         spin_lock_init(&priv->lock);
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 348e19834b83..c6f497f16526 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1818,6 +1818,8 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d02, 0xff, 0x00, 0x00) },
         { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x02, 0x01) },
         { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) },
+        { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e19, 0xff),                     /* D-Link DWM-221 B1 */
+          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
         { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */
         { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */
         { USB_DEVICE_INTERFACE_CLASS(0x2020, 0x4000, 0xff) },                /* OLICARD300 - MT6225 */
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/usb/usbip/usbip_common.c b/drivers/usb/usbip/usbip_common.c
index facaaf003f19..e40da7759a0e 100644
--- a/drivers/usb/usbip/usbip_common.c
+++ b/drivers/usb/usbip/usbip_common.c
@@ -741,6 +741,17 @@ int usbip_recv_xbuff(struct usbip_device *ud, struct urb *urb)
         if (!(size > 0))
                 return 0;
 
+        if (size > urb->transfer_buffer_length) {
+                /* should not happen, probably malicious packet */
+                if (ud->side == USBIP_STUB) {
+                        usbip_event_add(ud, SDEV_EVENT_ERROR_TCP);
+                        return 0;
+                } else {
+                        usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
+                        return -EPIPE;
+                }
+        }
+
         ret = usbip_recv(ud->tcp_socket, urb->transfer_buffer, size);
         if (ret != size) {
                 dev_err(&urb->dev->dev, "recv xbuf, %d\n", ret);
diff --git a/drivers/video/fbdev/pvr2fb.c b/drivers/video/fbdev/pvr2fb.c
index 71a923e53f93..3b1ca4411073 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/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index f6f28cc7eb45..e76bd91a29da 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -17,6 +17,7 @@
  *
  */
 
+#include <linux/delay.h>
 #define VIRTIO_PCI_NO_LEGACY
 #include "virtio_pci_common.h"
 
@@ -271,9 +272,13 @@ static void vp_reset(struct virtio_device *vdev)
         struct virtio_pci_device *vp_dev = to_vp_device(vdev);
         /* 0 status means a reset. */
         vp_iowrite8(0, &vp_dev->common->device_status);
-        /* Flush out the status write, and flush in device writes,
-         * including MSI-X interrupts, if any. */
-        vp_ioread8(&vp_dev->common->device_status);
+        /* After writing 0 to device_status, the driver MUST wait for a read of
+         * device_status to return 0 before reinitializing the device.
+         * This will flush out the status write, and flush in device writes,
+         * including MSI-X interrupts, if any.
+         */
+        while (vp_ioread8(&vp_dev->common->device_status))
+                msleep(1);
         /* Flush pending VQ/configuration callbacks. */
         vp_synchronize_vectors(vdev);
 }
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index 488017a0806a..cb7138c97c69 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -484,9 +484,19 @@ static void eoi_pirq(struct irq_data *data)
         struct physdev_eoi eoi = { .irq = pirq_from_irq(data->irq) };
         int rc = 0;
 
-        irq_move_irq(data);
+        if (!VALID_EVTCHN(evtchn))
+                return;
 
-        if (VALID_EVTCHN(evtchn))
+        if (unlikely(irqd_is_setaffinity_pending(data))) {
+                int masked = test_and_set_mask(evtchn);
+
+                clear_evtchn(evtchn);
+
+                irq_move_masked_irq(data);
+
+                if (!masked)
+                        unmask_evtchn(evtchn);
+        } else
                 clear_evtchn(evtchn);
 
         if (pirq_needs_eoi(data->irq)) {
@@ -1357,9 +1367,19 @@ static void ack_dynirq(struct irq_data *data)
 {
         int evtchn = evtchn_from_irq(data->irq);
 
-        irq_move_irq(data);
+        if (!VALID_EVTCHN(evtchn))
+                return;
 
-        if (VALID_EVTCHN(evtchn))
+        if (unlikely(irqd_is_setaffinity_pending(data))) {
+                int masked = test_and_set_mask(evtchn);
+
+                clear_evtchn(evtchn);
+
+                irq_move_masked_irq(data);
+
+                if (!masked)
+                        unmask_evtchn(evtchn);
+        } else
                 clear_evtchn(evtchn);
 }
 
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 e34a71b3e225..516e19d1d202 100644
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@ -757,7 +757,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);
@@ -1231,15 +1231,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);
 
@@ -1605,8 +1605,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]) {
@@ -1637,15 +1637,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);
@@ -1676,8 +1676,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) {
@@ -1693,7 +1693,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++) {
@@ -1769,9 +1769,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))
@@ -1779,8 +1779,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);
         }
@@ -1826,14 +1826,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) {
@@ -1844,7 +1844,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");
@@ -1880,7 +1880,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");
@@ -2013,7 +2013,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,
@@ -2172,8 +2172,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;
 }
 
@@ -2954,7 +2954,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) {
@@ -3037,16 +3037,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 77592931ab4f..ec7928a27aaa 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -19,6 +19,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/rbtree.h>
+#include <linux/vmalloc.h>
 #include "ctree.h"
 #include "disk-io.h"
 #include "transaction.h"
@@ -5361,10 +5362,13 @@ int btrfs_compare_trees(struct btrfs_root *left_root,
                 goto out;
         }
 
-        tmp_buf = kmalloc(left_root->nodesize, GFP_KERNEL);
+        tmp_buf = kmalloc(left_root->nodesize, GFP_KERNEL | __GFP_NOWARN);
         if (!tmp_buf) {
-                ret = -ENOMEM;
-                goto out;
+                tmp_buf = vmalloc(left_root->nodesize);
+                if (!tmp_buf) {
+                        ret = -ENOMEM;
+                        goto out;
+                }
         }
 
         left_path->search_commit_root = 1;
@@ -5565,7 +5569,7 @@ int btrfs_compare_trees(struct btrfs_root *left_root,
 out:
         btrfs_free_path(left_path);
         btrfs_free_path(right_path);
-        kfree(tmp_buf);
+        kvfree(tmp_buf);
         return ret;
 }
 
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index a1d6652e0c47..26bcb487f958 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -394,6 +394,8 @@ int btrfs_dev_replace_start(struct btrfs_root *root,
         dev_replace->cursor_right = 0;
         dev_replace->is_valid = 1;
         dev_replace->item_needs_writeback = 1;
+        atomic64_set(&dev_replace->num_write_errors, 0);
+        atomic64_set(&dev_replace->num_uncorrectable_read_errors, 0);
         args->result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR;
         btrfs_dev_replace_unlock(dev_replace, 1);
 
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 4b02591b0301..4e47849d7427 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -25,7 +25,6 @@
 #include <linux/buffer_head.h>
 #include <linux/workqueue.h>
 #include <linux/kthread.h>
-#include <linux/freezer.h>
 #include <linux/slab.h>
 #include <linux/migrate.h>
 #include <linux/ratelimit.h>
@@ -303,7 +302,7 @@ static int csum_tree_block(struct btrfs_fs_info *fs_info,
                 err = map_private_extent_buffer(buf, offset, 32,
                                         &kaddr, &map_start, &map_len);
                 if (err)
-                        return 1;
+                        return err;
                 cur_len = min(len, map_len - (offset - map_start));
                 crc = btrfs_csum_data(kaddr + offset - map_start,
                                       crc, cur_len);
@@ -313,7 +312,7 @@ static int csum_tree_block(struct btrfs_fs_info *fs_info,
         if (csum_size > sizeof(inline_result)) {
                 result = kzalloc(csum_size, GFP_NOFS);
                 if (!result)
-                        return 1;
+                        return -ENOMEM;
         } else {
                 result = (char *)&inline_result;
         }
@@ -334,7 +333,7 @@ static int csum_tree_block(struct btrfs_fs_info *fs_info,
                                 val, found, btrfs_header_level(buf));
                         if (result != (char *)&inline_result)
                                 kfree(result);
-                        return 1;
+                        return -EUCLEAN;
                 }
         } else {
                 write_extent_buffer(buf, result, 0, csum_size);
@@ -513,11 +512,21 @@ static int csum_dirty_buffer(struct btrfs_fs_info *fs_info, struct page *page)
         eb = (struct extent_buffer *)page->private;
         if (page != eb->pages[0])
                 return 0;
+
         found_start = btrfs_header_bytenr(eb);
-        if (WARN_ON(found_start != start || !PageUptodate(page)))
-                return 0;
-        csum_tree_block(fs_info, eb, 0);
-        return 0;
+        /*
+         * Please do not consolidate these warnings into a single if.
+         * It is useful to know what went wrong.
+         */
+        if (WARN_ON(found_start != start))
+                return -EUCLEAN;
+        if (WARN_ON(!PageUptodate(page)))
+                return -EUCLEAN;
+
+        ASSERT(memcmp_extent_buffer(eb, fs_info->fsid,
+                        btrfs_header_fsid(), BTRFS_FSID_SIZE) == 0);
+
+        return csum_tree_block(fs_info, eb, 0);
 }
 
 static int check_tree_block_fsid(struct btrfs_fs_info *fs_info,
@@ -661,10 +670,8 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio,
                                        eb, found_level);
 
         ret = csum_tree_block(fs_info, eb, 1);
-        if (ret) {
-                ret = -EIO;
+        if (ret)
                 goto err;
-        }
 
         /*
          * If this is a leaf block and it is corrupt, set the corrupt bit so
@@ -1055,7 +1062,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);
         }
 }
 
@@ -1757,7 +1764,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;
@@ -1831,7 +1838,7 @@ static int cleaner_kthread(void *arg)
                  */
                 btrfs_delete_unused_bgs(root->fs_info);
 sleep:
-                if (!try_to_freeze() && !again) {
+                if (!again) {
                         set_current_state(TASK_INTERRUPTIBLE);
                         if (!kthread_should_stop())
                                 schedule();
@@ -1921,14 +1928,12 @@ sleep:
                 if (unlikely(test_bit(BTRFS_FS_STATE_ERROR,
                                       &root->fs_info->fs_state)))
                         btrfs_cleanup_transaction(root);
-                if (!try_to_freeze()) {
-                        set_current_state(TASK_INTERRUPTIBLE);
-                        if (!kthread_should_stop() &&
-                            (!btrfs_transaction_blocked(root->fs_info) ||
-                             cannot_commit))
-                                schedule_timeout(delay);
-                        __set_current_state(TASK_RUNNING);
-                }
+                set_current_state(TASK_INTERRUPTIBLE);
+                if (!kthread_should_stop() &&
+                                (!btrfs_transaction_blocked(root->fs_info) ||
+                                 cannot_commit))
+                        schedule_timeout(delay);
+                __set_current_state(TASK_RUNNING);
         } while (!kthread_should_stop());
         return 0;
 }
@@ -2537,7 +2542,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);
@@ -2782,7 +2787,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;
@@ -2832,7 +2837,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;
@@ -4071,9 +4076,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 53e12977bfd0..84e060eb0de8 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
@@ -9386,15 +9386,23 @@ int btrfs_can_relocate(struct btrfs_root *root, u64 bytenr)
         u64 dev_min = 1;
         u64 dev_nr = 0;
         u64 target;
+        int debug;
         int index;
         int full = 0;
         int ret = 0;
 
+        debug = btrfs_test_opt(root, ENOSPC_DEBUG);
+
         block_group = btrfs_lookup_block_group(root->fs_info, bytenr);
 
         /* odd, couldn't find the block group, leave it alone */
-        if (!block_group)
+        if (!block_group) {
+                if (debug)
+                        btrfs_warn(root->fs_info,
+                                   "can't find block group for bytenr %llu",
+                                   bytenr);
                 return -1;
+        }
 
         min_free = btrfs_block_group_used(&block_group->item);
 
@@ -9448,8 +9456,13 @@ int btrfs_can_relocate(struct btrfs_root *root, u64 bytenr)
                  * this is just a balance, so if we were marked as full
                  * we know there is no space for a new chunk
                  */
-                if (full)
+                if (full) {
+                        if (debug)
+                                btrfs_warn(root->fs_info,
+                                        "no space to alloc new chunk for block group %llu",
+                                        block_group->key.objectid);
                         goto out;
+                }
 
                 index = get_block_group_index(block_group);
         }
@@ -9496,6 +9509,10 @@ int btrfs_can_relocate(struct btrfs_root *root, u64 bytenr)
                         ret = -1;
                 }
         }
+        if (debug && ret == -1)
+                btrfs_warn(root->fs_info,
+                        "no space to allocate a new chunk for block group %llu",
+                        block_group->key.objectid);
         mutex_unlock(&root->fs_info->chunk_mutex);
         btrfs_end_transaction(trans, root);
 out:
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 76a0c8597d98..d247fc0eea19 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1363,23 +1363,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) {
@@ -1387,7 +1387,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++;
         }
 }
@@ -1397,15 +1397,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++;
         }
 }
@@ -1556,8 +1556,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;
 
@@ -1571,7 +1571,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;
@@ -1584,9 +1584,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;
@@ -1619,11 +1619,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;
@@ -1636,7 +1636,7 @@ done:
                 __unlock_for_delalloc(inode, locked_page,
                               delalloc_start,
                               ((u64)(start_index + pages_locked - 1)) <<
-                              PAGE_CACHE_SHIFT);
+                              PAGE_SHIFT);
         }
         return ret;
 }
@@ -1696,7 +1696,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 {
@@ -1735,8 +1735,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;
 
@@ -1757,7 +1757,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)
@@ -1770,7 +1770,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;
@@ -2466,8 +2466,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);
@@ -2541,8 +2541,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);
@@ -2598,13 +2598,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);
@@ -2768,7 +2768,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;
@@ -2821,7 +2821,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);
@@ -2832,7 +2832,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);
         }
 }
@@ -2880,7 +2880,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;
@@ -2909,12 +2909,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);
@@ -2922,14 +2922,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);
@@ -3112,7 +3112,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]);
         }
 }
 
@@ -3134,10 +3134,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,
@@ -3145,7 +3145,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;
                 }
         }
@@ -3167,13 +3167,13 @@ 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) {
                 lock_extent(tree, start, end);
                 ordered = btrfs_lookup_ordered_range(inode, start,
-                                                PAGE_CACHE_SIZE);
+                                                PAGE_SIZE);
                 if (!ordered)
                         break;
                 unlock_extent(tree, start, end);
@@ -3227,7 +3227,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;
@@ -3264,13 +3264,11 @@ static noinline_for_stack int writepage_delalloc(struct inode *inode,
                         goto done;
                 }
                 /*
-                 * delalloc_end is already one less than the total
-                 * length, so we don't subtract one from
-                 * PAGE_CACHE_SIZE
+                 * delalloc_end is already one less than the total length, so
+                 * we don't subtract one from 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) {
@@ -3319,7 +3317,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;
@@ -3434,7 +3432,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)) {
@@ -3477,12 +3475,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;
 
@@ -3497,10 +3495,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;
         }
@@ -3510,7 +3508,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);
         }
@@ -3748,7 +3746,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;
@@ -3760,7 +3758,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);
         }
@@ -3804,8 +3802,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)
@@ -3948,8 +3946,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)
@@ -4083,8 +4081,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,
@@ -4102,18 +4100,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);
@@ -4163,7 +4161,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;
                 }
 
@@ -4197,7 +4195,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);
@@ -4223,7 +4221,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,
@@ -4262,7 +4260,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) {
@@ -4587,14 +4585,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);
 }
 
@@ -4779,7 +4777,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();
                 /*
@@ -4829,7 +4827,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) {
@@ -4862,7 +4860,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;
@@ -4896,7 +4894,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;
                         }
@@ -4908,7 +4906,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);
@@ -4931,7 +4929,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) {
@@ -4994,7 +4992,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);
@@ -5168,8 +5166,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;
         }
@@ -5252,18 +5250,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);
 
@@ -5283,19 +5281,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;
@@ -5316,13 +5314,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;
@@ -5332,7 +5330,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) {
@@ -5345,7 +5343,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;
 }
 
@@ -5358,19 +5356,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);
@@ -5393,19 +5391,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);
 
@@ -5423,19 +5421,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);
 
@@ -5454,19 +5452,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);
@@ -5508,7 +5506,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;
 
@@ -5519,8 +5517,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);
 }
 
 /**
@@ -5572,7 +5570,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));
@@ -5614,7 +5612,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));
@@ -5661,7 +5659,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;
 
@@ -5680,17 +5678,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);
@@ -5709,7 +5707,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;
 
@@ -5728,13 +5726,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 5dbf92e68fbd..b5e0ade90e88 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;
@@ -365,8 +365,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 b5baf5bdc8e1..7a7d6e253cfc 100644
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -32,7 +32,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)) / \
@@ -203,7 +203,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 15a09cb156ce..8d7b5a45c005 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -414,11 +414,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
@@ -448,7 +448,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++;
@@ -473,7 +473,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]);
         }
 }
 
@@ -1297,7 +1297,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)
@@ -1323,7 +1323,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;
@@ -1345,7 +1345,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;
@@ -1360,7 +1360,7 @@ again:
 fail:
         while (faili >= 0) {
                 unlock_page(pages[faili]);
-                page_cache_release(pages[faili]);
+                put_page(pages[faili]);
                 faili--;
         }
         return err;
@@ -1408,7 +1408,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);
@@ -1497,8 +1497,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);
@@ -1506,13 +1506,13 @@ 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 sector_offset;
                 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;
@@ -1547,7 +1547,7 @@ 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);
+                                                 PAGE_SIZE);
                         reserve_bytes = round_up(write_bytes + sector_offset,
                                         root->sectorsize);
                         goto reserve_metadata;
@@ -1609,7 +1609,7 @@ again:
                 } else {
                         force_page_uptodate = false;
                         dirty_pages = DIV_ROUND_UP(copied + offset,
-                                                   PAGE_CACHE_SIZE);
+                                                   PAGE_SIZE);
                 }
 
                 /*
@@ -1641,7 +1641,7 @@ 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);
                         }
@@ -1682,7 +1682,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;
@@ -1738,8 +1738,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;
 }
@@ -1905,7 +1905,7 @@ static int start_ordered_ops(struct inode *inode, loff_t start, loff_t end)
  */
 int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
 {
-        struct dentry *dentry = file->f_path.dentry;
+        struct dentry *dentry = file_dentry(file);
         struct inode *inode = d_inode(dentry);
         struct btrfs_root *root = BTRFS_I(inode)->root;
         struct btrfs_trans_handle *trans;
@@ -2682,9 +2682,12 @@ static long btrfs_fallocate(struct file *file, int mode,
                 return ret;
 
         inode_lock(inode);
-        ret = inode_newsize_ok(inode, alloc_end);
-        if (ret)
-                goto out;
+
+        if (!(mode & FALLOC_FL_KEEP_SIZE) && offset + len > inode->i_size) {
+                ret = inode_newsize_ok(inode, offset + len);
+                if (ret)
+                        goto out;
+        }
 
         /*
          * TODO: Move these two operations after we have checked
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 1f0ec19b23f6..70107f7c9307 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 41a5688ffdfe..2aaba58b4856 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);
@@ -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);
@@ -2003,7 +2003,7 @@ again:
                 goto out;
 
         ordered = btrfs_lookup_ordered_range(inode, page_start,
-                                        PAGE_CACHE_SIZE);
+                                        PAGE_SIZE);
         if (ordered) {
                 unlock_extent_cached(&BTRFS_I(inode)->io_tree, page_start,
                                      page_end, &cached_state, GFP_NOFS);
@@ -2014,7 +2014,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);
@@ -2030,7 +2030,7 @@ out:
                              &cached_state, GFP_NOFS);
 out_page:
         unlock_page(page);
-        page_cache_release(page);
+        put_page(page);
         kfree(fixup);
 }
 
@@ -2063,7 +2063,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;
@@ -4247,7 +4247,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,
@@ -4633,7 +4633,7 @@ int btrfs_truncate_block(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;
+        pgoff_t index = from >> PAGE_SHIFT;
         unsigned offset = from & (blocksize - 1);
         struct page *page;
         gfp_t mask = btrfs_alloc_write_mask(mapping);
@@ -4668,7 +4668,7 @@ again:
                 lock_page(page);
                 if (page->mapping != mapping) {
                         unlock_page(page);
-                        page_cache_release(page);
+                        put_page(page);
                         goto again;
                 }
                 if (!PageUptodate(page)) {
@@ -4686,7 +4686,7 @@ again:
                 unlock_extent_cached(io_tree, block_start, block_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;
@@ -4728,7 +4728,7 @@ out_unlock:
                 btrfs_delalloc_release_space(inode, block_start,
                                              blocksize);
         unlock_page(page);
-        page_cache_release(page);
+        put_page(page);
 out:
         return ret;
 }
@@ -6717,7 +6717,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);
@@ -6879,8 +6879,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;
@@ -6899,9 +6899,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);
@@ -7336,12 +7336,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();
 
@@ -7382,7 +7382,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;
                 }
         }
@@ -7390,7 +7390,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();
@@ -8719,7 +8719,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;
 }
@@ -8739,7 +8739,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;
         u64 start;
         u64 end;
         int inode_evicting = inode->i_state & I_FREEING;
@@ -8822,7 +8822,7 @@ again:
          * 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 |
@@ -8837,7 +8837,7 @@ again:
         if (PagePrivate(page)) {
                 ClearPagePrivate(page);
                 set_page_private(page, 0);
-                page_cache_release(page);
+                put_page(page);
         }
 }
 
@@ -8874,11 +8874,11 @@ int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
         u64 page_end;
         u64 end;
 
-        reserved_space = PAGE_CACHE_SIZE;
+        reserved_space = PAGE_SIZE;
 
         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;
         end = page_end;
 
         /*
@@ -8934,15 +8934,15 @@ again:
                 goto again;
         }
 
-        if (page->index == ((size - 1) >> PAGE_CACHE_SHIFT)) {
+        if (page->index == ((size - 1) >> PAGE_SHIFT)) {
                 reserved_space = round_up(size - page_start, root->sectorsize);
-                if (reserved_space < PAGE_CACHE_SIZE) {
+                if (reserved_space < PAGE_SIZE) {
                         end = page_start + reserved_space - 1;
                         spin_lock(&BTRFS_I(inode)->lock);
                         BTRFS_I(inode)->outstanding_extents++;
                         spin_unlock(&BTRFS_I(inode)->lock);
                         btrfs_delalloc_release_space(inode, page_start,
-                                                PAGE_CACHE_SIZE - reserved_space);
+                                                PAGE_SIZE - reserved_space);
                 }
         }
 
@@ -8969,14 +8969,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);
         }
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 053e677839fe..5a23806ae418 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -898,7 +898,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) {
@@ -988,7 +988,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
@@ -1124,15 +1124,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;
@@ -1148,7 +1148,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);
@@ -1169,7 +1169,7 @@ again:
                          */
                         if (page->mapping != inode->i_mapping) {
                                 unlock_page(page);
-                                page_cache_release(page);
+                                put_page(page);
                                 goto again;
                         }
                 }
@@ -1179,7 +1179,7 @@ again:
                         lock_page(page);
                         if (!PageUptodate(page)) {
                                 unlock_page(page);
-                                page_cache_release(page);
+                                put_page(page);
                                 ret = -EIO;
                                 break;
                         }
@@ -1187,7 +1187,7 @@ again:
 
                 if (page->mapping != inode->i_mapping) {
                         unlock_page(page);
-                        page_cache_release(page);
+                        put_page(page);
                         goto again;
                 }
 
@@ -1208,7 +1208,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);
@@ -1222,8 +1222,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);
         }
 
 
@@ -1240,17 +1240,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;
 
 }
@@ -1273,7 +1273,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;
@@ -1317,9 +1317,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) {
@@ -1331,11 +1331,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;
@@ -1348,7 +1348,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
@@ -1362,7 +1362,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)) {
@@ -1371,14 +1371,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;
@@ -1412,20 +1412,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;
@@ -1654,7 +1654,7 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file,
 
                 src_inode = file_inode(src.file);
                 if (src_inode->i_sb != file_inode(file)->i_sb) {
-                        btrfs_info(BTRFS_I(src_inode)->root->fs_info,
+                        btrfs_info(BTRFS_I(file_inode(file))->root->fs_info,
                                    "Snapshot src from another FS");
                         ret = -EXDEV;
                 } else if (!inode_owner_or_capable(src_inode)) {
@@ -1722,7 +1722,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;
                 }
@@ -2806,12 +2806,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);
                 }
         }
@@ -2823,7 +2823,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:
@@ -2932,12 +2932,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);
@@ -2949,7 +2949,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;
 
         /*
@@ -2987,12 +2987,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);
@@ -3191,7 +3191,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
@@ -3891,8 +3891,8 @@ 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,
-                                round_down(destoff, PAGE_CACHE_SIZE),
-                                round_up(destoff + len, PAGE_CACHE_SIZE) - 1);
+                                round_down(destoff, PAGE_SIZE),
+                                round_up(destoff + len, PAGE_SIZE) - 1);
 out_unlock:
         if (!same_inode)
                 btrfs_double_inode_unlock(src, inode);
@@ -4124,7 +4124,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/qgroup.c b/fs/btrfs/qgroup.c
index 5279fdae7142..9e119552ed32 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1463,6 +1463,7 @@ struct btrfs_qgroup_extent_record
         u64 bytenr = record->bytenr;
 
         assert_spin_locked(&delayed_refs->lock);
+        trace_btrfs_qgroup_insert_dirty_extent(record);
 
         while (*p) {
                 parent_node = *p;
@@ -1594,6 +1595,9 @@ static int qgroup_update_counters(struct btrfs_fs_info *fs_info,
                 cur_old_count = btrfs_qgroup_get_old_refcnt(qg, seq);
                 cur_new_count = btrfs_qgroup_get_new_refcnt(qg, seq);
 
+                trace_qgroup_update_counters(qg->qgroupid, cur_old_count,
+                                             cur_new_count);
+
                 /* Rfer update part */
                 if (cur_old_count == 0 && cur_new_count > 0) {
                         qg->rfer += num_bytes;
@@ -1683,6 +1687,9 @@ btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans,
                 goto out_free;
         BUG_ON(!fs_info->quota_root);
 
+        trace_btrfs_qgroup_account_extent(bytenr, num_bytes, nr_old_roots,
+                                          nr_new_roots);
+
         qgroups = ulist_alloc(GFP_NOFS);
         if (!qgroups) {
                 ret = -ENOMEM;
@@ -1752,6 +1759,8 @@ int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans,
                 record = rb_entry(node, struct btrfs_qgroup_extent_record,
                                   node);
 
+                trace_btrfs_qgroup_account_extents(record);
+
                 if (!ret) {
                         /*
                          * Use (u64)-1 as time_seq to do special search, which
@@ -1842,8 +1851,10 @@ out:
 }
 
 /*
- * copy the acounting information between qgroups. This is necessary when a
- * snapshot or a subvolume is created
+ * Copy the acounting information between qgroups. This is necessary
+ * when a snapshot or a subvolume is created. Throwing an error will
+ * cause a transaction abort so we take extra care here to only error
+ * when a readonly fs is a reasonable outcome.
  */
 int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
                          struct btrfs_fs_info *fs_info, u64 srcid, u64 objectid,
@@ -1873,15 +1884,15 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
                        2 * inherit->num_excl_copies;
                 for (i = 0; i < nums; ++i) {
                         srcgroup = find_qgroup_rb(fs_info, *i_qgroups);
-                        if (!srcgroup) {
-                                ret = -EINVAL;
-                                goto out;
-                        }
 
-                        if ((srcgroup->qgroupid >> 48) <= (objectid >> 48)) {
-                                ret = -EINVAL;
-                                goto out;
-                        }
+                        /*
+                         * Zero out invalid groups so we can ignore
+                         * them later.
+                         */
+                        if (!srcgroup ||
+                            ((srcgroup->qgroupid >> 48) <= (objectid >> 48)))
+                                *i_qgroups = 0ULL;
+
                         ++i_qgroups;
                 }
         }
@@ -1916,17 +1927,19 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
          */
         if (inherit) {
                 i_qgroups = (u64 *)(inherit + 1);
-                for (i = 0; i < inherit->num_qgroups; ++i) {
+                for (i = 0; i < inherit->num_qgroups; ++i, ++i_qgroups) {
+                        if (*i_qgroups == 0)
+                                continue;
                         ret = add_qgroup_relation_item(trans, quota_root,
                                                        objectid, *i_qgroups);
-                        if (ret)
+                        if (ret && ret != -EEXIST)
                                 goto out;
                         ret = add_qgroup_relation_item(trans, quota_root,
                                                        *i_qgroups, objectid);
-                        if (ret)
+                        if (ret && ret != -EEXIST)
                                 goto out;
-                        ++i_qgroups;
                 }
+                ret = 0;
         }
 
 
@@ -1987,17 +2000,22 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
 
         i_qgroups = (u64 *)(inherit + 1);
         for (i = 0; i < inherit->num_qgroups; ++i) {
-                ret = add_relation_rb(quota_root->fs_info, objectid,
-                                      *i_qgroups);
-                if (ret)
-                        goto unlock;
+                if (*i_qgroups) {
+                        ret = add_relation_rb(quota_root->fs_info, objectid,
+                                              *i_qgroups);
+                        if (ret)
+                                goto unlock;
+                }
                 ++i_qgroups;
         }
 
-        for (i = 0; i <  inherit->num_ref_copies; ++i) {
+        for (i = 0; i <  inherit->num_ref_copies; ++i, i_qgroups += 2) {
                 struct btrfs_qgroup *src;
                 struct btrfs_qgroup *dst;
 
+                if (!i_qgroups[0] || !i_qgroups[1])
+                        continue;
+
                 src = find_qgroup_rb(fs_info, i_qgroups[0]);
                 dst = find_qgroup_rb(fs_info, i_qgroups[1]);
 
@@ -2008,12 +2026,14 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
 
                 dst->rfer = src->rfer - level_size;
                 dst->rfer_cmpr = src->rfer_cmpr - level_size;
-                i_qgroups += 2;
         }
-        for (i = 0; i <  inherit->num_excl_copies; ++i) {
+        for (i = 0; i <  inherit->num_excl_copies; ++i, i_qgroups += 2) {
                 struct btrfs_qgroup *src;
                 struct btrfs_qgroup *dst;
 
+                if (!i_qgroups[0] || !i_qgroups[1])
+                        continue;
+
                 src = find_qgroup_rb(fs_info, i_qgroups[0]);
                 dst = find_qgroup_rb(fs_info, i_qgroups[1]);
 
@@ -2024,7 +2044,6 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
 
                 dst->excl = src->excl + level_size;
                 dst->excl_cmpr = src->excl_cmpr + level_size;
-                i_qgroups += 2;
         }
 
 unlock:
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 b892914968c1..298631eaee78 100644
--- a/fs/btrfs/reada.c
+++ b/fs/btrfs/reada.c
@@ -226,7 +226,7 @@ int btree_readahead_hook(struct btrfs_fs_info *fs_info,
         /* find extent */
         spin_lock(&fs_info->reada_lock);
         re = radix_tree_lookup(&fs_info->reada_tree,
-                               start >> PAGE_CACHE_SHIFT);
+                               start >> PAGE_SHIFT);
         if (re)
                 re->refcnt++;
         spin_unlock(&fs_info->reada_lock);
@@ -257,7 +257,7 @@ static struct reada_zone *reada_find_zone(struct btrfs_fs_info *fs_info,
         zone = NULL;
         spin_lock(&fs_info->reada_lock);
         ret = radix_tree_gang_lookup(&dev->reada_zones, (void **)&zone,
-                                     logical >> PAGE_CACHE_SHIFT, 1);
+                                     logical >> PAGE_SHIFT, 1);
         if (ret == 1 && logical >= zone->start && logical <= zone->end) {
                 kref_get(&zone->refcnt);
                 spin_unlock(&fs_info->reada_lock);
@@ -294,13 +294,13 @@ static struct reada_zone *reada_find_zone(struct btrfs_fs_info *fs_info,
 
         spin_lock(&fs_info->reada_lock);
         ret = radix_tree_insert(&dev->reada_zones,
-                                (unsigned long)(zone->end >> PAGE_CACHE_SHIFT),
+                                (unsigned long)(zone->end >> PAGE_SHIFT),
                                 zone);
 
         if (ret == -EEXIST) {
                 kfree(zone);
                 ret = radix_tree_gang_lookup(&dev->reada_zones, (void **)&zone,
-                                             logical >> PAGE_CACHE_SHIFT, 1);
+                                             logical >> PAGE_SHIFT, 1);
                 if (ret == 1 && logical >= zone->start && logical <= zone->end)
                         kref_get(&zone->refcnt);
                 else
@@ -326,7 +326,7 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root,
         u64 length;
         int real_stripes;
         int nzones = 0;
-        unsigned long index = logical >> PAGE_CACHE_SHIFT;
+        unsigned long index = logical >> PAGE_SHIFT;
         int dev_replace_is_ongoing;
         int have_zone = 0;
 
@@ -495,7 +495,7 @@ static void reada_extent_put(struct btrfs_fs_info *fs_info,
                              struct reada_extent *re)
 {
         int i;
-        unsigned long index = re->logical >> PAGE_CACHE_SHIFT;
+        unsigned long index = re->logical >> PAGE_SHIFT;
 
         spin_lock(&fs_info->reada_lock);
         if (--re->refcnt) {
@@ -538,7 +538,7 @@ static void reada_zone_release(struct kref *kref)
         struct reada_zone *zone = container_of(kref, struct reada_zone, refcnt);
 
         radix_tree_delete(&zone->device->reada_zones,
-                          zone->end >> PAGE_CACHE_SHIFT);
+                          zone->end >> PAGE_SHIFT);
 
         kfree(zone);
 }
@@ -587,7 +587,7 @@ static int reada_add_block(struct reada_control *rc, u64 logical,
 static void reada_peer_zones_set_lock(struct reada_zone *zone, int lock)
 {
         int i;
-        unsigned long index = zone->end >> PAGE_CACHE_SHIFT;
+        unsigned long index = zone->end >> PAGE_SHIFT;
 
         for (i = 0; i < zone->ndevs; ++i) {
                 struct reada_zone *peer;
@@ -622,7 +622,7 @@ static int reada_pick_zone(struct btrfs_device *dev)
                                              (void **)&zone, index, 1);
                 if (ret == 0)
                         break;
-                index = (zone->end >> PAGE_CACHE_SHIFT) + 1;
+                index = (zone->end >> PAGE_SHIFT) + 1;
                 if (zone->locked) {
                         if (zone->elems > top_locked_elems) {
                                 top_locked_elems = zone->elems;
@@ -673,7 +673,7 @@ static int reada_start_machine_dev(struct btrfs_fs_info *fs_info,
          * plugging to speed things up
          */
         ret = radix_tree_gang_lookup(&dev->reada_extents, (void **)&re,
-                                     dev->reada_next >> PAGE_CACHE_SHIFT, 1);
+                                     dev->reada_next >> PAGE_SHIFT, 1);
         if (ret == 0 || re->logical > dev->reada_curr_zone->end) {
                 ret = reada_pick_zone(dev);
                 if (!ret) {
@@ -682,7 +682,7 @@ static int reada_start_machine_dev(struct btrfs_fs_info *fs_info,
                 }
                 re = NULL;
                 ret = radix_tree_gang_lookup(&dev->reada_extents, (void **)&re,
-                                        dev->reada_next >> PAGE_CACHE_SHIFT, 1);
+                                        dev->reada_next >> PAGE_SHIFT, 1);
         }
         if (ret == 0) {
                 spin_unlock(&fs_info->reada_lock);
@@ -838,7 +838,7 @@ static void dump_devs(struct btrfs_fs_info *fs_info, int all)
                                 printk(KERN_CONT " curr off %llu",
                                         device->reada_next - zone->start);
                         printk(KERN_CONT "\n");
-                        index = (zone->end >> PAGE_CACHE_SHIFT) + 1;
+                        index = (zone->end >> PAGE_SHIFT) + 1;
                 }
                 cnt = 0;
                 index = 0;
@@ -864,7 +864,7 @@ static void dump_devs(struct btrfs_fs_info *fs_info, int all)
                                 }
                         }
                         printk(KERN_CONT "\n");
-                        index = (re->logical >> PAGE_CACHE_SHIFT) + 1;
+                        index = (re->logical >> PAGE_SHIFT) + 1;
                         if (++cnt > 15)
                                 break;
                 }
@@ -880,7 +880,7 @@ static void dump_devs(struct btrfs_fs_info *fs_info, int all)
                 if (ret == 0)
                         break;
                 if (!re->scheduled) {
-                        index = (re->logical >> PAGE_CACHE_SHIFT) + 1;
+                        index = (re->logical >> PAGE_SHIFT) + 1;
                         continue;
                 }
                 printk(KERN_DEBUG
@@ -897,7 +897,7 @@ static void dump_devs(struct btrfs_fs_info *fs_info, int all)
                         }
                 }
                 printk(KERN_CONT "\n");
-                index = (re->logical >> PAGE_CACHE_SHIFT) + 1;
+                index = (re->logical >> PAGE_SHIFT) + 1;
         }
         spin_unlock(&fs_info->reada_lock);
 }
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 2bd0011450df..08ef890deca6 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -1850,6 +1850,7 @@ again:
                         eb = read_tree_block(dest, old_bytenr, old_ptr_gen);
                         if (IS_ERR(eb)) {
                                 ret = PTR_ERR(eb);
+                                break;
                         } else if (!extent_buffer_uptodate(eb)) {
                                 ret = -EIO;
                                 free_extent_buffer(eb);
@@ -3129,10 +3130,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 +3146,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 +3163,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 +3192,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 39dbdcbf4d13..4678f03e878e 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);
         }
@@ -4294,8 +4294,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) {
@@ -4326,7 +4326,7 @@ again:
                          */
                         if (page->mapping != inode->i_mapping) {
                                 unlock_page(page);
-                                page_cache_release(page);
+                                put_page(page);
                                 goto again;
                         }
                         if (!PageUptodate(page)) {
@@ -4348,15 +4348,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:
@@ -4390,8 +4390,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 19b7bf4284ee..8d358c547c59 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -4449,9 +4449,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;
@@ -4471,7 +4471,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));
@@ -4481,7 +4481,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_KERNEL);
                 if (!page) {
                         ret = -ENOMEM;
@@ -4493,7 +4493,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;
                         }
@@ -4503,7 +4503,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;
@@ -4804,7 +4804,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);
                 }
@@ -4886,7 +4886,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..e05619f241be 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/tree-log.c b/fs/btrfs/tree-log.c
index 24d03c751149..517d0ccb351e 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -4415,6 +4415,127 @@ static int btrfs_log_trailing_hole(struct btrfs_trans_handle *trans,
         return ret;
 }
 
+/*
+ * When we are logging a new inode X, check if it doesn't have a reference that
+ * matches the reference from some other inode Y created in a past transaction
+ * and that was renamed in the current transaction. If we don't do this, then at
+ * log replay time we can lose inode Y (and all its files if it's a directory):
+ *
+ * mkdir /mnt/x
+ * echo "hello world" > /mnt/x/foobar
+ * sync
+ * mv /mnt/x /mnt/y
+ * mkdir /mnt/x                 # or touch /mnt/x
+ * xfs_io -c fsync /mnt/x
+ * <power fail>
+ * mount fs, trigger log replay
+ *
+ * After the log replay procedure, we would lose the first directory and all its
+ * files (file foobar).
+ * For the case where inode Y is not a directory we simply end up losing it:
+ *
+ * echo "123" > /mnt/foo
+ * sync
+ * mv /mnt/foo /mnt/bar
+ * echo "abc" > /mnt/foo
+ * xfs_io -c fsync /mnt/foo
+ * <power fail>
+ *
+ * We also need this for cases where a snapshot entry is replaced by some other
+ * entry (file or directory) otherwise we end up with an unreplayable log due to
+ * attempts to delete the snapshot entry (entry of type BTRFS_ROOT_ITEM_KEY) as
+ * if it were a regular entry:
+ *
+ * mkdir /mnt/x
+ * btrfs subvolume snapshot /mnt /mnt/x/snap
+ * btrfs subvolume delete /mnt/x/snap
+ * rmdir /mnt/x
+ * mkdir /mnt/x
+ * fsync /mnt/x or fsync some new file inside it
+ * <power fail>
+ *
+ * The snapshot delete, rmdir of x, mkdir of a new x and the fsync all happen in
+ * the same transaction.
+ */
+static int btrfs_check_ref_name_override(struct extent_buffer *eb,
+                                         const int slot,
+                                         const struct btrfs_key *key,
+                                         struct inode *inode)
+{
+        int ret;
+        struct btrfs_path *search_path;
+        char *name = NULL;
+        u32 name_len = 0;
+        u32 item_size = btrfs_item_size_nr(eb, slot);
+        u32 cur_offset = 0;
+        unsigned long ptr = btrfs_item_ptr_offset(eb, slot);
+
+        search_path = btrfs_alloc_path();
+        if (!search_path)
+                return -ENOMEM;
+        search_path->search_commit_root = 1;
+        search_path->skip_locking = 1;
+
+        while (cur_offset < item_size) {
+                u64 parent;
+                u32 this_name_len;
+                u32 this_len;
+                unsigned long name_ptr;
+                struct btrfs_dir_item *di;
+
+                if (key->type == BTRFS_INODE_REF_KEY) {
+                        struct btrfs_inode_ref *iref;
+
+                        iref = (struct btrfs_inode_ref *)(ptr + cur_offset);
+                        parent = key->offset;
+                        this_name_len = btrfs_inode_ref_name_len(eb, iref);
+                        name_ptr = (unsigned long)(iref + 1);
+                        this_len = sizeof(*iref) + this_name_len;
+                } else {
+                        struct btrfs_inode_extref *extref;
+
+                        extref = (struct btrfs_inode_extref *)(ptr +
+                                                               cur_offset);
+                        parent = btrfs_inode_extref_parent(eb, extref);
+                        this_name_len = btrfs_inode_extref_name_len(eb, extref);
+                        name_ptr = (unsigned long)&extref->name;
+                        this_len = sizeof(*extref) + this_name_len;
+                }
+
+                if (this_name_len > name_len) {
+                        char *new_name;
+
+                        new_name = krealloc(name, this_name_len, GFP_NOFS);
+                        if (!new_name) {
+                                ret = -ENOMEM;
+                                goto out;
+                        }
+                        name_len = this_name_len;
+                        name = new_name;
+                }
+
+                read_extent_buffer(eb, name, name_ptr, this_name_len);
+                di = btrfs_lookup_dir_item(NULL, BTRFS_I(inode)->root,
+                                           search_path, parent,
+                                           name, this_name_len, 0);
+                if (di && !IS_ERR(di)) {
+                        ret = 1;
+                        goto out;
+                } else if (IS_ERR(di)) {
+                        ret = PTR_ERR(di);
+                        goto out;
+                }
+                btrfs_release_path(search_path);
+
+                cur_offset += this_len;
+        }
+        ret = 0;
+out:
+        btrfs_free_path(search_path);
+        kfree(name);
+        return ret;
+}
+
 /* log a single inode in the tree log.
  * At least one parent directory for this inode must exist in the tree
  * or be logged already.
@@ -4602,6 +4723,22 @@ again:
                 if (min_key.type == BTRFS_INODE_ITEM_KEY)
                         need_log_inode_item = false;
 
+                if ((min_key.type == BTRFS_INODE_REF_KEY ||
+                     min_key.type == BTRFS_INODE_EXTREF_KEY) &&
+                    BTRFS_I(inode)->generation == trans->transid) {
+                        ret = btrfs_check_ref_name_override(path->nodes[0],
+                                                            path->slots[0],
+                                                            &min_key, inode);
+                        if (ret < 0) {
+                                err = ret;
+                                goto out_unlock;
+                        } else if (ret > 0) {
+                                err = 1;
+                                btrfs_set_log_full_commit(root->fs_info, trans);
+                                goto out_unlock;
+                        }
+                }
+
                 /* Skip xattrs, we log them later with btrfs_log_all_xattrs() */
                 if (min_key.type == BTRFS_XATTR_ITEM_KEY) {
                         if (ins_nr == 0)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index e2b54d546b7c..bd0f45fb38c4 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1025,16 +1025,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 */
@@ -1047,7 +1047,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)
@@ -1075,7 +1075,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);
@@ -6527,7 +6527,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 fc5cae2a0db2..4801571f51cb 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;
@@ -887,7 +887,7 @@ get_more_pages:
 
                                 num_ops = 1 + do_sync;
                                 strip_unit_end = page->index +
-                                        ((len - 1) >> PAGE_CACHE_SHIFT);
+                                        ((len - 1) >> PAGE_SHIFT);
 
                                 BUG_ON(pages);
                                 max_pages = calc_pages_for(0, (u64)len);
@@ -901,7 +901,7 @@ get_more_pages:
 
                                 len = 0;
                         } else if (page->index !=
-                                   (offset + len) >> PAGE_CACHE_SHIFT) {
+                                   (offset + len) >> PAGE_SHIFT) {
                                 if (num_ops >= (pool ?  CEPH_OSD_SLAB_OPS :
                                                         CEPH_OSD_MAX_OPS)) {
                                         redirty_page_for_writepage(wbc, page);
@@ -929,7 +929,7 @@ get_more_pages:
 
                         pages[locked_pages] = page;
                         locked_pages++;
-                        len += PAGE_CACHE_SIZE;
+                        len += PAGE_SIZE;
                 }
 
                 /* did we get anything? */
@@ -981,7 +981,7 @@ new_request:
                         BUG_ON(IS_ERR(req));
                 }
                 BUG_ON(len < page_offset(pages[locked_pages - 1]) +
-                             PAGE_CACHE_SIZE - offset);
+                             PAGE_SIZE - offset);
 
                 req->r_callback = writepages_finish;
                 req->r_inode = inode;
@@ -1011,7 +1011,7 @@ new_request:
                         }
 
                         set_page_writeback(pages[i]);
-                        len += PAGE_CACHE_SIZE;
+                        len += PAGE_SIZE;
                 }
 
                 if (snap_size != -1) {
@@ -1020,7 +1020,7 @@ new_request:
                         /* writepages_finish() clears writeback pages
                          * according to the data length, so make sure
                          * data length covers all locked pages */
-                        u64 min_len = len + 1 - PAGE_CACHE_SIZE;
+                        u64 min_len = len + 1 - PAGE_SIZE;
                         len = min(len, (u64)i_size_read(inode) - offset);
                         len = max(len, min_len);
                 }
@@ -1135,8 +1135,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;
@@ -1191,7 +1191,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? */
@@ -1199,12 +1199,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;
         }
 
@@ -1228,7 +1228,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 {
@@ -1242,7 +1242,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);
@@ -1259,7 +1259,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,
@@ -1279,7 +1279,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);
@@ -1322,11 +1322,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
@@ -1343,7 +1343,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)
@@ -1352,16 +1352,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 {
@@ -1378,12 +1378,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);
@@ -1392,7 +1392,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;
 }
 
@@ -1430,10 +1430,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);
@@ -1519,7 +1519,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;
                 }
         }
@@ -1534,14 +1534,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);
         }
 }
 
@@ -1578,7 +1578,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;
                         }
                 }
@@ -1586,8 +1586,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) {
@@ -1670,7 +1670,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 de17bb232ff8..cfaeef18cbca 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -2510,7 +2510,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 fadc243dfb28..4fb2bbc2a272 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -129,7 +129,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 = {};
@@ -154,7 +154,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 ef38f01c1795..a79f9269831e 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -466,7 +466,7 @@ more:
                         ret += zlen;
                 }
 
-                didpages = (page_align + ret) >> PAGE_CACHE_SHIFT;
+                didpages = (page_align + ret) >> PAGE_SHIFT;
                 pos += ret;
                 read = pos - off;
                 left -= ret;
@@ -806,8 +806,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);
 
@@ -872,7 +872,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);
                 }
@@ -1006,8 +1006,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);
 
@@ -1036,7 +1036,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)) {
@@ -1159,7 +1159,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);
@@ -1188,10 +1188,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,
@@ -1463,21 +1463,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)
@@ -1486,8 +1486,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 ed58b168904a..edfade037738 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1338,7 +1338,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;
         }
 }
@@ -1348,7 +1348,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;
 
@@ -1367,7 +1367,7 @@ static int fill_readdir_cache(struct inode *dir, struct dentry *dn,
                 unlock_page(ctl->page);
                 ctl->dentries = kmap(ctl->page);
                 if (idx == 0)
-                        memset(ctl->dentries, 0, PAGE_CACHE_SIZE);
+                        memset(ctl->dentries, 0, PAGE_SIZE);
         }
 
         if (req->r_dir_release_cnt == atomic64_read(&ci->i_release_count) &&
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 44852c3ae531..541ead4d8965 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..ee69a537dba5 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 c973043deb0e..f12d5e2955c2 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)
@@ -912,13 +912,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/crypto/crypto.c b/fs/crypto/crypto.c
index 06cd1a22240b..7f5804537d30 100644
--- a/fs/crypto/crypto.c
+++ b/fs/crypto/crypto.c
@@ -175,10 +175,10 @@ static int do_page_crypto(struct inode *inode,
                         FS_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 == FS_DECRYPT)
                 res = crypto_skcipher_decrypt(req);
@@ -287,7 +287,7 @@ int fscrypt_zeroout_range(struct inode *inode, pgoff_t lblk,
         struct bio *bio;
         int ret, err = 0;
 
-        BUG_ON(inode->i_sb->s_blocksize != PAGE_CACHE_SIZE);
+        BUG_ON(inode->i_sb->s_blocksize != PAGE_SIZE);
 
         ctx = fscrypt_get_ctx(inode);
         if (IS_ERR(ctx))
diff --git a/fs/dax.c b/fs/dax.c
index 90322eb7498c..75ba46d82a76 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -323,7 +323,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;
         }
 
@@ -351,7 +351,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)
@@ -506,8 +506,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();
@@ -642,12 +642,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;
@@ -711,10 +711,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;
         }
 
@@ -747,7 +747,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;
 }
@@ -1094,7 +1094,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
@@ -1104,18 +1104,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;
@@ -1123,7 +1123,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)
@@ -1146,7 +1146,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
@@ -1154,7 +1154,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/dcache.c b/fs/dcache.c
index 32ceae3e6112..d5ecc6e477da 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1667,7 +1667,8 @@ void d_set_d_op(struct dentry *dentry, const struct dentry_operations *op)
                                 DCACHE_OP_REVALIDATE    |
                                 DCACHE_OP_WEAK_REVALIDATE       |
                                 DCACHE_OP_DELETE        |
-                                DCACHE_OP_SELECT_INODE));
+                                DCACHE_OP_SELECT_INODE  |
+                                DCACHE_OP_REAL));
         dentry->d_op = op;
         if (!op)
                 return;
@@ -1685,6 +1686,8 @@ void d_set_d_op(struct dentry *dentry, const struct dentry_operations *op)
                 dentry->d_flags |= DCACHE_OP_PRUNE;
         if (op->d_select_inode)
                 dentry->d_flags |= DCACHE_OP_SELECT_INODE;
+        if (op->d_real)
+                dentry->d_flags |= DCACHE_OP_REAL;
 
 }
 EXPORT_SYMBOL(d_set_d_op);
diff --git a/fs/direct-io.c b/fs/direct-io.c
index 476f1ecbd1f0..472037732daf 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;
@@ -424,7 +424,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++]);
 }
 
 /*
@@ -487,7 +487,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);
@@ -696,7 +696,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;
@@ -810,13 +810,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;
@@ -830,7 +830,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;
@@ -947,7 +947,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))
@@ -988,7 +988,7 @@ do_holes:
 
                                 /* AKPM: eargh, -ENOTBLK is a hack */
                                 if (dio->rw & WRITE) {
-                                        page_cache_release(page);
+                                        put_page(page);
                                         return -ENOTBLK;
                                 }
 
@@ -1001,7 +1001,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);
@@ -1041,7 +1041,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;
@@ -1057,7 +1057,7 @@ next_block:
                 }
 
                 /* Drop the ref which was taken in get_user_pages() */
-                page_cache_release(page);
+                put_page(page);
         }
 out:
         return ret;
@@ -1281,7 +1281,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/config.c b/fs/dlm/config.c
index 519112168a9e..1669f6291c95 100644
--- a/fs/dlm/config.c
+++ b/fs/dlm/config.c
@@ -343,13 +343,12 @@ static struct config_group *make_cluster(struct config_group *g,
         struct dlm_cluster *cl = NULL;
         struct dlm_spaces *sps = NULL;
         struct dlm_comms *cms = NULL;
-        void *gps = NULL;
 
         cl = kzalloc(sizeof(struct dlm_cluster), GFP_NOFS);
         sps = kzalloc(sizeof(struct dlm_spaces), GFP_NOFS);
         cms = kzalloc(sizeof(struct dlm_comms), GFP_NOFS);
 
-        if (!cl || !gps || !sps || !cms)
+        if (!cl || !sps || !cms)
                 goto fail;
 
         config_group_init_type_name(&cl->group, name, &cluster_type);
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 9893d1538122..3cf1546dca82 100644
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -1798,7 +1798,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..db9ae6e18154 100644
--- a/fs/ext4/crypto.c
+++ b/fs/ext4/crypto.c
@@ -91,7 +91,8 @@ void ext4_release_crypto_ctx(struct ext4_crypto_ctx *ctx)
  * Return: An allocated and initialized encryption context on success; error
  * value or NULL otherwise.
  */
-struct ext4_crypto_ctx *ext4_get_crypto_ctx(struct inode *inode)
+struct ext4_crypto_ctx *ext4_get_crypto_ctx(struct inode *inode,
+                                            gfp_t gfp_flags)
 {
         struct ext4_crypto_ctx *ctx = NULL;
         int res = 0;
@@ -118,7 +119,7 @@ struct ext4_crypto_ctx *ext4_get_crypto_ctx(struct inode *inode)
                 list_del(&ctx->free_list);
         spin_unlock_irqrestore(&ext4_crypto_ctx_lock, flags);
         if (!ctx) {
-                ctx = kmem_cache_zalloc(ext4_crypto_ctx_cachep, GFP_NOFS);
+                ctx = kmem_cache_zalloc(ext4_crypto_ctx_cachep, gfp_flags);
                 if (!ctx) {
                         res = -ENOMEM;
                         goto out;
@@ -255,7 +256,8 @@ static int ext4_page_crypto(struct inode *inode,
                             ext4_direction_t rw,
                             pgoff_t index,
                             struct page *src_page,
-                            struct page *dest_page)
+                            struct page *dest_page,
+                            gfp_t gfp_flags)
 
 {
         u8 xts_tweak[EXT4_XTS_TWEAK_SIZE];
@@ -266,7 +268,7 @@ static int ext4_page_crypto(struct inode *inode,
         struct crypto_skcipher *tfm = ci->ci_ctfm;
         int res = 0;
 
-        req = skcipher_request_alloc(tfm, GFP_NOFS);
+        req = skcipher_request_alloc(tfm, gfp_flags);
         if (!req) {
                 printk_ratelimited(KERN_ERR
                                    "%s: crypto_request_alloc() failed\n",
@@ -283,10 +285,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);
@@ -307,9 +309,10 @@ static int ext4_page_crypto(struct inode *inode,
         return 0;
 }
 
-static struct page *alloc_bounce_page(struct ext4_crypto_ctx *ctx)
+static struct page *alloc_bounce_page(struct ext4_crypto_ctx *ctx,
+                                      gfp_t gfp_flags)
 {
-        ctx->w.bounce_page = mempool_alloc(ext4_bounce_page_pool, GFP_NOWAIT);
+        ctx->w.bounce_page = mempool_alloc(ext4_bounce_page_pool, gfp_flags);
         if (ctx->w.bounce_page == NULL)
                 return ERR_PTR(-ENOMEM);
         ctx->flags |= EXT4_WRITE_PATH_FL;
@@ -332,7 +335,8 @@ static struct page *alloc_bounce_page(struct ext4_crypto_ctx *ctx)
  * error value or NULL.
  */
 struct page *ext4_encrypt(struct inode *inode,
-                          struct page *plaintext_page)
+                          struct page *plaintext_page,
+                          gfp_t gfp_flags)
 {
         struct ext4_crypto_ctx *ctx;
         struct page *ciphertext_page = NULL;
@@ -340,17 +344,17 @@ struct page *ext4_encrypt(struct inode *inode,
 
         BUG_ON(!PageLocked(plaintext_page));
 
-        ctx = ext4_get_crypto_ctx(inode);
+        ctx = ext4_get_crypto_ctx(inode, gfp_flags);
         if (IS_ERR(ctx))
                 return (struct page *) ctx;
 
         /* The encryption operation will require a bounce page. */
-        ciphertext_page = alloc_bounce_page(ctx);
+        ciphertext_page = alloc_bounce_page(ctx, gfp_flags);
         if (IS_ERR(ciphertext_page))
                 goto errout;
         ctx->w.control_page = plaintext_page;
         err = ext4_page_crypto(inode, EXT4_ENCRYPT, plaintext_page->index,
-                               plaintext_page, ciphertext_page);
+                               plaintext_page, ciphertext_page, gfp_flags);
         if (err) {
                 ciphertext_page = ERR_PTR(err);
         errout:
@@ -378,8 +382,8 @@ int ext4_decrypt(struct page *page)
 {
         BUG_ON(!PageLocked(page));
 
-        return ext4_page_crypto(page->mapping->host,
-                                EXT4_DECRYPT, page->index, page, page);
+        return ext4_page_crypto(page->mapping->host, EXT4_DECRYPT,
+                                page->index, page, page, GFP_NOFS);
 }
 
 int ext4_encrypted_zeroout(struct inode *inode, ext4_lblk_t lblk,
@@ -396,13 +400,13 @@ 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);
+        ctx = ext4_get_crypto_ctx(inode, GFP_NOFS);
         if (IS_ERR(ctx))
                 return PTR_ERR(ctx);
 
-        ciphertext_page = alloc_bounce_page(ctx);
+        ciphertext_page = alloc_bounce_page(ctx, GFP_NOWAIT);
         if (IS_ERR(ciphertext_page)) {
                 err = PTR_ERR(ciphertext_page);
                 goto errout;
@@ -410,11 +414,12 @@ int ext4_encrypted_zeroout(struct inode *inode, ext4_lblk_t lblk,
 
         while (len--) {
                 err = ext4_page_crypto(inode, EXT4_ENCRYPT, lblk,
-                                       ZERO_PAGE(0), ciphertext_page);
+                                       ZERO_PAGE(0), ciphertext_page,
+                                       GFP_NOFS);
                 if (err)
                         goto errout;
 
-                bio = bio_alloc(GFP_KERNEL, 1);
+                bio = bio_alloc(GFP_NOWAIT, 1);
                 if (!bio) {
                         err = -ENOMEM;
                         goto errout;
@@ -473,13 +478,16 @@ uint32_t ext4_validate_encryption_key_size(uint32_t mode, uint32_t size)
  */
 static int ext4_d_revalidate(struct dentry *dentry, unsigned int flags)
 {
-        struct inode *dir = d_inode(dentry->d_parent);
-        struct ext4_crypt_info *ci = EXT4_I(dir)->i_crypt_info;
+        struct dentry *dir;
+        struct ext4_crypt_info *ci;
         int dir_has_key, cached_with_key;
 
-        if (!ext4_encrypted_inode(dir))
+        dir = dget_parent(dentry);
+        if (!ext4_encrypted_inode(d_inode(dir))) {
+                dput(dir);
                 return 0;
-
+        }
+        ci = EXT4_I(d_inode(dir))->i_crypt_info;
         if (ci && ci->ci_keyring_key &&
             (ci->ci_keyring_key->flags & ((1 << KEY_FLAG_INVALIDATED) |
                                           (1 << KEY_FLAG_REVOKED) |
@@ -489,6 +497,7 @@ static int ext4_d_revalidate(struct dentry *dentry, unsigned int flags)
         /* this should eventually be an flag in d_flags */
         cached_with_key = dentry->d_fsdata != NULL;
         dir_has_key = (ci != NULL);
+        dput(dir);
 
         /*
          * If the dentry was cached without the key, and it is a
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index 50ba27cbed03..561d7308b393 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 c04743519865..349afebe21ee 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -912,6 +912,29 @@ do {									       \
 #include "extents_status.h"
 
 /*
+ * Lock subclasses for i_data_sem in the ext4_inode_info structure.
+ *
+ * These are needed to avoid lockdep false positives when we need to
+ * allocate blocks to the quota inode during ext4_map_blocks(), while
+ * holding i_data_sem for a normal (non-quota) inode.  Since we don't
+ * do quota tracking for the quota inode, this avoids deadlock (as
+ * well as infinite recursion, since it isn't turtles all the way
+ * down...)
+ *
+ *  I_DATA_SEM_NORMAL - Used for most inodes
+ *  I_DATA_SEM_OTHER  - Used by move_inode.c for the second normal inode
+ *                        where the second inode has larger inode number
+ *                        than the first
+ *  I_DATA_SEM_QUOTA  - Used for quota inodes only
+ */
+enum {
+        I_DATA_SEM_NORMAL = 0,
+        I_DATA_SEM_OTHER,
+        I_DATA_SEM_QUOTA,
+};
+
+
+/*
  * fourth extended file system inode data in memory
  */
 struct ext4_inode_info {
@@ -1961,7 +1984,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);
@@ -1974,7 +1997,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) {
@@ -2282,11 +2305,13 @@ extern struct kmem_cache *ext4_crypt_info_cachep;
 bool ext4_valid_contents_enc_mode(uint32_t mode);
 uint32_t ext4_validate_encryption_key_size(uint32_t mode, uint32_t size);
 extern struct workqueue_struct *ext4_read_workqueue;
-struct ext4_crypto_ctx *ext4_get_crypto_ctx(struct inode *inode);
+struct ext4_crypto_ctx *ext4_get_crypto_ctx(struct inode *inode,
+                                            gfp_t gfp_flags);
 void ext4_release_crypto_ctx(struct ext4_crypto_ctx *ctx);
 void ext4_restore_control_page(struct page *data_page);
 struct page *ext4_encrypt(struct inode *inode,
-                          struct page *plaintext_page);
+                          struct page *plaintext_page,
+                          gfp_t gfp_flags);
 int ext4_decrypt(struct page *page);
 int ext4_encrypted_zeroout(struct inode *inode, ext4_lblk_t lblk,
                            ext4_fsblk_t pblk, ext4_lblk_t len);
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 6659e216385e..fa2208bae2e1 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -329,7 +329,7 @@ static int ext4_file_open(struct inode * inode, struct file * filp)
         struct super_block *sb = inode->i_sb;
         struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
         struct vfsmount *mnt = filp->f_path.mnt;
-        struct inode *dir = filp->f_path.dentry->d_parent->d_inode;
+        struct dentry *dir;
         struct path path;
         char buf[64], *cp;
         int ret;
@@ -373,14 +373,18 @@ static int ext4_file_open(struct inode * inode, struct file * filp)
                 if (ext4_encryption_info(inode) == NULL)
                         return -ENOKEY;
         }
-        if (ext4_encrypted_inode(dir) &&
-            !ext4_is_child_context_consistent_with_parent(dir, inode)) {
+
+        dir = dget_parent(file_dentry(filp));
+        if (ext4_encrypted_inode(d_inode(dir)) &&
+            !ext4_is_child_context_consistent_with_parent(d_inode(dir), inode)) {
                 ext4_warning(inode->i_sb,
                              "Inconsistent encryption contexts: %lu/%lu\n",
-                             (unsigned long) dir->i_ino,
+                             (unsigned long) d_inode(dir)->i_ino,
                              (unsigned long) inode->i_ino);
+                dput(dir);
                 return -EPERM;
         }
+        dput(dir);
         /*
          * Set up the jbd2_inode if we are opening the inode for
          * writing and the journal is present
@@ -428,8 +432,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 dab84a2530ff..981a1fc30eaa 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -763,39 +763,47 @@ int ext4_get_block_unwritten(struct inode *inode, sector_t iblock,
 /* Maximum number of blocks we map for direct IO at once. */
 #define DIO_MAX_BLOCKS 4096
 
-static handle_t *start_dio_trans(struct inode *inode,
-                                 struct buffer_head *bh_result)
+/*
+ * Get blocks function for the cases that need to start a transaction -
+ * generally difference cases of direct IO and DAX IO. It also handles retries
+ * in case of ENOSPC.
+ */
+static int ext4_get_block_trans(struct inode *inode, sector_t iblock,
+                                struct buffer_head *bh_result, int flags)
 {
         int dio_credits;
+        handle_t *handle;
+        int retries = 0;
+        int ret;
 
         /* Trim mapping request to maximum we can map at once for DIO */
         if (bh_result->b_size >> inode->i_blkbits > DIO_MAX_BLOCKS)
                 bh_result->b_size = DIO_MAX_BLOCKS << inode->i_blkbits;
         dio_credits = ext4_chunk_trans_blocks(inode,
                                       bh_result->b_size >> inode->i_blkbits);
-        return ext4_journal_start(inode, EXT4_HT_MAP_BLOCKS, dio_credits);
+retry:
+        handle = ext4_journal_start(inode, EXT4_HT_MAP_BLOCKS, dio_credits);
+        if (IS_ERR(handle))
+                return PTR_ERR(handle);
+
+        ret = _ext4_get_block(inode, iblock, bh_result, flags);
+        ext4_journal_stop(handle);
+
+        if (ret == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
+                goto retry;
+        return ret;
 }
 
 /* Get block function for DIO reads and writes to inodes without extents */
 int ext4_dio_get_block(struct inode *inode, sector_t iblock,
                        struct buffer_head *bh, int create)
 {
-        handle_t *handle;
-        int ret;
-
         /* We don't expect handle for direct IO */
         WARN_ON_ONCE(ext4_journal_current_handle());
 
-        if (create) {
-                handle = start_dio_trans(inode, bh);
-                if (IS_ERR(handle))
-                        return PTR_ERR(handle);
-        }
-        ret = _ext4_get_block(inode, iblock, bh,
-                              create ? EXT4_GET_BLOCKS_CREATE : 0);
-        if (create)
-                ext4_journal_stop(handle);
-        return ret;
+        if (!create)
+                return _ext4_get_block(inode, iblock, bh, 0);
+        return ext4_get_block_trans(inode, iblock, bh, EXT4_GET_BLOCKS_CREATE);
 }
 
 /*
@@ -806,18 +814,13 @@ int ext4_dio_get_block(struct inode *inode, sector_t iblock,
 static int ext4_dio_get_block_unwritten_async(struct inode *inode,
                 sector_t iblock, struct buffer_head *bh_result, int create)
 {
-        handle_t *handle;
         int ret;
 
         /* We don't expect handle for direct IO */
         WARN_ON_ONCE(ext4_journal_current_handle());
 
-        handle = start_dio_trans(inode, bh_result);
-        if (IS_ERR(handle))
-                return PTR_ERR(handle);
-        ret = _ext4_get_block(inode, iblock, bh_result,
-                              EXT4_GET_BLOCKS_IO_CREATE_EXT);
-        ext4_journal_stop(handle);
+        ret = ext4_get_block_trans(inode, iblock, bh_result,
+                                   EXT4_GET_BLOCKS_IO_CREATE_EXT);
 
         /*
          * When doing DIO using unwritten extents, we need io_end to convert
@@ -850,18 +853,13 @@ static int ext4_dio_get_block_unwritten_async(struct inode *inode,
 static int ext4_dio_get_block_unwritten_sync(struct inode *inode,
                 sector_t iblock, struct buffer_head *bh_result, int create)
 {
-        handle_t *handle;
         int ret;
 
         /* We don't expect handle for direct IO */
         WARN_ON_ONCE(ext4_journal_current_handle());
 
-        handle = start_dio_trans(inode, bh_result);
-        if (IS_ERR(handle))
-                return PTR_ERR(handle);
-        ret = _ext4_get_block(inode, iblock, bh_result,
-                              EXT4_GET_BLOCKS_IO_CREATE_EXT);
-        ext4_journal_stop(handle);
+        ret = ext4_get_block_trans(inode, iblock, bh_result,
+                                   EXT4_GET_BLOCKS_IO_CREATE_EXT);
 
         /*
          * Mark inode as having pending DIO writes to unwritten extents.
@@ -1057,7 +1055,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 +1067,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 +1157,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 +1186,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 +1194,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 +1250,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 +1293,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 +1313,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 +1397,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 +1421,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 +1535,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 +1551,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 +1561,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 +1570,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 +1617,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 +1634,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 +2005,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 +2032,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 +2074,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 +2211,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 +2272,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 +2424,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 +2560,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 +2645,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 +2676,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 +2836,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 +2879,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 +2887,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 +2915,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 +2963,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 +3185,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);
@@ -3556,8 +3554,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;
@@ -3565,14 +3563,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);
@@ -3614,7 +3612,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));
                 }
         }
@@ -3638,7 +3636,7 @@ static int __ext4_block_zero_page_range(handle_t *handle,
 
 unlock:
         unlock_page(page);
-        page_cache_release(page);
+        put_page(page);
         return err;
 }
 
@@ -3653,7 +3651,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));
 
@@ -3678,7 +3676,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;
@@ -3816,7 +3814,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;
         }
 
@@ -4891,23 +4889,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;
@@ -5546,10 +5544,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
@@ -5580,7 +5578,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..325cef48b39a 100644
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -60,10 +60,10 @@ ext4_double_down_write_data_sem(struct inode *first, struct inode *second)
 {
         if (first < second) {
                 down_write(&EXT4_I(first)->i_data_sem);
-                down_write_nested(&EXT4_I(second)->i_data_sem, SINGLE_DEPTH_NESTING);
+                down_write_nested(&EXT4_I(second)->i_data_sem, I_DATA_SEM_OTHER);
         } else {
                 down_write(&EXT4_I(second)->i_data_sem);
-                down_write_nested(&EXT4_I(first)->i_data_sem, SINGLE_DEPTH_NESTING);
+                down_write_nested(&EXT4_I(first)->i_data_sem, I_DATA_SEM_OTHER);
 
         }
 }
@@ -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 &&
@@ -484,6 +484,13 @@ mext_check_arguments(struct inode *orig_inode,
                 return -EBUSY;
         }
 
+        if (IS_NOQUOTA(orig_inode) || IS_NOQUOTA(donor_inode)) {
+                ext4_debug("ext4 move extent: The argument files should "
+                        "not be quota files [ino:orig %lu, donor %lu]\n",
+                        orig_inode->i_ino, donor_inode->i_ino);
+                return -EBUSY;
+        }
+
         /* Ext4 move extent supports only extent based file */
         if (!(ext4_test_inode_flag(orig_inode, EXT4_INODE_EXTENTS))) {
                 ext4_debug("ext4 move extent: orig file is not extents "
@@ -554,7 +561,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 +655,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 d77d15f4b674..e4fc8ea45d78 100644
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@ -23,6 +23,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
+#include <linux/backing-dev.h>
 
 #include "ext4_jbd2.h"
 #include "xattr.h"
@@ -432,8 +433,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
@@ -470,9 +471,20 @@ int ext4_bio_write_page(struct ext4_io_submit *io,
 
         if (ext4_encrypted_inode(inode) && S_ISREG(inode->i_mode) &&
             nr_to_submit) {
-                data_page = ext4_encrypt(inode, page);
+                gfp_t gfp_flags = GFP_NOFS;
+
+        retry_encrypt:
+                data_page = ext4_encrypt(inode, page, gfp_flags);
                 if (IS_ERR(data_page)) {
                         ret = PTR_ERR(data_page);
+                        if (ret == -ENOMEM && wbc->sync_mode == WB_SYNC_ALL) {
+                                if (io->io_bio) {
+                                        ext4_io_submit(io);
+                                        congestion_wait(BLK_RW_ASYNC, HZ/50);
+                                }
+                                gfp_flags |= __GFP_NOFAIL;
+                                goto retry_encrypt;
+                        }
                         data_page = NULL;
                         goto out;
                 }
diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c
index 5dc5e95063de..dc54a4b60eba 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);
@@ -279,7 +279,7 @@ int ext4_mpage_readpages(struct address_space *mapping,
 
                         if (ext4_encrypted_inode(inode) &&
                             S_ISREG(inode->i_mode)) {
-                                ctx = ext4_get_crypto_ctx(inode);
+                                ctx = ext4_get_crypto_ctx(inode, GFP_NOFS);
                                 if (IS_ERR(ctx))
                                         goto set_error_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 539297515896..304c712dbe12 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1113,6 +1113,7 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type,
 static int ext4_quota_enable(struct super_block *sb, int type, int format_id,
                              unsigned int flags);
 static int ext4_enable_quotas(struct super_block *sb);
+static int ext4_get_next_id(struct super_block *sb, struct kqid *qid);
 
 static struct dquot **ext4_get_dquots(struct inode *inode)
 {
@@ -1129,7 +1130,7 @@ static const struct dquot_operations ext4_quota_operations = {
         .alloc_dquot    = dquot_alloc,
         .destroy_dquot  = dquot_destroy,
         .get_projid     = ext4_get_projid,
-        .get_next_id    = dquot_get_next_id,
+        .get_next_id    = ext4_get_next_id,
 };
 
 static const struct quotactl_ops ext4_qctl_operations = {
@@ -1323,9 +1324,9 @@ static int set_qf_name(struct super_block *sb, int qtype, substring_t *args)
                 return -1;
         }
         if (ext4_has_feature_quota(sb)) {
-                ext4_msg(sb, KERN_ERR, "Cannot set journaled quota options "
-                         "when QUOTA feature is enabled");
-                return -1;
+                ext4_msg(sb, KERN_INFO, "Journaled quota options "
+                         "ignored when QUOTA feature is enabled");
+                return 1;
         }
         qname = match_strdup(args);
         if (!qname) {
@@ -1688,10 +1689,10 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token,
                         return -1;
                 }
                 if (ext4_has_feature_quota(sb)) {
-                        ext4_msg(sb, KERN_ERR,
-                                 "Cannot set journaled quota options "
+                        ext4_msg(sb, KERN_INFO,
+                                 "Quota format mount options ignored "
                                  "when QUOTA feature is enabled");
-                        return -1;
+                        return 1;
                 }
                 sbi->s_jquota_fmt = m->mount_opt;
 #endif
@@ -1756,11 +1757,11 @@ static int parse_options(char *options, struct super_block *sb,
 #ifdef CONFIG_QUOTA
         if (ext4_has_feature_quota(sb) &&
             (test_opt(sb, USRQUOTA) || test_opt(sb, GRPQUOTA))) {
-                ext4_msg(sb, KERN_ERR, "Cannot set quota options when QUOTA "
-                         "feature is enabled");
-                return 0;
-        }
-        if (sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) {
+                ext4_msg(sb, KERN_INFO, "Quota feature enabled, usrquota and grpquota "
+                         "mount options ignored.");
+                clear_opt(sb, USRQUOTA);
+                clear_opt(sb, GRPQUOTA);
+        } else if (sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) {
                 if (test_opt(sb, USRQUOTA) && sbi->s_qf_names[USRQUOTA])
                         clear_opt(sb, USRQUOTA);
 
@@ -1784,7 +1785,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;
@@ -3808,7 +3809,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;
@@ -5028,6 +5029,20 @@ static int ext4_quota_on_mount(struct super_block *sb, int type)
                                         EXT4_SB(sb)->s_jquota_fmt, type);
 }
 
+static void lockdep_set_quota_inode(struct inode *inode, int subclass)
+{
+        struct ext4_inode_info *ei = EXT4_I(inode);
+
+        /* The first argument of lockdep_set_subclass has to be
+         * *exactly* the same as the argument to init_rwsem() --- in
+         * this case, in init_once() --- or lockdep gets unhappy
+         * because the name of the lock is set using the
+         * stringification of the argument to init_rwsem().
+         */
+        (void) ei;      /* shut up clang warning if !CONFIG_LOCKDEP */
+        lockdep_set_subclass(&ei->i_data_sem, subclass);
+}
+
 /*
  * Standard function to be called on quota_on
  */
@@ -5067,8 +5082,12 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id,
                 if (err)
                         return err;
         }
-
-        return dquot_quota_on(sb, type, format_id, path);
+        lockdep_set_quota_inode(path->dentry->d_inode, I_DATA_SEM_QUOTA);
+        err = dquot_quota_on(sb, type, format_id, path);
+        if (err)
+                lockdep_set_quota_inode(path->dentry->d_inode,
+                                             I_DATA_SEM_NORMAL);
+        return err;
 }
 
 static int ext4_quota_enable(struct super_block *sb, int type, int format_id,
@@ -5095,8 +5114,11 @@ static int ext4_quota_enable(struct super_block *sb, int type, int format_id,
 
         /* Don't account quota for quota files to avoid recursion */
         qf_inode->i_flags |= S_NOQUOTA;
+        lockdep_set_quota_inode(qf_inode, I_DATA_SEM_QUOTA);
         err = dquot_enable(qf_inode, type, format_id, flags);
         iput(qf_inode);
+        if (err)
+                lockdep_set_quota_inode(qf_inode, I_DATA_SEM_NORMAL);
 
         return err;
 }
@@ -5253,6 +5275,17 @@ out:
         return len;
 }
 
+static int ext4_get_next_id(struct super_block *sb, struct kqid *qid)
+{
+        const struct quota_format_ops   *ops;
+
+        if (!sb_has_quota_loaded(sb, qid->type))
+                return -ESRCH;
+        ops = sb_dqopt(sb)->ops[qid->type];
+        if (!ops || !ops->get_next_id)
+                return -ENOSYS;
+        return dquot_get_next_id(sb, qid);
+}
 #endif
 
 static struct dentry *ext4_mount(struct file_system_type *fs_type, int flags,
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/ext4/xattr.c b/fs/ext4/xattr.c
index 0441e055c8e8..e79bd32b9b79 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -230,6 +230,27 @@ ext4_xattr_check_block(struct inode *inode, struct buffer_head *bh)
         return error;
 }
 
+static int
+__xattr_check_inode(struct inode *inode, struct ext4_xattr_ibody_header *header,
+                         void *end, const char *function, unsigned int line)
+{
+        struct ext4_xattr_entry *entry = IFIRST(header);
+        int error = -EFSCORRUPTED;
+
+        if (((void *) header >= end) ||
+            (header->h_magic != le32_to_cpu(EXT4_XATTR_MAGIC)))
+                goto errout;
+        error = ext4_xattr_check_names(entry, end, entry);
+errout:
+        if (error)
+                __ext4_error_inode(inode, function, line, 0,
+                                   "corrupted in-inode xattr");
+        return error;
+}
+
+#define xattr_check_inode(inode, header, end) \
+        __xattr_check_inode((inode), (header), (end), __func__, __LINE__)
+
 static inline int
 ext4_xattr_check_entry(struct ext4_xattr_entry *entry, size_t size)
 {
@@ -341,7 +362,7 @@ ext4_xattr_ibody_get(struct inode *inode, int name_index, const char *name,
         header = IHDR(inode, raw_inode);
         entry = IFIRST(header);
         end = (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size;
-        error = ext4_xattr_check_names(entry, end, entry);
+        error = xattr_check_inode(inode, header, end);
         if (error)
                 goto cleanup;
         error = ext4_xattr_find_entry(&entry, name_index, name,
@@ -477,7 +498,7 @@ ext4_xattr_ibody_list(struct dentry *dentry, char *buffer, size_t buffer_size)
         raw_inode = ext4_raw_inode(&iloc);
         header = IHDR(inode, raw_inode);
         end = (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size;
-        error = ext4_xattr_check_names(IFIRST(header), end, IFIRST(header));
+        error = xattr_check_inode(inode, header, end);
         if (error)
                 goto cleanup;
         error = ext4_xattr_list_entries(dentry, IFIRST(header),
@@ -1040,8 +1061,7 @@ int ext4_xattr_ibody_find(struct inode *inode, struct ext4_xattr_info *i,
         is->s.here = is->s.first;
         is->s.end = (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size;
         if (ext4_test_inode_state(inode, EXT4_STATE_XATTR)) {
-                error = ext4_xattr_check_names(IFIRST(header), is->s.end,
-                                               IFIRST(header));
+                error = xattr_check_inode(inode, header, is->s.end);
                 if (error)
                         return error;
                 /* Find the named attribute. */
@@ -1356,6 +1376,10 @@ retry:
         last = entry;
         total_ino = sizeof(struct ext4_xattr_ibody_header);
 
+        error = xattr_check_inode(inode, header, end);
+        if (error)
+                goto cleanup;
+
         free = ext4_xattr_free_space(last, &min_offs, base, &total_ino);
         if (free >= new_extra_isize) {
                 entry = IFIRST(header);
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index e5c762b37239..53fec0872e60 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -223,7 +223,7 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio)
         /* Allocate a new bio */
         bio = __bio_alloc(fio->sbi, fio->new_blkaddr, 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;
         }
@@ -265,8 +265,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;
         }
@@ -406,7 +406,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;
@@ -517,7 +517,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);
@@ -530,8 +530,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);
         }
@@ -570,9 +570,9 @@ alloc:
         /* update i_size */
         fofs = start_bidx_of_node(ofs_of_node(dn->node_page), dn->inode) +
                                                         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;
 }
 
@@ -971,7 +971,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;
@@ -1021,7 +1021,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:
@@ -1032,7 +1032,7 @@ confused:
                 unlock_page(page);
 next_page:
                 if (pages)
-                        page_cache_release(page);
+                        put_page(page);
         }
         BUG_ON(pages && !list_empty(pages));
         if (bio)
@@ -1136,7 +1136,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;
@@ -1157,11 +1157,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;
@@ -1267,8 +1267,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 */
@@ -1448,11 +1448,11 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,
          * the block addresses when there is no need to fill the page.
          */
         if (!f2fs_has_inline_data(inode) && !f2fs_encrypted_inode(inode) &&
-                                        len == PAGE_CACHE_SIZE)
+                                        len == PAGE_SIZE)
                 return 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;
         }
@@ -1513,7 +1513,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;
@@ -1561,22 +1561,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,
@@ -1688,7 +1688,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 80641ad82745..af819571bce7 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 bbe2cd1265d0..7a4558d17f36 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1294,7 +1294,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 b41c3579ea9e..443e07705c2a 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) {
@@ -370,7 +370,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);
 
@@ -508,8 +508,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;
 
@@ -529,7 +529,7 @@ static int truncate_partial_data_page(struct inode *inode, u64 from,
                 return 0;
 truncate_out:
         f2fs_wait_on_page_writeback(page, DATA, true);
-        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);
@@ -799,11 +799,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,
@@ -813,7 +813,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;
                 }
@@ -830,8 +830,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);
 
@@ -954,8 +954,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);
@@ -1006,11 +1006,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,
@@ -1024,12 +1024,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++) {
@@ -1060,7 +1060,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) {
@@ -1117,8 +1117,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;
 
@@ -1158,11 +1158,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);
 
@@ -1180,12 +1180,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) &&
@@ -1652,8 +1652,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);
 
@@ -1770,7 +1770,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 358214e9f707..a2fbe6f427d3 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);
 
@@ -375,7 +375,7 @@ static int f2fs_convert_inline_dir(struct inode *dir, struct page *ipage,
                 goto out;
 
         f2fs_wait_on_page_writeback(page, DATA, true);
-        zero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE);
+        zero_user_segment(page, MAX_INLINE_DATA, PAGE_SIZE);
 
         dentry_blk = kmap_atomic(page);
 
@@ -405,8 +405,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 7876f1052101..013e57932d61 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -1027,12 +1027,6 @@ static const char *f2fs_encrypted_get_link(struct dentry *dentry,
                 goto errout;
         }
 
-        /* this is broken symlink case */
-        if (unlikely(cstr.name[0] == 0)) {
-                res = -ENOENT;
-                goto errout;
-        }
-
         if ((cstr.len + sizeof(struct fscrypt_symlink_data) - 1) > max_size) {
                 /* Symlink data on the disk is corrupted */
                 res = -EIO;
@@ -1046,17 +1040,23 @@ static const char *f2fs_encrypted_get_link(struct dentry *dentry,
         if (res < 0)
                 goto errout;
 
+        /* this is broken symlink case */
+        if (unlikely(pstr.name[0] == 0)) {
+                res = -ENOENT;
+                goto errout;
+        }
+
         paddr = pstr.name;
 
         /* Null-terminate the name */
         paddr[res] = '\0';
 
-        page_cache_release(cpage);
+        put_page(cpage);
         set_delayed_call(done, kfree_link, paddr);
         return paddr;
 errout:
         fscrypt_fname_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 118321bd1a7f..1a33de9d84b1 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 0b30cd2aeebd..011942f94d64 100644
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -591,7 +591,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 6f16b39f0b52..540669d6978e 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -885,12 +885,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;
 }
@@ -909,9 +909,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);
 }
@@ -1596,7 +1596,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;
 
@@ -1757,7 +1757,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;
 
@@ -1844,7 +1844,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);
@@ -2171,7 +2171,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;
                 init_rwsem(&array[i].journal_rwsem);
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 15bb81f8dac2..006f87d69921 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -984,9 +984,25 @@ static loff_t max_file_blocks(void)
         return result;
 }
 
+static int __f2fs_commit_super(struct buffer_head *bh,
+                        struct f2fs_super_block *super)
+{
+        lock_buffer(bh);
+        if (super)
+                memcpy(bh->b_data + F2FS_SUPER_OFFSET, super, sizeof(*super));
+        set_buffer_uptodate(bh);
+        set_buffer_dirty(bh);
+        unlock_buffer(bh);
+
+        /* it's rare case, we can do fua all the time */
+        return __sync_dirty_buffer(bh, WRITE_FLUSH_FUA);
+}
+
 static inline bool sanity_check_area_boundary(struct super_block *sb,
-                                        struct f2fs_super_block *raw_super)
+                                        struct buffer_head *bh)
 {
+        struct f2fs_super_block *raw_super = (struct f2fs_super_block *)
+                                        (bh->b_data + F2FS_SUPER_OFFSET);
         u32 segment0_blkaddr = le32_to_cpu(raw_super->segment0_blkaddr);
         u32 cp_blkaddr = le32_to_cpu(raw_super->cp_blkaddr);
         u32 sit_blkaddr = le32_to_cpu(raw_super->sit_blkaddr);
@@ -1000,6 +1016,10 @@ static inline bool sanity_check_area_boundary(struct super_block *sb,
         u32 segment_count_main = le32_to_cpu(raw_super->segment_count_main);
         u32 segment_count = le32_to_cpu(raw_super->segment_count);
         u32 log_blocks_per_seg = le32_to_cpu(raw_super->log_blocks_per_seg);
+        u64 main_end_blkaddr = main_blkaddr +
+                                (segment_count_main << log_blocks_per_seg);
+        u64 seg_end_blkaddr = segment0_blkaddr +
+                                (segment_count << log_blocks_per_seg);
 
         if (segment0_blkaddr != cp_blkaddr) {
                 f2fs_msg(sb, KERN_INFO,
@@ -1044,22 +1064,45 @@ static inline bool sanity_check_area_boundary(struct super_block *sb,
                 return true;
         }
 
-        if (main_blkaddr + (segment_count_main << log_blocks_per_seg) !=
-                segment0_blkaddr + (segment_count << log_blocks_per_seg)) {
+        if (main_end_blkaddr > seg_end_blkaddr) {
                 f2fs_msg(sb, KERN_INFO,
-                        "Wrong MAIN_AREA boundary, start(%u) end(%u) blocks(%u)",
+                        "Wrong MAIN_AREA boundary, start(%u) end(%u) block(%u)",
                         main_blkaddr,
-                        segment0_blkaddr + (segment_count << log_blocks_per_seg),
+                        segment0_blkaddr +
+                                (segment_count << log_blocks_per_seg),
                         segment_count_main << log_blocks_per_seg);
                 return true;
+        } else if (main_end_blkaddr < seg_end_blkaddr) {
+                int err = 0;
+                char *res;
+
+                /* fix in-memory information all the time */
+                raw_super->segment_count = cpu_to_le32((main_end_blkaddr -
+                                segment0_blkaddr) >> log_blocks_per_seg);
+
+                if (f2fs_readonly(sb) || bdev_read_only(sb->s_bdev)) {
+                        res = "internally";
+                } else {
+                        err = __f2fs_commit_super(bh, NULL);
+                        res = err ? "failed" : "done";
+                }
+                f2fs_msg(sb, KERN_INFO,
+                        "Fix alignment : %s, start(%u) end(%u) block(%u)",
+                        res, main_blkaddr,
+                        segment0_blkaddr +
+                                (segment_count << log_blocks_per_seg),
+                        segment_count_main << log_blocks_per_seg);
+                if (err)
+                        return true;
         }
-
         return false;
 }
 
 static int sanity_check_raw_super(struct super_block *sb,
-                        struct f2fs_super_block *raw_super)
+                                struct buffer_head *bh)
 {
+        struct f2fs_super_block *raw_super = (struct f2fs_super_block *)
+                                        (bh->b_data + F2FS_SUPER_OFFSET);
         unsigned int blocksize;
 
         if (F2FS_SUPER_MAGIC != le32_to_cpu(raw_super->magic)) {
@@ -1070,10 +1113,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;
         }
 
@@ -1126,7 +1169,7 @@ static int sanity_check_raw_super(struct super_block *sb,
         }
 
         /* check CP/SIT/NAT/SSA/MAIN_AREA area boundary */
-        if (sanity_check_area_boundary(sb, raw_super))
+        if (sanity_check_area_boundary(sb, bh))
                 return 1;
 
         return 0;
@@ -1202,7 +1245,7 @@ static int read_raw_super_block(struct super_block *sb,
 {
         int block;
         struct buffer_head *bh;
-        struct f2fs_super_block *super, *buf;
+        struct f2fs_super_block *super;
         int err = 0;
 
         super = kzalloc(sizeof(struct f2fs_super_block), GFP_KERNEL);
@@ -1218,11 +1261,8 @@ static int read_raw_super_block(struct super_block *sb,
                         continue;
                 }
 
-                buf = (struct f2fs_super_block *)
-                                (bh->b_data + F2FS_SUPER_OFFSET);
-
                 /* sanity checking of raw super */
-                if (sanity_check_raw_super(sb, buf)) {
+                if (sanity_check_raw_super(sb, bh)) {
                         f2fs_msg(sb, KERN_ERR,
                                 "Can't find valid F2FS filesystem in %dth superblock",
                                 block + 1);
@@ -1232,7 +1272,8 @@ static int read_raw_super_block(struct super_block *sb,
                 }
 
                 if (!*raw_super) {
-                        memcpy(super, buf, sizeof(*super));
+                        memcpy(super, bh->b_data + F2FS_SUPER_OFFSET,
+                                                        sizeof(*super));
                         *valid_super_block = block;
                         *raw_super = super;
                 }
@@ -1252,42 +1293,29 @@ static int read_raw_super_block(struct super_block *sb,
         return err;
 }
 
-static int __f2fs_commit_super(struct f2fs_sb_info *sbi, int block)
+int f2fs_commit_super(struct f2fs_sb_info *sbi, bool recover)
 {
-        struct f2fs_super_block *super = F2FS_RAW_SUPER(sbi);
         struct buffer_head *bh;
         int err;
 
-        bh = sb_getblk(sbi->sb, block);
+        /* write back-up superblock first */
+        bh = sb_getblk(sbi->sb, sbi->valid_super_block ? 0: 1);
         if (!bh)
                 return -EIO;
-
-        lock_buffer(bh);
-        memcpy(bh->b_data + F2FS_SUPER_OFFSET, super, sizeof(*super));
-        set_buffer_uptodate(bh);
-        set_buffer_dirty(bh);
-        unlock_buffer(bh);
-
-        /* it's rare case, we can do fua all the time */
-        err = __sync_dirty_buffer(bh, WRITE_FLUSH_FUA);
+        err = __f2fs_commit_super(bh, F2FS_RAW_SUPER(sbi));
         brelse(bh);
 
-        return err;
-}
-
-int f2fs_commit_super(struct f2fs_sb_info *sbi, bool recover)
-{
-        int err;
-
-        /* write back-up superblock first */
-        err = __f2fs_commit_super(sbi, sbi->valid_super_block ? 0 : 1);
-
         /* if we are in recovery path, skip writing valid superblock */
         if (recover || err)
                 return err;
 
         /* write current valid superblock */
-        return __f2fs_commit_super(sbi, sbi->valid_super_block);
+        bh = sb_getblk(sbi->sb, sbi->valid_super_block);
+        if (!bh)
+                return -EIO;
+        err = __f2fs_commit_super(bh, F2FS_RAW_SUPER(sbi));
+        brelse(bh);
+        return err;
 }
 
 static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
@@ -1442,7 +1470,7 @@ try_onemore:
         seg_i = CURSEG_I(sbi, CURSEG_HOT_NODE);
         if (__exist_node_summaries(sbi))
                 sbi->kbytes_written =
-                        le64_to_cpu(seg_i->sum_blk->journal.info.kbytes_written);
+                        le64_to_cpu(seg_i->journal->info.kbytes_written);
 
         build_gc_manager(sbi);
 
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 fee81e8768c9..592cea54cea0 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 9dde38f12c07..719924d6c706 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;
@@ -683,11 +683,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 {
@@ -704,7 +704,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;
 
@@ -789,7 +789,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);
@@ -800,7 +800,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;
@@ -836,7 +836,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);
@@ -858,7 +858,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++;
@@ -1003,17 +1003,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;
@@ -1024,7 +1024,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;
 
@@ -1034,8 +1034,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);
@@ -1059,7 +1059,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;
                 }
@@ -1072,7 +1072,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)
@@ -1086,8 +1086,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);
 }
 
@@ -1205,8 +1205,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;
@@ -1315,8 +1315,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;
         int err = 0;
@@ -1466,7 +1466,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;
@@ -1727,7 +1727,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;
@@ -1742,7 +1742,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;
@@ -1799,7 +1799,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;
@@ -1924,7 +1924,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;
@@ -1938,15 +1938,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;
@@ -1960,7 +1960,7 @@ success:
 
 cleanup:
         unlock_page(page);
-        page_cache_release(page);
+        put_page(page);
 error:
         return err;
 }
@@ -1973,16 +1973,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 7e553f286775..9ed0f26cf023 100644
--- a/fs/jffs2/gc.c
+++ b/fs/jffs2/gc.c
@@ -552,7 +552,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 {
@@ -1192,8 +1192,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);
 
@@ -1351,7 +1351,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 b67dbccdaf88..f73541fbe7af 100644
--- a/fs/kernfs/mount.c
+++ b/fs/kernfs/mount.c
@@ -138,8 +138,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..eedc644b78d7 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/namei.c b/fs/namei.c
index 794f81dce766..1d9ca2d5dff6 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1740,15 +1740,17 @@ static int walk_component(struct nameidata *nd, int flags)
                                           nd->flags);
                 if (IS_ERR(path.dentry))
                         return PTR_ERR(path.dentry);
-                if (unlikely(d_is_negative(path.dentry))) {
-                        dput(path.dentry);
-                        return -ENOENT;
-                }
+
                 path.mnt = nd->path.mnt;
                 err = follow_managed(&path, nd);
                 if (unlikely(err < 0))
                         return err;
 
+                if (unlikely(d_is_negative(path.dentry))) {
+                        path_to_nameidata(&path, nd);
+                        return -ENOENT;
+                }
+
                 seq = 0;        /* we are already out of RCU mode */
                 inode = d_backing_inode(path.dentry);
         }
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 02e4d87d2ed3..17a42e4eb872 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,
@@ -820,7 +820,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);
@@ -828,9 +828,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 bc21205309e0..18e6fd0b9506 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..33eb81738d03 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -377,7 +377,7 @@ int nfs_readdir_xdr_filler(struct page **pages, nfs_readdir_descriptor_t *desc,
  again:
         timestamp = jiffies;
         gencount = nfs_inc_attr_generation_counter();
-        error = NFS_PROTO(inode)->readdir(file->f_path.dentry, cred, entry->cookie, pages,
+        error = NFS_PROTO(inode)->readdir(file_dentry(file), cred, entry->cookie, pages,
                                           NFS_SERVER(inode)->dtsize, desc->plus);
         if (error < 0) {
                 /* We requested READDIRPLUS, but the server doesn't grok it */
@@ -560,7 +560,7 @@ int nfs_readdir_page_filler(nfs_readdir_descriptor_t *desc, struct nfs_entry *en
                 count++;
 
                 if (desc->plus != 0)
-                        nfs_prime_dcache(desc->file->f_path.dentry, entry);
+                        nfs_prime_dcache(file_dentry(desc->file), entry);
 
                 status = nfs_readdir_add_to_array(entry, page);
                 if (status != 0)
@@ -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;
 }
 
@@ -864,7 +864,7 @@ static bool nfs_dir_mapping_need_revalidate(struct inode *dir)
  */
 static int nfs_readdir(struct file *file, struct dir_context *ctx)
 {
-        struct dentry   *dentry = file->f_path.dentry;
+        struct dentry   *dentry = file_dentry(file);
         struct inode    *inode = d_inode(dentry);
         nfs_readdir_descriptor_t my_desc,
                         *desc = &my_desc;
@@ -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 89bf093d342a..be01095b97ae 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -320,7 +320,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)) {
@@ -351,7 +351,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;
 
@@ -380,12 +380,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;
         }
@@ -396,7 +396,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;
 
@@ -413,20 +413,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;
@@ -454,7 +454,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/inode.c b/fs/nfs/inode.c
index 33d18c411905..738c84a42eb0 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -940,7 +940,7 @@ int nfs_open(struct inode *inode, struct file *filp)
 {
         struct nfs_open_context *ctx;
 
-        ctx = alloc_nfs_open_context(filp->f_path.dentry, filp->f_mode);
+        ctx = alloc_nfs_open_context(file_dentry(filp), filp->f_mode);
         if (IS_ERR(ctx))
                 return PTR_ERR(ctx);
         nfs_file_set_open_context(filp, ctx);
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 565f8135ae1f..f1d1d2c472e9 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -638,11 +638,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/nfs4file.c b/fs/nfs/nfs4file.c
index 22c35abbee9d..d0390516467c 100644
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -26,7 +26,7 @@ static int
 nfs4_file_open(struct inode *inode, struct file *filp)
 {
         struct nfs_open_context *ctx;
-        struct dentry *dentry = filp->f_path.dentry;
+        struct dentry *dentry = file_dentry(filp);
         struct dentry *parent = NULL;
         struct inode *dir;
         unsigned openflags = filp->f_flags;
@@ -57,7 +57,7 @@ nfs4_file_open(struct inode *inode, struct file *filp)
         parent = dget_parent(dentry);
         dir = d_inode(parent);
 
-        ctx = alloc_nfs_open_context(filp->f_path.dentry, filp->f_mode);
+        ctx = alloc_nfs_open_context(file_dentry(filp), filp->f_mode);
         err = PTR_ERR(ctx);
         if (IS_ERR(ctx))
                 goto out;
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 70907d638b60..e361d1a0ca09 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -6671,7 +6671,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)));
@@ -6679,21 +6679,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)
@@ -6712,7 +6712,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]) {
@@ -6723,7 +6723,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) {
@@ -6950,8 +6950,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) {
@@ -6971,8 +6971,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 1581240a7ca0..ad1577348a92 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;
 
@@ -511,12 +511,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;
@@ -684,13 +684,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)
 
 struct ocfs2_unwritten_extent {
         struct list_head        ue_node;
@@ -785,7 +785,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]);
                 }
         }
 }
@@ -808,7 +808,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);
 }
@@ -857,7 +857,7 @@ static int ocfs2_alloc_write_ctxt(struct ocfs2_write_ctxt **wcp,
         wc->w_di_bh = di_bh;
         wc->w_type = type;
 
-        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;
@@ -920,7 +920,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;
 
@@ -960,7 +960,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)
@@ -1034,7 +1034,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
@@ -1053,14 +1053,14 @@ 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 {
                 wc->w_num_pages = 1;
                 start = target_index;
         }
-        end_index = (user_pos + user_len - 1) >> PAGE_CACHE_SHIFT;
+        end_index = (user_pos + user_len - 1) >> PAGE_SHIFT;
 
         for(i = 0; i < wc->w_num_pages; i++) {
                 index = start + i;
@@ -1082,7 +1082,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 if (index >= target_index && index <= end_index &&
@@ -1272,7 +1272,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)
@@ -1309,7 +1309,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;
         }
 }
 
@@ -1981,7 +1981,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;
@@ -2027,8 +2027,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 {
                         /*
@@ -2037,7 +2037,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 bd15929b5f92..1934abb6b680 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 c18ab45f8d21..5308841756be 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 9ea081f4e6e4..71545ad4628c 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(mapping, pos, len, OCFS2_WRITE_MMAP,
                                        &locked_page, &fsdata, di_bh, page);
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
index 6cf6538a0651..e63af7ddfe68 100644
--- a/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
@@ -822,10 +822,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;
 }
@@ -839,10 +839,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;
@@ -853,8 +853,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/quota_global.c b/fs/ocfs2/quota_global.c
index 3892f3c079ca..ab6a6cdcf91c 100644
--- a/fs/ocfs2/quota_global.c
+++ b/fs/ocfs2/quota_global.c
@@ -867,6 +867,10 @@ static int ocfs2_get_next_id(struct super_block *sb, struct kqid *qid)
         int status = 0;
 
         trace_ocfs2_get_next_id(from_kqid(&init_user_ns, *qid), type);
+        if (!sb_has_quota_loaded(sb, type)) {
+                status = -ESRCH;
+                goto out;
+        }
         status = ocfs2_lock_global_qf(info, 0);
         if (status < 0)
                 goto out;
@@ -878,8 +882,11 @@ static int ocfs2_get_next_id(struct super_block *sb, struct kqid *qid)
 out_global:
         ocfs2_unlock_global_qf(info, 0);
 out:
-        /* Avoid logging ENOENT since it just means there isn't next ID */
-        if (status && status != -ENOENT)
+        /*
+         * Avoid logging ENOENT since it just means there isn't next ID and
+         * ESRCH which means quota isn't enabled for the filesystem.
+         */
+        if (status && status != -ENOENT && status != -ESRCH)
                 mlog_errno(status);
         return status;
 }
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 7db631e1c8b0..d7cae3327de5 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -605,8 +605,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/orangefs/dir.c b/fs/orangefs/dir.c
index f30b6ecacdd1..324f0af40d7b 100644
--- a/fs/orangefs/dir.c
+++ b/fs/orangefs/dir.c
@@ -153,7 +153,6 @@ static int orangefs_readdir(struct file *file, struct dir_context *ctx)
         struct dentry *dentry = file->f_path.dentry;
         struct orangefs_kernel_op_s *new_op = NULL;
         struct orangefs_inode_s *orangefs_inode = ORANGEFS_I(dentry->d_inode);
-        int buffer_full = 0;
         struct orangefs_readdir_response_s readdir_response;
         void *dents_buf;
         int i = 0;
@@ -235,7 +234,7 @@ get_new_buffer_index:
         if (ret == -EIO && op_state_purged(new_op)) {
                 gossip_err("%s: Client is down. Aborting readdir call.\n",
                         __func__);
-                goto out_slot;
+                goto out_free_op;
         }
 
         if (ret < 0 || new_op->downcall.status != 0) {
@@ -244,14 +243,14 @@ get_new_buffer_index:
                              new_op->downcall.status);
                 if (ret >= 0)
                         ret = new_op->downcall.status;
-                goto out_slot;
+                goto out_free_op;
         }
 
         dents_buf = new_op->downcall.trailer_buf;
         if (dents_buf == NULL) {
                 gossip_err("Invalid NULL buffer in readdir response\n");
                 ret = -ENOMEM;
-                goto out_slot;
+                goto out_free_op;
         }
 
         bytes_decoded = decode_dirents(dents_buf, new_op->downcall.trailer_size,
@@ -350,8 +349,7 @@ get_new_buffer_index:
         /*
          * Did we hit the end of the directory?
          */
-        if (readdir_response.token == ORANGEFS_READDIR_END &&
-            !buffer_full) {
+        if (readdir_response.token == ORANGEFS_READDIR_END) {
                 gossip_debug(GOSSIP_DIR_DEBUG,
                 "End of dir detected; setting ctx->pos to ORANGEFS_READDIR_END.\n");
                 ctx->pos = ORANGEFS_READDIR_END;
@@ -363,8 +361,6 @@ out_destroy_handle:
 out_vfree:
         gossip_debug(GOSSIP_DIR_DEBUG, "vfree %p\n", dents_buf);
         vfree(dents_buf);
-out_slot:
-        orangefs_readdir_index_put(buffer_index);
 out_free_op:
         op_release(new_op);
         gossip_debug(GOSSIP_DIR_DEBUG, "orangefs_readdir returning %d\n", ret);
diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index 2382e267b49e..85640e955cde 100644
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -18,8 +18,8 @@ static int read_one_page(struct page *page)
         int max_block;
         ssize_t bytes_read = 0;
         struct inode *inode = page->mapping->host;
-        const __u32 blocksize = PAGE_CACHE_SIZE;        /* inode->i_blksize */
-        const __u32 blockbits = PAGE_CACHE_SHIFT;       /* inode->i_blkbits */
+        const __u32 blocksize = PAGE_SIZE;      /* inode->i_blksize */
+        const __u32 blockbits = PAGE_SHIFT;     /* inode->i_blkbits */
         struct iov_iter to;
         struct bio_vec bv = {.bv_page = page, .bv_len = PAGE_SIZE};
 
@@ -86,7 +86,7 @@ static int orangefs_readpages(struct file *file,
                                 "failure adding page to cache, read_one_page returned: %d\n",
                                 ret);
               } else {
-                        page_cache_release(page);
+                        put_page(page);
               }
         }
         BUG_ON(!list_empty(pages));
@@ -204,22 +204,8 @@ static int orangefs_setattr_size(struct inode *inode, struct iattr *iattr)
         if (ret != 0)
                 return ret;
 
-        /*
-         * Only change the c/mtime if we are changing the size or we are
-         * explicitly asked to change it.  This handles the semantic difference
-         * between truncate() and ftruncate() as implemented in the VFS.
-         *
-         * The regular truncate() case without ATTR_CTIME and ATTR_MTIME is a
-         * special case where we need to update the times despite not having
-         * these flags set.  For all other operations the VFS set these flags
-         * explicitly if it wants a timestamp update.
-         */
-        if (orig_size != i_size_read(inode) &&
-            !(iattr->ia_valid & (ATTR_CTIME | ATTR_MTIME))) {
-                iattr->ia_ctime = iattr->ia_mtime =
-                        current_fs_time(inode->i_sb);
+        if (orig_size != i_size_read(inode))
                 iattr->ia_valid |= ATTR_CTIME | ATTR_MTIME;
-        }
 
         return ret;
 }
@@ -328,7 +314,7 @@ static int orangefs_init_iops(struct inode *inode)
         case S_IFREG:
                 inode->i_op = &orangefs_file_inode_operations;
                 inode->i_fop = &orangefs_file_operations;
-                inode->i_blkbits = PAGE_CACHE_SHIFT;
+                inode->i_blkbits = PAGE_SHIFT;
                 break;
         case S_IFLNK:
                 inode->i_op = &orangefs_symlink_inode_operations;
@@ -456,7 +442,7 @@ struct inode *orangefs_new_inode(struct super_block *sb, struct inode *dir,
         inode->i_uid = current_fsuid();
         inode->i_gid = current_fsgid();
         inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
-        inode->i_size = PAGE_CACHE_SIZE;
+        inode->i_size = PAGE_SIZE;
         inode->i_rdev = dev;
 
         error = insert_inode_locked4(inode, hash, orangefs_test_inode, ref);
diff --git a/fs/orangefs/orangefs-bufmap.c b/fs/orangefs/orangefs-bufmap.c
index 1f8acc9f9a88..75375e90a63f 100644
--- a/fs/orangefs/orangefs-bufmap.c
+++ b/fs/orangefs/orangefs-bufmap.c
@@ -170,7 +170,7 @@ orangefs_bufmap_unmap(struct orangefs_bufmap *bufmap)
         int i;
 
         for (i = 0; i < bufmap->page_count; i++)
-                page_cache_release(bufmap->page_array[i]);
+                put_page(bufmap->page_array[i]);
 }
 
 static void
@@ -299,7 +299,7 @@ orangefs_bufmap_map(struct orangefs_bufmap *bufmap,
 
                 for (i = 0; i < ret; i++) {
                         SetPageError(bufmap->page_array[i]);
-                        page_cache_release(bufmap->page_array[i]);
+                        put_page(bufmap->page_array[i]);
                 }
                 return -ENOMEM;
         }
diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c
index 19670b8b4053..1714a737d556 100644
--- a/fs/orangefs/orangefs-debugfs.c
+++ b/fs/orangefs/orangefs-debugfs.c
@@ -126,8 +126,7 @@ out:
 
 void orangefs_debugfs_cleanup(void)
 {
-        if (debug_dir)
-                debugfs_remove_recursive(debug_dir);
+        debugfs_remove_recursive(debug_dir);
 }
 
 /* open ORANGEFS_KMOD_DEBUG_HELP_FILE */
diff --git a/fs/orangefs/orangefs-utils.c b/fs/orangefs/orangefs-utils.c
index 40f5163b56aa..2d129b5886ee 100644
--- a/fs/orangefs/orangefs-utils.c
+++ b/fs/orangefs/orangefs-utils.c
@@ -303,7 +303,7 @@ int orangefs_inode_getattr(struct inode *inode, int new, int size)
                 }
                 break;
         case S_IFDIR:
-                inode->i_size = PAGE_CACHE_SIZE;
+                inode->i_size = PAGE_SIZE;
                 orangefs_inode->blksize = (1 << inode->i_blkbits);
                 spin_lock(&inode->i_lock);
                 inode_set_bytes(inode, inode->i_size);
@@ -315,9 +315,13 @@ int orangefs_inode_getattr(struct inode *inode, int new, int size)
                         inode->i_size = (loff_t)strlen(new_op->
                             downcall.resp.getattr.link_target);
                         orangefs_inode->blksize = (1 << inode->i_blkbits);
-                        strlcpy(orangefs_inode->link_target,
+                        ret = strscpy(orangefs_inode->link_target,
                             new_op->downcall.resp.getattr.link_target,
                             ORANGEFS_NAME_MAX);
+                        if (ret == -E2BIG) {
+                                ret = -EIO;
+                                goto out;
+                        }
                         inode->i_link = orangefs_inode->link_target;
                 }
                 break;
diff --git a/fs/orangefs/protocol.h b/fs/orangefs/protocol.h
index 45ce4ff4cbc7..1efc6f8a5224 100644
--- a/fs/orangefs/protocol.h
+++ b/fs/orangefs/protocol.h
@@ -1,3 +1,4 @@
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/spinlock_types.h>
 #include <linux/slab.h>
@@ -74,8 +75,8 @@ static inline void ORANGEFS_khandle_to(const struct orangefs_khandle *kh,
                                    void *p, int size)
 {
 
-        memset(p, 0, size);
         memcpy(p, kh->u, 16);
+        memset(p + 16, 0, size - 16);
 
 }
 
@@ -407,7 +408,7 @@ enum {
  * space. Zero signifies the upstream version of the kernel module.
  */
 #define ORANGEFS_KERNEL_PROTO_VERSION 0
-#define ORANGEFS_MINIMUM_USERSPACE_VERSION 20904
+#define ORANGEFS_MINIMUM_USERSPACE_VERSION 20903
 
 /*
  * describes memory regions to map in the ORANGEFS_DEV_MAP ioctl.
@@ -427,26 +428,28 @@ struct ORANGEFS_dev_map_desc {
 /* gossip.h *****************************************************************/
 
 #ifdef GOSSIP_DISABLE_DEBUG
-#define gossip_debug(mask, format, f...) do {} while (0)
+#define gossip_debug(mask, fmt, ...)                                    \
+do {                                                                    \
+        if (0)                                                          \
+                printk(KERN_DEBUG fmt, ##__VA_ARGS__);                  \
+} while (0)
 #else
 extern __u64 gossip_debug_mask;
 extern struct client_debug_mask client_debug_mask;
 
 /* try to avoid function call overhead by checking masks in macro */
-#define gossip_debug(mask, format, f...)                        \
-do {                                                            \
-        if (gossip_debug_mask & mask)                           \
-                printk(format, ##f);                            \
+#define gossip_debug(mask, fmt, ...)                                    \
+do {                                                                    \
+        if (gossip_debug_mask & (mask))                                 \
+                printk(KERN_DEBUG fmt, ##__VA_ARGS__);                  \
 } while (0)
 #endif /* GOSSIP_DISABLE_DEBUG */
 
 /* do file and line number printouts w/ the GNU preprocessor */
-#define gossip_ldebug(mask, format, f...)                               \
-                gossip_debug(mask, "%s: " format, __func__, ##f)
-
-#define gossip_err printk
-#define gossip_lerr(format, f...)                                       \
-                gossip_err("%s line %d: " format,                       \
-                           __FILE__,                                    \
-                           __LINE__,                                    \
-                           ##f)
+#define gossip_ldebug(mask, fmt, ...)                                   \
+        gossip_debug(mask, "%s: " fmt, __func__, ##__VA_ARGS__)
+
+#define gossip_err pr_err
+#define gossip_lerr(fmt, ...)                                           \
+        gossip_err("%s line %d: " fmt,                                  \
+                   __FILE__, __LINE__, ##__VA_ARGS__)
diff --git a/fs/orangefs/xattr.c b/fs/orangefs/xattr.c
index ef5da7538cd5..63a6280d8c3a 100644
--- a/fs/orangefs/xattr.c
+++ b/fs/orangefs/xattr.c
@@ -73,10 +73,6 @@ ssize_t orangefs_inode_getxattr(struct inode *inode, const char *prefix,
                      "%s: prefix %s name %s, buffer_size %zd\n",
                      __func__, prefix, name, size);
 
-        if (name == NULL || (size > 0 && buffer == NULL)) {
-                gossip_err("orangefs_inode_getxattr: bogus NULL pointers\n");
-                return -EINVAL;
-        }
         if ((strlen(name) + strlen(prefix)) >= ORANGEFS_MAX_XATTR_NAMELEN) {
                 gossip_err("Invalid key length (%d)\n",
                            (int)(strlen(name) + strlen(prefix)));
@@ -146,8 +142,8 @@ ssize_t orangefs_inode_getxattr(struct inode *inode, const char *prefix,
                 goto out_release_op;
         }
 
-        memset(buffer, 0, size);
         memcpy(buffer, new_op->downcall.resp.getxattr.val, length);
+        memset(buffer + length, 0, size - length);
         gossip_debug(GOSSIP_XATTR_DEBUG,
              "orangefs_inode_getxattr: inode %pU "
              "key %s key_sz %d, val_len %d\n",
@@ -239,8 +235,7 @@ int orangefs_inode_setxattr(struct inode *inode, const char *prefix,
                      "%s: prefix %s, name %s, buffer_size %zd\n",
                      __func__, prefix, name, size);
 
-        if (size < 0 ||
-            size >= ORANGEFS_MAX_XATTR_VALUELEN ||
+        if (size >= ORANGEFS_MAX_XATTR_VALUELEN ||
             flags < 0) {
                 gossip_err("orangefs_inode_setxattr: bogus values of size(%d), flags(%d)\n",
                            (int)size,
@@ -248,12 +243,6 @@ int orangefs_inode_setxattr(struct inode *inode, const char *prefix,
                 return -EINVAL;
         }
 
-        if (name == NULL ||
-            (size > 0 && value == NULL)) {
-                gossip_err("orangefs_inode_setxattr: bogus NULL pointers!\n");
-                return -EINVAL;
-        }
-
         internal_flag = convert_to_internal_xattr_flags(flags);
 
         if (prefix) {
@@ -353,10 +342,6 @@ ssize_t orangefs_listxattr(struct dentry *dentry, char *buffer, size_t size)
                 gossip_err("%s: bogus NULL pointers\n", __func__);
                 return -EINVAL;
         }
-        if (size < 0) {
-                gossip_err("Invalid size (%d)\n", (int)size);
-                return -EINVAL;
-        }
 
         down_read(&orangefs_inode->xattr_sem);
         new_op = op_alloc(ORANGEFS_VFS_OP_LISTXATTR);
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index ef64984c9bbc..5d972e6cd3fe 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -295,6 +295,37 @@ static void ovl_dentry_release(struct dentry *dentry)
         }
 }
 
+static struct dentry *ovl_d_real(struct dentry *dentry, struct inode *inode)
+{
+        struct dentry *real;
+
+        if (d_is_dir(dentry)) {
+                if (!inode || inode == d_inode(dentry))
+                        return dentry;
+                goto bug;
+        }
+
+        real = ovl_dentry_upper(dentry);
+        if (real && (!inode || inode == d_inode(real)))
+                return real;
+
+        real = ovl_dentry_lower(dentry);
+        if (!real)
+                goto bug;
+
+        if (!inode || inode == d_inode(real))
+                return real;
+
+        /* Handle recursion */
+        if (real->d_flags & DCACHE_OP_REAL)
+                return real->d_op->d_real(real, inode);
+
+bug:
+        WARN(1, "ovl_d_real(%pd4, %s:%lu\n): real dentry not found\n", dentry,
+             inode ? inode->i_sb->s_id : "NULL", inode ? inode->i_ino : 0);
+        return dentry;
+}
+
 static int ovl_dentry_revalidate(struct dentry *dentry, unsigned int flags)
 {
         struct ovl_entry *oe = dentry->d_fsdata;
@@ -339,11 +370,13 @@ static int ovl_dentry_weak_revalidate(struct dentry *dentry, unsigned int flags)
 static const struct dentry_operations ovl_dentry_operations = {
         .d_release = ovl_dentry_release,
         .d_select_inode = ovl_d_select_inode,
+        .d_real = ovl_d_real,
 };
 
 static const struct dentry_operations ovl_reval_dentry_operations = {
         .d_release = ovl_dentry_release,
         .d_select_inode = ovl_d_select_inode,
+        .d_real = ovl_d_real,
         .d_revalidate = ovl_dentry_revalidate,
         .d_weak_revalidate = ovl_dentry_weak_revalidate,
 };
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 9df431642042..229cb546bee0 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/quota/dquot.c b/fs/quota/dquot.c
index ba827daea5a0..ff21980d0119 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -2047,11 +2047,20 @@ int dquot_get_next_id(struct super_block *sb, struct kqid *qid)
         struct quota_info *dqopt = sb_dqopt(sb);
         int err;
 
-        if (!dqopt->ops[qid->type]->get_next_id)
-                return -ENOSYS;
+        mutex_lock(&dqopt->dqonoff_mutex);
+        if (!sb_has_quota_active(sb, qid->type)) {
+                err = -ESRCH;
+                goto out;
+        }
+        if (!dqopt->ops[qid->type]->get_next_id) {
+                err = -ENOSYS;
+                goto out;
+        }
         mutex_lock(&dqopt->dqio_mutex);
         err = dqopt->ops[qid->type]->get_next_id(sb, qid);
         mutex_unlock(&dqopt->dqio_mutex);
+out:
+        mutex_unlock(&dqopt->dqonoff_mutex);
 
         return err;
 }
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 c2a57e193a81..4cd7e569cd00 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -46,8 +46,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 041b6948aecc..ce41d7fe753c 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -3742,11 +3742,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 d445a64b979e..e49b2406d15d 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -704,7 +704,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;
 }
 
@@ -925,9 +925,9 @@ xfs_do_writepage(
          * ---------------------------------^------------------|
          */
         offset = i_size_read(inode);
-        end_index = offset >> PAGE_CACHE_SHIFT;
+        end_index = offset >> PAGE_SHIFT;
         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
@@ -940,7 +940,7 @@ xfs_do_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
@@ -971,7 +971,7 @@ xfs_do_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;
@@ -1475,7 +1475,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;
         struct xfs_mount        *mp = XFS_I(inode)->i_mount;
@@ -1491,7 +1491,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);
 
@@ -1558,12 +1558,12 @@ 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;
         struct xfs_mount        *mp = XFS_I(mapping->host)->i_mount;
 
-        ASSERT(len <= PAGE_CACHE_SIZE);
+        ASSERT(len <= PAGE_SIZE);
 
         page = grab_cache_page_write_begin(mapping, index, flags);
         if (!page)
@@ -1592,7 +1592,7 @@ xfs_vm_write_begin(
                         truncate_pagecache_range(inode, start, pos + len);
                 }
 
-                page_cache_release(page);
+                put_page(page);
                 page = NULL;
         }
 
@@ -1620,7 +1620,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 a32c1dcae2ff..3b6309865c65 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -1237,7 +1237,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,
@@ -1466,7 +1466,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 ac0fd32de31e..569938a4a357 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 536a0ee9cd5a..cfd4210dd015 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 bac6b3435591..eafe257b357a 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -231,12 +231,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 d760934109b5..187e14b696c2 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -556,10 +556,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
@@ -570,10 +570,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/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index afae2316bd43..055a08ddac02 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -92,7 +92,7 @@ struct ttm_placement {
  */
 struct ttm_bus_placement {
         void            *addr;
-        unsigned long   base;
+        phys_addr_t     base;
         unsigned long   size;
         unsigned long   offset;
         bool            is_iomem;
diff --git a/include/linux/atomic.h b/include/linux/atomic.h
index df4f369254c0..506c3531832e 100644
--- a/include/linux/atomic.h
+++ b/include/linux/atomic.h
@@ -559,25 +559,25 @@ static inline int atomic_dec_if_positive(atomic_t *v)
 #endif
 
 /**
- * fetch_or - perform *ptr |= mask and return old value of *ptr
- * @ptr: pointer to value
- * @mask: mask to OR on the value
- *
- * cmpxchg based fetch_or, macro so it works for different integer types
+ * atomic_fetch_or - perform *p |= mask and return old value of *p
+ * @p: pointer to atomic_t
+ * @mask: mask to OR on the atomic_t
  */
-#ifndef fetch_or
-#define fetch_or(ptr, mask)                                             \
-({      typeof(*(ptr)) __old, __val = *(ptr);                           \
-        for (;;) {                                                      \
-                __old = cmpxchg((ptr), __val, __val | (mask));          \
-                if (__old == __val)                                     \
-                        break;                                          \
-                __val = __old;                                          \
-        }                                                               \
-        __old;                                                          \
-})
-#endif
+#ifndef atomic_fetch_or
+static inline int atomic_fetch_or(atomic_t *p, int mask)
+{
+        int old, val = atomic_read(p);
+
+        for (;;) {
+                old = atomic_cmpxchg(p, val, val | mask);
+                if (old == val)
+                        break;
+                val = old;
+        }
 
+        return old;
+}
+#endif
 
 #ifdef CONFIG_GENERIC_ATOMIC64
 #include <asm-generic/atomic64.h>
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/brcmphy.h b/include/linux/brcmphy.h
index f0ba9c2ec639..e3354b74286c 100644
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
@@ -24,6 +24,8 @@
 #define PHY_ID_BCM7250                  0xae025280
 #define PHY_ID_BCM7364                  0xae025260
 #define PHY_ID_BCM7366                  0x600d8490
+#define PHY_ID_BCM7346                  0x600d8650
+#define PHY_ID_BCM7362                  0x600d84b0
 #define PHY_ID_BCM7425                  0x600d86b0
 #define PHY_ID_BCM7429                  0x600d8730
 #define PHY_ID_BCM7435                  0x600d8750
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 e7975e4681e1..db92a8d4926e 100644
--- a/include/linux/ceph/libceph.h
+++ b/include/linux/ceph/libceph.h
@@ -176,8 +176,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/compiler-gcc.h b/include/linux/compiler-gcc.h
index 22ab246feed3..eeae401a2412 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -199,7 +199,7 @@
 #define unreachable() __builtin_unreachable()
 
 /* Mark a function definition as prohibited from being cloned. */
-#define __noclone       __attribute__((__noclone__))
+#define __noclone       __attribute__((__noclone__, __optimize__("no-tracer")))
 
 #endif /* GCC_VERSION >= 40500 */
 
diff --git a/include/linux/configfs.h b/include/linux/configfs.h
index 485fe5519448..d9d6a9d77489 100644
--- a/include/linux/configfs.h
+++ b/include/linux/configfs.h
@@ -188,7 +188,7 @@ static struct configfs_bin_attribute _pfx##attr_##_name = {	\
 }
 
 #define CONFIGFS_BIN_ATTR_RO(_pfx, _name, _priv, _maxsz)        \
-static struct configfs_attribute _pfx##attr_##_name = {         \
+static struct configfs_bin_attribute _pfx##attr_##_name = {     \
         .cb_attr = {                                            \
                 .ca_name        = __stringify(_name),           \
                 .ca_mode        = S_IRUGO,                      \
@@ -200,7 +200,7 @@ static struct configfs_attribute _pfx##attr_##_name = {		\
 }
 
 #define CONFIGFS_BIN_ATTR_WO(_pfx, _name, _priv, _maxsz)        \
-static struct configfs_attribute _pfx##attr_##_name = {         \
+static struct configfs_bin_attribute _pfx##attr_##_name = {     \
         .cb_attr = {                                            \
                 .ca_name        = __stringify(_name),           \
                 .ca_mode        = S_IWUSR,                      \
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 7cb043d8f4e8..4bb4de8d95ea 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -161,6 +161,7 @@ struct dentry_operations {
         struct vfsmount *(*d_automount)(struct path *);
         int (*d_manage)(struct dentry *, bool);
         struct inode *(*d_select_inode)(struct dentry *, unsigned);
+        struct dentry *(*d_real)(struct dentry *, struct inode *);
 } ____cacheline_aligned;
 
 /*
@@ -229,6 +230,7 @@ struct dentry_operations {
 #define DCACHE_OP_SELECT_INODE          0x02000000 /* Unioned entry: dcache op selects inode */
 
 #define DCACHE_ENCRYPTED_WITH_KEY       0x04000000 /* dir is encrypted with a valid key */
+#define DCACHE_OP_REAL                  0x08000000
 
 extern seqlock_t rename_lock;
 
@@ -555,4 +557,12 @@ static inline struct dentry *d_backing_dentry(struct dentry *upper)
         return upper;
 }
 
+static inline struct dentry *d_real(struct dentry *dentry)
+{
+        if (unlikely(dentry->d_flags & DCACHE_OP_REAL))
+                return dentry->d_op->d_real(dentry, NULL);
+        else
+                return dentry;
+}
+
 #endif  /* __LINUX_DCACHE_H */
diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h
index 9eb215a155e0..b90e9bdbd1dd 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/filter.h b/include/linux/filter.h
index 43aa1f8855c7..a51a5361695f 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -465,10 +465,14 @@ int bpf_prog_create_from_user(struct bpf_prog **pfp, struct sock_fprog *fprog,
 void bpf_prog_destroy(struct bpf_prog *fp);
 
 int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk);
+int __sk_attach_filter(struct sock_fprog *fprog, struct sock *sk,
+                       bool locked);
 int sk_attach_bpf(u32 ufd, struct sock *sk);
 int sk_reuseport_attach_filter(struct sock_fprog *fprog, struct sock *sk);
 int sk_reuseport_attach_bpf(u32 ufd, struct sock *sk);
 int sk_detach_filter(struct sock *sk);
+int __sk_detach_filter(struct sock *sk, bool locked);
+
 int sk_get_filter(struct sock *sk, struct sock_filter __user *filter,
                   unsigned int len);
 
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 14a97194b34b..70e61b58baaf 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -929,7 +929,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
@@ -1241,6 +1241,16 @@ static inline struct inode *file_inode(const struct file *f)
         return f->f_inode;
 }
 
+static inline struct dentry *file_dentry(const struct file *file)
+{
+        struct dentry *dentry = file->f_path.dentry;
+
+        if (unlikely(dentry->d_flags & DCACHE_OP_REAL))
+                return dentry->d_op->d_real(dentry, file_inode(file));
+        else
+                return dentry;
+}
+
 static inline int locks_lock_file_wait(struct file *filp, struct file_lock *fl)
 {
         return locks_lock_inode_wait(file_inode(filp), fl);
@@ -2067,7 +2077,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/huge_mm.h b/include/linux/huge_mm.h
index 79b0ef6aaa14..7008623e24b1 100644
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
@@ -127,7 +127,7 @@ static inline spinlock_t *pmd_trans_huge_lock(pmd_t *pmd,
         if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd))
                 return __pmd_trans_huge_lock(pmd, vma);
         else
-                return false;
+                return NULL;
 }
 static inline int hpage_nr_pages(struct page *page)
 {
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index a5c539fa5d2b..ef7a6ecd8584 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -195,9 +195,7 @@ struct iommu_ops {
         /* Get the number of windows per domain */
         u32 (*domain_get_windows)(struct iommu_domain *domain);
 
-#ifdef CONFIG_OF_IOMMU
         int (*of_xlate)(struct device *dev, struct of_phandle_args *args);
-#endif
 
         unsigned long pgsize_bitmap;
         void *priv;
diff --git a/include/linux/mm.h b/include/linux/mm.h
index ed6407d1b7b5..ffcff53e3b2b 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -623,7 +623,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/netdevice.h b/include/linux/netdevice.h
index cb0d5d09c2e4..8395308a2445 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2120,7 +2120,10 @@ struct napi_gro_cb {
         /* Used in foo-over-udp, set in udp[46]_gro_receive */
         u8      is_ipv6:1;
 
-        /* 7 bit hole */
+        /* Used in GRE, set in fou/gue_gro_receive */
+        u8      is_fou:1;
+
+        /* 6 bit hole */
 
         /* used to support CHECKSUM_COMPLETE for tunneling protocols */
         __wsum  csum;
diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h
index 0e1f433cc4b7..f48b8a664b0f 100644
--- a/include/linux/netfilter/ipset/ip_set.h
+++ b/include/linux/netfilter/ipset/ip_set.h
@@ -234,6 +234,10 @@ struct ip_set {
         spinlock_t lock;
         /* References to the set */
         u32 ref;
+        /* References to the set for netlink events like dump,
+         * ref can be swapped out by ip_set_swap
+         */
+        u32 ref_netlink;
         /* The core set type */
         struct ip_set_type *type;
         /* The type variant doing the real job */
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..7e1ab155c67c 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;
 }
 
 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,8 @@ 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/pmem.h b/include/linux/pmem.h
index 3ec5309e29f3..ac6d872ce067 100644
--- a/include/linux/pmem.h
+++ b/include/linux/pmem.h
@@ -42,6 +42,13 @@ static inline void arch_memcpy_to_pmem(void __pmem *dst, const void *src,
         BUG();
 }
 
+static inline int arch_memcpy_from_pmem(void *dst, const void __pmem *src,
+                size_t n)
+{
+        BUG();
+        return -EFAULT;
+}
+
 static inline size_t arch_copy_from_iter_pmem(void __pmem *addr, size_t bytes,
                 struct iov_iter *i)
 {
@@ -66,14 +73,17 @@ static inline void arch_invalidate_pmem(void __pmem *addr, size_t size)
 #endif
 
 /*
- * Architectures that define ARCH_HAS_PMEM_API must provide
- * implementations for arch_memcpy_to_pmem(), arch_wmb_pmem(),
- * arch_copy_from_iter_pmem(), arch_clear_pmem(), arch_wb_cache_pmem()
- * and arch_has_wmb_pmem().
+ * memcpy_from_pmem - read from persistent memory with error handling
+ * @dst: destination buffer
+ * @src: source buffer
+ * @size: transfer length
+ *
+ * Returns 0 on success negative error code on failure.
  */
-static inline void memcpy_from_pmem(void *dst, void __pmem const *src, size_t size)
+static inline int memcpy_from_pmem(void *dst, void __pmem const *src,
+                size_t size)
 {
-        memcpy(dst, (void __force const *) src, size);
+        return arch_memcpy_from_pmem(dst, src, size);
 }
 
 static inline bool arch_has_pmem_api(void)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 9dff190e6a0a..0450831d5a40 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -720,7 +720,7 @@ struct signal_struct {
         struct task_cputime cputime_expires;
 
 #ifdef CONFIG_NO_HZ_FULL
-        unsigned long tick_dep_mask;
+        atomic_t tick_dep_mask;
 #endif
 
         struct list_head cpu_timers[3];
@@ -1549,7 +1549,7 @@ struct task_struct {
 #endif
 
 #ifdef CONFIG_NO_HZ_FULL
-        unsigned long tick_dep_mask;
+        atomic_t tick_dep_mask;
 #endif
         unsigned long nvcsw, nivcsw; /* context switch counts */
         u64 start_time;         /* monotonic time in nsec */
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 4bcf5a61aada..e6bc30a42a74 100644
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -108,7 +108,6 @@ struct stmmac_axi {
 };
 
 struct plat_stmmacenet_data {
-        char *phy_bus_name;
         int bus_id;
         int phy_addr;
         int interface;
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..2b83359c19ca 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 put_page and 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/include/net/act_api.h b/include/net/act_api.h
index 2a19fe111c78..03e322b30218 100644
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
@@ -135,6 +135,7 @@ void tcf_hashinfo_destroy(const struct tc_action_ops *ops,
 static inline void tc_action_net_exit(struct tc_action_net *tn)
 {
         tcf_hashinfo_destroy(tn->ops, tn->hinfo);
+        kfree(tn->hinfo);
 }
 
 int tcf_generic_walker(struct tc_action_net *tn, struct sk_buff *skb,
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 0c09da34b67a..e385eb3076a1 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1001,6 +1001,8 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
  *      flag indicates that the PN was verified for replay protection.
  *      Note that this flag is also currently only supported when a frame
  *      is also decrypted (ie. @RX_FLAG_DECRYPTED must be set)
+ * @RX_FLAG_DUP_VALIDATED: The driver should set this flag if it did
+ *      de-duplication by itself.
  * @RX_FLAG_FAILED_FCS_CRC: Set this flag if the FCS check failed on
  *      the frame.
  * @RX_FLAG_FAILED_PLCP_CRC: Set this flag if the PCLP check failed on
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 65521cfdcade..03fb33efcae2 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -386,11 +386,9 @@ static inline struct list_head *sctp_list_dequeue(struct list_head *list)
 {
         struct list_head *result = NULL;
 
-        if (list->next != list) {
+        if (!list_empty(list)) {
                 result = list->next;
-                list->next = result->next;
-                list->next->prev = list;
-                INIT_LIST_HEAD(result);
+                list_del_init(result);
         }
         return result;
 }
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index c067019ed12a..74d79bde7075 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -516,6 +516,31 @@ static inline int scsi_device_tpgs(struct scsi_device *sdev)
         return sdev->inquiry ? (sdev->inquiry[5] >> 4) & 0x3 : 0;
 }
 
+/**
+ * scsi_device_supports_vpd - test if a device supports VPD pages
+ * @sdev: the &struct scsi_device to test
+ *
+ * If the 'try_vpd_pages' flag is set it takes precedence.
+ * Otherwise we will assume VPD pages are supported if the
+ * SCSI level is at least SPC-3 and 'skip_vpd_pages' is not set.
+ */
+static inline int scsi_device_supports_vpd(struct scsi_device *sdev)
+{
+        /* Attempt VPD inquiry if the device blacklist explicitly calls
+         * for it.
+         */
+        if (sdev->try_vpd_pages)
+                return 1;
+        /*
+         * Although VPD inquiries can go to SCSI-2 type devices,
+         * some USB ones crash on receiving them, and the pages
+         * we currently ask for are for SPC-3 and beyond
+         */
+        if (sdev->scsi_level > SCSI_SPC_2 && !sdev->skip_vpd_pages)
+                return 1;
+        return 0;
+}
+
 #define MODULE_ALIAS_SCSI_DEVICE(type) \
         MODULE_ALIAS("scsi:t-" __stringify(type) "*")
 #define SCSI_DEVICE_MODALIAS_FMT "scsi:t-0x%02x"
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 685a51aa98cc..8ff6d40a294f 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -76,6 +76,7 @@ struct target_core_fabric_ops {
         struct se_wwn *(*fabric_make_wwn)(struct target_fabric_configfs *,
                                 struct config_group *, const char *);
         void (*fabric_drop_wwn)(struct se_wwn *);
+        void (*add_wwn_groups)(struct se_wwn *);
         struct se_portal_group *(*fabric_make_tpg)(struct se_wwn *,
                                 struct config_group *, const char *);
         void (*fabric_drop_tpg)(struct se_portal_group *);
@@ -87,7 +88,6 @@ struct target_core_fabric_ops {
                                 struct config_group *, const char *);
         void (*fabric_drop_np)(struct se_tpg_np *);
         int (*fabric_init_nodeacl)(struct se_node_acl *, const char *);
-        void (*fabric_cleanup_nodeacl)(struct se_node_acl *);
 
         struct configfs_attribute **tfc_discovery_attrs;
         struct configfs_attribute **tfc_wwn_attrs;
diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h
index 677807f29a1c..e90e82ad6875 100644
--- a/include/trace/events/btrfs.h
+++ b/include/trace/events/btrfs.h
@@ -23,7 +23,7 @@ struct map_lookup;
 struct extent_buffer;
 struct btrfs_work;
 struct __btrfs_workqueue;
-struct btrfs_qgroup_operation;
+struct btrfs_qgroup_extent_record;
 
 #define show_ref_type(type)                                             \
         __print_symbolic(type,                                          \
@@ -1231,6 +1231,93 @@ DEFINE_EVENT(btrfs__qgroup_delayed_ref, btrfs_qgroup_free_delayed_ref,
 
         TP_ARGS(ref_root, reserved)
 );
+
+DECLARE_EVENT_CLASS(btrfs_qgroup_extent,
+        TP_PROTO(struct btrfs_qgroup_extent_record *rec),
+
+        TP_ARGS(rec),
+
+        TP_STRUCT__entry(
+                __field(        u64,  bytenr            )
+                __field(        u64,  num_bytes         )
+        ),
+
+        TP_fast_assign(
+                __entry->bytenr         = rec->bytenr,
+                __entry->num_bytes      = rec->num_bytes;
+        ),
+
+        TP_printk("bytenr = %llu, num_bytes = %llu",
+                  (unsigned long long)__entry->bytenr,
+                  (unsigned long long)__entry->num_bytes)
+);
+
+DEFINE_EVENT(btrfs_qgroup_extent, btrfs_qgroup_account_extents,
+
+        TP_PROTO(struct btrfs_qgroup_extent_record *rec),
+
+        TP_ARGS(rec)
+);
+
+DEFINE_EVENT(btrfs_qgroup_extent, btrfs_qgroup_insert_dirty_extent,
+
+        TP_PROTO(struct btrfs_qgroup_extent_record *rec),
+
+        TP_ARGS(rec)
+);
+
+TRACE_EVENT(btrfs_qgroup_account_extent,
+
+        TP_PROTO(u64 bytenr, u64 num_bytes, u64 nr_old_roots, u64 nr_new_roots),
+
+        TP_ARGS(bytenr, num_bytes, nr_old_roots, nr_new_roots),
+
+        TP_STRUCT__entry(
+                __field(        u64,  bytenr                    )
+                __field(        u64,  num_bytes                 )
+                __field(        u64,  nr_old_roots              )
+                __field(        u64,  nr_new_roots              )
+        ),
+
+        TP_fast_assign(
+                __entry->bytenr         = bytenr;
+                __entry->num_bytes      = num_bytes;
+                __entry->nr_old_roots   = nr_old_roots;
+                __entry->nr_new_roots   = nr_new_roots;
+        ),
+
+        TP_printk("bytenr = %llu, num_bytes = %llu, nr_old_roots = %llu, "
+                  "nr_new_roots = %llu",
+                  __entry->bytenr,
+                  __entry->num_bytes,
+                  __entry->nr_old_roots,
+                  __entry->nr_new_roots)
+);
+
+TRACE_EVENT(qgroup_update_counters,
+
+        TP_PROTO(u64 qgid, u64 cur_old_count, u64 cur_new_count),
+
+        TP_ARGS(qgid, cur_old_count, cur_new_count),
+
+        TP_STRUCT__entry(
+                __field(        u64,  qgid                      )
+                __field(        u64,  cur_old_count             )
+                __field(        u64,  cur_new_count             )
+        ),
+
+        TP_fast_assign(
+                __entry->qgid           = qgid;
+                __entry->cur_old_count  = cur_old_count;
+                __entry->cur_new_count  = cur_new_count;
+        ),
+
+        TP_printk("qgid = %llu, cur_old_count = %llu, cur_new_count = %llu",
+                  __entry->qgid,
+                  __entry->cur_old_count,
+                  __entry->cur_new_count)
+);
+
 #endif /* _TRACE_BTRFS_H */
 
 /* This part must be outside protection */
diff --git a/include/trace/events/page_isolation.h b/include/trace/events/page_isolation.h
index 6fb644029c80..8738a78e6bf4 100644
--- a/include/trace/events/page_isolation.h
+++ b/include/trace/events/page_isolation.h
@@ -29,7 +29,7 @@ TRACE_EVENT(test_pages_isolated,
 
         TP_printk("start_pfn=0x%lx end_pfn=0x%lx fin_pfn=0x%lx ret=%s",
                 __entry->start_pfn, __entry->end_pfn, __entry->fin_pfn,
-                __entry->end_pfn == __entry->fin_pfn ? "success" : "fail")
+                __entry->end_pfn <= __entry->fin_pfn ? "success" : "fail")
 );
 
 #endif /* _TRACE_PAGE_ISOLATION_H */
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 924f537183fd..23917bb47bf3 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -375,6 +375,7 @@ struct bpf_tunnel_key {
         };
         __u8 tunnel_tos;
         __u8 tunnel_ttl;
+        __u16 tunnel_ext;
         __u32 tunnel_label;
 };
 
diff --git a/include/uapi/linux/stddef.h b/include/uapi/linux/stddef.h
index aa9f10428743..621fa8ac4425 100644
--- a/include/uapi/linux/stddef.h
+++ b/include/uapi/linux/stddef.h
@@ -1 +1,5 @@
 #include <linux/compiler.h>
+
+#ifndef __always_inline
+#define __always_inline inline
+#endif
diff --git a/include/uapi/linux/usb/ch9.h b/include/uapi/linux/usb/ch9.h
index 06d6c6228a7a..d5ce71607972 100644
--- a/include/uapi/linux/usb/ch9.h
+++ b/include/uapi/linux/usb/ch9.h
@@ -899,7 +899,7 @@ struct usb_ssp_cap_descriptor {
         __le32 bmAttributes;
 #define USB_SSP_SUBLINK_SPEED_ATTRIBS   (0x1f << 0) /* sublink speed entries */
 #define USB_SSP_SUBLINK_SPEED_IDS       (0xf << 5)  /* speed ID entries */
-        __u16  wFunctionalitySupport;
+        __le16  wFunctionalitySupport;
 #define USB_SSP_MIN_SUBLINK_SPEED_ATTRIBUTE_ID  (0xf)
 #define USB_SSP_MIN_RX_LANE_COUNT               (0xf << 8)
 #define USB_SSP_MIN_TX_LANE_COUNT               (0xf << 12)
diff --git a/include/uapi/linux/virtio_config.h b/include/uapi/linux/virtio_config.h
index c18264df9504..4cb65bbfa654 100644
--- a/include/uapi/linux/virtio_config.h
+++ b/include/uapi/linux/virtio_config.h
@@ -40,6 +40,8 @@
 #define VIRTIO_CONFIG_S_DRIVER_OK       4
 /* Driver has finished configuring features */
 #define VIRTIO_CONFIG_S_FEATURES_OK     8
+/* Device entered invalid state, driver must reset it */
+#define VIRTIO_CONFIG_S_NEEDS_RESET     0x40
 /* We've given up on this device. */
 #define VIRTIO_CONFIG_S_FAILED          0x80
 
diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h
index eeba75395f7d..ad66589f2ae6 100644
--- a/include/video/imx-ipu-v3.h
+++ b/include/video/imx-ipu-v3.h
@@ -194,8 +194,9 @@ int ipu_cpmem_set_format_rgb(struct ipuv3_channel *ch,
 int ipu_cpmem_set_format_passthrough(struct ipuv3_channel *ch, int width);
 void ipu_cpmem_set_yuv_interleaved(struct ipuv3_channel *ch, u32 pixel_format);
 void ipu_cpmem_set_yuv_planar_full(struct ipuv3_channel *ch,
-                                   u32 pixel_format, int stride,
-                                   int u_offset, int v_offset);
+                                   unsigned int uv_stride,
+                                   unsigned int u_offset,
+                                   unsigned int v_offset);
 void ipu_cpmem_set_yuv_planar(struct ipuv3_channel *ch,
                               u32 pixel_format, int stride, int height);
 int ipu_cpmem_set_fmt(struct ipuv3_channel *ch, u32 drm_fourcc);
@@ -236,7 +237,7 @@ void ipu_dmfc_disable_channel(struct dmfc_channel *dmfc);
 int ipu_dmfc_alloc_bandwidth(struct dmfc_channel *dmfc,
                 unsigned long bandwidth_mbs, int burstsize);
 void ipu_dmfc_free_bandwidth(struct dmfc_channel *dmfc);
-int ipu_dmfc_init_channel(struct dmfc_channel *dmfc, int width);
+void ipu_dmfc_config_wait4eot(struct dmfc_channel *dmfc, int width);
 struct dmfc_channel *ipu_dmfc_get(struct ipu_soc *ipu, int ipuv3_channel);
 void ipu_dmfc_put(struct dmfc_channel *dmfc);
 
diff --git a/init/Kconfig b/init/Kconfig
index e0d26162432e..0dfd09d54c65 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -272,8 +272,9 @@ config CROSS_MEMORY_ATTACH
           See the man page for more details.
 
 config FHANDLE
-        bool "open by fhandle syscalls"
+        bool "open by fhandle syscalls" if EXPERT
         select EXPORTFS
+        default y
         help
           If you say Y here, a user level program will be able to map
           file names to handle and then later use the handle for
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/bpf/syscall.c b/kernel/bpf/syscall.c
index 2a2efe1bc76c..adc5e4bd74f8 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -137,11 +137,13 @@ static void bpf_map_show_fdinfo(struct seq_file *m, struct file *filp)
                    "map_type:\t%u\n"
                    "key_size:\t%u\n"
                    "value_size:\t%u\n"
-                   "max_entries:\t%u\n",
+                   "max_entries:\t%u\n"
+                   "map_flags:\t%#x\n",
                    map->map_type,
                    map->key_size,
                    map->value_size,
-                   map->max_entries);
+                   map->max_entries,
+                   map->map_flags);
 }
 #endif
 
diff --git a/kernel/events/core.c b/kernel/events/core.c
index de24fbce5277..52bedc5a5aaa 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -2417,14 +2417,24 @@ static void ctx_sched_out(struct perf_event_context *ctx,
                         cpuctx->task_ctx = NULL;
         }
 
-        is_active ^= ctx->is_active; /* changed bits */
-
+        /*
+         * Always update time if it was set; not only when it changes.
+         * Otherwise we can 'forget' to update time for any but the last
+         * context we sched out. For example:
+         *
+         *   ctx_sched_out(.event_type = EVENT_FLEXIBLE)
+         *   ctx_sched_out(.event_type = EVENT_PINNED)
+         *
+         * would only update time for the pinned events.
+         */
         if (is_active & EVENT_TIME) {
                 /* update (and stop) ctx time */
                 update_context_time(ctx);
                 update_cgrp_time_from_cpuctx(cpuctx);
         }
 
+        is_active ^= ctx->is_active; /* changed bits */
+
         if (!ctx->nr_active || !(is_active & EVENT_ALL))
                 return;
 
@@ -8532,6 +8542,7 @@ SYSCALL_DEFINE5(perf_event_open,
                                         f_flags);
         if (IS_ERR(event_file)) {
                 err = PTR_ERR(event_file);
+                event_file = NULL;
                 goto err_context;
         }
 
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 220fc17b9718..7edc95edfaee 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/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 53ab2f85d77e..2324ba5310db 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -2000,6 +2000,77 @@ static inline int get_first_held_lock(struct task_struct *curr,
 }
 
 /*
+ * Returns the next chain_key iteration
+ */
+static u64 print_chain_key_iteration(int class_idx, u64 chain_key)
+{
+        u64 new_chain_key = iterate_chain_key(chain_key, class_idx);
+
+        printk(" class_idx:%d -> chain_key:%016Lx",
+                class_idx,
+                (unsigned long long)new_chain_key);
+        return new_chain_key;
+}
+
+static void
+print_chain_keys_held_locks(struct task_struct *curr, struct held_lock *hlock_next)
+{
+        struct held_lock *hlock;
+        u64 chain_key = 0;
+        int depth = curr->lockdep_depth;
+        int i;
+
+        printk("depth: %u\n", depth + 1);
+        for (i = get_first_held_lock(curr, hlock_next); i < depth; i++) {
+                hlock = curr->held_locks + i;
+                chain_key = print_chain_key_iteration(hlock->class_idx, chain_key);
+
+                print_lock(hlock);
+        }
+
+        print_chain_key_iteration(hlock_next->class_idx, chain_key);
+        print_lock(hlock_next);
+}
+
+static void print_chain_keys_chain(struct lock_chain *chain)
+{
+        int i;
+        u64 chain_key = 0;
+        int class_id;
+
+        printk("depth: %u\n", chain->depth);
+        for (i = 0; i < chain->depth; i++) {
+                class_id = chain_hlocks[chain->base + i];
+                chain_key = print_chain_key_iteration(class_id + 1, chain_key);
+
+                print_lock_name(lock_classes + class_id);
+                printk("\n");
+        }
+}
+
+static void print_collision(struct task_struct *curr,
+                        struct held_lock *hlock_next,
+                        struct lock_chain *chain)
+{
+        printk("\n");
+        printk("======================\n");
+        printk("[chain_key collision ]\n");
+        print_kernel_ident();
+        printk("----------------------\n");
+        printk("%s/%d: ", current->comm, task_pid_nr(current));
+        printk("Hash chain already cached but the contents don't match!\n");
+
+        printk("Held locks:");
+        print_chain_keys_held_locks(curr, hlock_next);
+
+        printk("Locks in cached chain:");
+        print_chain_keys_chain(chain);
+
+        printk("\nstack backtrace:\n");
+        dump_stack();
+}
+
+/*
  * Checks whether the chain and the current held locks are consistent
  * in depth and also in content. If they are not it most likely means
  * that there was a collision during the calculation of the chain_key.
@@ -2014,14 +2085,18 @@ static int check_no_collision(struct task_struct *curr,
 
         i = get_first_held_lock(curr, hlock);
 
-        if (DEBUG_LOCKS_WARN_ON(chain->depth != curr->lockdep_depth - (i - 1)))
+        if (DEBUG_LOCKS_WARN_ON(chain->depth != curr->lockdep_depth - (i - 1))) {
+                print_collision(curr, hlock, chain);
                 return 0;
+        }
 
         for (j = 0; j < chain->depth - 1; j++, i++) {
                 id = curr->held_locks[i].class_idx - 1;
 
-                if (DEBUG_LOCKS_WARN_ON(chain_hlocks[chain->base + j] != id))
+                if (DEBUG_LOCKS_WARN_ON(chain_hlocks[chain->base + j] != id)) {
+                        print_collision(curr, hlock, chain);
                         return 0;
+                }
         }
 #endif
         return 1;
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index d8465eeab8b3..8b489fcac37b 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -321,6 +321,24 @@ static inline void init_hrtick(void)
 }
 #endif  /* CONFIG_SCHED_HRTICK */
 
+/*
+ * cmpxchg based fetch_or, macro so it works for different integer types
+ */
+#define fetch_or(ptr, mask)                                             \
+        ({                                                              \
+                typeof(ptr) _ptr = (ptr);                               \
+                typeof(mask) _mask = (mask);                            \
+                typeof(*_ptr) _old, _val = *_ptr;                       \
+                                                                        \
+                for (;;) {                                              \
+                        _old = cmpxchg(_ptr, _val, _val | _mask);       \
+                        if (_old == _val)                               \
+                                break;                                  \
+                        _val = _old;                                    \
+                }                                                       \
+        _old;                                                           \
+})
+
 #if defined(CONFIG_SMP) && defined(TIF_POLLING_NRFLAG)
 /*
  * Atomically set TIF_NEED_RESCHED and test for TIF_POLLING_NRFLAG,
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 084b79f5917e..58e3310c9b21 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -157,52 +157,50 @@ static void tick_sched_handle(struct tick_sched *ts, struct pt_regs *regs)
 cpumask_var_t tick_nohz_full_mask;
 cpumask_var_t housekeeping_mask;
 bool tick_nohz_full_running;
-static unsigned long tick_dep_mask;
+static atomic_t tick_dep_mask;
 
-static void trace_tick_dependency(unsigned long dep)
+static bool check_tick_dependency(atomic_t *dep)
 {
-        if (dep & TICK_DEP_MASK_POSIX_TIMER) {
+        int val = atomic_read(dep);
+
+        if (val & TICK_DEP_MASK_POSIX_TIMER) {
                 trace_tick_stop(0, TICK_DEP_MASK_POSIX_TIMER);
-                return;
+                return true;
         }
 
-        if (dep & TICK_DEP_MASK_PERF_EVENTS) {
+        if (val & TICK_DEP_MASK_PERF_EVENTS) {
                 trace_tick_stop(0, TICK_DEP_MASK_PERF_EVENTS);
-                return;
+                return true;
         }
 
-        if (dep & TICK_DEP_MASK_SCHED) {
+        if (val & TICK_DEP_MASK_SCHED) {
                 trace_tick_stop(0, TICK_DEP_MASK_SCHED);
-                return;
+                return true;
         }
 
-        if (dep & TICK_DEP_MASK_CLOCK_UNSTABLE)
+        if (val & TICK_DEP_MASK_CLOCK_UNSTABLE) {
                 trace_tick_stop(0, TICK_DEP_MASK_CLOCK_UNSTABLE);
+                return true;
+        }
+
+        return false;
 }
 
 static bool can_stop_full_tick(struct tick_sched *ts)
 {
         WARN_ON_ONCE(!irqs_disabled());
 
-        if (tick_dep_mask) {
-                trace_tick_dependency(tick_dep_mask);
+        if (check_tick_dependency(&tick_dep_mask))
                 return false;
-        }
 
-        if (ts->tick_dep_mask) {
-                trace_tick_dependency(ts->tick_dep_mask);
+        if (check_tick_dependency(&ts->tick_dep_mask))
                 return false;
-        }
 
-        if (current->tick_dep_mask) {
-                trace_tick_dependency(current->tick_dep_mask);
+        if (check_tick_dependency(&current->tick_dep_mask))
                 return false;
-        }
 
-        if (current->signal->tick_dep_mask) {
-                trace_tick_dependency(current->signal->tick_dep_mask);
+        if (check_tick_dependency(&current->signal->tick_dep_mask))
                 return false;
-        }
 
         return true;
 }
@@ -259,12 +257,12 @@ static void tick_nohz_full_kick_all(void)
         preempt_enable();
 }
 
-static void tick_nohz_dep_set_all(unsigned long *dep,
+static void tick_nohz_dep_set_all(atomic_t *dep,
                                   enum tick_dep_bits bit)
 {
-        unsigned long prev;
+        int prev;
 
-        prev = fetch_or(dep, BIT_MASK(bit));
+        prev = atomic_fetch_or(dep, BIT(bit));
         if (!prev)
                 tick_nohz_full_kick_all();
 }
@@ -280,7 +278,7 @@ void tick_nohz_dep_set(enum tick_dep_bits bit)
 
 void tick_nohz_dep_clear(enum tick_dep_bits bit)
 {
-        clear_bit(bit, &tick_dep_mask);
+        atomic_andnot(BIT(bit), &tick_dep_mask);
 }
 
 /*
@@ -289,12 +287,12 @@ void tick_nohz_dep_clear(enum tick_dep_bits bit)
  */
 void tick_nohz_dep_set_cpu(int cpu, enum tick_dep_bits bit)
 {
-        unsigned long prev;
+        int prev;
         struct tick_sched *ts;
 
         ts = per_cpu_ptr(&tick_cpu_sched, cpu);
 
-        prev = fetch_or(&ts->tick_dep_mask, BIT_MASK(bit));
+        prev = atomic_fetch_or(&ts->tick_dep_mask, BIT(bit));
         if (!prev) {
                 preempt_disable();
                 /* Perf needs local kick that is NMI safe */
@@ -313,7 +311,7 @@ void tick_nohz_dep_clear_cpu(int cpu, enum tick_dep_bits bit)
 {
         struct tick_sched *ts = per_cpu_ptr(&tick_cpu_sched, cpu);
 
-        clear_bit(bit, &ts->tick_dep_mask);
+        atomic_andnot(BIT(bit), &ts->tick_dep_mask);
 }
 
 /*
@@ -331,7 +329,7 @@ void tick_nohz_dep_set_task(struct task_struct *tsk, enum tick_dep_bits bit)
 
 void tick_nohz_dep_clear_task(struct task_struct *tsk, enum tick_dep_bits bit)
 {
-        clear_bit(bit, &tsk->tick_dep_mask);
+        atomic_andnot(BIT(bit), &tsk->tick_dep_mask);
 }
 
 /*
@@ -345,7 +343,7 @@ void tick_nohz_dep_set_signal(struct signal_struct *sig, enum tick_dep_bits bit)
 
 void tick_nohz_dep_clear_signal(struct signal_struct *sig, enum tick_dep_bits bit)
 {
-        clear_bit(bit, &sig->tick_dep_mask);
+        atomic_andnot(BIT(bit), &sig->tick_dep_mask);
 }
 
 /*
@@ -366,7 +364,8 @@ void __tick_nohz_task_switch(void)
         ts = this_cpu_ptr(&tick_cpu_sched);
 
         if (ts->tick_stopped) {
-                if (current->tick_dep_mask || current->signal->tick_dep_mask)
+                if (atomic_read(&current->tick_dep_mask) ||
+                    atomic_read(&current->signal->tick_dep_mask))
                         tick_nohz_full_kick();
         }
 out:
diff --git a/kernel/time/tick-sched.h b/kernel/time/tick-sched.h
index eb4e32566a83..bf38226e5c17 100644
--- a/kernel/time/tick-sched.h
+++ b/kernel/time/tick-sched.h
@@ -60,7 +60,7 @@ struct tick_sched {
         u64                             next_timer;
         ktime_t                         idle_expires;
         int                             do_timer_last;
-        unsigned long                   tick_dep_mask;
+        atomic_t                        tick_dep_mask;
 };
 
 extern struct tick_sched *tick_get_tick_sched(int cpu);
diff --git a/lib/test_bpf.c b/lib/test_bpf.c
index 27a7a26b1ece..8f22fbedc3a6 100644
--- a/lib/test_bpf.c
+++ b/lib/test_bpf.c
@@ -2444,6 +2444,22 @@ static struct bpf_test tests[] = {
                 { { 0, 4294967295U } },
         },
         {
+                "ALU_ADD_X: 2 + 4294967294 = 0",
+                .u.insns_int = {
+                        BPF_LD_IMM64(R0, 2),
+                        BPF_LD_IMM64(R1, 4294967294U),
+                        BPF_ALU32_REG(BPF_ADD, R0, R1),
+                        BPF_JMP_IMM(BPF_JEQ, R0, 0, 2),
+                        BPF_ALU32_IMM(BPF_MOV, R0, 0),
+                        BPF_EXIT_INSN(),
+                        BPF_ALU32_IMM(BPF_MOV, R0, 1),
+                        BPF_EXIT_INSN(),
+                },
+                INTERNAL,
+                { },
+                { { 0, 1 } },
+        },
+        {
                 "ALU64_ADD_X: 1 + 2 = 3",
                 .u.insns_int = {
                         BPF_LD_IMM64(R0, 1),
@@ -2467,6 +2483,23 @@ static struct bpf_test tests[] = {
                 { },
                 { { 0, 4294967295U } },
         },
+        {
+                "ALU64_ADD_X: 2 + 4294967294 = 4294967296",
+                .u.insns_int = {
+                        BPF_LD_IMM64(R0, 2),
+                        BPF_LD_IMM64(R1, 4294967294U),
+                        BPF_LD_IMM64(R2, 4294967296ULL),
+                        BPF_ALU64_REG(BPF_ADD, R0, R1),
+                        BPF_JMP_REG(BPF_JEQ, R0, R2, 2),
+                        BPF_MOV32_IMM(R0, 0),
+                        BPF_EXIT_INSN(),
+                        BPF_MOV32_IMM(R0, 1),
+                        BPF_EXIT_INSN(),
+                },
+                INTERNAL,
+                { },
+                { { 0, 1 } },
+        },
         /* BPF_ALU | BPF_ADD | BPF_K */
         {
                 "ALU_ADD_K: 1 + 2 = 3",
@@ -2502,6 +2535,21 @@ static struct bpf_test tests[] = {
                 { { 0, 4294967295U } },
         },
         {
+                "ALU_ADD_K: 4294967294 + 2 = 0",
+                .u.insns_int = {
+                        BPF_LD_IMM64(R0, 4294967294U),
+                        BPF_ALU32_IMM(BPF_ADD, R0, 2),
+                        BPF_JMP_IMM(BPF_JEQ, R0, 0, 2),
+                        BPF_ALU32_IMM(BPF_MOV, R0, 0),
+                        BPF_EXIT_INSN(),
+                        BPF_ALU32_IMM(BPF_MOV, R0, 1),
+                        BPF_EXIT_INSN(),
+                },
+                INTERNAL,
+                { },
+                { { 0, 1 } },
+        },
+        {
                 "ALU_ADD_K: 0 + (-1) = 0x00000000ffffffff",
                 .u.insns_int = {
                         BPF_LD_IMM64(R2, 0x0),
@@ -2518,6 +2566,70 @@ static struct bpf_test tests[] = {
                 { { 0, 0x1 } },
         },
         {
+                "ALU_ADD_K: 0 + 0xffff = 0xffff",
+                .u.insns_int = {
+                        BPF_LD_IMM64(R2, 0x0),
+                        BPF_LD_IMM64(R3, 0xffff),
+                        BPF_ALU32_IMM(BPF_ADD, R2, 0xffff),
+                        BPF_JMP_REG(BPF_JEQ, R2, R3, 2),
+                        BPF_MOV32_IMM(R0, 2),
+                        BPF_EXIT_INSN(),
+                        BPF_MOV32_IMM(R0, 1),
+                        BPF_EXIT_INSN(),
+                },
+                INTERNAL,
+                { },
+                { { 0, 0x1 } },
+        },
+        {
+                "ALU_ADD_K: 0 + 0x7fffffff = 0x7fffffff",
+                .u.insns_int = {
+                        BPF_LD_IMM64(R2, 0x0),
+                        BPF_LD_IMM64(R3, 0x7fffffff),
+                        BPF_ALU32_IMM(BPF_ADD, R2, 0x7fffffff),
+                        BPF_JMP_REG(BPF_JEQ, R2, R3, 2),
+                        BPF_MOV32_IMM(R0, 2),
+                        BPF_EXIT_INSN(),
+                        BPF_MOV32_IMM(R0, 1),
+                        BPF_EXIT_INSN(),
+                },
+                INTERNAL,
+                { },
+                { { 0, 0x1 } },
+        },
+        {
+                "ALU_ADD_K: 0 + 0x80000000 = 0x80000000",
+                .u.insns_int = {
+                        BPF_LD_IMM64(R2, 0x0),
+                        BPF_LD_IMM64(R3, 0x80000000),
+                        BPF_ALU32_IMM(BPF_ADD, R2, 0x80000000),
+                        BPF_JMP_REG(BPF_JEQ, R2, R3, 2),
+                        BPF_MOV32_IMM(R0, 2),
+                        BPF_EXIT_INSN(),
+                        BPF_MOV32_IMM(R0, 1),
+                        BPF_EXIT_INSN(),
+                },
+                INTERNAL,
+                { },
+                { { 0, 0x1 } },
+        },
+        {
+                "ALU_ADD_K: 0 + 0x80008000 = 0x80008000",
+                .u.insns_int = {
+                        BPF_LD_IMM64(R2, 0x0),
+                        BPF_LD_IMM64(R3, 0x80008000),
+                        BPF_ALU32_IMM(BPF_ADD, R2, 0x80008000),
+                        BPF_JMP_REG(BPF_JEQ, R2, R3, 2),
+                        BPF_MOV32_IMM(R0, 2),
+                        BPF_EXIT_INSN(),
+                        BPF_MOV32_IMM(R0, 1),
+                        BPF_EXIT_INSN(),
+                },
+                INTERNAL,
+                { },
+                { { 0, 0x1 } },
+        },
+        {
                 "ALU64_ADD_K: 1 + 2 = 3",
                 .u.insns_int = {
                         BPF_LD_IMM64(R0, 1),
@@ -2551,6 +2663,22 @@ static struct bpf_test tests[] = {
                 { { 0, 2147483647 } },
         },
         {
+                "ALU64_ADD_K: 4294967294 + 2 = 4294967296",
+                .u.insns_int = {
+                        BPF_LD_IMM64(R0, 4294967294U),
+                        BPF_LD_IMM64(R1, 4294967296ULL),
+                        BPF_ALU64_IMM(BPF_ADD, R0, 2),
+                        BPF_JMP_REG(BPF_JEQ, R0, R1, 2),
+                        BPF_ALU32_IMM(BPF_MOV, R0, 0),
+                        BPF_EXIT_INSN(),
+                        BPF_ALU32_IMM(BPF_MOV, R0, 1),
+                        BPF_EXIT_INSN(),
+                },
+                INTERNAL,
+                { },
+                { { 0, 1 } },
+        },
+        {
                 "ALU64_ADD_K: 2147483646 + -2147483647 = -1",
                 .u.insns_int = {
                         BPF_LD_IMM64(R0, 2147483646),
@@ -2593,6 +2721,70 @@ static struct bpf_test tests[] = {
                 { },
                 { { 0, 0x1 } },
         },
+        {
+                "ALU64_ADD_K: 0 + 0xffff = 0xffff",
+                .u.insns_int = {
+                        BPF_LD_IMM64(R2, 0x0),
+                        BPF_LD_IMM64(R3, 0xffff),
+                        BPF_ALU64_IMM(BPF_ADD, R2, 0xffff),
+                        BPF_JMP_REG(BPF_JEQ, R2, R3, 2),
+                        BPF_MOV32_IMM(R0, 2),
+                        BPF_EXIT_INSN(),
+                        BPF_MOV32_IMM(R0, 1),
+                        BPF_EXIT_INSN(),
+                },
+                INTERNAL,
+                { },
+                { { 0, 0x1 } },
+        },
+        {
+                "ALU64_ADD_K: 0 + 0x7fffffff = 0x7fffffff",
+                .u.insns_int = {
+                        BPF_LD_IMM64(R2, 0x0),
+                        BPF_LD_IMM64(R3, 0x7fffffff),
+                        BPF_ALU64_IMM(BPF_ADD, R2, 0x7fffffff),
+                        BPF_JMP_REG(BPF_JEQ, R2, R3, 2),
+                        BPF_MOV32_IMM(R0, 2),
+                        BPF_EXIT_INSN(),
+                        BPF_MOV32_IMM(R0, 1),
+                        BPF_EXIT_INSN(),
+                },
+                INTERNAL,
+                { },
+                { { 0, 0x1 } },
+        },
+        {
+                "ALU64_ADD_K: 0 + 0x80000000 = 0xffffffff80000000",
+                .u.insns_int = {
+                        BPF_LD_IMM64(R2, 0x0),
+                        BPF_LD_IMM64(R3, 0xffffffff80000000LL),
+                        BPF_ALU64_IMM(BPF_ADD, R2, 0x80000000),
+                        BPF_JMP_REG(BPF_JEQ, R2, R3, 2),
+                        BPF_MOV32_IMM(R0, 2),
+                        BPF_EXIT_INSN(),
+                        BPF_MOV32_IMM(R0, 1),
+                        BPF_EXIT_INSN(),
+                },
+                INTERNAL,
+                { },
+                { { 0, 0x1 } },
+        },
+        {
+                "ALU_ADD_K: 0 + 0x80008000 = 0xffffffff80008000",
+                .u.insns_int = {
+                        BPF_LD_IMM64(R2, 0x0),
+                        BPF_LD_IMM64(R3, 0xffffffff80008000LL),
+                        BPF_ALU64_IMM(BPF_ADD, R2, 0x80008000),
+                        BPF_JMP_REG(BPF_JEQ, R2, R3, 2),
+                        BPF_MOV32_IMM(R0, 2),
+                        BPF_EXIT_INSN(),
+                        BPF_MOV32_IMM(R0, 1),
+                        BPF_EXIT_INSN(),
+                },
+                INTERNAL,
+                { },
+                { { 0, 0x1 } },
+        },
         /* BPF_ALU | BPF_SUB | BPF_X */
         {
                 "ALU_SUB_X: 3 - 1 = 2",
@@ -4222,6 +4414,20 @@ static struct bpf_test tests[] = {
                 { },
                 { { 0, 1 } },
         },
+        {
+                "JMP_JGT_K: Unsigned jump: if (-1 > 1) return 1",
+                .u.insns_int = {
+                        BPF_ALU32_IMM(BPF_MOV, R0, 0),
+                        BPF_LD_IMM64(R1, -1),
+                        BPF_JMP_IMM(BPF_JGT, R1, 1, 1),
+                        BPF_EXIT_INSN(),
+                        BPF_ALU32_IMM(BPF_MOV, R0, 1),
+                        BPF_EXIT_INSN(),
+                },
+                INTERNAL,
+                { },
+                { { 0, 1 } },
+        },
         /* BPF_JMP | BPF_JGE | BPF_K */
         {
                 "JMP_JGE_K: if (3 >= 2) return 1",
@@ -4303,7 +4509,7 @@ static struct bpf_test tests[] = {
                 .u.insns_int = {
                         BPF_ALU32_IMM(BPF_MOV, R0, 0),
                         BPF_LD_IMM64(R1, 3),
-                        BPF_JMP_IMM(BPF_JNE, R1, 2, 1),
+                        BPF_JMP_IMM(BPF_JSET, R1, 2, 1),
                         BPF_EXIT_INSN(),
                         BPF_ALU32_IMM(BPF_MOV, R0, 1),
                         BPF_EXIT_INSN(),
@@ -4317,7 +4523,7 @@ static struct bpf_test tests[] = {
                 .u.insns_int = {
                         BPF_ALU32_IMM(BPF_MOV, R0, 0),
                         BPF_LD_IMM64(R1, 3),
-                        BPF_JMP_IMM(BPF_JNE, R1, 0xffffffff, 1),
+                        BPF_JMP_IMM(BPF_JSET, R1, 0xffffffff, 1),
                         BPF_EXIT_INSN(),
                         BPF_ALU32_IMM(BPF_MOV, R0, 1),
                         BPF_EXIT_INSN(),
@@ -4404,6 +4610,21 @@ static struct bpf_test tests[] = {
                 { },
                 { { 0, 1 } },
         },
+        {
+                "JMP_JGT_X: Unsigned jump: if (-1 > 1) return 1",
+                .u.insns_int = {
+                        BPF_ALU32_IMM(BPF_MOV, R0, 0),
+                        BPF_LD_IMM64(R1, -1),
+                        BPF_LD_IMM64(R2, 1),
+                        BPF_JMP_REG(BPF_JGT, R1, R2, 1),
+                        BPF_EXIT_INSN(),
+                        BPF_ALU32_IMM(BPF_MOV, R0, 1),
+                        BPF_EXIT_INSN(),
+                },
+                INTERNAL,
+                { },
+                { { 0, 1 } },
+        },
         /* BPF_JMP | BPF_JGE | BPF_X */
         {
                 "JMP_JGE_X: if (3 >= 2) return 1",
@@ -4474,7 +4695,7 @@ static struct bpf_test tests[] = {
                         BPF_ALU32_IMM(BPF_MOV, R0, 0),
                         BPF_LD_IMM64(R1, 3),
                         BPF_LD_IMM64(R2, 2),
-                        BPF_JMP_REG(BPF_JNE, R1, R2, 1),
+                        BPF_JMP_REG(BPF_JSET, R1, R2, 1),
                         BPF_EXIT_INSN(),
                         BPF_ALU32_IMM(BPF_MOV, R0, 1),
                         BPF_EXIT_INSN(),
@@ -4489,7 +4710,7 @@ static struct bpf_test tests[] = {
                         BPF_ALU32_IMM(BPF_MOV, R0, 0),
                         BPF_LD_IMM64(R1, 3),
                         BPF_LD_IMM64(R2, 0xffffffff),
-                        BPF_JMP_REG(BPF_JNE, R1, R2, 1),
+                        BPF_JMP_REG(BPF_JSET, R1, R2, 1),
                         BPF_EXIT_INSN(),
                         BPF_ALU32_IMM(BPF_MOV, R0, 1),
                         BPF_EXIT_INSN(),
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 a8c69c8c0a90..f2479af09da9 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;
 }
@@ -1912,7 +1912,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);
 
@@ -2022,8 +2022,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;
 
         /*
@@ -2049,7 +2049,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;
         }
 
@@ -2072,10 +2072,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;
         }
 
@@ -2120,7 +2120,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;
@@ -2164,7 +2164,7 @@ repeat:
 
                 /* Has the page moved? */
                 if (unlikely(page != *slot)) {
-                        page_cache_release(page);
+                        put_page(page);
                         goto repeat;
                 }
 
@@ -2178,8 +2178,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;
@@ -2195,7 +2195,7 @@ repeat:
 unlock:
                 unlock_page(page);
 skip:
-                page_cache_release(page);
+                put_page(page);
 next:
                 if (iter.index == vmf->max_pgoff)
                         break;
@@ -2278,7 +2278,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);
                 }
         }
@@ -2301,7 +2301,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 */
@@ -2311,7 +2311,7 @@ repeat:
 filler:
                 err = filler(data, page);
                 if (err < 0) {
-                        page_cache_release(page);
+                        put_page(page);
                         return ERR_PTR(err);
                 }
 
@@ -2364,7 +2364,7 @@ filler:
         /* Case c or d, restart the operation */
         if (!page->mapping) {
                 unlock_page(page);
-                page_cache_release(page);
+                put_page(page);
                 goto repeat;
         }
 
@@ -2511,7 +2511,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)
@@ -2525,7 +2525,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.
@@ -2550,7 +2550,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) {
@@ -2611,8 +2611,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:
@@ -2665,7 +2665,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;
                 }
@@ -2752,8 +2752,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 7f1c4fb77cfa..fb87aea9edc8 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1107,7 +1107,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/kasan/kasan.c b/mm/kasan/kasan.c
index acb3b6c4dd89..38f1dd79acdb 100644
--- a/mm/kasan/kasan.c
+++ b/mm/kasan/kasan.c
@@ -498,7 +498,7 @@ void kasan_slab_free(struct kmem_cache *cache, void *object)
                 struct kasan_alloc_meta *alloc_info =
                         get_alloc_info(cache, object);
                 alloc_info->state = KASAN_STATE_FREE;
-                set_track(&free_info->track);
+                set_track(&free_info->track, GFP_NOWAIT);
         }
 #endif
 
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 098f00d05461..93897f23cc11 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2054,7 +2054,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) {
                         /*
@@ -2188,7 +2188,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);
@@ -2203,14 +2203,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;
 }
 
@@ -2258,7 +2258,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;
@@ -2267,7 +2267,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;
                 }
                 /*
@@ -2281,7 +2281,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;
@@ -2341,7 +2341,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,
@@ -2349,10 +2349,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)) {
                         /*
@@ -2375,7 +2375,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,
@@ -2400,7 +2400,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;
@@ -2619,7 +2618,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) {
@@ -2641,10 +2640,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;
 }
@@ -2752,7 +2751,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);
         }
@@ -2771,10 +2770,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;
 }
@@ -2807,7 +2806,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;
         }
 
@@ -2996,7 +2995,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);
@@ -3024,7 +3023,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;
         }
 
@@ -3041,7 +3040,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
@@ -3057,7 +3056,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
@@ -3068,7 +3067,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;
 }
 
@@ -3096,7 +3095,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;
                 }
         }
@@ -3105,7 +3104,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);
@@ -3736,7 +3735,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..c0b5ba965200 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 de8b6b6580c1..102e257cc6c3 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -141,7 +141,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/oom_kill.c b/mm/oom_kill.c
index b34d279a7ee6..86349586eacb 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -547,7 +547,11 @@ static int oom_reaper(void *unused)
 
 static void wake_oom_reaper(struct task_struct *tsk)
 {
-        if (!oom_reaper_th || tsk->oom_reaper_list)
+        if (!oom_reaper_th)
+                return;
+
+        /* tsk is already queued? */
+        if (tsk == oom_reaper_list || tsk->oom_reaper_list)
                 return;
 
         get_task_struct(tsk);
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 18aac7819cc9..cd92e3d67a32 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -252,7 +252,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/page_isolation.c b/mm/page_isolation.c
index 92c4c36501e7..c4f568206544 100644
--- a/mm/page_isolation.c
+++ b/mm/page_isolation.c
@@ -215,7 +215,7 @@ int undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
  * all pages in [start_pfn...end_pfn) must be in the same zone.
  * zone->lock must be held before call this.
  *
- * Returns 1 if all pages in the range are isolated.
+ * Returns the last tested pfn.
  */
 static unsigned long
 __test_page_isolated_in_pageblock(unsigned long pfn, unsigned long end_pfn,
@@ -289,11 +289,11 @@ struct page *alloc_migrate_target(struct page *page, unsigned long private,
          * now as a simple work-around, we use the next node for destination.
          */
         if (PageHuge(page)) {
-                nodemask_t src = nodemask_of_node(page_to_nid(page));
-                nodemask_t dst;
-                nodes_complement(dst, src);
+                int node = next_online_node(page_to_nid(page));
+                if (node == MAX_NUMNODES)
+                        node = first_online_node;
                 return alloc_huge_page_node(page_hstate(compound_head(page)),
-                                            next_node(page_to_nid(page), dst));
+                                            node);
         }
 
         if (PageHighMem(page))
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..307b555024ef 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -569,19 +569,6 @@ void page_unlock_anon_vma_read(struct anon_vma *anon_vma)
 }
 
 #ifdef CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH
-static void percpu_flush_tlb_batch_pages(void *data)
-{
-        /*
-         * All TLB entries are flushed on the assumption that it is
-         * cheaper to flush all TLBs and let them be refilled than
-         * flushing individual PFNs. Note that we do not track mm's
-         * to flush as that might simply be multiple full TLB flushes
-         * for no gain.
-         */
-        count_vm_tlb_event(NR_TLB_REMOTE_FLUSH_RECEIVED);
-        flush_tlb_local();
-}
-
 /*
  * Flush TLB entries for recently unmapped pages from remote CPUs. It is
  * important if a PTE was dirty when it was unmapped that it's flushed
@@ -598,15 +585,14 @@ void try_to_unmap_flush(void)
 
         cpu = get_cpu();
 
-        trace_tlb_flush(TLB_REMOTE_SHOOTDOWN, -1UL);
-
-        if (cpumask_test_cpu(cpu, &tlb_ubc->cpumask))
-                percpu_flush_tlb_batch_pages(&tlb_ubc->cpumask);
-
-        if (cpumask_any_but(&tlb_ubc->cpumask, cpu) < nr_cpu_ids) {
-                smp_call_function_many(&tlb_ubc->cpumask,
-                        percpu_flush_tlb_batch_pages, (void *)tlb_ubc, true);
+        if (cpumask_test_cpu(cpu, &tlb_ubc->cpumask)) {
+                count_vm_tlb_event(NR_TLB_LOCAL_FLUSH_ALL);
+                local_flush_tlb();
+                trace_tlb_flush(TLB_LOCAL_SHOOTDOWN, TLB_FLUSH_ALL);
         }
+
+        if (cpumask_any_but(&tlb_ubc->cpumask, cpu) < nr_cpu_ids)
+                flush_tlb_others(&tlb_ubc->cpumask, NULL, 0, TLB_FLUSH_ALL);
         cpumask_clear(&tlb_ubc->cpumask);
         tlb_ubc->flush_required = false;
         tlb_ubc->writable = false;
@@ -1555,7 +1541,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 560ad380634c..83874eced5bf 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -119,7 +119,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;
 }
 
@@ -1000,7 +1000,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;
                         }
                 }
@@ -1017,7 +1017,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;
 }
@@ -1518,7 +1518,7 @@ int try_to_unuse(unsigned int type, bool frontswap,
                 }
                 if (retval) {
                         unlock_page(page);
-                        page_cache_release(page);
+                        put_page(page);
                         break;
                 }
 
@@ -1570,7 +1570,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
@@ -2574,7 +2574,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/bridge/br_stp.c b/net/bridge/br_stp.c
index e23449094188..9cb7044d0801 100644
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -582,7 +582,7 @@ int br_set_ageing_time(struct net_bridge *br, u32 ageing_time)
         int err;
 
         err = switchdev_port_attr_set(br->dev, &attr);
-        if (err)
+        if (err && err != -EOPNOTSUPP)
                 return err;
 
         br->ageing_time = t;
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 67b2e27999aa..8570bc7744c2 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -1521,6 +1521,8 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
         if (copy_from_user(&tmp, user, sizeof(tmp)))
                 return -EFAULT;
 
+        tmp.name[sizeof(tmp.name) - 1] = '\0';
+
         t = find_table_lock(net, tmp.name, &ret, &ebt_mutex);
         if (!t)
                 return ret;
@@ -2332,6 +2334,8 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
         if (copy_from_user(&tmp, user, sizeof(tmp)))
                 return -EFAULT;
 
+        tmp.name[sizeof(tmp.name) - 1] = '\0';
+
         t = find_table_lock(net, tmp.name, &ret, &ebt_mutex);
         if (!t)
                 return ret;
diff --git a/net/bridge/netfilter/nft_reject_bridge.c b/net/bridge/netfilter/nft_reject_bridge.c
index adc8d7221dbb..77f7e7a9ebe1 100644
--- a/net/bridge/netfilter/nft_reject_bridge.c
+++ b/net/bridge/netfilter/nft_reject_bridge.c
@@ -40,7 +40,8 @@ static void nft_reject_br_push_etherhdr(struct sk_buff *oldskb,
 /* We cannot use oldskb->dev, it can be either bridge device (NF_BRIDGE INPUT)
  * or the bridge port (NF_BRIDGE PREROUTING).
  */
-static void nft_reject_br_send_v4_tcp_reset(struct sk_buff *oldskb,
+static void nft_reject_br_send_v4_tcp_reset(struct net *net,
+                                            struct sk_buff *oldskb,
                                             const struct net_device *dev,
                                             int hook)
 {
@@ -48,7 +49,6 @@ static void nft_reject_br_send_v4_tcp_reset(struct sk_buff *oldskb,
         struct iphdr *niph;
         const struct tcphdr *oth;
         struct tcphdr _oth;
-        struct net *net = sock_net(oldskb->sk);
 
         if (!nft_bridge_iphdr_validate(oldskb))
                 return;
@@ -75,7 +75,8 @@ static void nft_reject_br_send_v4_tcp_reset(struct sk_buff *oldskb,
         br_deliver(br_port_get_rcu(dev), nskb);
 }
 
-static void nft_reject_br_send_v4_unreach(struct sk_buff *oldskb,
+static void nft_reject_br_send_v4_unreach(struct net *net,
+                                          struct sk_buff *oldskb,
                                           const struct net_device *dev,
                                           int hook, u8 code)
 {
@@ -86,7 +87,6 @@ static void nft_reject_br_send_v4_unreach(struct sk_buff *oldskb,
         void *payload;
         __wsum csum;
         u8 proto;
-        struct net *net = sock_net(oldskb->sk);
 
         if (oldskb->csum_bad || !nft_bridge_iphdr_validate(oldskb))
                 return;
@@ -273,17 +273,17 @@ static void nft_reject_bridge_eval(const struct nft_expr *expr,
         case htons(ETH_P_IP):
                 switch (priv->type) {
                 case NFT_REJECT_ICMP_UNREACH:
-                        nft_reject_br_send_v4_unreach(pkt->skb, pkt->in,
-                                                      pkt->hook,
+                        nft_reject_br_send_v4_unreach(pkt->net, pkt->skb,
+                                                      pkt->in, pkt->hook,
                                                       priv->icmp_code);
                         break;
                 case NFT_REJECT_TCP_RST:
-                        nft_reject_br_send_v4_tcp_reset(pkt->skb, pkt->in,
-                                                        pkt->hook);
+                        nft_reject_br_send_v4_tcp_reset(pkt->net, pkt->skb,
+                                                        pkt->in, pkt->hook);
                         break;
                 case NFT_REJECT_ICMPX_UNREACH:
-                        nft_reject_br_send_v4_unreach(pkt->skb, pkt->in,
-                                                      pkt->hook,
+                        nft_reject_br_send_v4_unreach(pkt->net, pkt->skb,
+                                                      pkt->in, pkt->hook,
                                                       nft_reject_icmp_code(priv->icmp_code));
                         break;
                 }
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 1831f6353622..a5502898ea33 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -269,7 +269,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();
@@ -282,7 +282,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
@@ -1602,7 +1602,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 10297f7a89ba..00d2601407c5 100644
--- a/net/ceph/pagevec.c
+++ b/net/ceph/pagevec.c
@@ -95,19 +95,19 @@ int ceph_copy_user_to_page_vector(struct page **pages,
                                          loff_t off, size_t len)
 {
         int i = 0;
-        int po = off & ~PAGE_CACHE_MASK;
+        int po = off & ~PAGE_MASK;
         int left = len;
         int l, bad;
 
         while (left > 0) {
-                l = min_t(int, PAGE_CACHE_SIZE-po, left);
+                l = min_t(int, PAGE_SIZE-po, left);
                 bad = copy_from_user(page_address(pages[i]) + po, data, l);
                 if (bad == l)
                         return -EFAULT;
                 data += l - bad;
                 left -= l - bad;
                 po += l - bad;
-                if (po == PAGE_CACHE_SIZE) {
+                if (po == PAGE_SIZE) {
                         po = 0;
                         i++;
                 }
@@ -121,17 +121,17 @@ void ceph_copy_to_page_vector(struct page **pages,
                                     loff_t off, size_t len)
 {
         int i = 0;
-        size_t po = off & ~PAGE_CACHE_MASK;
+        size_t po = off & ~PAGE_MASK;
         size_t left = len;
 
         while (left > 0) {
-                size_t l = min_t(size_t, PAGE_CACHE_SIZE-po, left);
+                size_t l = min_t(size_t, PAGE_SIZE-po, left);
 
                 memcpy(page_address(pages[i]) + po, data, l);
                 data += l;
                 left -= l;
                 po += l;
-                if (po == PAGE_CACHE_SIZE) {
+                if (po == PAGE_SIZE) {
                         po = 0;
                         i++;
                 }
@@ -144,17 +144,17 @@ void ceph_copy_from_page_vector(struct page **pages,
                                     loff_t off, size_t len)
 {
         int i = 0;
-        size_t po = off & ~PAGE_CACHE_MASK;
+        size_t po = off & ~PAGE_MASK;
         size_t left = len;
 
         while (left > 0) {
-                size_t l = min_t(size_t, PAGE_CACHE_SIZE-po, left);
+                size_t l = min_t(size_t, PAGE_SIZE-po, left);
 
                 memcpy(data, page_address(pages[i]) + po, l);
                 data += l;
                 left -= l;
                 po += l;
-                if (po == PAGE_CACHE_SIZE) {
+                if (po == PAGE_SIZE) {
                         po = 0;
                         i++;
                 }
@@ -168,25 +168,25 @@ EXPORT_SYMBOL(ceph_copy_from_page_vector);
  */
 void ceph_zero_page_vector_range(int off, int len, struct page **pages)
 {
-        int i = off >> PAGE_CACHE_SHIFT;
+        int i = off >> PAGE_SHIFT;
 
-        off &= ~PAGE_CACHE_MASK;
+        off &= ~PAGE_MASK;
 
         dout("zero_page_vector_page %u~%u\n", off, len);
 
         /* leading partial page? */
         if (off) {
-                int end = min((int)PAGE_CACHE_SIZE, off + len);
+                int end = min((int)PAGE_SIZE, off + len);
                 dout("zeroing %d %p head from %d\n", i, pages[i],
                      (int)off);
                 zero_user_segment(pages[i], off, end);
                 len -= (end - off);
                 i++;
         }
-        while (len >= PAGE_CACHE_SIZE) {
+        while (len >= PAGE_SIZE) {
                 dout("zeroing %d %p len=%d\n", i, pages[i], len);
-                zero_user_segment(pages[i], 0, PAGE_CACHE_SIZE);
-                len -= PAGE_CACHE_SIZE;
+                zero_user_segment(pages[i], 0, PAGE_SIZE);
+                len -= PAGE_SIZE;
                 i++;
         }
         /* trailing partial page? */
diff --git a/net/core/dev.c b/net/core/dev.c
index b9bcbe77d913..77a71cd68535 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4439,6 +4439,7 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff
                 NAPI_GRO_CB(skb)->flush = 0;
                 NAPI_GRO_CB(skb)->free = 0;
                 NAPI_GRO_CB(skb)->encap_mark = 0;
+                NAPI_GRO_CB(skb)->is_fou = 0;
                 NAPI_GRO_CB(skb)->gro_remcsum_start = 0;
 
                 /* Setup for GRO checksum validation */
diff --git a/net/core/filter.c b/net/core/filter.c
index b7177d01ecb0..ca7f832b2980 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -1149,7 +1149,8 @@ void bpf_prog_destroy(struct bpf_prog *fp)
 }
 EXPORT_SYMBOL_GPL(bpf_prog_destroy);
 
-static int __sk_attach_prog(struct bpf_prog *prog, struct sock *sk)
+static int __sk_attach_prog(struct bpf_prog *prog, struct sock *sk,
+                            bool locked)
 {
         struct sk_filter *fp, *old_fp;
 
@@ -1165,10 +1166,8 @@ static int __sk_attach_prog(struct bpf_prog *prog, struct sock *sk)
                 return -ENOMEM;
         }
 
-        old_fp = rcu_dereference_protected(sk->sk_filter,
-                                           sock_owned_by_user(sk));
+        old_fp = rcu_dereference_protected(sk->sk_filter, locked);
         rcu_assign_pointer(sk->sk_filter, fp);
-
         if (old_fp)
                 sk_filter_uncharge(sk, old_fp);
 
@@ -1247,7 +1246,8 @@ struct bpf_prog *__get_filter(struct sock_fprog *fprog, struct sock *sk)
  * occurs or there is insufficient memory for the filter a negative
  * errno code is returned. On success the return is zero.
  */
-int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk)
+int __sk_attach_filter(struct sock_fprog *fprog, struct sock *sk,
+                       bool locked)
 {
         struct bpf_prog *prog = __get_filter(fprog, sk);
         int err;
@@ -1255,7 +1255,7 @@ int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk)
         if (IS_ERR(prog))
                 return PTR_ERR(prog);
 
-        err = __sk_attach_prog(prog, sk);
+        err = __sk_attach_prog(prog, sk, locked);
         if (err < 0) {
                 __bpf_prog_release(prog);
                 return err;
@@ -1263,7 +1263,12 @@ int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk)
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(sk_attach_filter);
+EXPORT_SYMBOL_GPL(__sk_attach_filter);
+
+int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk)
+{
+        return __sk_attach_filter(fprog, sk, sock_owned_by_user(sk));
+}
 
 int sk_reuseport_attach_filter(struct sock_fprog *fprog, struct sock *sk)
 {
@@ -1309,7 +1314,7 @@ int sk_attach_bpf(u32 ufd, struct sock *sk)
         if (IS_ERR(prog))
                 return PTR_ERR(prog);
 
-        err = __sk_attach_prog(prog, sk);
+        err = __sk_attach_prog(prog, sk, sock_owned_by_user(sk));
         if (err < 0) {
                 bpf_prog_put(prog);
                 return err;
@@ -1764,6 +1769,7 @@ static u64 bpf_skb_get_tunnel_key(u64 r1, u64 r2, u64 size, u64 flags, u64 r5)
         if (unlikely(size != sizeof(struct bpf_tunnel_key))) {
                 switch (size) {
                 case offsetof(struct bpf_tunnel_key, tunnel_label):
+                case offsetof(struct bpf_tunnel_key, tunnel_ext):
                         goto set_compat;
                 case offsetof(struct bpf_tunnel_key, remote_ipv6[1]):
                         /* Fixup deprecated structure layouts here, so we have
@@ -1849,6 +1855,7 @@ static u64 bpf_skb_set_tunnel_key(u64 r1, u64 r2, u64 size, u64 flags, u64 r5)
         if (unlikely(size != sizeof(struct bpf_tunnel_key))) {
                 switch (size) {
                 case offsetof(struct bpf_tunnel_key, tunnel_label):
+                case offsetof(struct bpf_tunnel_key, tunnel_ext):
                 case offsetof(struct bpf_tunnel_key, remote_ipv6[1]):
                         /* Fixup deprecated structure layouts here, so we have
                          * a common path later on.
@@ -1861,7 +1868,8 @@ static u64 bpf_skb_set_tunnel_key(u64 r1, u64 r2, u64 size, u64 flags, u64 r5)
                         return -EINVAL;
                 }
         }
-        if (unlikely(!(flags & BPF_F_TUNINFO_IPV6) && from->tunnel_label))
+        if (unlikely((!(flags & BPF_F_TUNINFO_IPV6) && from->tunnel_label) ||
+                     from->tunnel_ext))
                 return -EINVAL;
 
         skb_dst_drop(skb);
@@ -2247,7 +2255,7 @@ static int __init register_sk_filter_ops(void)
 }
 late_initcall(register_sk_filter_ops);
 
-int sk_detach_filter(struct sock *sk)
+int __sk_detach_filter(struct sock *sk, bool locked)
 {
         int ret = -ENOENT;
         struct sk_filter *filter;
@@ -2255,8 +2263,7 @@ int sk_detach_filter(struct sock *sk)
         if (sock_flag(sk, SOCK_FILTER_LOCKED))
                 return -EPERM;
 
-        filter = rcu_dereference_protected(sk->sk_filter,
-                                           sock_owned_by_user(sk));
+        filter = rcu_dereference_protected(sk->sk_filter, locked);
         if (filter) {
                 RCU_INIT_POINTER(sk->sk_filter, NULL);
                 sk_filter_uncharge(sk, filter);
@@ -2265,7 +2272,12 @@ int sk_detach_filter(struct sock *sk)
 
         return ret;
 }
-EXPORT_SYMBOL_GPL(sk_detach_filter);
+EXPORT_SYMBOL_GPL(__sk_detach_filter);
+
+int sk_detach_filter(struct sock *sk)
+{
+        return __sk_detach_filter(sk, sock_owned_by_user(sk));
+}
 
 int sk_get_filter(struct sock *sk, struct sock_filter __user *ubuf,
                   unsigned int len)
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index f2066772d0f3..a75f7e94b445 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -909,6 +909,7 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev,
                + rtnl_link_get_af_size(dev, ext_filter_mask) /* IFLA_AF_SPEC */
                + nla_total_size(MAX_PHYS_ITEM_ID_LEN) /* IFLA_PHYS_PORT_ID */
                + nla_total_size(MAX_PHYS_ITEM_ID_LEN) /* IFLA_PHYS_SWITCH_ID */
+               + nla_total_size(IFNAMSIZ) /* IFLA_PHYS_PORT_NAME */
                + nla_total_size(1); /* IFLA_PROTO_DOWN */
 
 }
diff --git a/net/core/sock.c b/net/core/sock.c
index b67b9aedb230..7e73c26b6bb4 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -221,7 +221,8 @@ static const char *const af_family_key_strings[AF_MAX+1] = {
   "sk_lock-AF_TIPC"  , "sk_lock-AF_BLUETOOTH", "sk_lock-IUCV"        ,
   "sk_lock-AF_RXRPC" , "sk_lock-AF_ISDN"     , "sk_lock-AF_PHONET"   ,
   "sk_lock-AF_IEEE802154", "sk_lock-AF_CAIF" , "sk_lock-AF_ALG"      ,
-  "sk_lock-AF_NFC"   , "sk_lock-AF_VSOCK"    , "sk_lock-AF_MAX"
+  "sk_lock-AF_NFC"   , "sk_lock-AF_VSOCK"    , "sk_lock-AF_KCM"      ,
+  "sk_lock-AF_MAX"
 };
 static const char *const af_family_slock_key_strings[AF_MAX+1] = {
   "slock-AF_UNSPEC", "slock-AF_UNIX"     , "slock-AF_INET"     ,
@@ -237,7 +238,8 @@ static const char *const af_family_slock_key_strings[AF_MAX+1] = {
   "slock-AF_TIPC"  , "slock-AF_BLUETOOTH", "slock-AF_IUCV"     ,
   "slock-AF_RXRPC" , "slock-AF_ISDN"     , "slock-AF_PHONET"   ,
   "slock-AF_IEEE802154", "slock-AF_CAIF" , "slock-AF_ALG"      ,
-  "slock-AF_NFC"   , "slock-AF_VSOCK"    ,"slock-AF_MAX"
+  "slock-AF_NFC"   , "slock-AF_VSOCK"    ,"slock-AF_KCM"       ,
+  "slock-AF_MAX"
 };
 static const char *const af_family_clock_key_strings[AF_MAX+1] = {
   "clock-AF_UNSPEC", "clock-AF_UNIX"     , "clock-AF_INET"     ,
@@ -253,7 +255,8 @@ static const char *const af_family_clock_key_strings[AF_MAX+1] = {
   "clock-AF_TIPC"  , "clock-AF_BLUETOOTH", "clock-AF_IUCV"     ,
   "clock-AF_RXRPC" , "clock-AF_ISDN"     , "clock-AF_PHONET"   ,
   "clock-AF_IEEE802154", "clock-AF_CAIF" , "clock-AF_ALG"      ,
-  "clock-AF_NFC"   , "clock-AF_VSOCK"    , "clock-AF_MAX"
+  "clock-AF_NFC"   , "clock-AF_VSOCK"    , "clock-AF_KCM"      ,
+  "clock-AF_MAX"
 };
 
 /*
diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
index a0586b4a197d..a39068b4a4d9 100644
--- a/net/ipv4/fou.c
+++ b/net/ipv4/fou.c
@@ -195,6 +195,17 @@ static struct sk_buff **fou_gro_receive(struct sk_buff **head,
         u8 proto = NAPI_GRO_CB(skb)->proto;
         const struct net_offload **offloads;
 
+        /* We can clear the encap_mark for FOU as we are essentially doing
+         * one of two possible things.  We are either adding an L4 tunnel
+         * header to the outer L3 tunnel header, or we are are simply
+         * treating the GRE tunnel header as though it is a UDP protocol
+         * specific header such as VXLAN or GENEVE.
+         */
+        NAPI_GRO_CB(skb)->encap_mark = 0;
+
+        /* Flag this frame as already having an outer encap header */
+        NAPI_GRO_CB(skb)->is_fou = 1;
+
         rcu_read_lock();
         offloads = NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads;
         ops = rcu_dereference(offloads[proto]);
@@ -352,6 +363,17 @@ static struct sk_buff **gue_gro_receive(struct sk_buff **head,
                 }
         }
 
+        /* We can clear the encap_mark for GUE as we are essentially doing
+         * one of two possible things.  We are either adding an L4 tunnel
+         * header to the outer L3 tunnel header, or we are are simply
+         * treating the GRE tunnel header as though it is a UDP protocol
+         * specific header such as VXLAN or GENEVE.
+         */
+        NAPI_GRO_CB(skb)->encap_mark = 0;
+
+        /* Flag this frame as already having an outer encap header */
+        NAPI_GRO_CB(skb)->is_fou = 1;
+
         rcu_read_lock();
         offloads = NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads;
         ops = rcu_dereference(offloads[guehdr->proto_ctype]);
diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c
index c47539d04b88..6a5bd4317866 100644
--- a/net/ipv4/gre_offload.c
+++ b/net/ipv4/gre_offload.c
@@ -150,6 +150,14 @@ static struct sk_buff **gre_gro_receive(struct sk_buff **head,
         if ((greh->flags & ~(GRE_KEY|GRE_CSUM)) != 0)
                 goto out;
 
+        /* We can only support GRE_CSUM if we can track the location of
+         * the GRE header.  In the case of FOU/GUE we cannot because the
+         * outer UDP header displaces the GRE header leaving us in a state
+         * of limbo.
+         */
+        if ((greh->flags & GRE_CSUM) && NAPI_GRO_CB(skb)->is_fou)
+                goto out;
+
         type = greh->protocol;
 
         rcu_read_lock();
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 31936d387cfd..af5d1f38217f 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -862,9 +862,16 @@ static void __gre_tunnel_init(struct net_device *dev)
         dev->hw_features        |= GRE_FEATURES;
 
         if (!(tunnel->parms.o_flags & TUNNEL_SEQ)) {
-                /* TCP offload with GRE SEQ is not supported. */
-                dev->features    |= NETIF_F_GSO_SOFTWARE;
-                dev->hw_features |= NETIF_F_GSO_SOFTWARE;
+                /* TCP offload with GRE SEQ is not supported, nor
+                 * can we support 2 levels of outer headers requiring
+                 * an update.
+                 */
+                if (!(tunnel->parms.o_flags & TUNNEL_CSUM) ||
+                    (tunnel->encap.type == TUNNEL_ENCAP_NONE)) {
+                        dev->features    |= NETIF_F_GSO_SOFTWARE;
+                        dev->hw_features |= NETIF_F_GSO_SOFTWARE;
+                }
+
                 /* Can use a lockless transmit, unless we generate
                  * output sequences
                  */
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index 02dd990af542..6165f30c4d72 100644
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -372,8 +372,8 @@ static int ip6_tun_fill_encap_info(struct sk_buff *skb,
         if (nla_put_be64(skb, LWTUNNEL_IP6_ID, tun_info->key.tun_id) ||
             nla_put_in6_addr(skb, LWTUNNEL_IP6_DST, &tun_info->key.u.ipv6.dst) ||
             nla_put_in6_addr(skb, LWTUNNEL_IP6_SRC, &tun_info->key.u.ipv6.src) ||
-            nla_put_u8(skb, LWTUNNEL_IP6_HOPLIMIT, tun_info->key.tos) ||
-            nla_put_u8(skb, LWTUNNEL_IP6_TC, tun_info->key.ttl) ||
+            nla_put_u8(skb, LWTUNNEL_IP6_TC, tun_info->key.tos) ||
+            nla_put_u8(skb, LWTUNNEL_IP6_HOPLIMIT, tun_info->key.ttl) ||
             nla_put_be16(skb, LWTUNNEL_IP6_FLAGS, tun_info->key.tun_flags))
                 return -ENOMEM;
 
diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
index bf081927e06b..4133b0f513af 100644
--- a/net/ipv4/netfilter/arp_tables.c
+++ b/net/ipv4/netfilter/arp_tables.c
@@ -359,11 +359,12 @@ unsigned int arpt_do_table(struct sk_buff *skb,
 }
 
 /* All zeroes == unconditional rule. */
-static inline bool unconditional(const struct arpt_arp *arp)
+static inline bool unconditional(const struct arpt_entry *e)
 {
         static const struct arpt_arp uncond;
 
-        return memcmp(arp, &uncond, sizeof(uncond)) == 0;
+        return e->target_offset == sizeof(struct arpt_entry) &&
+               memcmp(&e->arp, &uncond, sizeof(uncond)) == 0;
 }
 
 /* Figures out from what hook each rule can be called: returns 0 if
@@ -402,11 +403,10 @@ static int mark_source_chains(const struct xt_table_info *newinfo,
                                 |= ((1 << hook) | (1 << NF_ARP_NUMHOOKS));
 
                         /* Unconditional return/END. */
-                        if ((e->target_offset == sizeof(struct arpt_entry) &&
+                        if ((unconditional(e) &&
                              (strcmp(t->target.u.user.name,
                                      XT_STANDARD_TARGET) == 0) &&
-                             t->verdict < 0 && unconditional(&e->arp)) ||
-                            visited) {
+                             t->verdict < 0) || visited) {
                                 unsigned int oldpos, size;
 
                                 if ((strcmp(t->target.u.user.name,
@@ -474,14 +474,12 @@ next:
         return 1;
 }
 
-static inline int check_entry(const struct arpt_entry *e, const char *name)
+static inline int check_entry(const struct arpt_entry *e)
 {
         const struct xt_entry_target *t;
 
-        if (!arp_checkentry(&e->arp)) {
-                duprintf("arp_tables: arp check failed %p %s.\n", e, name);
+        if (!arp_checkentry(&e->arp))
                 return -EINVAL;
-        }
 
         if (e->target_offset + sizeof(struct xt_entry_target) > e->next_offset)
                 return -EINVAL;
@@ -522,10 +520,6 @@ find_check_entry(struct arpt_entry *e, const char *name, unsigned int size)
         struct xt_target *target;
         int ret;
 
-        ret = check_entry(e, name);
-        if (ret)
-                return ret;
-
         e->counters.pcnt = xt_percpu_counter_alloc();
         if (IS_ERR_VALUE(e->counters.pcnt))
                 return -ENOMEM;
@@ -557,7 +551,7 @@ static bool check_underflow(const struct arpt_entry *e)
         const struct xt_entry_target *t;
         unsigned int verdict;
 
-        if (!unconditional(&e->arp))
+        if (!unconditional(e))
                 return false;
         t = arpt_get_target_c(e);
         if (strcmp(t->u.user.name, XT_STANDARD_TARGET) != 0)
@@ -576,9 +570,11 @@ static inline int check_entry_size_and_hooks(struct arpt_entry *e,
                                              unsigned int valid_hooks)
 {
         unsigned int h;
+        int err;
 
         if ((unsigned long)e % __alignof__(struct arpt_entry) != 0 ||
-            (unsigned char *)e + sizeof(struct arpt_entry) >= limit) {
+            (unsigned char *)e + sizeof(struct arpt_entry) >= limit ||
+            (unsigned char *)e + e->next_offset > limit) {
                 duprintf("Bad offset %p\n", e);
                 return -EINVAL;
         }
@@ -590,6 +586,10 @@ static inline int check_entry_size_and_hooks(struct arpt_entry *e,
                 return -EINVAL;
         }
 
+        err = check_entry(e);
+        if (err)
+                return err;
+
         /* Check hooks & underflows */
         for (h = 0; h < NF_ARP_NUMHOOKS; h++) {
                 if (!(valid_hooks & (1 << h)))
@@ -598,9 +598,9 @@ static inline int check_entry_size_and_hooks(struct arpt_entry *e,
                         newinfo->hook_entry[h] = hook_entries[h];
                 if ((unsigned char *)e - base == underflows[h]) {
                         if (!check_underflow(e)) {
-                                pr_err("Underflows must be unconditional and "
-                                       "use the STANDARD target with "
-                                       "ACCEPT/DROP\n");
+                                pr_debug("Underflows must be unconditional and "
+                                         "use the STANDARD target with "
+                                         "ACCEPT/DROP\n");
                                 return -EINVAL;
                         }
                         newinfo->underflow[h] = underflows[h];
@@ -969,6 +969,7 @@ static int get_entries(struct net *net, struct arpt_get_entries __user *uptr,
                          sizeof(struct arpt_get_entries) + get.size);
                 return -EINVAL;
         }
+        get.name[sizeof(get.name) - 1] = '\0';
 
         t = xt_find_table_lock(net, NFPROTO_ARP, get.name);
         if (!IS_ERR_OR_NULL(t)) {
@@ -1233,7 +1234,8 @@ check_compat_entry_size_and_hooks(struct compat_arpt_entry *e,
 
         duprintf("check_compat_entry_size_and_hooks %p\n", e);
         if ((unsigned long)e % __alignof__(struct compat_arpt_entry) != 0 ||
-            (unsigned char *)e + sizeof(struct compat_arpt_entry) >= limit) {
+            (unsigned char *)e + sizeof(struct compat_arpt_entry) >= limit ||
+            (unsigned char *)e + e->next_offset > limit) {
                 duprintf("Bad offset %p, limit = %p\n", e, limit);
                 return -EINVAL;
         }
@@ -1246,7 +1248,7 @@ check_compat_entry_size_and_hooks(struct compat_arpt_entry *e,
         }
 
         /* For purposes of check_entry casting the compat entry is fine */
-        ret = check_entry((struct arpt_entry *)e, name);
+        ret = check_entry((struct arpt_entry *)e);
         if (ret)
                 return ret;
 
@@ -1662,6 +1664,7 @@ static int compat_get_entries(struct net *net,
                          *len, sizeof(get) + get.size);
                 return -EINVAL;
         }
+        get.name[sizeof(get.name) - 1] = '\0';
 
         xt_compat_lock(NFPROTO_ARP);
         t = xt_find_table_lock(net, NFPROTO_ARP, get.name);
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index e53f8d6f326d..631c100a1338 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -168,11 +168,12 @@ get_entry(const void *base, unsigned int offset)
 
 /* All zeroes == unconditional rule. */
 /* Mildly perf critical (only if packet tracing is on) */
-static inline bool unconditional(const struct ipt_ip *ip)
+static inline bool unconditional(const struct ipt_entry *e)
 {
         static const struct ipt_ip uncond;
 
-        return memcmp(ip, &uncond, sizeof(uncond)) == 0;
+        return e->target_offset == sizeof(struct ipt_entry) &&
+               memcmp(&e->ip, &uncond, sizeof(uncond)) == 0;
 #undef FWINV
 }
 
@@ -229,11 +230,10 @@ get_chainname_rulenum(const struct ipt_entry *s, const struct ipt_entry *e,
         } else if (s == e) {
                 (*rulenum)++;
 
-                if (s->target_offset == sizeof(struct ipt_entry) &&
+                if (unconditional(s) &&
                     strcmp(t->target.u.kernel.target->name,
                            XT_STANDARD_TARGET) == 0 &&
-                   t->verdict < 0 &&
-                   unconditional(&s->ip)) {
+                   t->verdict < 0) {
                         /* Tail of chains: STANDARD target (return/policy) */
                         *comment = *chainname == hookname
                                 ? comments[NF_IP_TRACE_COMMENT_POLICY]
@@ -476,11 +476,10 @@ mark_source_chains(const struct xt_table_info *newinfo,
                         e->comefrom |= ((1 << hook) | (1 << NF_INET_NUMHOOKS));
 
                         /* Unconditional return/END. */
-                        if ((e->target_offset == sizeof(struct ipt_entry) &&
+                        if ((unconditional(e) &&
                              (strcmp(t->target.u.user.name,
                                      XT_STANDARD_TARGET) == 0) &&
-                             t->verdict < 0 && unconditional(&e->ip)) ||
-                            visited) {
+                             t->verdict < 0) || visited) {
                                 unsigned int oldpos, size;
 
                                 if ((strcmp(t->target.u.user.name,
@@ -569,14 +568,12 @@ static void cleanup_match(struct xt_entry_match *m, struct net *net)
 }
 
 static int
-check_entry(const struct ipt_entry *e, const char *name)
+check_entry(const struct ipt_entry *e)
 {
         const struct xt_entry_target *t;
 
-        if (!ip_checkentry(&e->ip)) {
-                duprintf("ip check failed %p %s.\n", e, name);
+        if (!ip_checkentry(&e->ip))
                 return -EINVAL;
-        }
 
         if (e->target_offset + sizeof(struct xt_entry_target) >
             e->next_offset)
@@ -666,10 +663,6 @@ find_check_entry(struct ipt_entry *e, struct net *net, const char *name,
         struct xt_mtchk_param mtpar;
         struct xt_entry_match *ematch;
 
-        ret = check_entry(e, name);
-        if (ret)
-                return ret;
-
         e->counters.pcnt = xt_percpu_counter_alloc();
         if (IS_ERR_VALUE(e->counters.pcnt))
                 return -ENOMEM;
@@ -721,7 +714,7 @@ static bool check_underflow(const struct ipt_entry *e)
         const struct xt_entry_target *t;
         unsigned int verdict;
 
-        if (!unconditional(&e->ip))
+        if (!unconditional(e))
                 return false;
         t = ipt_get_target_c(e);
         if (strcmp(t->u.user.name, XT_STANDARD_TARGET) != 0)
@@ -741,9 +734,11 @@ check_entry_size_and_hooks(struct ipt_entry *e,
                            unsigned int valid_hooks)
 {
         unsigned int h;
+        int err;
 
         if ((unsigned long)e % __alignof__(struct ipt_entry) != 0 ||
-            (unsigned char *)e + sizeof(struct ipt_entry) >= limit) {
+            (unsigned char *)e + sizeof(struct ipt_entry) >= limit ||
+            (unsigned char *)e + e->next_offset > limit) {
                 duprintf("Bad offset %p\n", e);
                 return -EINVAL;
         }
@@ -755,6 +750,10 @@ check_entry_size_and_hooks(struct ipt_entry *e,
                 return -EINVAL;
         }
 
+        err = check_entry(e);
+        if (err)
+                return err;
+
         /* Check hooks & underflows */
         for (h = 0; h < NF_INET_NUMHOOKS; h++) {
                 if (!(valid_hooks & (1 << h)))
@@ -763,9 +762,9 @@ check_entry_size_and_hooks(struct ipt_entry *e,
                         newinfo->hook_entry[h] = hook_entries[h];
                 if ((unsigned char *)e - base == underflows[h]) {
                         if (!check_underflow(e)) {
-                                pr_err("Underflows must be unconditional and "
-                                       "use the STANDARD target with "
-                                       "ACCEPT/DROP\n");
+                                pr_debug("Underflows must be unconditional and "
+                                         "use the STANDARD target with "
+                                         "ACCEPT/DROP\n");
                                 return -EINVAL;
                         }
                         newinfo->underflow[h] = underflows[h];
@@ -1157,6 +1156,7 @@ get_entries(struct net *net, struct ipt_get_entries __user *uptr,
                          *len, sizeof(get) + get.size);
                 return -EINVAL;
         }
+        get.name[sizeof(get.name) - 1] = '\0';
 
         t = xt_find_table_lock(net, AF_INET, get.name);
         if (!IS_ERR_OR_NULL(t)) {
@@ -1493,7 +1493,8 @@ check_compat_entry_size_and_hooks(struct compat_ipt_entry *e,
 
         duprintf("check_compat_entry_size_and_hooks %p\n", e);
         if ((unsigned long)e % __alignof__(struct compat_ipt_entry) != 0 ||
-            (unsigned char *)e + sizeof(struct compat_ipt_entry) >= limit) {
+            (unsigned char *)e + sizeof(struct compat_ipt_entry) >= limit ||
+            (unsigned char *)e + e->next_offset > limit) {
                 duprintf("Bad offset %p, limit = %p\n", e, limit);
                 return -EINVAL;
         }
@@ -1506,7 +1507,7 @@ check_compat_entry_size_and_hooks(struct compat_ipt_entry *e,
         }
 
         /* For purposes of check_entry casting the compat entry is fine */
-        ret = check_entry((struct ipt_entry *)e, name);
+        ret = check_entry((struct ipt_entry *)e);
         if (ret)
                 return ret;
 
@@ -1935,6 +1936,7 @@ compat_get_entries(struct net *net, struct compat_ipt_get_entries __user *uptr,
                          *len, sizeof(get) + get.size);
                 return -EINVAL;
         }
+        get.name[sizeof(get.name) - 1] = '\0';
 
         xt_compat_lock(AF_INET);
         t = xt_find_table_lock(net, AF_INET, get.name);
diff --git a/net/ipv4/netfilter/ipt_SYNPROXY.c b/net/ipv4/netfilter/ipt_SYNPROXY.c
index 7b8fbb352877..db5b87509446 100644
--- a/net/ipv4/netfilter/ipt_SYNPROXY.c
+++ b/net/ipv4/netfilter/ipt_SYNPROXY.c
@@ -18,10 +18,10 @@
 #include <net/netfilter/nf_conntrack_synproxy.h>
 
 static struct iphdr *
-synproxy_build_ip(struct sk_buff *skb, __be32 saddr, __be32 daddr)
+synproxy_build_ip(struct net *net, struct sk_buff *skb, __be32 saddr,
+                  __be32 daddr)
 {
         struct iphdr *iph;
-        struct net *net = sock_net(skb->sk);
 
         skb_reset_network_header(skb);
         iph = (struct iphdr *)skb_put(skb, sizeof(*iph));
@@ -40,14 +40,12 @@ synproxy_build_ip(struct sk_buff *skb, __be32 saddr, __be32 daddr)
 }
 
 static void
-synproxy_send_tcp(const struct synproxy_net *snet,
+synproxy_send_tcp(struct net *net,
                   const struct sk_buff *skb, struct sk_buff *nskb,
                   struct nf_conntrack *nfct, enum ip_conntrack_info ctinfo,
                   struct iphdr *niph, struct tcphdr *nth,
                   unsigned int tcp_hdr_size)
 {
-        struct net *net = nf_ct_net(snet->tmpl);
-
         nth->check = ~tcp_v4_check(tcp_hdr_size, niph->saddr, niph->daddr, 0);
         nskb->ip_summed   = CHECKSUM_PARTIAL;
         nskb->csum_start  = (unsigned char *)nth - nskb->head;
@@ -72,7 +70,7 @@ free_nskb:
 }
 
 static void
-synproxy_send_client_synack(const struct synproxy_net *snet,
+synproxy_send_client_synack(struct net *net,
                             const struct sk_buff *skb, const struct tcphdr *th,
                             const struct synproxy_options *opts)
 {
@@ -91,7 +89,7 @@ synproxy_send_client_synack(const struct synproxy_net *snet,
                 return;
         skb_reserve(nskb, MAX_TCP_HEADER);
 
-        niph = synproxy_build_ip(nskb, iph->daddr, iph->saddr);
+        niph = synproxy_build_ip(net, nskb, iph->daddr, iph->saddr);
 
         skb_reset_transport_header(nskb);
         nth = (struct tcphdr *)skb_put(nskb, tcp_hdr_size);
@@ -109,15 +107,16 @@ synproxy_send_client_synack(const struct synproxy_net *snet,
 
         synproxy_build_options(nth, opts);
 
-        synproxy_send_tcp(snet, skb, nskb, skb->nfct, IP_CT_ESTABLISHED_REPLY,
+        synproxy_send_tcp(net, skb, nskb, skb->nfct, IP_CT_ESTABLISHED_REPLY,
                           niph, nth, tcp_hdr_size);
 }
 
 static void
-synproxy_send_server_syn(const struct synproxy_net *snet,
+synproxy_send_server_syn(struct net *net,
                          const struct sk_buff *skb, const struct tcphdr *th,
                          const struct synproxy_options *opts, u32 recv_seq)
 {
+        struct synproxy_net *snet = synproxy_pernet(net);
         struct sk_buff *nskb;
         struct iphdr *iph, *niph;
         struct tcphdr *nth;
@@ -132,7 +131,7 @@ synproxy_send_server_syn(const struct synproxy_net *snet,
                 return;
         skb_reserve(nskb, MAX_TCP_HEADER);
 
-        niph = synproxy_build_ip(nskb, iph->saddr, iph->daddr);
+        niph = synproxy_build_ip(net, nskb, iph->saddr, iph->daddr);
 
         skb_reset_transport_header(nskb);
         nth = (struct tcphdr *)skb_put(nskb, tcp_hdr_size);
@@ -153,12 +152,12 @@ synproxy_send_server_syn(const struct synproxy_net *snet,
 
         synproxy_build_options(nth, opts);
 
-        synproxy_send_tcp(snet, skb, nskb, &snet->tmpl->ct_general, IP_CT_NEW,
+        synproxy_send_tcp(net, skb, nskb, &snet->tmpl->ct_general, IP_CT_NEW,
                           niph, nth, tcp_hdr_size);
 }
 
 static void
-synproxy_send_server_ack(const struct synproxy_net *snet,
+synproxy_send_server_ack(struct net *net,
                          const struct ip_ct_tcp *state,
                          const struct sk_buff *skb, const struct tcphdr *th,
                          const struct synproxy_options *opts)
@@ -177,7 +176,7 @@ synproxy_send_server_ack(const struct synproxy_net *snet,
                 return;
         skb_reserve(nskb, MAX_TCP_HEADER);
 
-        niph = synproxy_build_ip(nskb, iph->daddr, iph->saddr);
+        niph = synproxy_build_ip(net, nskb, iph->daddr, iph->saddr);
 
         skb_reset_transport_header(nskb);
         nth = (struct tcphdr *)skb_put(nskb, tcp_hdr_size);
@@ -193,11 +192,11 @@ synproxy_send_server_ack(const struct synproxy_net *snet,
 
         synproxy_build_options(nth, opts);
 
-        synproxy_send_tcp(snet, skb, nskb, NULL, 0, niph, nth, tcp_hdr_size);
+        synproxy_send_tcp(net, skb, nskb, NULL, 0, niph, nth, tcp_hdr_size);
 }
 
 static void
-synproxy_send_client_ack(const struct synproxy_net *snet,
+synproxy_send_client_ack(struct net *net,
                          const struct sk_buff *skb, const struct tcphdr *th,
                          const struct synproxy_options *opts)
 {
@@ -215,7 +214,7 @@ synproxy_send_client_ack(const struct synproxy_net *snet,
                 return;
         skb_reserve(nskb, MAX_TCP_HEADER);
 
-        niph = synproxy_build_ip(nskb, iph->saddr, iph->daddr);
+        niph = synproxy_build_ip(net, nskb, iph->saddr, iph->daddr);
 
         skb_reset_transport_header(nskb);
         nth = (struct tcphdr *)skb_put(nskb, tcp_hdr_size);
@@ -231,15 +230,16 @@ synproxy_send_client_ack(const struct synproxy_net *snet,
 
         synproxy_build_options(nth, opts);
 
-        synproxy_send_tcp(snet, skb, nskb, skb->nfct, IP_CT_ESTABLISHED_REPLY,
+        synproxy_send_tcp(net, skb, nskb, skb->nfct, IP_CT_ESTABLISHED_REPLY,
                           niph, nth, tcp_hdr_size);
 }
 
 static bool
-synproxy_recv_client_ack(const struct synproxy_net *snet,
+synproxy_recv_client_ack(struct net *net,
                          const struct sk_buff *skb, const struct tcphdr *th,
                          struct synproxy_options *opts, u32 recv_seq)
 {
+        struct synproxy_net *snet = synproxy_pernet(net);
         int mss;
 
         mss = __cookie_v4_check(ip_hdr(skb), th, ntohl(th->ack_seq) - 1);
@@ -255,7 +255,7 @@ synproxy_recv_client_ack(const struct synproxy_net *snet,
         if (opts->options & XT_SYNPROXY_OPT_TIMESTAMP)
                 synproxy_check_timestamp_cookie(opts);
 
-        synproxy_send_server_syn(snet, skb, th, opts, recv_seq);
+        synproxy_send_server_syn(net, skb, th, opts, recv_seq);
         return true;
 }
 
@@ -263,7 +263,8 @@ static unsigned int
 synproxy_tg4(struct sk_buff *skb, const struct xt_action_param *par)
 {
         const struct xt_synproxy_info *info = par->targinfo;
-        struct synproxy_net *snet = synproxy_pernet(par->net);
+        struct net *net = par->net;
+        struct synproxy_net *snet = synproxy_pernet(net);
         struct synproxy_options opts = {};
         struct tcphdr *th, _th;
 
@@ -292,12 +293,12 @@ synproxy_tg4(struct sk_buff *skb, const struct xt_action_param *par)
                                           XT_SYNPROXY_OPT_SACK_PERM |
                                           XT_SYNPROXY_OPT_ECN);
 
-                synproxy_send_client_synack(snet, skb, th, &opts);
+                synproxy_send_client_synack(net, skb, th, &opts);
                 return NF_DROP;
 
         } else if (th->ack && !(th->fin || th->rst || th->syn)) {
                 /* ACK from client */
-                synproxy_recv_client_ack(snet, skb, th, &opts, ntohl(th->seq));
+                synproxy_recv_client_ack(net, skb, th, &opts, ntohl(th->seq));
                 return NF_DROP;
         }
 
@@ -308,7 +309,8 @@ static unsigned int ipv4_synproxy_hook(void *priv,
                                        struct sk_buff *skb,
                                        const struct nf_hook_state *nhs)
 {
-        struct synproxy_net *snet = synproxy_pernet(nhs->net);
+        struct net *net = nhs->net;
+        struct synproxy_net *snet = synproxy_pernet(net);
         enum ip_conntrack_info ctinfo;
         struct nf_conn *ct;
         struct nf_conn_synproxy *synproxy;
@@ -365,7 +367,7 @@ static unsigned int ipv4_synproxy_hook(void *priv,
                          * therefore we need to add 1 to make the SYN sequence
                          * number match the one of first SYN.
                          */
-                        if (synproxy_recv_client_ack(snet, skb, th, &opts,
+                        if (synproxy_recv_client_ack(net, skb, th, &opts,
                                                      ntohl(th->seq) + 1))
                                 this_cpu_inc(snet->stats->cookie_retrans);
 
@@ -391,12 +393,12 @@ static unsigned int ipv4_synproxy_hook(void *priv,
                                   XT_SYNPROXY_OPT_SACK_PERM);
 
                 swap(opts.tsval, opts.tsecr);
-                synproxy_send_server_ack(snet, state, skb, th, &opts);
+                synproxy_send_server_ack(net, state, skb, th, &opts);
 
                 nf_ct_seqadj_init(ct, ctinfo, synproxy->isn - ntohl(th->seq));
 
                 swap(opts.tsval, opts.tsecr);
-                synproxy_send_client_ack(snet, skb, th, &opts);
+                synproxy_send_client_ack(net, skb, th, &opts);
 
                 consume_skb(skb);
                 return NF_STOLEN;
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 9428345d3a07..bc972e7152c7 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1090,8 +1090,8 @@ static inline int ip6_ufo_append_data(struct sock *sk,
                         int getfrag(void *from, char *to, int offset, int len,
                         int odd, struct sk_buff *skb),
                         void *from, int length, int hh_len, int fragheaderlen,
-                        int transhdrlen, int mtu, unsigned int flags,
-                        const struct flowi6 *fl6)
+                        int exthdrlen, int transhdrlen, int mtu,
+                        unsigned int flags, const struct flowi6 *fl6)
 
 {
         struct sk_buff *skb;
@@ -1116,7 +1116,7 @@ static inline int ip6_ufo_append_data(struct sock *sk,
                 skb_put(skb, fragheaderlen + transhdrlen);
 
                 /* initialize network header pointer */
-                skb_reset_network_header(skb);
+                skb_set_network_header(skb, exthdrlen);
 
                 /* initialize protocol header pointer */
                 skb->transport_header = skb->network_header + fragheaderlen;
@@ -1358,7 +1358,7 @@ emsgsize:
             (rt->dst.dev->features & NETIF_F_UFO) &&
             (sk->sk_type == SOCK_DGRAM) && !udp_get_no_check6_tx(sk)) {
                 err = ip6_ufo_append_data(sk, queue, getfrag, from, length,
-                                          hh_len, fragheaderlen,
+                                          hh_len, fragheaderlen, exthdrlen,
                                           transhdrlen, mtu, flags, fl6);
                 if (err)
                         goto error;
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index eb2ac4bb09ce..1f20345cbc97 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -252,12 +252,12 @@ static int ip6_tnl_create2(struct net_device *dev)
 
         t = netdev_priv(dev);
 
+        dev->rtnl_link_ops = &ip6_link_ops;
         err = register_netdevice(dev);
         if (err < 0)
                 goto out;
 
         strcpy(t->parms.name, dev->name);
-        dev->rtnl_link_ops = &ip6_link_ops;
 
         dev_hold(dev);
         ip6_tnl_link(ip6n, t);
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 84f9baf7aee8..86b67b70b626 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -198,11 +198,12 @@ get_entry(const void *base, unsigned int offset)
 
 /* All zeroes == unconditional rule. */
 /* Mildly perf critical (only if packet tracing is on) */
-static inline bool unconditional(const struct ip6t_ip6 *ipv6)
+static inline bool unconditional(const struct ip6t_entry *e)
 {
         static const struct ip6t_ip6 uncond;
 
-        return memcmp(ipv6, &uncond, sizeof(uncond)) == 0;
+        return e->target_offset == sizeof(struct ip6t_entry) &&
+               memcmp(&e->ipv6, &uncond, sizeof(uncond)) == 0;
 }
 
 static inline const struct xt_entry_target *
@@ -258,11 +259,10 @@ get_chainname_rulenum(const struct ip6t_entry *s, const struct ip6t_entry *e,
         } else if (s == e) {
                 (*rulenum)++;
 
-                if (s->target_offset == sizeof(struct ip6t_entry) &&
+                if (unconditional(s) &&
                     strcmp(t->target.u.kernel.target->name,
                            XT_STANDARD_TARGET) == 0 &&
-                    t->verdict < 0 &&
-                    unconditional(&s->ipv6)) {
+                    t->verdict < 0) {
                         /* Tail of chains: STANDARD target (return/policy) */
                         *comment = *chainname == hookname
                                 ? comments[NF_IP6_TRACE_COMMENT_POLICY]
@@ -488,11 +488,10 @@ mark_source_chains(const struct xt_table_info *newinfo,
                         e->comefrom |= ((1 << hook) | (1 << NF_INET_NUMHOOKS));
 
                         /* Unconditional return/END. */
-                        if ((e->target_offset == sizeof(struct ip6t_entry) &&
+                        if ((unconditional(e) &&
                              (strcmp(t->target.u.user.name,
                                      XT_STANDARD_TARGET) == 0) &&
-                             t->verdict < 0 &&
-                             unconditional(&e->ipv6)) || visited) {
+                             t->verdict < 0) || visited) {
                                 unsigned int oldpos, size;
 
                                 if ((strcmp(t->target.u.user.name,
@@ -581,14 +580,12 @@ static void cleanup_match(struct xt_entry_match *m, struct net *net)
 }
 
 static int
-check_entry(const struct ip6t_entry *e, const char *name)
+check_entry(const struct ip6t_entry *e)
 {
         const struct xt_entry_target *t;
 
-        if (!ip6_checkentry(&e->ipv6)) {
-                duprintf("ip_tables: ip check failed %p %s.\n", e, name);
+        if (!ip6_checkentry(&e->ipv6))
                 return -EINVAL;
-        }
 
         if (e->target_offset + sizeof(struct xt_entry_target) >
             e->next_offset)
@@ -679,10 +676,6 @@ find_check_entry(struct ip6t_entry *e, struct net *net, const char *name,
         struct xt_mtchk_param mtpar;
         struct xt_entry_match *ematch;
 
-        ret = check_entry(e, name);
-        if (ret)
-                return ret;
-
         e->counters.pcnt = xt_percpu_counter_alloc();
         if (IS_ERR_VALUE(e->counters.pcnt))
                 return -ENOMEM;
@@ -733,7 +726,7 @@ static bool check_underflow(const struct ip6t_entry *e)
         const struct xt_entry_target *t;
         unsigned int verdict;
 
-        if (!unconditional(&e->ipv6))
+        if (!unconditional(e))
                 return false;
         t = ip6t_get_target_c(e);
         if (strcmp(t->u.user.name, XT_STANDARD_TARGET) != 0)
@@ -753,9 +746,11 @@ check_entry_size_and_hooks(struct ip6t_entry *e,
                            unsigned int valid_hooks)
 {
         unsigned int h;
+        int err;
 
         if ((unsigned long)e % __alignof__(struct ip6t_entry) != 0 ||
-            (unsigned char *)e + sizeof(struct ip6t_entry) >= limit) {
+            (unsigned char *)e + sizeof(struct ip6t_entry) >= limit ||
+            (unsigned char *)e + e->next_offset > limit) {
                 duprintf("Bad offset %p\n", e);
                 return -EINVAL;
         }
@@ -767,6 +762,10 @@ check_entry_size_and_hooks(struct ip6t_entry *e,
                 return -EINVAL;
         }
 
+        err = check_entry(e);
+        if (err)
+                return err;
+
         /* Check hooks & underflows */
         for (h = 0; h < NF_INET_NUMHOOKS; h++) {
                 if (!(valid_hooks & (1 << h)))
@@ -775,9 +774,9 @@ check_entry_size_and_hooks(struct ip6t_entry *e,
                         newinfo->hook_entry[h] = hook_entries[h];
                 if ((unsigned char *)e - base == underflows[h]) {
                         if (!check_underflow(e)) {
-                                pr_err("Underflows must be unconditional and "
-                                       "use the STANDARD target with "
-                                       "ACCEPT/DROP\n");
+                                pr_debug("Underflows must be unconditional and "
+                                         "use the STANDARD target with "
+                                         "ACCEPT/DROP\n");
                                 return -EINVAL;
                         }
                         newinfo->underflow[h] = underflows[h];
@@ -1169,6 +1168,7 @@ get_entries(struct net *net, struct ip6t_get_entries __user *uptr,
                          *len, sizeof(get) + get.size);
                 return -EINVAL;
         }
+        get.name[sizeof(get.name) - 1] = '\0';
 
         t = xt_find_table_lock(net, AF_INET6, get.name);
         if (!IS_ERR_OR_NULL(t)) {
@@ -1505,7 +1505,8 @@ check_compat_entry_size_and_hooks(struct compat_ip6t_entry *e,
 
         duprintf("check_compat_entry_size_and_hooks %p\n", e);
         if ((unsigned long)e % __alignof__(struct compat_ip6t_entry) != 0 ||
-            (unsigned char *)e + sizeof(struct compat_ip6t_entry) >= limit) {
+            (unsigned char *)e + sizeof(struct compat_ip6t_entry) >= limit ||
+            (unsigned char *)e + e->next_offset > limit) {
                 duprintf("Bad offset %p, limit = %p\n", e, limit);
                 return -EINVAL;
         }
@@ -1518,7 +1519,7 @@ check_compat_entry_size_and_hooks(struct compat_ip6t_entry *e,
         }
 
         /* For purposes of check_entry casting the compat entry is fine */
-        ret = check_entry((struct ip6t_entry *)e, name);
+        ret = check_entry((struct ip6t_entry *)e);
         if (ret)
                 return ret;
 
@@ -1944,6 +1945,7 @@ compat_get_entries(struct net *net, struct compat_ip6t_get_entries __user *uptr,
                          *len, sizeof(get) + get.size);
                 return -EINVAL;
         }
+        get.name[sizeof(get.name) - 1] = '\0';
 
         xt_compat_lock(AF_INET6);
         t = xt_find_table_lock(net, AF_INET6, get.name);
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index fd25e447a5fa..8125931106be 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -843,8 +843,8 @@ start_lookup:
                 flush_stack(stack, count, skb, count - 1);
         } else {
                 if (!inner_flushed)
-                        UDP_INC_STATS_BH(net, UDP_MIB_IGNOREDMULTI,
-                                         proto == IPPROTO_UDPLITE);
+                        UDP6_INC_STATS_BH(net, UDP_MIB_IGNOREDMULTI,
+                                          proto == IPPROTO_UDPLITE);
                 consume_skb(skb);
         }
         return 0;
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index ec22078b0914..42de4ccd159f 100644
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -123,12 +123,11 @@ static int l2tp_ip_recv(struct sk_buff *skb)
         struct l2tp_tunnel *tunnel = NULL;
         int length;
 
-        /* Point to L2TP header */
-        optr = ptr = skb->data;
-
         if (!pskb_may_pull(skb, 4))
                 goto discard;
 
+        /* Point to L2TP header */
+        optr = ptr = skb->data;
         session_id = ntohl(*((__be32 *) ptr));
         ptr += 4;
 
@@ -156,6 +155,9 @@ static int l2tp_ip_recv(struct sk_buff *skb)
                 if (!pskb_may_pull(skb, length))
                         goto discard;
 
+                /* Point to L2TP header */
+                optr = ptr = skb->data;
+                ptr += 4;
                 pr_debug("%s: ip recv\n", tunnel->name);
                 print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, ptr, length);
         }
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
index 6b54ff3ff4cb..cd479903d943 100644
--- a/net/l2tp/l2tp_ip6.c
+++ b/net/l2tp/l2tp_ip6.c
@@ -136,12 +136,11 @@ static int l2tp_ip6_recv(struct sk_buff *skb)
         struct l2tp_tunnel *tunnel = NULL;
         int length;
 
-        /* Point to L2TP header */
-        optr = ptr = skb->data;
-
         if (!pskb_may_pull(skb, 4))
                 goto discard;
 
+        /* Point to L2TP header */
+        optr = ptr = skb->data;
         session_id = ntohl(*((__be32 *) ptr));
         ptr += 4;
 
@@ -169,6 +168,9 @@ static int l2tp_ip6_recv(struct sk_buff *skb)
                 if (!pskb_may_pull(skb, length))
                         goto discard;
 
+                /* Point to L2TP header */
+                optr = ptr = skb->data;
+                ptr += 4;
                 pr_debug("%s: ip recv\n", tunnel->name);
                 print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, ptr, length);
         }
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 283981108ca8..74142d07ad31 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -343,8 +343,10 @@ static void ieee80211_change_chanctx(struct ieee80211_local *local,
                                      struct ieee80211_chanctx *ctx,
                                      const struct cfg80211_chan_def *chandef)
 {
-        if (cfg80211_chandef_identical(&ctx->conf.def, chandef))
+        if (cfg80211_chandef_identical(&ctx->conf.def, chandef)) {
+                ieee80211_recalc_chanctx_min_def(local, ctx);
                 return;
+        }
 
         WARN_ON(!cfg80211_chandef_compatible(&ctx->conf.def, chandef));
 
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 804575ff7af5..422003540169 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1719,6 +1719,10 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata,
 enum ieee80211_sta_rx_bandwidth ieee80211_sta_cap_rx_bw(struct sta_info *sta);
 enum ieee80211_sta_rx_bandwidth ieee80211_sta_cur_vht_bw(struct sta_info *sta);
 void ieee80211_sta_set_rx_nss(struct sta_info *sta);
+enum ieee80211_sta_rx_bandwidth
+ieee80211_chan_width_to_rx_bw(enum nl80211_chan_width width);
+enum nl80211_chan_width ieee80211_sta_cap_chan_bw(struct sta_info *sta);
+void ieee80211_sta_set_rx_nss(struct sta_info *sta);
 void ieee80211_process_mu_groups(struct ieee80211_sub_if_data *sdata,
                                  struct ieee80211_mgmt *mgmt);
 u32 __ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata,
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 5b6aec1a0630..002244bca948 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -530,7 +530,7 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
         const u8 *target_addr, *orig_addr;
         const u8 *da;
         u8 target_flags, ttl, flags;
-        u32 orig_sn, target_sn, lifetime, target_metric;
+        u32 orig_sn, target_sn, lifetime, target_metric = 0;
         bool reply = false;
         bool forward = true;
         bool root_is_gate;
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index d20bab5c146c..861b93ffbe92 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -67,6 +67,7 @@
 
 static const struct rhashtable_params sta_rht_params = {
         .nelem_hint = 3, /* start small */
+        .insecure_elasticity = true, /* Disable chain-length checks. */
         .automatic_shrinking = true,
         .head_offset = offsetof(struct sta_info, hash_node),
         .key_offset = offsetof(struct sta_info, addr),
@@ -258,11 +259,11 @@ void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)
 }
 
 /* Caller must hold local->sta_mtx */
-static void sta_info_hash_add(struct ieee80211_local *local,
-                              struct sta_info *sta)
+static int sta_info_hash_add(struct ieee80211_local *local,
+                             struct sta_info *sta)
 {
-        rhashtable_insert_fast(&local->sta_hash, &sta->hash_node,
-                               sta_rht_params);
+        return rhashtable_insert_fast(&local->sta_hash, &sta->hash_node,
+                                      sta_rht_params);
 }
 
 static void sta_deliver_ps_frames(struct work_struct *wk)
@@ -524,7 +525,9 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU)
         set_sta_flag(sta, WLAN_STA_BLOCK_BA);
 
         /* make the station visible */
-        sta_info_hash_add(local, sta);
+        err = sta_info_hash_add(local, sta);
+        if (err)
+                goto out_drop_sta;
 
         list_add_tail_rcu(&sta->list, &local->sta_list);
 
@@ -557,6 +560,7 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU)
  out_remove:
         sta_info_hash_del(local, sta);
         list_del_rcu(&sta->list);
+ out_drop_sta:
         local->num_sta--;
         synchronize_net();
         __cleanup_single_sta(sta);
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 053f5c4fa495..62193f4bc37b 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -377,7 +377,6 @@ DECLARE_EWMA(signal, 1024, 8)
  * @uploaded: set to true when sta is uploaded to the driver
  * @sta: station information we share with the driver
  * @sta_state: duplicates information about station state (for debug)
- * @beacon_loss_count: number of times beacon loss has triggered
  * @rcu_head: RCU head used for freeing this station struct
  * @cur_max_bandwidth: maximum bandwidth to use for TX to the station,
  *      taken from HT/VHT capabilities or VHT operating mode notification
diff --git a/net/mac80211/tdls.c b/net/mac80211/tdls.c
index c9eeb3f12808..a29ea813b7d5 100644
--- a/net/mac80211/tdls.c
+++ b/net/mac80211/tdls.c
@@ -4,7 +4,7 @@
  * Copyright 2006-2010  Johannes Berg <johannes@sipsolutions.net>
  * Copyright 2014, Intel Corporation
  * Copyright 2014  Intel Mobile Communications GmbH
- * Copyright 2015  Intel Deutschland GmbH
+ * Copyright 2015 - 2016 Intel Deutschland GmbH
  *
  * This file is GPLv2 as found in COPYING.
  */
@@ -15,6 +15,7 @@
 #include <linux/rtnetlink.h>
 #include "ieee80211_i.h"
 #include "driver-ops.h"
+#include "rate.h"
 
 /* give usermode some time for retries in setting up the TDLS session */
 #define TDLS_PEER_SETUP_TIMEOUT (15 * HZ)
@@ -302,7 +303,7 @@ ieee80211_tdls_chandef_vht_upgrade(struct ieee80211_sub_if_data *sdata,
         /* IEEE802.11ac-2013 Table E-4 */
         u16 centers_80mhz[] = { 5210, 5290, 5530, 5610, 5690, 5775 };
         struct cfg80211_chan_def uc = sta->tdls_chandef;
-        enum nl80211_chan_width max_width = ieee80211_get_sta_bw(&sta->sta);
+        enum nl80211_chan_width max_width = ieee80211_sta_cap_chan_bw(sta);
         int i;
 
         /* only support upgrading non-narrow channels up to 80Mhz */
@@ -313,7 +314,7 @@ ieee80211_tdls_chandef_vht_upgrade(struct ieee80211_sub_if_data *sdata,
         if (max_width > NL80211_CHAN_WIDTH_80)
                 max_width = NL80211_CHAN_WIDTH_80;
 
-        if (uc.width == max_width)
+        if (uc.width >= max_width)
                 return;
         /*
          * Channel usage constrains in the IEEE802.11ac-2013 specification only
@@ -324,6 +325,7 @@ ieee80211_tdls_chandef_vht_upgrade(struct ieee80211_sub_if_data *sdata,
         for (i = 0; i < ARRAY_SIZE(centers_80mhz); i++)
                 if (abs(uc.chan->center_freq - centers_80mhz[i]) <= 30) {
                         uc.center_freq1 = centers_80mhz[i];
+                        uc.center_freq2 = 0;
                         uc.width = NL80211_CHAN_WIDTH_80;
                         break;
                 }
@@ -332,7 +334,7 @@ ieee80211_tdls_chandef_vht_upgrade(struct ieee80211_sub_if_data *sdata,
                 return;
 
         /* proceed to downgrade the chandef until usable or the same */
-        while (uc.width > max_width &&
+        while (uc.width > max_width ||
                !cfg80211_reg_can_beacon_relax(sdata->local->hw.wiphy, &uc,
                                               sdata->wdev.iftype))
                 ieee80211_chandef_downgrade(&uc);
@@ -1242,18 +1244,44 @@ int ieee80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,
         return ret;
 }
 
-static void iee80211_tdls_recalc_chanctx(struct ieee80211_sub_if_data *sdata)
+static void iee80211_tdls_recalc_chanctx(struct ieee80211_sub_if_data *sdata,
+                                         struct sta_info *sta)
 {
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_chanctx_conf *conf;
         struct ieee80211_chanctx *ctx;
+        enum nl80211_chan_width width;
+        struct ieee80211_supported_band *sband;
 
         mutex_lock(&local->chanctx_mtx);
         conf = rcu_dereference_protected(sdata->vif.chanctx_conf,
                                          lockdep_is_held(&local->chanctx_mtx));
         if (conf) {
+                width = conf->def.width;
+                sband = local->hw.wiphy->bands[conf->def.chan->band];
                 ctx = container_of(conf, struct ieee80211_chanctx, conf);
                 ieee80211_recalc_chanctx_chantype(local, ctx);
+
+                /* if width changed and a peer is given, update its BW */
+                if (width != conf->def.width && sta &&
+                    test_sta_flag(sta, WLAN_STA_TDLS_WIDER_BW)) {
+                        enum ieee80211_sta_rx_bandwidth bw;
+
+                        bw = ieee80211_chan_width_to_rx_bw(conf->def.width);
+                        bw = min(bw, ieee80211_sta_cap_rx_bw(sta));
+                        if (bw != sta->sta.bandwidth) {
+                                sta->sta.bandwidth = bw;
+                                rate_control_rate_update(local, sband, sta,
+                                                         IEEE80211_RC_BW_CHANGED);
+                                /*
+                                 * if a TDLS peer BW was updated, we need to
+                                 * recalc the chandef width again, to get the
+                                 * correct chanctx min_def
+                                 */
+                                ieee80211_recalc_chanctx_chantype(local, ctx);
+                        }
+                }
+
         }
         mutex_unlock(&local->chanctx_mtx);
 }
@@ -1350,8 +1378,6 @@ int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev,
                         break;
                 }
 
-                iee80211_tdls_recalc_chanctx(sdata);
-
                 mutex_lock(&local->sta_mtx);
                 sta = sta_info_get(sdata, peer);
                 if (!sta) {
@@ -1360,6 +1386,7 @@ int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev,
                         break;
                 }
 
+                iee80211_tdls_recalc_chanctx(sdata, sta);
                 iee80211_tdls_recalc_ht_protection(sdata, sta);
 
                 set_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH);
@@ -1390,7 +1417,7 @@ int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev,
                 iee80211_tdls_recalc_ht_protection(sdata, NULL);
                 mutex_unlock(&local->sta_mtx);
 
-                iee80211_tdls_recalc_chanctx(sdata);
+                iee80211_tdls_recalc_chanctx(sdata, NULL);
                 break;
         default:
                 ret = -ENOTSUPP;
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 62ad5321257d..21f6602395f7 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1116,11 +1116,15 @@ static bool ieee80211_tx_prep_agg(struct ieee80211_tx_data *tx,
                         reset_agg_timer = true;
                 } else {
                         queued = true;
+                        if (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER) {
+                                clear_sta_flag(tx->sta, WLAN_STA_SP);
+                                ps_dbg(tx->sta->sdata,
+                                       "STA %pM aid %d: SP frame queued, close the SP w/o telling the peer\n",
+                                       tx->sta->sta.addr, tx->sta->sta.aid);
+                        }
                         info->control.vif = &tx->sdata->vif;
                         info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
-                        info->flags &= ~IEEE80211_TX_TEMPORARY_FLAGS |
-                                        IEEE80211_TX_CTL_NO_PS_BUFFER |
-                                        IEEE80211_TX_STATUS_EOSP;
+                        info->flags &= ~IEEE80211_TX_TEMPORARY_FLAGS;
                         __skb_queue_tail(&tid_tx->pending, skb);
                         if (skb_queue_len(&tid_tx->pending) > STA_MAX_TX_BUFFER)
                                 purge_skb = __skb_dequeue(&tid_tx->pending);
@@ -1247,7 +1251,8 @@ static void ieee80211_drv_tx(struct ieee80211_local *local,
         struct txq_info *txqi;
         u8 ac;
 
-        if (info->control.flags & IEEE80211_TX_CTRL_PS_RESPONSE)
+        if ((info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM) ||
+            (info->control.flags & IEEE80211_TX_CTRL_PS_RESPONSE))
                 goto tx_normal;
 
         if (!ieee80211_is_data(hdr->frame_control))
diff --git a/net/mac80211/vht.c b/net/mac80211/vht.c
index 89e04d55aa18..e590e2ef9eaf 100644
--- a/net/mac80211/vht.c
+++ b/net/mac80211/vht.c
@@ -319,7 +319,30 @@ enum ieee80211_sta_rx_bandwidth ieee80211_sta_cap_rx_bw(struct sta_info *sta)
         return IEEE80211_STA_RX_BW_80;
 }
 
-static enum ieee80211_sta_rx_bandwidth
+enum nl80211_chan_width ieee80211_sta_cap_chan_bw(struct sta_info *sta)
+{
+        struct ieee80211_sta_vht_cap *vht_cap = &sta->sta.vht_cap;
+        u32 cap_width;
+
+        if (!vht_cap->vht_supported) {
+                if (!sta->sta.ht_cap.ht_supported)
+                        return NL80211_CHAN_WIDTH_20_NOHT;
+
+                return sta->sta.ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 ?
+                                NL80211_CHAN_WIDTH_40 : NL80211_CHAN_WIDTH_20;
+        }
+
+        cap_width = vht_cap->cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK;
+
+        if (cap_width == IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ)
+                return NL80211_CHAN_WIDTH_160;
+        else if (cap_width == IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ)
+                return NL80211_CHAN_WIDTH_80P80;
+
+        return NL80211_CHAN_WIDTH_80;
+}
+
+enum ieee80211_sta_rx_bandwidth
 ieee80211_chan_width_to_rx_bw(enum nl80211_chan_width width)
 {
         switch (width) {
@@ -347,10 +370,7 @@ enum ieee80211_sta_rx_bandwidth ieee80211_sta_cur_vht_bw(struct sta_info *sta)
 
         bw = ieee80211_sta_cap_rx_bw(sta);
         bw = min(bw, sta->cur_max_bandwidth);
-
-        /* do not cap the BW of TDLS WIDER_BW peers by the bss */
-        if (!test_sta_flag(sta, WLAN_STA_TDLS_WIDER_BW))
-                bw = min(bw, ieee80211_chan_width_to_rx_bw(bss_width));
+        bw = min(bw, ieee80211_chan_width_to_rx_bw(bss_width));
 
         return bw;
 }
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index b18c5ed42d95..0b80a7140cc4 100644
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -543,6 +543,9 @@ static struct net_device *find_outdev(struct net *net,
         if (!dev)
                 return ERR_PTR(-ENODEV);
 
+        if (IS_ERR(dev))
+                return dev;
+
         /* The caller is holding rtnl anyways, so release the dev reference */
         dev_put(dev);
 
diff --git a/net/netfilter/ipset/ip_set_bitmap_gen.h b/net/netfilter/ipset/ip_set_bitmap_gen.h
index b0bc475f641e..2e8e7e5fb4a6 100644
--- a/net/netfilter/ipset/ip_set_bitmap_gen.h
+++ b/net/netfilter/ipset/ip_set_bitmap_gen.h
@@ -95,7 +95,7 @@ mtype_head(struct ip_set *set, struct sk_buff *skb)
         if (!nested)
                 goto nla_put_failure;
         if (mtype_do_head(skb, map) ||
-            nla_put_net32(skb, IPSET_ATTR_REFERENCES, htonl(set->ref - 1)) ||
+            nla_put_net32(skb, IPSET_ATTR_REFERENCES, htonl(set->ref)) ||
             nla_put_net32(skb, IPSET_ATTR_MEMSIZE, htonl(memsize)))
                 goto nla_put_failure;
         if (unlikely(ip_set_put_flags(skb, set)))
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index 7e6568cad494..a748b0c2c981 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -497,6 +497,26 @@ __ip_set_put(struct ip_set *set)
         write_unlock_bh(&ip_set_ref_lock);
 }
 
+/* set->ref can be swapped out by ip_set_swap, netlink events (like dump) need
+ * a separate reference counter
+ */
+static inline void
+__ip_set_get_netlink(struct ip_set *set)
+{
+        write_lock_bh(&ip_set_ref_lock);
+        set->ref_netlink++;
+        write_unlock_bh(&ip_set_ref_lock);
+}
+
+static inline void
+__ip_set_put_netlink(struct ip_set *set)
+{
+        write_lock_bh(&ip_set_ref_lock);
+        BUG_ON(set->ref_netlink == 0);
+        set->ref_netlink--;
+        write_unlock_bh(&ip_set_ref_lock);
+}
+
 /* Add, del and test set entries from kernel.
  *
  * The set behind the index must exist and must be referenced
@@ -1002,7 +1022,7 @@ static int ip_set_destroy(struct net *net, struct sock *ctnl,
         if (!attr[IPSET_ATTR_SETNAME]) {
                 for (i = 0; i < inst->ip_set_max; i++) {
                         s = ip_set(inst, i);
-                        if (s && s->ref) {
+                        if (s && (s->ref || s->ref_netlink)) {
                                 ret = -IPSET_ERR_BUSY;
                                 goto out;
                         }
@@ -1024,7 +1044,7 @@ static int ip_set_destroy(struct net *net, struct sock *ctnl,
                 if (!s) {
                         ret = -ENOENT;
                         goto out;
-                } else if (s->ref) {
+                } else if (s->ref || s->ref_netlink) {
                         ret = -IPSET_ERR_BUSY;
                         goto out;
                 }
@@ -1171,6 +1191,9 @@ static int ip_set_swap(struct net *net, struct sock *ctnl, struct sk_buff *skb,
               from->family == to->family))
                 return -IPSET_ERR_TYPE_MISMATCH;
 
+        if (from->ref_netlink || to->ref_netlink)
+                return -EBUSY;
+
         strncpy(from_name, from->name, IPSET_MAXNAMELEN);
         strncpy(from->name, to->name, IPSET_MAXNAMELEN);
         strncpy(to->name, from_name, IPSET_MAXNAMELEN);
@@ -1206,7 +1229,7 @@ ip_set_dump_done(struct netlink_callback *cb)
                 if (set->variant->uref)
                         set->variant->uref(set, cb, false);
                 pr_debug("release set %s\n", set->name);
-                __ip_set_put_byindex(inst, index);
+                __ip_set_put_netlink(set);
         }
         return 0;
 }
@@ -1328,7 +1351,7 @@ dump_last:
                 if (!cb->args[IPSET_CB_ARG0]) {
                         /* Start listing: make sure set won't be destroyed */
                         pr_debug("reference set\n");
-                        set->ref++;
+                        set->ref_netlink++;
                 }
                 write_unlock_bh(&ip_set_ref_lock);
                 nlh = start_msg(skb, NETLINK_CB(cb->skb).portid,
@@ -1396,7 +1419,7 @@ release_refcount:
                 if (set->variant->uref)
                         set->variant->uref(set, cb, false);
                 pr_debug("release set %s\n", set->name);
-                __ip_set_put_byindex(inst, index);
+                __ip_set_put_netlink(set);
                 cb->args[IPSET_CB_ARG0] = 0;
         }
 out:
diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h
index e5336ab36d67..d32fd6b036bf 100644
--- a/net/netfilter/ipset/ip_set_hash_gen.h
+++ b/net/netfilter/ipset/ip_set_hash_gen.h
@@ -1082,7 +1082,7 @@ mtype_head(struct ip_set *set, struct sk_buff *skb)
         if (nla_put_u32(skb, IPSET_ATTR_MARKMASK, h->markmask))
                 goto nla_put_failure;
 #endif
-        if (nla_put_net32(skb, IPSET_ATTR_REFERENCES, htonl(set->ref - 1)) ||
+        if (nla_put_net32(skb, IPSET_ATTR_REFERENCES, htonl(set->ref)) ||
             nla_put_net32(skb, IPSET_ATTR_MEMSIZE, htonl(memsize)))
                 goto nla_put_failure;
         if (unlikely(ip_set_put_flags(skb, set)))
diff --git a/net/netfilter/ipset/ip_set_list_set.c b/net/netfilter/ipset/ip_set_list_set.c
index 24c6c1962aea..a2a89e4e0a14 100644
--- a/net/netfilter/ipset/ip_set_list_set.c
+++ b/net/netfilter/ipset/ip_set_list_set.c
@@ -458,7 +458,7 @@ list_set_head(struct ip_set *set, struct sk_buff *skb)
         if (!nested)
                 goto nla_put_failure;
         if (nla_put_net32(skb, IPSET_ATTR_SIZE, htonl(map->size)) ||
-            nla_put_net32(skb, IPSET_ATTR_REFERENCES, htonl(set->ref - 1)) ||
+            nla_put_net32(skb, IPSET_ATTR_REFERENCES, htonl(set->ref)) ||
             nla_put_net32(skb, IPSET_ATTR_MEMSIZE,
                           htonl(sizeof(*map) + n * set->dsize)))
                 goto nla_put_failure;
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index 75429997ed41..cb5b630a645b 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -582,7 +582,12 @@ __nfqnl_enqueue_packet(struct net *net, struct nfqnl_instance *queue,
         /* nfnetlink_unicast will either free the nskb or add it to a socket */
         err = nfnetlink_unicast(nskb, net, queue->peer_portid, MSG_DONTWAIT);
         if (err < 0) {
-                queue->queue_user_dropped++;
+                if (queue->flags & NFQA_CFG_F_FAIL_OPEN) {
+                        failopen = 1;
+                        err = 0;
+                } else {
+                        queue->queue_user_dropped++;
+                }
                 goto err_out_unlock;
         }
 
diff --git a/net/openvswitch/Kconfig b/net/openvswitch/Kconfig
index 234a73344c6e..ce947292ae77 100644
--- a/net/openvswitch/Kconfig
+++ b/net/openvswitch/Kconfig
@@ -7,7 +7,9 @@ config OPENVSWITCH
         depends on INET
         depends on !NF_CONNTRACK || \
                    (NF_CONNTRACK && ((!NF_DEFRAG_IPV6 || NF_DEFRAG_IPV6) && \
-                                     (!NF_NAT || NF_NAT)))
+                                     (!NF_NAT || NF_NAT) && \
+                                     (!NF_NAT_IPV4 || NF_NAT_IPV4) && \
+                                     (!NF_NAT_IPV6 || NF_NAT_IPV6)))
         select LIBCRC32C
         select MPLS
         select NET_MPLS_GSO
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index dc5eb29fe7d6..1b9d286756be 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -535,14 +535,15 @@ static int ovs_ct_nat_execute(struct sk_buff *skb, struct nf_conn *ct,
         switch (ctinfo) {
         case IP_CT_RELATED:
         case IP_CT_RELATED_REPLY:
-                if (skb->protocol == htons(ETH_P_IP) &&
+                if (IS_ENABLED(CONFIG_NF_NAT_IPV4) &&
+                    skb->protocol == htons(ETH_P_IP) &&
                     ip_hdr(skb)->protocol == IPPROTO_ICMP) {
                         if (!nf_nat_icmp_reply_translation(skb, ct, ctinfo,
                                                            hooknum))
                                 err = NF_DROP;
                         goto push;
-#if IS_ENABLED(CONFIG_NF_NAT_IPV6)
-                } else if (skb->protocol == htons(ETH_P_IPV6)) {
+                } else if (IS_ENABLED(CONFIG_NF_NAT_IPV6) &&
+                           skb->protocol == htons(ETH_P_IPV6)) {
                         __be16 frag_off;
                         u8 nexthdr = ipv6_hdr(skb)->nexthdr;
                         int hdrlen = ipv6_skip_exthdr(skb,
@@ -557,7 +558,6 @@ static int ovs_ct_nat_execute(struct sk_buff *skb, struct nf_conn *ct,
                                         err = NF_DROP;
                                 goto push;
                         }
-#endif
                 }
                 /* Non-ICMP, fall thru to initialize if needed. */
         case IP_CT_NEW:
@@ -664,11 +664,12 @@ static int ovs_ct_nat(struct net *net, struct sw_flow_key *key,
 
         /* Determine NAT type.
          * Check if the NAT type can be deduced from the tracked connection.
-         * Make sure expected traffic is NATted only when committing.
+         * Make sure new expected connections (IP_CT_RELATED) are NATted only
+         * when committing.
          */
         if (info->nat & OVS_CT_NAT && ctinfo != IP_CT_NEW &&
             ct->status & IPS_NAT_MASK &&
-            (!(ct->status & IPS_EXPECTED_BIT) || info->commit)) {
+            (ctinfo != IP_CT_RELATED || info->commit)) {
                 /* NAT an established or related connection like before. */
                 if (CTINFO2DIR(ctinfo) == IP_CT_DIR_REPLY)
                         /* This is the REPLY direction for a connection
@@ -968,7 +969,8 @@ static int parse_nat(const struct nlattr *attr,
                         break;
 
                 case OVS_NAT_ATTR_IP_MIN:
-                        nla_memcpy(&info->range.min_addr, a, nla_len(a));
+                        nla_memcpy(&info->range.min_addr, a,
+                                   sizeof(info->range.min_addr));
                         info->range.flags |= NF_NAT_RANGE_MAP_IPS;
                         break;
 
@@ -1238,7 +1240,8 @@ static bool ovs_ct_nat_to_attr(const struct ovs_conntrack_info *info,
         }
 
         if (info->range.flags & NF_NAT_RANGE_MAP_IPS) {
-                if (info->family == NFPROTO_IPV4) {
+                if (IS_ENABLED(CONFIG_NF_NAT_IPV4) &&
+                    info->family == NFPROTO_IPV4) {
                         if (nla_put_in_addr(skb, OVS_NAT_ATTR_IP_MIN,
                                             info->range.min_addr.ip) ||
                             (info->range.max_addr.ip
@@ -1246,8 +1249,8 @@ static bool ovs_ct_nat_to_attr(const struct ovs_conntrack_info *info,
                              (nla_put_in_addr(skb, OVS_NAT_ATTR_IP_MAX,
                                               info->range.max_addr.ip))))
                                 return false;
-#if IS_ENABLED(CONFIG_NF_NAT_IPV6)
-                } else if (info->family == NFPROTO_IPV6) {
+                } else if (IS_ENABLED(CONFIG_NF_NAT_IPV6) &&
+                           info->family == NFPROTO_IPV6) {
                         if (nla_put_in6_addr(skb, OVS_NAT_ATTR_IP_MIN,
                                              &info->range.min_addr.in6) ||
                             (memcmp(&info->range.max_addr.in6,
@@ -1256,7 +1259,6 @@ static bool ovs_ct_nat_to_attr(const struct ovs_conntrack_info *info,
                              (nla_put_in6_addr(skb, OVS_NAT_ATTR_IP_MAX,
                                                &info->range.max_addr.in6))))
                                 return false;
-#endif
                 } else {
                         return false;
                 }
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 1ecfa710ca98..f12c17f355d9 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -4151,7 +4151,7 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
 
         /* Opening a Tx-ring is NOT supported in TPACKET_V3 */
         if (!closing && tx_ring && (po->tp_version > TPACKET_V2)) {
-                WARN(1, "Tx-ring is not supported.\n");
+                net_warn_ratelimited("Tx-ring is not supported.\n");
                 goto out;
         }
 
diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
index 977fb86065b7..abc8cc805e8d 100644
--- a/net/rds/ib_recv.c
+++ b/net/rds/ib_recv.c
@@ -796,7 +796,7 @@ static void rds_ib_cong_recv(struct rds_connection *conn,
 
                 addr = kmap_atomic(sg_page(&frag->f_sg));
 
-                src = addr + frag_off;
+                src = addr + frag->f_sg.offset + frag_off;
                 dst = (void *)map->m_page_addrs[map_page] + map_off;
                 for (k = 0; k < to_copy; k += 8) {
                         /* Record ports that became uncongested, ie
diff --git a/net/rds/page.c b/net/rds/page.c
index 616f21f4e7d7..e2b5a5832d3d 100644
--- a/net/rds/page.c
+++ b/net/rds/page.c
@@ -135,8 +135,8 @@ int rds_page_remainder_alloc(struct scatterlist *scat, unsigned long bytes,
                         if (rem->r_offset != 0)
                                 rds_stats_inc(s_page_remainder_hit);
 
-                        rem->r_offset += bytes;
-                        if (rem->r_offset == PAGE_SIZE) {
+                        rem->r_offset += ALIGN(bytes, 8);
+                        if (rem->r_offset >= PAGE_SIZE) {
                                 __free_page(rem->r_page);
                                 rem->r_page = NULL;
                         }
diff --git a/net/sctp/output.c b/net/sctp/output.c
index 736c004abfbc..9844fe573029 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -401,7 +401,7 @@ int sctp_packet_transmit(struct sctp_packet *packet, gfp_t gfp)
         sk = chunk->skb->sk;
 
         /* Allocate the new skb.  */
-        nskb = alloc_skb(packet->size + MAX_HEADER, GFP_ATOMIC);
+        nskb = alloc_skb(packet->size + MAX_HEADER, gfp);
         if (!nskb)
                 goto nomem;
 
@@ -523,8 +523,8 @@ int sctp_packet_transmit(struct sctp_packet *packet, gfp_t gfp)
          */
         if (auth)
                 sctp_auth_calculate_hmac(asoc, nskb,
-                                        (struct sctp_auth_chunk *)auth,
-                                        GFP_ATOMIC);
+                                         (struct sctp_auth_chunk *)auth,
+                                         gfp);
 
         /* 2) Calculate the Adler-32 checksum of the whole packet,
          *    including the SCTP common header and all the
@@ -705,7 +705,8 @@ static sctp_xmit_t sctp_packet_can_append_data(struct sctp_packet *packet,
         /* Check whether this chunk and all the rest of pending data will fit
          * or delay in hopes of bundling a full sized packet.
          */
-        if (chunk->skb->len + q->out_qlen >= transport->pathmtu - packet->overhead)
+        if (chunk->skb->len + q->out_qlen >
+                transport->pathmtu - packet->overhead - sizeof(sctp_data_chunk_t) - 4)
                 /* Enough data queued to fill a packet */
                 return SCTP_XMIT_OK;
 
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index 8c6bc795f060..15612ffa8d57 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 008c25d1b9f9..553bf95f7003 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;
         }
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 8b5833c1ff2e..2b9b98f1c2ff 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -1079,7 +1079,7 @@ nla_put_failure:
  *      @filter_dev: filter device
  *      @idx:
  *
- *      Delete FDB entry from switch device.
+ *      Dump FDB entries from switch device.
  */
 int switchdev_port_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
                             struct net_device *dev,
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index 0a369bb440e7..662bdd20a748 100644
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -842,7 +842,7 @@ static void vmci_transport_peer_detach_cb(u32 sub_id,
          * qp_handle.
          */
         if (vmci_handle_is_invalid(e_payload->handle) ||
-            vmci_handle_is_equal(trans->qp_handle, e_payload->handle))
+            !vmci_handle_is_equal(trans->qp_handle, e_payload->handle))
                 return;
 
         /* We don't ask for delayed CBs when we subscribe to this event (we
@@ -2154,7 +2154,7 @@ module_exit(vmci_transport_exit);
 
 MODULE_AUTHOR("VMware, Inc.");
 MODULE_DESCRIPTION("VMCI transport for Virtual Sockets");
-MODULE_VERSION("1.0.2.0-k");
+MODULE_VERSION("1.0.3.0-k");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("vmware_vsock");
 MODULE_ALIAS_NETPROTO(PF_VSOCK);
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index ad7f5b3f9b61..1c4ad477ce93 100644
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -292,12 +292,15 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
                 XFRM_SKB_CB(skb)->seq.input.hi = seq_hi;
 
                 skb_dst_force(skb);
+                dev_hold(skb->dev);
 
                 nexthdr = x->type->input(x, skb);
 
                 if (nexthdr == -EINPROGRESS)
                         return 0;
 resume:
+                dev_put(skb->dev);
+
                 spin_lock(&x->lock);
                 if (nexthdr <= 0) {
                         if (nexthdr == -EBADMSG) {
diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile
index 502c9fc8db85..b820cc96a3bc 100644
--- a/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
@@ -76,16 +76,10 @@ HOSTLOADLIBES_offwaketime += -lelf
 HOSTLOADLIBES_spintest += -lelf
 HOSTLOADLIBES_map_perf_test += -lelf -lrt
 
-# point this to your LLVM backend with bpf support
-LLC=$(srctree)/tools/bpf/llvm/bld/Debug+Asserts/bin/llc
-
-# asm/sysreg.h inline assmbly used by it is incompatible with llvm.
-# But, ehere is not easy way to fix it, so just exclude it since it is
+# asm/sysreg.h - inline assembly used by it is incompatible with llvm.
+# But, there is no easy way to fix it, so just exclude it since it is
 # useless for BPF samples.
 $(obj)/%.o: $(src)/%.c
         clang $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(EXTRA_CFLAGS) \
                 -D__KERNEL__ -D__ASM_SYSREG_H -Wno-unused-value -Wno-pointer-sign \
-                -O2 -emit-llvm -c $< -o -| $(LLC) -march=bpf -filetype=obj -o $@
-        clang $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(EXTRA_CFLAGS) \
-                -D__KERNEL__ -D__ASM_SYSREG_H -Wno-unused-value -Wno-pointer-sign \
-                -O2 -emit-llvm -c $< -o -| $(LLC) -march=bpf -filetype=asm -o $@.s
+                -O2 -emit-llvm -c $< -o -| llc -march=bpf -filetype=obj -o $@
diff --git a/samples/bpf/bpf_helpers.h b/samples/bpf/bpf_helpers.h
index 9363500131a7..7904a2a493de 100644
--- a/samples/bpf/bpf_helpers.h
+++ b/samples/bpf/bpf_helpers.h
@@ -82,6 +82,7 @@ static int (*bpf_l4_csum_replace)(void *ctx, int off, int from, int to, int flag
 #define PT_REGS_FP(x) ((x)->bp)
 #define PT_REGS_RC(x) ((x)->ax)
 #define PT_REGS_SP(x) ((x)->sp)
+#define PT_REGS_IP(x) ((x)->ip)
 
 #elif defined(__s390x__)
 
@@ -94,6 +95,7 @@ static int (*bpf_l4_csum_replace)(void *ctx, int off, int from, int to, int flag
 #define PT_REGS_FP(x) ((x)->gprs[11]) /* Works only with CONFIG_FRAME_POINTER */
 #define PT_REGS_RC(x) ((x)->gprs[2])
 #define PT_REGS_SP(x) ((x)->gprs[15])
+#define PT_REGS_IP(x) ((x)->ip)
 
 #elif defined(__aarch64__)
 
@@ -106,6 +108,30 @@ static int (*bpf_l4_csum_replace)(void *ctx, int off, int from, int to, int flag
 #define PT_REGS_FP(x) ((x)->regs[29]) /* Works only with CONFIG_FRAME_POINTER */
 #define PT_REGS_RC(x) ((x)->regs[0])
 #define PT_REGS_SP(x) ((x)->sp)
+#define PT_REGS_IP(x) ((x)->pc)
+
+#elif defined(__powerpc__)
+
+#define PT_REGS_PARM1(x) ((x)->gpr[3])
+#define PT_REGS_PARM2(x) ((x)->gpr[4])
+#define PT_REGS_PARM3(x) ((x)->gpr[5])
+#define PT_REGS_PARM4(x) ((x)->gpr[6])
+#define PT_REGS_PARM5(x) ((x)->gpr[7])
+#define PT_REGS_RC(x) ((x)->gpr[3])
+#define PT_REGS_SP(x) ((x)->sp)
+#define PT_REGS_IP(x) ((x)->nip)
 
 #endif
+
+#ifdef __powerpc__
+#define BPF_KPROBE_READ_RET_IP(ip, ctx)         ({ (ip) = (ctx)->link; })
+#define BPF_KRETPROBE_READ_RET_IP               BPF_KPROBE_READ_RET_IP
+#else
+#define BPF_KPROBE_READ_RET_IP(ip, ctx)         ({                              \
+                bpf_probe_read(&(ip), sizeof(ip), (void *)PT_REGS_RET(ctx)); })
+#define BPF_KRETPROBE_READ_RET_IP(ip, ctx)      ({                              \
+                bpf_probe_read(&(ip), sizeof(ip),                               \
+                                (void *)(PT_REGS_FP(ctx) + sizeof(ip))); })
+#endif
+
 #endif
diff --git a/samples/bpf/map_perf_test_user.c b/samples/bpf/map_perf_test_user.c
index 95af56ec5739..3147377e8fd3 100644
--- a/samples/bpf/map_perf_test_user.c
+++ b/samples/bpf/map_perf_test_user.c
@@ -17,6 +17,7 @@
 #include <linux/bpf.h>
 #include <string.h>
 #include <time.h>
+#include <sys/resource.h>
 #include "libbpf.h"
 #include "bpf_load.h"
 
diff --git a/samples/bpf/spintest_kern.c b/samples/bpf/spintest_kern.c
index 4b27619d91a4..ce0167d09cdc 100644
--- a/samples/bpf/spintest_kern.c
+++ b/samples/bpf/spintest_kern.c
@@ -34,7 +34,7 @@ struct bpf_map_def SEC("maps") stackmap = {
 #define PROG(foo) \
 int foo(struct pt_regs *ctx) \
 { \
-        long v = ctx->ip, *val; \
+        long v = PT_REGS_IP(ctx), *val; \
 \
         val = bpf_map_lookup_elem(&my_map, &v); \
         bpf_map_update_elem(&my_map, &v, &v, BPF_ANY); \
diff --git a/samples/bpf/tracex2_kern.c b/samples/bpf/tracex2_kern.c
index 09c1adc27d42..6d6eefd0d465 100644
--- a/samples/bpf/tracex2_kern.c
+++ b/samples/bpf/tracex2_kern.c
@@ -27,10 +27,10 @@ int bpf_prog2(struct pt_regs *ctx)
         long init_val = 1;
         long *value;
 
-        /* x64/s390x specific: read ip of kfree_skb caller.
+        /* read ip of kfree_skb caller.
          * non-portable version of __builtin_return_address(0)
          */
-        bpf_probe_read(&loc, sizeof(loc), (void *)PT_REGS_RET(ctx));
+        BPF_KPROBE_READ_RET_IP(loc, ctx);
 
         value = bpf_map_lookup_elem(&my_map, &loc);
         if (value)
diff --git a/samples/bpf/tracex4_kern.c b/samples/bpf/tracex4_kern.c
index ac4671420cf1..6dd8e384de96 100644
--- a/samples/bpf/tracex4_kern.c
+++ b/samples/bpf/tracex4_kern.c
@@ -40,7 +40,7 @@ int bpf_prog2(struct pt_regs *ctx)
         long ip = 0;
 
         /* get ip address of kmem_cache_alloc_node() caller */
-        bpf_probe_read(&ip, sizeof(ip), (void *)(PT_REGS_FP(ctx) + sizeof(ip)));
+        BPF_KRETPROBE_READ_RET_IP(ip, ctx);
 
         struct pair v = {
                 .val = bpf_ktime_get_ns(),
diff --git a/sound/core/timer.c b/sound/core/timer.c
index aa1b15c155d1..6469bedda2f3 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1019,8 +1019,8 @@ static int snd_timer_s_start(struct snd_timer * timer)
                 njiff += timer->sticks - priv->correction;
                 priv->correction = 0;
         }
-        priv->last_expires = priv->tlist.expires = njiff;
-        add_timer(&priv->tlist);
+        priv->last_expires = njiff;
+        mod_timer(&priv->tlist, njiff);
         return 0;
 }
 
@@ -1502,17 +1502,13 @@ static int snd_timer_user_ginfo(struct file *file,
         return err;
 }
 
-static int snd_timer_user_gparams(struct file *file,
-                                  struct snd_timer_gparams __user *_gparams)
+static int timer_set_gparams(struct snd_timer_gparams *gparams)
 {
-        struct snd_timer_gparams gparams;
         struct snd_timer *t;
         int err;
 
-        if (copy_from_user(&gparams, _gparams, sizeof(gparams)))
-                return -EFAULT;
         mutex_lock(&register_mutex);
-        t = snd_timer_find(&gparams.tid);
+        t = snd_timer_find(&gparams->tid);
         if (!t) {
                 err = -ENODEV;
                 goto _error;
@@ -1525,12 +1521,22 @@ static int snd_timer_user_gparams(struct file *file,
                 err = -ENOSYS;
                 goto _error;
         }
-        err = t->hw.set_period(t, gparams.period_num, gparams.period_den);
+        err = t->hw.set_period(t, gparams->period_num, gparams->period_den);
 _error:
         mutex_unlock(&register_mutex);
         return err;
 }
 
+static int snd_timer_user_gparams(struct file *file,
+                                  struct snd_timer_gparams __user *_gparams)
+{
+        struct snd_timer_gparams gparams;
+
+        if (copy_from_user(&gparams, _gparams, sizeof(gparams)))
+                return -EFAULT;
+        return timer_set_gparams(&gparams);
+}
+
 static int snd_timer_user_gstatus(struct file *file,
                                   struct snd_timer_gstatus __user *_gstatus)
 {
diff --git a/sound/core/timer_compat.c b/sound/core/timer_compat.c
index 2e908225d754..6a437eb66115 100644
--- a/sound/core/timer_compat.c
+++ b/sound/core/timer_compat.c
@@ -22,6 +22,19 @@
 
 #include <linux/compat.h>
 
+/*
+ * ILP32/LP64 has different size for 'long' type. Additionally, the size
+ * of storage alignment differs depending on architectures. Here, '__packed'
+ * qualifier is used so that the size of this structure is multiple of 4 and
+ * it fits to any architectures with 32 bit storage alignment.
+ */
+struct snd_timer_gparams32 {
+        struct snd_timer_id tid;
+        u32 period_num;
+        u32 period_den;
+        unsigned char reserved[32];
+} __packed;
+
 struct snd_timer_info32 {
         u32 flags;
         s32 card;
@@ -32,6 +45,19 @@ struct snd_timer_info32 {
         unsigned char reserved[64];
 };
 
+static int snd_timer_user_gparams_compat(struct file *file,
+                                        struct snd_timer_gparams32 __user *user)
+{
+        struct snd_timer_gparams gparams;
+
+        if (copy_from_user(&gparams.tid, &user->tid, sizeof(gparams.tid)) ||
+            get_user(gparams.period_num, &user->period_num) ||
+            get_user(gparams.period_den, &user->period_den))
+                return -EFAULT;
+
+        return timer_set_gparams(&gparams);
+}
+
 static int snd_timer_user_info_compat(struct file *file,
                                       struct snd_timer_info32 __user *_info)
 {
@@ -99,6 +125,7 @@ static int snd_timer_user_status_compat(struct file *file,
  */
 
 enum {
+        SNDRV_TIMER_IOCTL_GPARAMS32 = _IOW('T', 0x04, struct snd_timer_gparams32),
         SNDRV_TIMER_IOCTL_INFO32 = _IOR('T', 0x11, struct snd_timer_info32),
         SNDRV_TIMER_IOCTL_STATUS32 = _IOW('T', 0x14, struct snd_timer_status32),
 #ifdef CONFIG_X86_X32
@@ -114,7 +141,6 @@ static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd, uns
         case SNDRV_TIMER_IOCTL_PVERSION:
         case SNDRV_TIMER_IOCTL_TREAD:
         case SNDRV_TIMER_IOCTL_GINFO:
-        case SNDRV_TIMER_IOCTL_GPARAMS:
         case SNDRV_TIMER_IOCTL_GSTATUS:
         case SNDRV_TIMER_IOCTL_SELECT:
         case SNDRV_TIMER_IOCTL_PARAMS:
@@ -128,6 +154,8 @@ static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd, uns
         case SNDRV_TIMER_IOCTL_PAUSE_OLD:
         case SNDRV_TIMER_IOCTL_NEXT_DEVICE:
                 return snd_timer_user_ioctl(file, cmd, (unsigned long)argp);
+        case SNDRV_TIMER_IOCTL_GPARAMS32:
+                return snd_timer_user_gparams_compat(file, argp);
         case SNDRV_TIMER_IOCTL_INFO32:
                 return snd_timer_user_info_compat(file, argp);
         case SNDRV_TIMER_IOCTL_STATUS32:
diff --git a/sound/firewire/dice/dice-stream.c b/sound/firewire/dice/dice-stream.c
index 845d5e5884a4..ec4db3a514fc 100644
--- a/sound/firewire/dice/dice-stream.c
+++ b/sound/firewire/dice/dice-stream.c
@@ -446,18 +446,12 @@ end:
 
 void snd_dice_stream_destroy_duplex(struct snd_dice *dice)
 {
-        struct reg_params tx_params, rx_params;
-
-        snd_dice_transaction_clear_enable(dice);
+        unsigned int i;
 
-        if (get_register_params(dice, &tx_params, &rx_params) == 0) {
-                stop_streams(dice, AMDTP_IN_STREAM, &tx_params);
-                stop_streams(dice, AMDTP_OUT_STREAM, &rx_params);
+        for (i = 0; i < MAX_STREAMS; i++) {
+                destroy_stream(dice, AMDTP_IN_STREAM, i);
+                destroy_stream(dice, AMDTP_OUT_STREAM, i);
         }
-
-        release_resources(dice);
-
-        dice->substreams_counter = 0;
 }
 
 void snd_dice_stream_update_duplex(struct snd_dice *dice)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 2624cfe98884..b680be0e937d 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2361,6 +2361,10 @@ static const struct pci_device_id azx_ids[] = {
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
         { PCI_DEVICE(0x1002, 0xaae8),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
+        { PCI_DEVICE(0x1002, 0xaae0),
+          .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
+        { PCI_DEVICE(0x1002, 0xaaf0),
+          .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
         /* VIA VT8251/VT8237A */
         { PCI_DEVICE(0x1106, 0x3288), .driver_data = AZX_DRIVER_VIA },
         /* VIA GFX VT7122/VX900 */
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 4f5ca0b9ce27..fefe83f2beab 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -4759,6 +4759,7 @@ enum {
         ALC255_FIXUP_DELL_SPK_NOISE,
         ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,
         ALC280_FIXUP_HP_HEADSET_MIC,
+        ALC221_FIXUP_HP_FRONT_MIC,
 };
 
 static const struct hda_fixup alc269_fixups[] = {
@@ -5401,6 +5402,13 @@ static const struct hda_fixup alc269_fixups[] = {
                 .chained = true,
                 .chain_id = ALC269_FIXUP_HEADSET_MIC,
         },
+        [ALC221_FIXUP_HP_FRONT_MIC] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x19, 0x02a19020 }, /* Front Mic */
+                        { }
+                },
+        },
 };
 
 static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -5506,6 +5514,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x2336, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
         SND_PCI_QUIRK(0x103c, 0x2337, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
         SND_PCI_QUIRK(0x103c, 0x221c, "HP EliteBook 755 G2", ALC280_FIXUP_HP_HEADSET_MIC),
+        SND_PCI_QUIRK(0x103c, 0x8256, "HP", ALC221_FIXUP_HP_FRONT_MIC),
         SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),
         SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
         SND_PCI_QUIRK(0x1043, 0x115d, "Asus 1015E", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
@@ -6406,6 +6415,7 @@ enum {
         ALC668_FIXUP_AUTO_MUTE,
         ALC668_FIXUP_DELL_DISABLE_AAMIX,
         ALC668_FIXUP_DELL_XPS13,
+        ALC662_FIXUP_ASUS_Nx50,
 };
 
 static const struct hda_fixup alc662_fixups[] = {
@@ -6646,6 +6656,12 @@ static const struct hda_fixup alc662_fixups[] = {
                 .type = HDA_FIXUP_FUNC,
                 .v.func = alc_fixup_bass_chmap,
         },
+        [ALC662_FIXUP_ASUS_Nx50] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc_fixup_auto_mute_via_amp,
+                .chained = true,
+                .chain_id = ALC662_FIXUP_BASS_1A
+        },
 };
 
 static const struct snd_pci_quirk alc662_fixup_tbl[] = {
@@ -6668,8 +6684,9 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1028, 0x0698, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x069f, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800),
-        SND_PCI_QUIRK(0x1043, 0x11cd, "Asus N550", ALC662_FIXUP_BASS_1A),
+        SND_PCI_QUIRK(0x1043, 0x11cd, "Asus N550", ALC662_FIXUP_ASUS_Nx50),
         SND_PCI_QUIRK(0x1043, 0x13df, "Asus N550JX", ALC662_FIXUP_BASS_1A),
+        SND_PCI_QUIRK(0x1043, 0x129d, "Asus N750", ALC662_FIXUP_ASUS_Nx50),
         SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_BASS_MODE4_CHMAP),
         SND_PCI_QUIRK(0x1043, 0x15a7, "ASUS UX51VZH", ALC662_FIXUP_BASS_16),
         SND_PCI_QUIRK(0x1043, 0x1b73, "ASUS N55SF", ALC662_FIXUP_BASS_16),
diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index d14bf411515b..a452ad7cec40 100644
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -15,7 +15,6 @@ config SND_USB_AUDIO
         select SND_RAWMIDI
         select SND_PCM
         select BITREVERSE
-        select SND_USB_AUDIO_USE_MEDIA_CONTROLLER if MEDIA_CONTROLLER && (MEDIA_SUPPORT=y || MEDIA_SUPPORT=SND_USB_AUDIO)
         help
           Say Y here to include support for USB audio and USB MIDI
           devices.
@@ -23,9 +22,6 @@ config SND_USB_AUDIO
           To compile this driver as a module, choose M here: the module
           will be called snd-usb-audio.
 
-config SND_USB_AUDIO_USE_MEDIA_CONTROLLER
-        bool
-
 config SND_USB_UA101
         tristate "Edirol UA-101/UA-1000 driver"
         select SND_PCM
diff --git a/sound/usb/Makefile b/sound/usb/Makefile
index 8dca3c407f5a..2d2d122b069f 100644
--- a/sound/usb/Makefile
+++ b/sound/usb/Makefile
@@ -15,8 +15,6 @@ snd-usb-audio-objs := 	card.o \
                         quirks.o \
                         stream.o
 
-snd-usb-audio-$(CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER) += media.o
-
 snd-usbmidi-lib-objs := midi.o
 
 # Toplevel Module Dependency
diff --git a/sound/usb/card.c b/sound/usb/card.c
index 63244bbba8c7..3fc63583a537 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -66,7 +66,6 @@
 #include "format.h"
 #include "power.h"
 #include "stream.h"
-#include "media.h"
 
 MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
 MODULE_DESCRIPTION("USB Audio");
@@ -612,11 +611,6 @@ static int usb_audio_probe(struct usb_interface *intf,
         if (err < 0)
                 goto __error;
 
-        if (quirk->media_device) {
-                /* don't want to fail when media_snd_device_create() fails */
-                media_snd_device_create(chip, intf);
-        }
-
         usb_chip[chip->index] = chip;
         chip->num_interfaces++;
         usb_set_intfdata(intf, chip);
@@ -673,14 +667,6 @@ static void usb_audio_disconnect(struct usb_interface *intf)
                 list_for_each(p, &chip->midi_list) {
                         snd_usbmidi_disconnect(p);
                 }
-                /*
-                 * Nice to check quirk && quirk->media_device
-                 * need some special handlings. Doesn't look like
-                 * we have access to quirk here
-                 * Acceses mixer_list
-                */
-                media_snd_device_delete(chip);
-
                 /* release mixer resources */
                 list_for_each_entry(mixer, &chip->mixer_list, list) {
                         snd_usb_mixer_disconnect(mixer);
diff --git a/sound/usb/card.h b/sound/usb/card.h
index 34a0898e2238..71778ca4b26a 100644
--- a/sound/usb/card.h
+++ b/sound/usb/card.h
@@ -105,8 +105,6 @@ struct snd_usb_endpoint {
         struct list_head list;
 };
 
-struct media_ctl;
-
 struct snd_usb_substream {
         struct snd_usb_stream *stream;
         struct usb_device *dev;
@@ -158,7 +156,6 @@ struct snd_usb_substream {
         } dsd_dop;
 
         bool trigger_tstamp_pending_update; /* trigger timestamp being updated from initial estimate */
-        struct media_ctl *media_ctl;
 };
 
 struct snd_usb_stream {
diff --git a/sound/usb/media.c b/sound/usb/media.c
deleted file mode 100644
index 93a50d01490c..000000000000
--- a/sound/usb/media.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * media.c - Media Controller specific ALSA driver code
- *
- * Copyright (c) 2016 Shuah Khan <shuahkh@osg.samsung.com>
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * This file is released under the GPLv2.
- */
-
-/*
- * This file adds Media Controller support to ALSA driver
- * to use the Media Controller API to share tuner with DVB
- * and V4L2 drivers that control media device. Media device
- * is created based on existing quirks framework. Using this
- * approach, the media controller API usage can be added for
- * a specific device.
-*/
-
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/mutex.h>
-#include <linux/slab.h>
-#include <linux/usb.h>
-
-#include <sound/pcm.h>
-#include <sound/core.h>
-
-#include "usbaudio.h"
-#include "card.h"
-#include "mixer.h"
-#include "media.h"
-
-static int media_snd_enable_source(struct media_ctl *mctl)
-{
-        if (mctl && mctl->media_dev->enable_source)
-                return mctl->media_dev->enable_source(&mctl->media_entity,
-                                                      &mctl->media_pipe);
-        return 0;
-}
-
-static void media_snd_disable_source(struct media_ctl *mctl)
-{
-        if (mctl && mctl->media_dev->disable_source)
-                mctl->media_dev->disable_source(&mctl->media_entity);
-}
-
-int media_snd_stream_init(struct snd_usb_substream *subs, struct snd_pcm *pcm,
-                        int stream)
-{
-        struct media_device *mdev;
-        struct media_ctl *mctl;
-        struct device *pcm_dev = &pcm->streams[stream].dev;
-        u32 intf_type;
-        int ret = 0;
-        u16 mixer_pad;
-        struct media_entity *entity;
-
-        mdev = subs->stream->chip->media_dev;
-        if (!mdev)
-                return -ENODEV;
-
-        if (subs->media_ctl)
-                return 0;
-
-        /* allocate media_ctl */
-        mctl = kzalloc(sizeof(*mctl), GFP_KERNEL);
-        if (!mctl)
-                return -ENOMEM;
-
-        mctl->media_dev = mdev;
-        if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                intf_type = MEDIA_INTF_T_ALSA_PCM_PLAYBACK;
-                mctl->media_entity.function = MEDIA_ENT_F_AUDIO_PLAYBACK;
-                mctl->media_pad.flags = MEDIA_PAD_FL_SOURCE;
-                mixer_pad = 1;
-        } else {
-                intf_type = MEDIA_INTF_T_ALSA_PCM_CAPTURE;
-                mctl->media_entity.function = MEDIA_ENT_F_AUDIO_CAPTURE;
-                mctl->media_pad.flags = MEDIA_PAD_FL_SINK;
-                mixer_pad = 2;
-        }
-        mctl->media_entity.name = pcm->name;
-        media_entity_pads_init(&mctl->media_entity, 1, &mctl->media_pad);
-        ret =  media_device_register_entity(mctl->media_dev,
-                                            &mctl->media_entity);
-        if (ret)
-                goto free_mctl;
-
-        mctl->intf_devnode = media_devnode_create(mdev, intf_type, 0,
-                                                  MAJOR(pcm_dev->devt),
-                                                  MINOR(pcm_dev->devt));
-        if (!mctl->intf_devnode) {
-                ret = -ENOMEM;
-                goto unregister_entity;
-        }
-        mctl->intf_link = media_create_intf_link(&mctl->media_entity,
-                                                 &mctl->intf_devnode->intf,
-                                                 MEDIA_LNK_FL_ENABLED);
-        if (!mctl->intf_link) {
-                ret = -ENOMEM;
-                goto devnode_remove;
-        }
-
-        /* create link between mixer and audio */
-        media_device_for_each_entity(entity, mdev) {
-                switch (entity->function) {
-                case MEDIA_ENT_F_AUDIO_MIXER:
-                        ret = media_create_pad_link(entity, mixer_pad,
-                                                    &mctl->media_entity, 0,
-                                                    MEDIA_LNK_FL_ENABLED);
-                        if (ret)
-                                goto remove_intf_link;
-                        break;
-                }
-        }
-
-        subs->media_ctl = mctl;
-        return 0;
-
-remove_intf_link:
-        media_remove_intf_link(mctl->intf_link);
-devnode_remove:
-        media_devnode_remove(mctl->intf_devnode);
-unregister_entity:
-        media_device_unregister_entity(&mctl->media_entity);
-free_mctl:
-        kfree(mctl);
-        return ret;
-}
-
-void media_snd_stream_delete(struct snd_usb_substream *subs)
-{
-        struct media_ctl *mctl = subs->media_ctl;
-
-        if (mctl && mctl->media_dev) {
-                struct media_device *mdev;
-
-                mdev = subs->stream->chip->media_dev;
-                if (mdev && media_devnode_is_registered(&mdev->devnode)) {
-                        media_devnode_remove(mctl->intf_devnode);
-                        media_device_unregister_entity(&mctl->media_entity);
-                        media_entity_cleanup(&mctl->media_entity);
-                }
-                kfree(mctl);
-                subs->media_ctl = NULL;
-        }
-}
-
-int media_snd_start_pipeline(struct snd_usb_substream *subs)
-{
-        struct media_ctl *mctl = subs->media_ctl;
-
-        if (mctl)
-                return media_snd_enable_source(mctl);
-        return 0;
-}
-
-void media_snd_stop_pipeline(struct snd_usb_substream *subs)
-{
-        struct media_ctl *mctl = subs->media_ctl;
-
-        if (mctl)
-                media_snd_disable_source(mctl);
-}
-
-int media_snd_mixer_init(struct snd_usb_audio *chip)
-{
-        struct device *ctl_dev = &chip->card->ctl_dev;
-        struct media_intf_devnode *ctl_intf;
-        struct usb_mixer_interface *mixer;
-        struct media_device *mdev = chip->media_dev;
-        struct media_mixer_ctl *mctl;
-        u32 intf_type = MEDIA_INTF_T_ALSA_CONTROL;
-        int ret;
-
-        if (!mdev)
-                return -ENODEV;
-
-        ctl_intf = chip->ctl_intf_media_devnode;
-        if (!ctl_intf) {
-                ctl_intf = media_devnode_create(mdev, intf_type, 0,
-                                                MAJOR(ctl_dev->devt),
-                                                MINOR(ctl_dev->devt));
-                if (!ctl_intf)
-                        return -ENOMEM;
-                chip->ctl_intf_media_devnode = ctl_intf;
-        }
-
-        list_for_each_entry(mixer, &chip->mixer_list, list) {
-
-                if (mixer->media_mixer_ctl)
-                        continue;
-
-                /* allocate media_mixer_ctl */
-                mctl = kzalloc(sizeof(*mctl), GFP_KERNEL);
-                if (!mctl)
-                        return -ENOMEM;
-
-                mctl->media_dev = mdev;
-                mctl->media_entity.function = MEDIA_ENT_F_AUDIO_MIXER;
-                mctl->media_entity.name = chip->card->mixername;
-                mctl->media_pad[0].flags = MEDIA_PAD_FL_SINK;
-                mctl->media_pad[1].flags = MEDIA_PAD_FL_SOURCE;
-                mctl->media_pad[2].flags = MEDIA_PAD_FL_SOURCE;
-                media_entity_pads_init(&mctl->media_entity, MEDIA_MIXER_PAD_MAX,
-                                  mctl->media_pad);
-                ret =  media_device_register_entity(mctl->media_dev,
-                                                    &mctl->media_entity);
-                if (ret) {
-                        kfree(mctl);
-                        return ret;
-                }
-
-                mctl->intf_link = media_create_intf_link(&mctl->media_entity,
-                                                         &ctl_intf->intf,
-                                                         MEDIA_LNK_FL_ENABLED);
-                if (!mctl->intf_link) {
-                        media_device_unregister_entity(&mctl->media_entity);
-                        media_entity_cleanup(&mctl->media_entity);
-                        kfree(mctl);
-                        return -ENOMEM;
-                }
-                mctl->intf_devnode = ctl_intf;
-                mixer->media_mixer_ctl = mctl;
-        }
-        return 0;
-}
-
-static void media_snd_mixer_delete(struct snd_usb_audio *chip)
-{
-        struct usb_mixer_interface *mixer;
-        struct media_device *mdev = chip->media_dev;
-
-        if (!mdev)
-                return;
-
-        list_for_each_entry(mixer, &chip->mixer_list, list) {
-                struct media_mixer_ctl *mctl;
-
-                mctl = mixer->media_mixer_ctl;
-                if (!mixer->media_mixer_ctl)
-                        continue;
-
-                if (media_devnode_is_registered(&mdev->devnode)) {
-                        media_device_unregister_entity(&mctl->media_entity);
-                        media_entity_cleanup(&mctl->media_entity);
-                }
-                kfree(mctl);
-                mixer->media_mixer_ctl = NULL;
-        }
-        if (media_devnode_is_registered(&mdev->devnode))
-                media_devnode_remove(chip->ctl_intf_media_devnode);
-        chip->ctl_intf_media_devnode = NULL;
-}
-
-int media_snd_device_create(struct snd_usb_audio *chip,
-                        struct usb_interface *iface)
-{
-        struct media_device *mdev;
-        struct usb_device *usbdev = interface_to_usbdev(iface);
-        int ret;
-
-        mdev = media_device_get_devres(&usbdev->dev);
-        if (!mdev)
-                return -ENOMEM;
-        if (!mdev->dev) {
-                /* register media device */
-                mdev->dev = &usbdev->dev;
-                if (usbdev->product)
-                        strlcpy(mdev->model, usbdev->product,
-                                sizeof(mdev->model));
-                if (usbdev->serial)
-                        strlcpy(mdev->serial, usbdev->serial,
-                                sizeof(mdev->serial));
-                strcpy(mdev->bus_info, usbdev->devpath);
-                mdev->hw_revision = le16_to_cpu(usbdev->descriptor.bcdDevice);
-                media_device_init(mdev);
-        }
-        if (!media_devnode_is_registered(&mdev->devnode)) {
-                ret = media_device_register(mdev);
-                if (ret) {
-                        dev_err(&usbdev->dev,
-                                "Couldn't register media device. Error: %d\n",
-                                ret);
-                        return ret;
-                }
-        }
-
-        /* save media device - avoid lookups */
-        chip->media_dev = mdev;
-
-        /* Create media entities for mixer and control dev */
-        ret = media_snd_mixer_init(chip);
-        if (ret) {
-                dev_err(&usbdev->dev,
-                        "Couldn't create media mixer entities. Error: %d\n",
-                        ret);
-
-                /* clear saved media_dev */
-                chip->media_dev = NULL;
-
-                return ret;
-        }
-        return 0;
-}
-
-void media_snd_device_delete(struct snd_usb_audio *chip)
-{
-        struct media_device *mdev = chip->media_dev;
-
-        media_snd_mixer_delete(chip);
-
-        if (mdev) {
-                if (media_devnode_is_registered(&mdev->devnode))
-                        media_device_unregister(mdev);
-                chip->media_dev = NULL;
-        }
-}
diff --git a/sound/usb/media.h b/sound/usb/media.h
deleted file mode 100644
index 1dcdcdc5f7aa..000000000000
--- a/sound/usb/media.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * media.h - Media Controller specific ALSA driver code
- *
- * Copyright (c) 2016 Shuah Khan <shuahkh@osg.samsung.com>
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * This file is released under the GPLv2.
- */
-
-/*
- * This file adds Media Controller support to ALSA driver
- * to use the Media Controller API to share tuner with DVB
- * and V4L2 drivers that control media device. Media device
- * is created based on existing quirks framework. Using this
- * approach, the media controller API usage can be added for
- * a specific device.
-*/
-#ifndef __MEDIA_H
-
-#ifdef CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER
-
-#include <media/media-device.h>
-#include <media/media-entity.h>
-#include <sound/asound.h>
-
-struct media_ctl {
-        struct media_device *media_dev;
-        struct media_entity media_entity;
-        struct media_intf_devnode *intf_devnode;
-        struct media_link *intf_link;
-        struct media_pad media_pad;
-        struct media_pipeline media_pipe;
-};
-
-/*
- * One source pad each for SNDRV_PCM_STREAM_CAPTURE and
- * SNDRV_PCM_STREAM_PLAYBACK. One for sink pad to link
- * to AUDIO Source
-*/
-#define MEDIA_MIXER_PAD_MAX    (SNDRV_PCM_STREAM_LAST + 2)
-
-struct media_mixer_ctl {
-        struct media_device *media_dev;
-        struct media_entity media_entity;
-        struct media_intf_devnode *intf_devnode;
-        struct media_link *intf_link;
-        struct media_pad media_pad[MEDIA_MIXER_PAD_MAX];
-        struct media_pipeline media_pipe;
-};
-
-int media_snd_device_create(struct snd_usb_audio *chip,
-                            struct usb_interface *iface);
-void media_snd_device_delete(struct snd_usb_audio *chip);
-int media_snd_stream_init(struct snd_usb_substream *subs, struct snd_pcm *pcm,
-                          int stream);
-void media_snd_stream_delete(struct snd_usb_substream *subs);
-int media_snd_start_pipeline(struct snd_usb_substream *subs);
-void media_snd_stop_pipeline(struct snd_usb_substream *subs);
-#else
-static inline int media_snd_device_create(struct snd_usb_audio *chip,
-                                          struct usb_interface *iface)
-                                                { return 0; }
-static inline void media_snd_device_delete(struct snd_usb_audio *chip) { }
-static inline int media_snd_stream_init(struct snd_usb_substream *subs,
-                                        struct snd_pcm *pcm, int stream)
-                                                { return 0; }
-static inline void media_snd_stream_delete(struct snd_usb_substream *subs) { }
-static inline int media_snd_start_pipeline(struct snd_usb_substream *subs)
-                                        { return 0; }
-static inline void media_snd_stop_pipeline(struct snd_usb_substream *subs) { }
-#endif
-#endif /* __MEDIA_H */
diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h
index f3789446ab9c..3417ef347e40 100644
--- a/sound/usb/mixer.h
+++ b/sound/usb/mixer.h
@@ -3,8 +3,6 @@
 
 #include <sound/info.h>
 
-struct media_mixer_ctl;
-
 struct usb_mixer_interface {
         struct snd_usb_audio *chip;
         struct usb_host_interface *hostif;
@@ -24,7 +22,6 @@ struct usb_mixer_interface {
         struct urb *rc_urb;
         struct usb_ctrlrequest *rc_setup_packet;
         u8 rc_buffer[6];
-        struct media_mixer_ctl *media_mixer_ctl;
 };
 
 #define MAX_CHANNELS    16      /* max logical channels */
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index 0e4e0640c504..44d178ee9177 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -35,7 +35,6 @@
 #include "pcm.h"
 #include "clock.h"
 #include "power.h"
-#include "media.h"
 
 #define SUBSTREAM_FLAG_DATA_EP_STARTED  0
 #define SUBSTREAM_FLAG_SYNC_EP_STARTED  1
@@ -718,14 +717,10 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream,
         struct audioformat *fmt;
         int ret;
 
-        ret = media_snd_start_pipeline(subs);
-        if (ret)
-                return ret;
-
         ret = snd_pcm_lib_alloc_vmalloc_buffer(substream,
                                                params_buffer_bytes(hw_params));
         if (ret < 0)
-                goto err_ret;
+                return ret;
 
         subs->pcm_format = params_format(hw_params);
         subs->period_bytes = params_period_bytes(hw_params);
@@ -739,27 +734,22 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream,
                 dev_dbg(&subs->dev->dev,
                         "cannot set format: format = %#x, rate = %d, channels = %d\n",
                            subs->pcm_format, subs->cur_rate, subs->channels);
-                ret = -EINVAL;
-                goto err_ret;
+                return -EINVAL;
         }
 
         ret = snd_usb_lock_shutdown(subs->stream->chip);
         if (ret < 0)
-                goto err_ret;
+                return ret;
         ret = set_format(subs, fmt);
         snd_usb_unlock_shutdown(subs->stream->chip);
         if (ret < 0)
-                goto err_ret;
+                return ret;
 
         subs->interface = fmt->iface;
         subs->altset_idx = fmt->altset_idx;
         subs->need_setup_ep = true;
 
         return 0;
-
-err_ret:
-        media_snd_stop_pipeline(subs);
-        return ret;
 }
 
 /*
@@ -771,7 +761,6 @@ static int snd_usb_hw_free(struct snd_pcm_substream *substream)
 {
         struct snd_usb_substream *subs = substream->runtime->private_data;
 
-        media_snd_stop_pipeline(subs);
         subs->cur_audiofmt = NULL;
         subs->cur_rate = 0;
         subs->period_bytes = 0;
@@ -1232,7 +1221,6 @@ static int snd_usb_pcm_open(struct snd_pcm_substream *substream, int direction)
         struct snd_usb_stream *as = snd_pcm_substream_chip(substream);
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_usb_substream *subs = &as->substream[direction];
-        int ret;
 
         subs->interface = -1;
         subs->altset_idx = 0;
@@ -1246,12 +1234,7 @@ static int snd_usb_pcm_open(struct snd_pcm_substream *substream, int direction)
         subs->dsd_dop.channel = 0;
         subs->dsd_dop.marker = 1;
 
-        ret = setup_hw_info(runtime, subs);
-        if (ret == 0)
-                ret = media_snd_stream_init(subs, as->pcm, direction);
-        if (ret)
-                snd_usb_autosuspend(subs->stream->chip);
-        return ret;
+        return setup_hw_info(runtime, subs);
 }
 
 static int snd_usb_pcm_close(struct snd_pcm_substream *substream, int direction)
@@ -1260,7 +1243,6 @@ static int snd_usb_pcm_close(struct snd_pcm_substream *substream, int direction)
         struct snd_usb_substream *subs = &as->substream[direction];
 
         stop_endpoints(subs, true);
-        media_snd_stop_pipeline(subs);
 
         if (subs->interface >= 0 &&
             !snd_usb_lock_shutdown(subs->stream->chip)) {
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index 9d087b19c70c..c60a776e815d 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -2886,7 +2886,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                 .product_name = pname, \
                 .ifnum = QUIRK_ANY_INTERFACE, \
                 .type = QUIRK_AUDIO_ALIGN_TRANSFER, \
-                .media_device = 1, \
         } \
 }
 
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index fb62bce2435c..6178bb5d0731 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -150,6 +150,7 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip,
                 usb_audio_err(chip, "cannot memdup\n");
                 return -ENOMEM;
         }
+        INIT_LIST_HEAD(&fp->list);
         if (fp->nr_rates > MAX_NR_RATES) {
                 kfree(fp);
                 return -EINVAL;
@@ -193,6 +194,7 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip,
         return 0;
 
  error:
+        list_del(&fp->list); /* unlink for avoiding double-free */
         kfree(fp);
         kfree(rate_table);
         return err;
@@ -469,6 +471,7 @@ static int create_uaxx_quirk(struct snd_usb_audio *chip,
         fp->ep_attr = get_endpoint(alts, 0)->bmAttributes;
         fp->datainterval = 0;
         fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize);
+        INIT_LIST_HEAD(&fp->list);
 
         switch (fp->maxpacksize) {
         case 0x120:
@@ -492,6 +495,7 @@ static int create_uaxx_quirk(struct snd_usb_audio *chip,
                 ? SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK;
         err = snd_usb_add_audio_stream(chip, stream, fp);
         if (err < 0) {
+                list_del(&fp->list); /* unlink for avoiding double-free */
                 kfree(fp);
                 return err;
         }
diff --git a/sound/usb/stream.c b/sound/usb/stream.c
index 51258a15f653..8e9548bc1f1a 100644
--- a/sound/usb/stream.c
+++ b/sound/usb/stream.c
@@ -36,7 +36,6 @@
 #include "format.h"
 #include "clock.h"
 #include "stream.h"
-#include "media.h"
 
 /*
  * free a substream
@@ -53,7 +52,6 @@ static void free_substream(struct snd_usb_substream *subs)
                 kfree(fp);
         }
         kfree(subs->rate_list.list);
-        media_snd_stream_delete(subs);
 }
 
 
@@ -316,7 +314,9 @@ static struct snd_pcm_chmap_elem *convert_chmap(int channels, unsigned int bits,
 /*
  * add this endpoint to the chip instance.
  * if a stream with the same endpoint already exists, append to it.
- * if not, create a new pcm stream.
+ * if not, create a new pcm stream. note, fp is added to the substream
+ * fmt_list and will be freed on the chip instance release. do not free
+ * fp or do remove it from the substream fmt_list to avoid double-free.
  */
 int snd_usb_add_audio_stream(struct snd_usb_audio *chip,
                              int stream,
@@ -677,6 +677,7 @@ int snd_usb_parse_audio_interface(struct snd_usb_audio *chip, int iface_no)
                                         * (fp->maxpacksize & 0x7ff);
                 fp->attributes = parse_uac_endpoint_attributes(chip, alts, protocol, iface_no);
                 fp->clock = clock;
+                INIT_LIST_HEAD(&fp->list);
 
                 /* some quirks for attributes here */
 
@@ -725,6 +726,7 @@ int snd_usb_parse_audio_interface(struct snd_usb_audio *chip, int iface_no)
                 dev_dbg(&dev->dev, "%u:%d: add audio endpoint %#x\n", iface_no, altno, fp->endpoint);
                 err = snd_usb_add_audio_stream(chip, stream, fp);
                 if (err < 0) {
+                        list_del(&fp->list); /* unlink for avoiding double-free */
                         kfree(fp->rate_table);
                         kfree(fp->chmap);
                         kfree(fp);
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index a161c7c1b126..b665d85555cb 100644
--- a/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@ -30,9 +30,6 @@
  *
  */
 
-struct media_device;
-struct media_intf_devnode;
-
 struct snd_usb_audio {
         int index;
         struct usb_device *dev;
@@ -63,8 +60,6 @@ struct snd_usb_audio {
         bool autoclock;                 /* from the 'autoclock' module param */
 
         struct usb_host_interface *ctrl_intf;   /* the audio control interface */
-        struct media_device *media_dev;
-        struct media_intf_devnode *ctl_intf_media_devnode;
 };
 
 #define usb_audio_err(chip, fmt, args...) \
@@ -115,7 +110,6 @@ struct snd_usb_audio_quirk {
         const char *product_name;
         int16_t ifnum;
         uint16_t type;
-        bool media_device;
         const void *data;
 };
 
diff --git a/tools/lib/lockdep/run_tests.sh b/tools/lib/lockdep/run_tests.sh
index 5334ad9d39b7..1069d96248c1 100755
--- a/tools/lib/lockdep/run_tests.sh
+++ b/tools/lib/lockdep/run_tests.sh
@@ -3,7 +3,7 @@
 make &> /dev/null
 
 for i in `ls tests/*.c`; do
-        testname=$(basename -s .c "$i")
+        testname=$(basename "$i" .c)
         gcc -o tests/$testname -pthread -lpthread $i liblockdep.a -Iinclude -D__USE_LIBLOCKDEP &> /dev/null
         echo -ne "$testname... "
         if [ $(timeout 1 ./tests/$testname | wc -l) -gt 0 ]; then
@@ -11,11 +11,13 @@ for i in `ls tests/*.c`; do
         else
                 echo "FAILED!"
         fi
-        rm tests/$testname
+        if [ -f "tests/$testname" ]; then
+                rm tests/$testname
+        fi
 done
 
 for i in `ls tests/*.c`; do
-        testname=$(basename -s .c "$i")
+        testname=$(basename "$i" .c)
         gcc -o tests/$testname -pthread -lpthread -Iinclude $i &> /dev/null
         echo -ne "(PRELOAD) $testname... "
         if [ $(timeout 1 ./lockdep ./tests/$testname | wc -l) -gt 0 ]; then
@@ -23,5 +25,7 @@ for i in `ls tests/*.c`; do
         else
                 echo "FAILED!"
         fi
-        rm tests/$testname
+        if [ -f "tests/$testname" ]; then
+                rm tests/$testname
+        fi
 done
diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST
index 2e1fa2357528..8c8c6b9ce915 100644
--- a/tools/perf/MANIFEST
+++ b/tools/perf/MANIFEST
@@ -74,6 +74,7 @@ arch/*/include/uapi/asm/unistd*.h
 arch/*/include/uapi/asm/perf_regs.h
 arch/*/lib/memcpy*.S
 arch/*/lib/memset*.S
+arch/*/include/asm/*features.h
 include/linux/poison.h
 include/linux/hw_breakpoint.h
 include/uapi/linux/perf_event.h
diff --git a/tools/perf/arch/powerpc/util/header.c b/tools/perf/arch/powerpc/util/header.c
index 6138bdef6e63..f8ccee132867 100644
--- a/tools/perf/arch/powerpc/util/header.c
+++ b/tools/perf/arch/powerpc/util/header.c
@@ -4,6 +4,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <linux/stringify.h>
+#include "header.h"
+#include "util.h"
 
 #define mfspr(rn)       ({unsigned long rval; \
                          asm volatile("mfspr %0," __stringify(rn) \
diff --git a/tools/perf/tests/perf-targz-src-pkg b/tools/perf/tests/perf-targz-src-pkg
index 238aa3927c71..f2d9c5fe58e0 100755
--- a/tools/perf/tests/perf-targz-src-pkg
+++ b/tools/perf/tests/perf-targz-src-pkg
@@ -15,7 +15,7 @@ TMP_DEST=$(mktemp -d)
 tar xf ${TARBALL} -C $TMP_DEST
 rm -f ${TARBALL}
 cd - > /dev/null
-make -C $TMP_DEST/perf*/tools/perf > /dev/null 2>&1
+make -C $TMP_DEST/perf*/tools/perf > /dev/null
 RC=$?
 rm -rf ${TMP_DEST}
 exit $RC
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 4b9816555946..2a83414159a6 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -337,7 +337,7 @@ static void callchain_node__init_have_children(struct callchain_node *node,
         chain = list_entry(node->val.next, struct callchain_list, list);
         chain->has_children = has_sibling;
 
-        if (node->val.next != node->val.prev) {
+        if (!list_empty(&node->val)) {
                 chain = list_entry(node->val.prev, struct callchain_list, list);
                 chain->has_children = !RB_EMPTY_ROOT(&node->rb_root);
         }
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 52cf479bc593..dad55d04ffdd 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -56,13 +56,22 @@ const char *perf_event__name(unsigned int id)
         return perf_event__names[id];
 }
 
-static struct perf_sample synth_sample = {
+static int perf_tool__process_synth_event(struct perf_tool *tool,
+                                          union perf_event *event,
+                                          struct machine *machine,
+                                          perf_event__handler_t process)
+{
+        struct perf_sample synth_sample = {
         .pid       = -1,
         .tid       = -1,
         .time      = -1,
         .stream_id = -1,
         .cpu       = -1,
         .period    = 1,
+        .cpumode   = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK,
+        };
+
+        return process(tool, event, &synth_sample, machine);
 };
 
 /*
@@ -186,7 +195,7 @@ pid_t perf_event__synthesize_comm(struct perf_tool *tool,
         if (perf_event__prepare_comm(event, pid, machine, &tgid, &ppid) != 0)
                 return -1;
 
-        if (process(tool, event, &synth_sample, machine) != 0)
+        if (perf_tool__process_synth_event(tool, event, machine, process) != 0)
                 return -1;
 
         return tgid;
@@ -218,7 +227,7 @@ static int perf_event__synthesize_fork(struct perf_tool *tool,
 
         event->fork.header.size = (sizeof(event->fork) + machine->id_hdr_size);
 
-        if (process(tool, event, &synth_sample, machine) != 0)
+        if (perf_tool__process_synth_event(tool, event, machine, process) != 0)
                 return -1;
 
         return 0;
@@ -344,7 +353,7 @@ out:
                 event->mmap2.pid = tgid;
                 event->mmap2.tid = pid;
 
-                if (process(tool, event, &synth_sample, machine) != 0) {
+                if (perf_tool__process_synth_event(tool, event, machine, process) != 0) {
                         rc = -1;
                         break;
                 }
@@ -402,7 +411,7 @@ int perf_event__synthesize_modules(struct perf_tool *tool,
 
                 memcpy(event->mmap.filename, pos->dso->long_name,
                        pos->dso->long_name_len + 1);
-                if (process(tool, event, &synth_sample, machine) != 0) {
+                if (perf_tool__process_synth_event(tool, event, machine, process) != 0) {
                         rc = -1;
                         break;
                 }
@@ -472,7 +481,7 @@ static int __event__synthesize_thread(union perf_event *comm_event,
                 /*
                  * Send the prepared comm event
                  */
-                if (process(tool, comm_event, &synth_sample, machine) != 0)
+                if (perf_tool__process_synth_event(tool, comm_event, machine, process) != 0)
                         break;
 
                 rc = 0;
@@ -701,7 +710,7 @@ int perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
         event->mmap.len   = map->end - event->mmap.start;
         event->mmap.pid   = machine->pid;
 
-        err = process(tool, event, &synth_sample, machine);
+        err = perf_tool__process_synth_event(tool, event, machine, process);
         free(event);
 
         return err;
diff --git a/tools/perf/util/genelf.h b/tools/perf/util/genelf.h
index cd67e64a0494..2fbeb59c4bdd 100644
--- a/tools/perf/util/genelf.h
+++ b/tools/perf/util/genelf.h
@@ -9,36 +9,32 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent
 
 #if   defined(__arm__)
 #define GEN_ELF_ARCH    EM_ARM
-#define GEN_ELF_ENDIAN  ELFDATA2LSB
 #define GEN_ELF_CLASS   ELFCLASS32
 #elif defined(__aarch64__)
 #define GEN_ELF_ARCH    EM_AARCH64
-#define GEN_ELF_ENDIAN  ELFDATA2LSB
 #define GEN_ELF_CLASS   ELFCLASS64
 #elif defined(__x86_64__)
 #define GEN_ELF_ARCH    EM_X86_64
-#define GEN_ELF_ENDIAN  ELFDATA2LSB
 #define GEN_ELF_CLASS   ELFCLASS64
 #elif defined(__i386__)
 #define GEN_ELF_ARCH    EM_386
-#define GEN_ELF_ENDIAN  ELFDATA2LSB
 #define GEN_ELF_CLASS   ELFCLASS32
-#elif defined(__ppcle__)
-#define GEN_ELF_ARCH    EM_PPC
-#define GEN_ELF_ENDIAN  ELFDATA2LSB
-#define GEN_ELF_CLASS   ELFCLASS64
-#elif defined(__powerpc__)
-#define GEN_ELF_ARCH    EM_PPC64
-#define GEN_ELF_ENDIAN  ELFDATA2MSB
-#define GEN_ELF_CLASS   ELFCLASS64
-#elif defined(__powerpcle__)
+#elif defined(__powerpc64__)
 #define GEN_ELF_ARCH    EM_PPC64
-#define GEN_ELF_ENDIAN  ELFDATA2LSB
 #define GEN_ELF_CLASS   ELFCLASS64
+#elif defined(__powerpc__)
+#define GEN_ELF_ARCH    EM_PPC
+#define GEN_ELF_CLASS   ELFCLASS32
 #else
 #error "unsupported architecture"
 #endif
 
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define GEN_ELF_ENDIAN  ELFDATA2MSB
+#else
+#define GEN_ELF_ENDIAN  ELFDATA2LSB
+#endif
+
 #if GEN_ELF_CLASS == ELFCLASS64
 #define elf_newehdr     elf64_newehdr
 #define elf_getshdr     elf64_getshdr
diff --git a/tools/perf/util/intel-bts.c b/tools/perf/util/intel-bts.c
index 6bc3ecd2e7ca..abf1366e2a24 100644
--- a/tools/perf/util/intel-bts.c
+++ b/tools/perf/util/intel-bts.c
@@ -279,6 +279,7 @@ static int intel_bts_synth_branch_sample(struct intel_bts_queue *btsq,
         event.sample.header.misc = PERF_RECORD_MISC_USER;
         event.sample.header.size = sizeof(struct perf_event_header);
 
+        sample.cpumode = PERF_RECORD_MISC_USER;
         sample.ip = le64_to_cpu(branch->from);
         sample.pid = btsq->pid;
         sample.tid = btsq->tid;
diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index 05d815851be1..407f11b97c8d 100644
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -979,6 +979,7 @@ static int intel_pt_synth_branch_sample(struct intel_pt_queue *ptq)
         if (!pt->timeless_decoding)
                 sample.time = tsc_to_perf_time(ptq->timestamp, &pt->tc);
 
+        sample.cpumode = PERF_RECORD_MISC_USER;
         sample.ip = ptq->state->from_ip;
         sample.pid = ptq->pid;
         sample.tid = ptq->tid;
@@ -1035,6 +1036,7 @@ static int intel_pt_synth_instruction_sample(struct intel_pt_queue *ptq)
         if (!pt->timeless_decoding)
                 sample.time = tsc_to_perf_time(ptq->timestamp, &pt->tc);
 
+        sample.cpumode = PERF_RECORD_MISC_USER;
         sample.ip = ptq->state->from_ip;
         sample.pid = ptq->pid;
         sample.tid = ptq->tid;
@@ -1092,6 +1094,7 @@ static int intel_pt_synth_transaction_sample(struct intel_pt_queue *ptq)
         if (!pt->timeless_decoding)
                 sample.time = tsc_to_perf_time(ptq->timestamp, &pt->tc);
 
+        sample.cpumode = PERF_RECORD_MISC_USER;
         sample.ip = ptq->state->from_ip;
         sample.pid = ptq->pid;
         sample.tid = ptq->tid;
diff --git a/tools/perf/util/jitdump.c b/tools/perf/util/jitdump.c
index cd272cc21e05..ad0c0bb1fbc7 100644
--- a/tools/perf/util/jitdump.c
+++ b/tools/perf/util/jitdump.c
@@ -417,6 +417,7 @@ static int jit_repipe_code_load(struct jit_buf_desc *jd, union jr_entry *jr)
          * use first address as sample address
          */
         memset(&sample, 0, sizeof(sample));
+        sample.cpumode = PERF_RECORD_MISC_USER;
         sample.pid  = pid;
         sample.tid  = tid;
         sample.time = id->time;
@@ -505,6 +506,7 @@ static int jit_repipe_code_move(struct jit_buf_desc *jd, union jr_entry *jr)
          * use first address as sample address
          */
         memset(&sample, 0, sizeof(sample));
+        sample.cpumode = PERF_RECORD_MISC_USER;
         sample.pid  = pid;
         sample.tid  = tid;
         sample.time = id->time;
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 20a257a12ea5..acbf7ff2ee6e 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -66,6 +66,8 @@ unsigned int do_slm_cstates;
 unsigned int use_c1_residency_msr;
 unsigned int has_aperf;
 unsigned int has_epb;
+unsigned int do_irtl_snb;
+unsigned int do_irtl_hsw;
 unsigned int units = 1000000;   /* MHz etc */
 unsigned int genuine_intel;
 unsigned int has_invariant_tsc;
@@ -187,7 +189,7 @@ struct pkg_data {
         unsigned long long pkg_any_core_c0;
         unsigned long long pkg_any_gfxe_c0;
         unsigned long long pkg_both_core_gfxe_c0;
-        unsigned long long gfx_rc6_ms;
+        long long gfx_rc6_ms;
         unsigned int gfx_mhz;
         unsigned int package_id;
         unsigned int energy_pkg;        /* MSR_PKG_ENERGY_STATUS */
@@ -621,8 +623,14 @@ int format_counters(struct thread_data *t, struct core_data *c,
                 outp += sprintf(outp, "%8d", p->pkg_temp_c);
 
         /* GFXrc6 */
-        if (do_gfx_rc6_ms)
-                outp += sprintf(outp, "%8.2f", 100.0 * p->gfx_rc6_ms / 1000.0 / interval_float);
+        if (do_gfx_rc6_ms) {
+                if (p->gfx_rc6_ms == -1) {      /* detect counter reset */
+                        outp += sprintf(outp, "  ***.**");
+                } else {
+                        outp += sprintf(outp, "%8.2f",
+                                p->gfx_rc6_ms / 10.0 / interval_float);
+                }
+        }
 
         /* GFXMHz */
         if (do_gfx_mhz)
@@ -766,7 +774,12 @@ delta_package(struct pkg_data *new, struct pkg_data *old)
         old->pc10 = new->pc10 - old->pc10;
         old->pkg_temp_c = new->pkg_temp_c;
 
-        old->gfx_rc6_ms = new->gfx_rc6_ms - old->gfx_rc6_ms;
+        /* flag an error when rc6 counter resets/wraps */
+        if (old->gfx_rc6_ms >  new->gfx_rc6_ms)
+                old->gfx_rc6_ms = -1;
+        else
+                old->gfx_rc6_ms = new->gfx_rc6_ms - old->gfx_rc6_ms;
+
         old->gfx_mhz = new->gfx_mhz;
 
         DELTA_WRAP32(new->energy_pkg, old->energy_pkg);
@@ -1296,6 +1309,7 @@ int hsw_pkg_cstate_limits[16] = {PCL__0, PCL__2, PCL__3, PCL__6, PCL__7, PCL_7S,
 int slv_pkg_cstate_limits[16] = {PCL__0, PCL__1, PCLRSV, PCLRSV, PCL__4, PCLRSV, PCL__6, PCL__7, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV};
 int amt_pkg_cstate_limits[16] = {PCL__0, PCL__1, PCL__2, PCLRSV, PCLRSV, PCLRSV, PCL__6, PCL__7, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV};
 int phi_pkg_cstate_limits[16] = {PCL__0, PCL__2, PCL_6N, PCL_6R, PCLRSV, PCLRSV, PCLRSV, PCLUNL, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV};
+int bxt_pkg_cstate_limits[16] = {PCL__0, PCL__2, PCLUNL, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV};
 
 
 static void
@@ -1579,6 +1593,47 @@ dump_config_tdp(void)
         fprintf(outf, " lock=%d", (unsigned int)(msr >> 31) & 1);
         fprintf(outf, ")\n");
 }
+
+unsigned int irtl_time_units[] = {1, 32, 1024, 32768, 1048576, 33554432, 0, 0 };
+
+void print_irtl(void)
+{
+        unsigned long long msr;
+
+        get_msr(base_cpu, MSR_PKGC3_IRTL, &msr);
+        fprintf(outf, "cpu%d: MSR_PKGC3_IRTL: 0x%08llx (", base_cpu, msr);
+        fprintf(outf, "%svalid, %lld ns)\n", msr & (1 << 15) ? "" : "NOT",
+                (msr & 0x3FF) * irtl_time_units[(msr >> 10) & 0x3]);
+
+        get_msr(base_cpu, MSR_PKGC6_IRTL, &msr);
+        fprintf(outf, "cpu%d: MSR_PKGC6_IRTL: 0x%08llx (", base_cpu, msr);
+        fprintf(outf, "%svalid, %lld ns)\n", msr & (1 << 15) ? "" : "NOT",
+                (msr & 0x3FF) * irtl_time_units[(msr >> 10) & 0x3]);
+
+        get_msr(base_cpu, MSR_PKGC7_IRTL, &msr);
+        fprintf(outf, "cpu%d: MSR_PKGC7_IRTL: 0x%08llx (", base_cpu, msr);
+        fprintf(outf, "%svalid, %lld ns)\n", msr & (1 << 15) ? "" : "NOT",
+                (msr & 0x3FF) * irtl_time_units[(msr >> 10) & 0x3]);
+
+        if (!do_irtl_hsw)
+                return;
+
+        get_msr(base_cpu, MSR_PKGC8_IRTL, &msr);
+        fprintf(outf, "cpu%d: MSR_PKGC8_IRTL: 0x%08llx (", base_cpu, msr);
+        fprintf(outf, "%svalid, %lld ns)\n", msr & (1 << 15) ? "" : "NOT",
+                (msr & 0x3FF) * irtl_time_units[(msr >> 10) & 0x3]);
+
+        get_msr(base_cpu, MSR_PKGC9_IRTL, &msr);
+        fprintf(outf, "cpu%d: MSR_PKGC9_IRTL: 0x%08llx (", base_cpu, msr);
+        fprintf(outf, "%svalid, %lld ns)\n", msr & (1 << 15) ? "" : "NOT",
+                (msr & 0x3FF) * irtl_time_units[(msr >> 10) & 0x3]);
+
+        get_msr(base_cpu, MSR_PKGC10_IRTL, &msr);
+        fprintf(outf, "cpu%d: MSR_PKGC10_IRTL: 0x%08llx (", base_cpu, msr);
+        fprintf(outf, "%svalid, %lld ns)\n", msr & (1 << 15) ? "" : "NOT",
+                (msr & 0x3FF) * irtl_time_units[(msr >> 10) & 0x3]);
+
+}
 void free_fd_percpu(void)
 {
         int i;
@@ -2144,6 +2199,9 @@ int probe_nhm_msrs(unsigned int family, unsigned int model)
         case 0x56:      /* BDX-DE */
         case 0x4E:      /* SKL */
         case 0x5E:      /* SKL */
+        case 0x8E:      /* KBL */
+        case 0x9E:      /* KBL */
+        case 0x55:      /* SKX */
                 pkg_cstate_limits = hsw_pkg_cstate_limits;
                 break;
         case 0x37:      /* BYT */
@@ -2156,6 +2214,9 @@ int probe_nhm_msrs(unsigned int family, unsigned int model)
         case 0x57:      /* PHI */
                 pkg_cstate_limits = phi_pkg_cstate_limits;
                 break;
+        case 0x5C:      /* BXT */
+                pkg_cstate_limits = bxt_pkg_cstate_limits;
+                break;
         default:
                 return 0;
         }
@@ -2248,6 +2309,9 @@ int has_config_tdp(unsigned int family, unsigned int model)
         case 0x56:      /* BDX-DE */
         case 0x4E:      /* SKL */
         case 0x5E:      /* SKL */
+        case 0x8E:      /* KBL */
+        case 0x9E:      /* KBL */
+        case 0x55:      /* SKX */
 
         case 0x57:      /* Knights Landing */
                 return 1;
@@ -2585,13 +2649,19 @@ void rapl_probe(unsigned int family, unsigned int model)
         case 0x47:      /* BDW */
                 do_rapl = RAPL_PKG | RAPL_CORES | RAPL_CORE_POLICY | RAPL_GFX | RAPL_PKG_POWER_INFO;
                 break;
+        case 0x5C:      /* BXT */
+                do_rapl = RAPL_PKG | RAPL_PKG_POWER_INFO;
+                break;
         case 0x4E:      /* SKL */
         case 0x5E:      /* SKL */
+        case 0x8E:      /* KBL */
+        case 0x9E:      /* KBL */
                 do_rapl = RAPL_PKG | RAPL_DRAM | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_PKG_POWER_INFO;
                 break;
         case 0x3F:      /* HSX */
         case 0x4F:      /* BDX */
         case 0x56:      /* BDX-DE */
+        case 0x55:      /* SKX */
         case 0x57:      /* KNL */
                 do_rapl = RAPL_PKG | RAPL_DRAM | RAPL_DRAM_POWER_INFO | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_PKG_POWER_INFO;
                 break;
@@ -2871,6 +2941,10 @@ int has_snb_msrs(unsigned int family, unsigned int model)
         case 0x56:      /* BDX-DE */
         case 0x4E:      /* SKL */
         case 0x5E:      /* SKL */
+        case 0x8E:      /* KBL */
+        case 0x9E:      /* KBL */
+        case 0x55:      /* SKX */
+        case 0x5C:      /* BXT */
                 return 1;
         }
         return 0;
@@ -2879,9 +2953,14 @@ int has_snb_msrs(unsigned int family, unsigned int model)
 /*
  * HSW adds support for additional MSRs:
  *
- * MSR_PKG_C8_RESIDENCY            0x00000630
- * MSR_PKG_C9_RESIDENCY            0x00000631
- * MSR_PKG_C10_RESIDENCY           0x00000632
+ * MSR_PKG_C8_RESIDENCY         0x00000630
+ * MSR_PKG_C9_RESIDENCY         0x00000631
+ * MSR_PKG_C10_RESIDENCY        0x00000632
+ *
+ * MSR_PKGC8_IRTL               0x00000633
+ * MSR_PKGC9_IRTL               0x00000634
+ * MSR_PKGC10_IRTL              0x00000635
+ *
  */
 int has_hsw_msrs(unsigned int family, unsigned int model)
 {
@@ -2893,6 +2972,9 @@ int has_hsw_msrs(unsigned int family, unsigned int model)
         case 0x3D:      /* BDW */
         case 0x4E:      /* SKL */
         case 0x5E:      /* SKL */
+        case 0x8E:      /* KBL */
+        case 0x9E:      /* KBL */
+        case 0x5C:      /* BXT */
                 return 1;
         }
         return 0;
@@ -2914,6 +2996,8 @@ int has_skl_msrs(unsigned int family, unsigned int model)
         switch (model) {
         case 0x4E:      /* SKL */
         case 0x5E:      /* SKL */
+        case 0x8E:      /* KBL */
+        case 0x9E:      /* KBL */
                 return 1;
         }
         return 0;
@@ -3187,7 +3271,7 @@ void process_cpuid()
         if (debug)
                 decode_misc_enable_msr();
 
-        if (max_level >= 0x7) {
+        if (max_level >= 0x7 && debug) {
                 int has_sgx;
 
                 ecx = 0;
@@ -3221,7 +3305,15 @@ void process_cpuid()
                                 switch(model) {
                                 case 0x4E:      /* SKL */
                                 case 0x5E:      /* SKL */
-                                        crystal_hz = 24000000;  /* 24 MHz */
+                                case 0x8E:      /* KBL */
+                                case 0x9E:      /* KBL */
+                                        crystal_hz = 24000000;  /* 24.0 MHz */
+                                        break;
+                                case 0x55:      /* SKX */
+                                        crystal_hz = 25000000;  /* 25.0 MHz */
+                                        break;
+                                case 0x5C:      /* BXT */
+                                        crystal_hz = 19200000;  /* 19.2 MHz */
                                         break;
                                 default:
                                         crystal_hz = 0;
@@ -3254,11 +3346,13 @@ void process_cpuid()
 
         do_nhm_platform_info = do_nhm_cstates = do_smi = probe_nhm_msrs(family, model);
         do_snb_cstates = has_snb_msrs(family, model);
+        do_irtl_snb = has_snb_msrs(family, model);
         do_pc2 = do_snb_cstates && (pkg_cstate_limit >= PCL__2);
         do_pc3 = (pkg_cstate_limit >= PCL__3);
         do_pc6 = (pkg_cstate_limit >= PCL__6);
         do_pc7 = do_snb_cstates && (pkg_cstate_limit >= PCL__7);
         do_c8_c9_c10 = has_hsw_msrs(family, model);
+        do_irtl_hsw = has_hsw_msrs(family, model);
         do_skl_residency = has_skl_msrs(family, model);
         do_slm_cstates = is_slm(family, model);
         do_knl_cstates  = is_knl(family, model);
@@ -3564,6 +3658,9 @@ void turbostat_init()
 
         if (debug)
                 for_all_cpus(print_thermal, ODD_COUNTERS);
+
+        if (debug && do_irtl_snb)
+                print_irtl();
 }
 
 int fork_it(char **argv)
@@ -3629,7 +3726,7 @@ int get_and_dump_counters(void)
 }
 
 void print_version() {
-        fprintf(outf, "turbostat version 4.11 27 Feb 2016"
+        fprintf(outf, "turbostat version 4.12 5 Apr 2016"
                 " - Len Brown <lenb@kernel.org>\n");
 }
 
diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c
index b9453b838162..150829dd7998 100644
--- a/tools/testing/selftests/seccomp/seccomp_bpf.c
+++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
@@ -1497,15 +1497,15 @@ TEST_F(TRACE_syscall, syscall_dropped)
 #define SECCOMP_SET_MODE_FILTER 1
 #endif
 
-#ifndef SECCOMP_FLAG_FILTER_TSYNC
-#define SECCOMP_FLAG_FILTER_TSYNC 1
+#ifndef SECCOMP_FILTER_FLAG_TSYNC
+#define SECCOMP_FILTER_FLAG_TSYNC 1
 #endif
 
 #ifndef seccomp
-int seccomp(unsigned int op, unsigned int flags, struct sock_fprog *filter)
+int seccomp(unsigned int op, unsigned int flags, void *args)
 {
         errno = 0;
-        return syscall(__NR_seccomp, op, flags, filter);
+        return syscall(__NR_seccomp, op, flags, args);
 }
 #endif
 
@@ -1613,7 +1613,7 @@ TEST(TSYNC_first)
                 TH_LOG("Kernel does not support PR_SET_NO_NEW_PRIVS!");
         }
 
-        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FLAG_FILTER_TSYNC,
+        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FILTER_FLAG_TSYNC,
                       &prog);
         ASSERT_NE(ENOSYS, errno) {
                 TH_LOG("Kernel does not support seccomp syscall!");
@@ -1831,7 +1831,7 @@ TEST_F(TSYNC, two_siblings_with_ancestor)
                 self->sibling_count++;
         }
 
-        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FLAG_FILTER_TSYNC,
+        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FILTER_FLAG_TSYNC,
                       &self->apply_prog);
         ASSERT_EQ(0, ret) {
                 TH_LOG("Could install filter on all threads!");
@@ -1892,7 +1892,7 @@ TEST_F(TSYNC, two_siblings_with_no_filter)
                 TH_LOG("Kernel does not support PR_SET_NO_NEW_PRIVS!");
         }
 
-        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FLAG_FILTER_TSYNC,
+        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FILTER_FLAG_TSYNC,
                       &self->apply_prog);
         ASSERT_NE(ENOSYS, errno) {
                 TH_LOG("Kernel does not support seccomp syscall!");
@@ -1940,7 +1940,7 @@ TEST_F(TSYNC, two_siblings_with_one_divergence)
                 self->sibling_count++;
         }
 
-        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FLAG_FILTER_TSYNC,
+        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FILTER_FLAG_TSYNC,
                       &self->apply_prog);
         ASSERT_EQ(self->sibling[0].system_tid, ret) {
                 TH_LOG("Did not fail on diverged sibling.");
@@ -1992,7 +1992,7 @@ TEST_F(TSYNC, two_siblings_not_under_filter)
                 TH_LOG("Kernel does not support SECCOMP_SET_MODE_FILTER!");
         }
 
-        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FLAG_FILTER_TSYNC,
+        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FILTER_FLAG_TSYNC,
                       &self->apply_prog);
         ASSERT_EQ(ret, self->sibling[0].system_tid) {
                 TH_LOG("Did not fail on diverged sibling.");
@@ -2021,7 +2021,7 @@ TEST_F(TSYNC, two_siblings_not_under_filter)
         /* Switch to the remaining sibling */
         sib = !sib;
 
-        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FLAG_FILTER_TSYNC,
+        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FILTER_FLAG_TSYNC,
                       &self->apply_prog);
         ASSERT_EQ(0, ret) {
                 TH_LOG("Expected the remaining sibling to sync");
@@ -2044,7 +2044,7 @@ TEST_F(TSYNC, two_siblings_not_under_filter)
         while (!kill(self->sibling[sib].system_tid, 0))
                 sleep(0.1);
 
-        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FLAG_FILTER_TSYNC,
+        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FILTER_FLAG_TSYNC,
                       &self->apply_prog);
         ASSERT_EQ(0, ret);  /* just us chickens */
 }