45 files changed, 778 insertions, 2379 deletions
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h
index 5c823d5ab783..d814da4b5365 100644
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
@@ -85,7 +85,8 @@
 #define ACPI_LV_INIT                0x00000001
 #define ACPI_LV_DEBUG_OBJECT        0x00000002
 #define ACPI_LV_INFO                0x00000004
-#define ACPI_LV_ALL_EXCEPTIONS      0x00000007
+#define ACPI_LV_REPAIR              0x00000008
+#define ACPI_LV_ALL_EXCEPTIONS      0x0000000F
 /* Trace verbosity level 1 [Standard Trace Level] */
@@ -143,6 +144,7 @@
 #define ACPI_DB_INIT                ACPI_DEBUG_LEVEL (ACPI_LV_INIT)
 #define ACPI_DB_DEBUG_OBJECT        ACPI_DEBUG_LEVEL (ACPI_LV_DEBUG_OBJECT)
 #define ACPI_DB_INFO                ACPI_DEBUG_LEVEL (ACPI_LV_INFO)
+#define ACPI_DB_REPAIR              ACPI_DEBUG_LEVEL (ACPI_LV_REPAIR)
 #define ACPI_DB_ALL_EXCEPTIONS      ACPI_DEBUG_LEVEL (ACPI_LV_ALL_EXCEPTIONS)
 /* Trace level -- also used in the global "DebugLevel" */
@@ -174,8 +176,8 @@
 /* Defaults for debug_level, debug and normal */
-#define ACPI_DEBUG_DEFAULT          (ACPI_LV_INFO)
+#define ACPI_DEBUG_DEFAULT          (ACPI_LV_INFO | ACPI_LV_REPAIR)
-#define ACPI_NORMAL_DEFAULT         (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT)
+#define ACPI_NORMAL_DEFAULT         (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT | ACPI_LV_REPAIR)
 #define ACPI_DEBUG_ALL              (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL)
 #if defined (ACPI_DEBUG_OUTPUT) || !defined (ACPI_NO_ERROR_MESSAGES)
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 5e1ad3cd1bbd..86e9735a96bd 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -47,7 +47,7 @@
 /* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION                 0x20091112
+#define ACPI_CA_VERSION                 0x20091214
 #include "actypes.h"
 #include "actbl.h"
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 8b668ead6d6e..29245c6b5c0e 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -294,7 +294,7 @@ static inline void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx
 #ifdef CONFIG_CPU_FREQ
 void acpi_processor_ppc_init(void);
 void acpi_processor_ppc_exit(void);
-int acpi_processor_ppc_has_changed(struct acpi_processor *pr);
+int acpi_processor_ppc_has_changed(struct acpi_processor *pr, int event_flag);
 extern int acpi_processor_get_bios_limit(int cpu, unsigned int *limit);
 #else
 static inline void acpi_processor_ppc_init(void)
@@ -305,7 +305,8 @@ static inline void acpi_processor_ppc_exit(void)
 {
        return;
 }
-static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr)
+static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr,
+                                                                int event_flag)
 {
        static unsigned int printout = 1;
        if (printout) {
diff --git a/include/asm-generic/mman-common.h b/include/asm-generic/mman-common.h
index 20111265afd8..3da9e2742fa0 100644
--- a/include/asm-generic/mman-common.h
+++ b/include/asm-generic/mman-common.h
@@ -40,6 +40,7 @@
 #define MADV_DONTFORK   10              /* don't inherit across fork */
 #define MADV_DOFORK     11              /* do inherit across fork */
 #define MADV_HWPOISON   100             /* poison a page for testing */
+#define MADV_SOFT_OFFLINE 101           /* soft offline page for testing */
 #define MADV_MERGEABLE   12             /* KSM may merge identical pages */
 #define MADV_UNMERGEABLE 13             /* KSM may not merge identical pages */
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index b6e818f4b247..67e652068e0e 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -52,8 +52,12 @@
 #define LOAD_OFFSET 0
 #endif
-#ifndef VMLINUX_SYMBOL
+#ifndef SYMBOL_PREFIX
-#define VMLINUX_SYMBOL(_sym_) _sym_
+#define VMLINUX_SYMBOL(sym) sym
+#else
+#define PASTE2(x,y) x##y
+#define PASTE(x,y) PASTE2(x,y)
+#define VMLINUX_SYMBOL(sym) PASTE(SYMBOL_PREFIX, sym)
 #endif
 /* Align . to a 8 byte boundary equals to maximum function alignment. */
diff --git a/include/drm/Kbuild b/include/drm/Kbuild
index cfa6af43c9ea..bd3a1c2fbdb4 100644
--- a/include/drm/Kbuild
+++ b/include/drm/Kbuild
@@ -7,5 +7,6 @@ unifdef-y += r128_drm.h
 unifdef-y += radeon_drm.h
 unifdef-y += sis_drm.h
 unifdef-y += savage_drm.h
+unifdef-y += vmwgfx_drm.h
 unifdef-y += via_drm.h
 unifdef-y += nouveau_drm.h
diff --git a/include/drm/ttm/ttm_object.h b/include/drm/ttm/ttm_object.h
index 703ca4db0a29..0d9db099978b 100644
--- a/include/drm/ttm/ttm_object.h
+++ b/include/drm/ttm/ttm_object.h
@@ -77,7 +77,11 @@ enum ttm_object_type {
        ttm_buffer_type,
        ttm_lock_type,
        ttm_driver_type0 = 256,
-        ttm_driver_type1
+        ttm_driver_type1,
+        ttm_driver_type2,
+        ttm_driver_type3,
+        ttm_driver_type4,
+        ttm_driver_type5
 };
 struct ttm_object_file;
diff --git a/include/drm/vmwgfx_drm.h b/include/drm/vmwgfx_drm.h
new file mode 100644
index 000000000000..2be7e1249b6f
--- /dev/null
+++ b/include/drm/vmwgfx_drm.h
@@ -0,0 +1,574 @@
+/**************************************************************************
+ *
+ * Copyright © 2009 VMware, Inc., Palo Alto, CA., USA
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+#ifndef __VMWGFX_DRM_H__
+#define __VMWGFX_DRM_H__
+#define DRM_VMW_MAX_SURFACE_FACES 6
+#define DRM_VMW_MAX_MIP_LEVELS 24
+#define DRM_VMW_EXT_NAME_LEN 128
+#define DRM_VMW_GET_PARAM            0
+#define DRM_VMW_ALLOC_DMABUF         1
+#define DRM_VMW_UNREF_DMABUF         2
+#define DRM_VMW_CURSOR_BYPASS        3
+/* guarded by DRM_VMW_PARAM_NUM_STREAMS != 0*/
+#define DRM_VMW_CONTROL_STREAM       4
+#define DRM_VMW_CLAIM_STREAM         5
+#define DRM_VMW_UNREF_STREAM         6
+/* guarded by DRM_VMW_PARAM_3D == 1 */
+#define DRM_VMW_CREATE_CONTEXT       7
+#define DRM_VMW_UNREF_CONTEXT        8
+#define DRM_VMW_CREATE_SURFACE       9
+#define DRM_VMW_UNREF_SURFACE        10
+#define DRM_VMW_REF_SURFACE          11
+#define DRM_VMW_EXECBUF              12
+#define DRM_VMW_FIFO_DEBUG           13
+#define DRM_VMW_FENCE_WAIT           14
+/*************************************************************************/
+/**
+ * DRM_VMW_GET_PARAM - get device information.
+ *
+ * DRM_VMW_PARAM_FIFO_OFFSET:
+ * Offset to use to map the first page of the FIFO read-only.
+ * The fifo is mapped using the mmap() system call on the drm device.
+ *
+ * DRM_VMW_PARAM_OVERLAY_IOCTL:
+ * Does the driver support the overlay ioctl.
+ */
+#define DRM_VMW_PARAM_NUM_STREAMS      0
+#define DRM_VMW_PARAM_NUM_FREE_STREAMS 1
+#define DRM_VMW_PARAM_3D               2
+#define DRM_VMW_PARAM_FIFO_OFFSET      3
+/**
+ * struct drm_vmw_getparam_arg
+ *
+ * @value: Returned value. //Out
+ * @param: Parameter to query. //In.
+ *
+ * Argument to the DRM_VMW_GET_PARAM Ioctl.
+ */
+struct drm_vmw_getparam_arg {
+        uint64_t value;
+        uint32_t param;
+        uint32_t pad64;
+};
+/*************************************************************************/
+/**
+ * DRM_VMW_EXTENSION - Query device extensions.
+ */
+/**
+ * struct drm_vmw_extension_rep
+ *
+ * @exists: The queried extension exists.
+ * @driver_ioctl_offset: Ioctl number of the first ioctl in the extension.
+ * @driver_sarea_offset: Offset to any space in the DRI SAREA
+ * used by the extension.
+ * @major: Major version number of the extension.
+ * @minor: Minor version number of the extension.
+ * @pl: Patch level version number of the extension.
+ *
+ * Output argument to the DRM_VMW_EXTENSION Ioctl.
+ */
+struct drm_vmw_extension_rep {
+        int32_t exists;
+        uint32_t driver_ioctl_offset;
+        uint32_t driver_sarea_offset;
+        uint32_t major;
+        uint32_t minor;
+        uint32_t pl;
+        uint32_t pad64;
+};
+/**
+ * union drm_vmw_extension_arg
+ *
+ * @extension - Ascii name of the extension to be queried. //In
+ * @rep - Reply as defined above. //Out
+ *
+ * Argument to the DRM_VMW_EXTENSION Ioctl.
+ */
+union drm_vmw_extension_arg {
+        char extension[DRM_VMW_EXT_NAME_LEN];
+        struct drm_vmw_extension_rep rep;
+};
+/*************************************************************************/
+/**
+ * DRM_VMW_CREATE_CONTEXT - Create a host context.
+ *
+ * Allocates a device unique context id, and queues a create context command
+ * for the host. Does not wait for host completion.
+ */
+/**
+ * struct drm_vmw_context_arg
+ *
+ * @cid: Device unique context ID.
+ *
+ * Output argument to the DRM_VMW_CREATE_CONTEXT Ioctl.
+ * Input argument to the DRM_VMW_UNREF_CONTEXT Ioctl.
+ */
+struct drm_vmw_context_arg {
+        int32_t cid;
+        uint32_t pad64;
+};
+/*************************************************************************/
+/**
+ * DRM_VMW_UNREF_CONTEXT - Create a host context.
+ *
+ * Frees a global context id, and queues a destroy host command for the host.
+ * Does not wait for host completion. The context ID can be used directly
+ * in the command stream and shows up as the same context ID on the host.
+ */
+/*************************************************************************/
+/**
+ * DRM_VMW_CREATE_SURFACE - Create a host suface.
+ *
+ * Allocates a device unique surface id, and queues a create surface command
+ * for the host. Does not wait for host completion. The surface ID can be
+ * used directly in the command stream and shows up as the same surface
+ * ID on the host.
+ */
+/**
+ * struct drm_wmv_surface_create_req
+ *
+ * @flags: Surface flags as understood by the host.
+ * @format: Surface format as understood by the host.
+ * @mip_levels: Number of mip levels for each face.
+ * An unused face should have 0 encoded.
+ * @size_addr: Address of a user-space array of sruct drm_vmw_size
+ * cast to an uint64_t for 32-64 bit compatibility.
+ * The size of the array should equal the total number of mipmap levels.
+ * @shareable: Boolean whether other clients (as identified by file descriptors)
+ * may reference this surface.
+ *
+ * Input data to the DRM_VMW_CREATE_SURFACE Ioctl.
+ * Output data from the DRM_VMW_REF_SURFACE Ioctl.
+ */
+struct drm_vmw_surface_create_req {
+        uint32_t flags;
+        uint32_t format;
+        uint32_t mip_levels[DRM_VMW_MAX_SURFACE_FACES];
+        uint64_t size_addr;
+        int32_t shareable;
+        uint32_t pad64;
+};
+/**
+ * struct drm_wmv_surface_arg
+ *
+ * @sid: Surface id of created surface or surface to destroy or reference.
+ *
+ * Output data from the DRM_VMW_CREATE_SURFACE Ioctl.
+ * Input argument to the DRM_VMW_UNREF_SURFACE Ioctl.
+ * Input argument to the DRM_VMW_REF_SURFACE Ioctl.
+ */
+struct drm_vmw_surface_arg {
+        int32_t sid;
+        uint32_t pad64;
+};
+/**
+ * struct drm_vmw_size ioctl.
+ *
+ * @width - mip level width
+ * @height - mip level height
+ * @depth - mip level depth
+ *
+ * Description of a mip level.
+ * Input data to the DRM_WMW_CREATE_SURFACE Ioctl.
+ */
+struct drm_vmw_size {
+        uint32_t width;
+        uint32_t height;
+        uint32_t depth;
+        uint32_t pad64;
+};
+/**
+ * union drm_vmw_surface_create_arg
+ *
+ * @rep: Output data as described above.
+ * @req: Input data as described above.
+ *
+ * Argument to the DRM_VMW_CREATE_SURFACE Ioctl.
+ */
+union drm_vmw_surface_create_arg {
+        struct drm_vmw_surface_arg rep;
+        struct drm_vmw_surface_create_req req;
+};
+/*************************************************************************/
+/**
+ * DRM_VMW_REF_SURFACE - Reference a host surface.
+ *
+ * Puts a reference on a host surface with a give sid, as previously
+ * returned by the DRM_VMW_CREATE_SURFACE ioctl.
+ * A reference will make sure the surface isn't destroyed while we hold
+ * it and will allow the calling client to use the surface ID in the command
+ * stream.
+ *
+ * On successful return, the Ioctl returns the surface information given
+ * in the DRM_VMW_CREATE_SURFACE ioctl.
+ */
+/**
+ * union drm_vmw_surface_reference_arg
+ *
+ * @rep: Output data as described above.
+ * @req: Input data as described above.
+ *
+ * Argument to the DRM_VMW_REF_SURFACE Ioctl.
+ */
+union drm_vmw_surface_reference_arg {
+        struct drm_vmw_surface_create_req rep;
+        struct drm_vmw_surface_arg req;
+};
+/*************************************************************************/
+/**
+ * DRM_VMW_UNREF_SURFACE - Unreference a host surface.
+ *
+ * Clear a reference previously put on a host surface.
+ * When all references are gone, including the one implicitly placed
+ * on creation,
+ * a destroy surface command will be queued for the host.
+ * Does not wait for completion.
+ */
+/*************************************************************************/
+/**
+ * DRM_VMW_EXECBUF
+ *
+ * Submit a command buffer for execution on the host, and return a
+ * fence sequence that when signaled, indicates that the command buffer has
+ * executed.
+ */
+/**
+ * struct drm_vmw_execbuf_arg
+ *
+ * @commands: User-space address of a command buffer cast to an uint64_t.
+ * @command-size: Size in bytes of the command buffer.
+ * @fence_rep: User-space address of a struct drm_vmw_fence_rep cast to an
+ * uint64_t.
+ *
+ * Argument to the DRM_VMW_EXECBUF Ioctl.
+ */
+struct drm_vmw_execbuf_arg {
+        uint64_t commands;
+        uint32_t command_size;
+        uint32_t pad64;
+        uint64_t fence_rep;
+};
+/**
+ * struct drm_vmw_fence_rep
+ *
+ * @fence_seq: Fence sequence associated with a command submission.
+ * @error: This member should've been set to -EFAULT on submission.
+ * The following actions should be take on completion:
+ * error == -EFAULT: Fence communication failed. The host is synchronized.
+ * Use the last fence id read from the FIFO fence register.
+ * error != 0 && error != -EFAULT:
+ * Fence submission failed. The host is synchronized. Use the fence_seq member.
+ * error == 0: All is OK, The host may not be synchronized.
+ * Use the fence_seq member.
+ *
+ * Input / Output data to the DRM_VMW_EXECBUF Ioctl.
+ */
+struct drm_vmw_fence_rep {
+        uint64_t fence_seq;
+        int32_t error;
+        uint32_t pad64;
+};
+/*************************************************************************/
+/**
+ * DRM_VMW_ALLOC_DMABUF
+ *
+ * Allocate a DMA buffer that is visible also to the host.
+ * NOTE: The buffer is
+ * identified by a handle and an offset, which are private to the guest, but
+ * useable in the command stream. The guest kernel may translate these
+ * and patch up the command stream accordingly. In the future, the offset may
+ * be zero at all times, or it may disappear from the interface before it is
+ * fixed.
+ *
+ * The DMA buffer may stay user-space mapped in the guest at all times,
+ * and is thus suitable for sub-allocation.
+ *
+ * DMA buffers are mapped using the mmap() syscall on the drm device.
+ */
+/**
+ * struct drm_vmw_alloc_dmabuf_req
+ *
+ * @size: Required minimum size of the buffer.
+ *
+ * Input data to the DRM_VMW_ALLOC_DMABUF Ioctl.
+ */
+struct drm_vmw_alloc_dmabuf_req {
+        uint32_t size;
+        uint32_t pad64;
+};
+/**
+ * struct drm_vmw_dmabuf_rep
+ *
+ * @map_handle: Offset to use in the mmap() call used to map the buffer.
+ * @handle: Handle unique to this buffer. Used for unreferencing.
+ * @cur_gmr_id: GMR id to use in the command stream when this buffer is
+ * referenced. See not above.
+ * @cur_gmr_offset: Offset to use in the command stream when this buffer is
+ * referenced. See note above.
+ *
+ * Output data from the DRM_VMW_ALLOC_DMABUF Ioctl.
+ */
+struct drm_vmw_dmabuf_rep {
+        uint64_t map_handle;
+        uint32_t handle;
+        uint32_t cur_gmr_id;
+        uint32_t cur_gmr_offset;
+        uint32_t pad64;
+};
+/**
+ * union drm_vmw_dmabuf_arg
+ *
+ * @req: Input data as described above.
+ * @rep: Output data as described above.
+ *
+ * Argument to the DRM_VMW_ALLOC_DMABUF Ioctl.
+ */
+union drm_vmw_alloc_dmabuf_arg {
+        struct drm_vmw_alloc_dmabuf_req req;
+        struct drm_vmw_dmabuf_rep rep;
+};
+/*************************************************************************/
+/**
+ * DRM_VMW_UNREF_DMABUF - Free a DMA buffer.
+ *
+ */
+/**
+ * struct drm_vmw_unref_dmabuf_arg
+ *
+ * @handle: Handle indicating what buffer to free. Obtained from the
+ * DRM_VMW_ALLOC_DMABUF Ioctl.
+ *
+ * Argument to the DRM_VMW_UNREF_DMABUF Ioctl.
+ */
+struct drm_vmw_unref_dmabuf_arg {
+        uint32_t handle;
+        uint32_t pad64;
+};
+/*************************************************************************/
+/**
+ * DRM_VMW_FIFO_DEBUG - Get last FIFO submission.
+ *
+ * This IOCTL copies the last FIFO submission directly out of the FIFO buffer.
+ */
+/**
+ * struct drm_vmw_fifo_debug_arg
+ *
+ * @debug_buffer: User space address of a debug_buffer cast to an uint64_t //In
+ * @debug_buffer_size: Size in bytes of debug buffer //In
+ * @used_size: Number of bytes copied to the buffer // Out
+ * @did_not_fit: Boolean indicating that the fifo contents did not fit. //Out
+ *
+ * Argument to the DRM_VMW_FIFO_DEBUG Ioctl.
+ */
+struct drm_vmw_fifo_debug_arg {
+        uint64_t debug_buffer;
+        uint32_t debug_buffer_size;
+        uint32_t used_size;
+        int32_t did_not_fit;
+        uint32_t pad64;
+};
+struct drm_vmw_fence_wait_arg {
+        uint64_t sequence;
+        uint64_t kernel_cookie;
+        int32_t cookie_valid;
+        int32_t pad64;
+};
+/*************************************************************************/
+/**
+ * DRM_VMW_CONTROL_STREAM - Control overlays, aka streams.
+ *
+ * This IOCTL controls the overlay units of the svga device.
+ * The SVGA overlay units does not work like regular hardware units in
+ * that they do not automaticaly read back the contents of the given dma
+ * buffer. But instead only read back for each call to this ioctl, and
+ * at any point between this call being made and a following call that
+ * either changes the buffer or disables the stream.
+ */
+/**
+ * struct drm_vmw_rect
+ *
+ * Defines a rectangle. Used in the overlay ioctl to define
+ * source and destination rectangle.
+ */
+struct drm_vmw_rect {
+        int32_t x;
+        int32_t y;
+        uint32_t w;
+        uint32_t h;
+};
+/**
+ * struct drm_vmw_control_stream_arg
+ *
+ * @stream_id: Stearm to control
+ * @enabled: If false all following arguments are ignored.
+ * @handle: Handle to buffer for getting data from.
+ * @format: Format of the overlay as understood by the host.
+ * @width: Width of the overlay.
+ * @height: Height of the overlay.
+ * @size: Size of the overlay in bytes.
+ * @pitch: Array of pitches, the two last are only used for YUV12 formats.
+ * @offset: Offset from start of dma buffer to overlay.
+ * @src: Source rect, must be within the defined area above.
+ * @dst: Destination rect, x and y may be negative.
+ *
+ * Argument to the DRM_VMW_CONTROL_STREAM Ioctl.
+ */
+struct drm_vmw_control_stream_arg {
+        uint32_t stream_id;
+        uint32_t enabled;
+        uint32_t flags;
+        uint32_t color_key;
+        uint32_t handle;
+        uint32_t offset;
+        int32_t format;
+        uint32_t size;
+        uint32_t width;
+        uint32_t height;
+        uint32_t pitch[3];
+        uint32_t pad64;
+        struct drm_vmw_rect src;
+        struct drm_vmw_rect dst;
+};
+/*************************************************************************/
+/**
+ * DRM_VMW_CURSOR_BYPASS - Give extra information about cursor bypass.
+ *
+ */
+#define DRM_VMW_CURSOR_BYPASS_ALL    (1 << 0)
+#define DRM_VMW_CURSOR_BYPASS_FLAGS       (1)
+/**
+ * struct drm_vmw_cursor_bypass_arg
+ *
+ * @flags: Flags.
+ * @crtc_id: Crtc id, only used if DMR_CURSOR_BYPASS_ALL isn't passed.
+ * @xpos: X position of cursor.
+ * @ypos: Y position of cursor.
+ * @xhot: X hotspot.
+ * @yhot: Y hotspot.
+ *
+ * Argument to the DRM_VMW_CURSOR_BYPASS Ioctl.
+ */
+struct drm_vmw_cursor_bypass_arg {
+        uint32_t flags;
+        uint32_t crtc_id;
+        int32_t xpos;
+        int32_t ypos;
+        int32_t xhot;
+        int32_t yhot;
+};
+/*************************************************************************/
+/**
+ * DRM_VMW_CLAIM_STREAM - Claim a single stream.
+ */
+/**
+ * struct drm_vmw_context_arg
+ *
+ * @stream_id: Device unique context ID.
+ *
+ * Output argument to the DRM_VMW_CREATE_CONTEXT Ioctl.
+ * Input argument to the DRM_VMW_UNREF_CONTEXT Ioctl.
+ */
+struct drm_vmw_stream_arg {
+        uint32_t stream_id;
+        uint32_t pad64;
+};
+/*************************************************************************/
+/**
+ * DRM_VMW_UNREF_STREAM - Unclaim a stream.
+ *
+ * Return a single stream that was claimed by this process. Also makes
+ * sure that the stream has been stopped.
+ */
+#endif
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index dfcd920c3e54..ce945d4845fc 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -240,7 +240,7 @@ extern int pnpacpi_disabled;
 #define PXM_INVAL       (-1)
 #define NID_INVAL       (-1)
-int acpi_check_resource_conflict(struct resource *res);
+int acpi_check_resource_conflict(const struct resource *res);
 int acpi_check_region(resource_size_t start, resource_size_t n,
                      const char *name);
@@ -253,10 +253,16 @@ void __init acpi_old_suspend_ordering(void);
 void __init acpi_s4_no_nvs(void);
 #endif /* CONFIG_PM_SLEEP */
+struct acpi_osc_context {
+        char *uuid_str; /* uuid string */
+        int rev;
+        struct acpi_buffer cap; /* arg2/arg3 */
+        struct acpi_buffer ret; /* free by caller if success */
+};
 #define OSC_QUERY_TYPE                  0
 #define OSC_SUPPORT_TYPE                1
 #define OSC_CONTROL_TYPE                2
-#define OSC_SUPPORT_MASKS               0x1f
 /* _OSC DW0 Definition */
 #define OSC_QUERY_ENABLE                1
@@ -265,12 +271,23 @@ void __init acpi_s4_no_nvs(void);
 #define OSC_INVALID_REVISION_ERROR      8
 #define OSC_CAPABILITIES_MASK_ERROR     16
+acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);
+/* platform-wide _OSC bits */
+#define OSC_SB_PAD_SUPPORT              1
+#define OSC_SB_PPC_OST_SUPPORT          2
+#define OSC_SB_PR3_SUPPORT              4
+#define OSC_SB_CPUHP_OST_SUPPORT        8
+#define OSC_SB_APEI_SUPPORT             16
+/* PCI defined _OSC bits */
 /* _OSC DW1 Definition (OS Support Fields) */
 #define OSC_EXT_PCI_CONFIG_SUPPORT              1
 #define OSC_ACTIVE_STATE_PWR_SUPPORT            2
 #define OSC_CLOCK_PWR_CAPABILITY_SUPPORT        4
 #define OSC_PCI_SEGMENT_GROUPS_SUPPORT          8
 #define OSC_MSI_SUPPORT                         16
+#define OSC_PCI_SUPPORT_MASKS                   0x1f
 /* _OSC DW1 Definition (OS Control Fields) */
 #define OSC_PCI_EXPRESS_NATIVE_HP_CONTROL       1
@@ -279,7 +296,7 @@ void __init acpi_s4_no_nvs(void);
 #define OSC_PCI_EXPRESS_AER_CONTROL             8
 #define OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL   16
-#define OSC_CONTROL_MASKS       (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL |    \
+#define OSC_PCI_CONTROL_MASKS   (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL |    \
                                OSC_SHPC_NATIVE_HP_CONTROL |            \
                                OSC_PCI_EXPRESS_PME_CONTROL |           \
                                OSC_PCI_EXPRESS_AER_CONTROL |           \
diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h
index 27e772cefb6a..dc12f416a49f 100644
--- a/include/linux/exportfs.h
+++ b/include/linux/exportfs.h
@@ -97,7 +97,7 @@ struct fid {
 * @get_name:       find the name for a given inode in a given directory
 * @get_parent:     find the parent of a given directory
 *
- * See Documentation/filesystems/Exporting for details on how to use
+ * See Documentation/filesystems/nfs/Exporting for details on how to use
 * this interface correctly.
 *
 * encode_fh:
diff --git a/include/linux/file.h b/include/linux/file.h
index 335a0a5c316e..5555508fd517 100644
--- a/include/linux/file.h
+++ b/include/linux/file.h
@@ -18,11 +18,9 @@ extern void drop_file_write_access(struct file *file);
 struct file_operations;
 struct vfsmount;
 struct dentry;
-extern int init_file(struct file *, struct vfsmount *mnt,
+struct path;
-                struct dentry *dentry, fmode_t mode,
+extern struct file *alloc_file(struct path *, fmode_t mode,
-                const struct file_operations *fop);
+        const struct file_operations *fop);
-extern struct file *alloc_file(struct vfsmount *, struct dentry *dentry,
-                fmode_t mode, const struct file_operations *fop);
 static inline void fput_light(struct file *file, int fput_needed)
 {
diff --git a/include/linux/fs.h b/include/linux/fs.h
index cf7fc8a7fe6a..66bc0a54b284 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2190,7 +2190,6 @@ static inline void insert_inode_hash(struct inode *inode) {
        __insert_inode_hash(inode, inode->i_ino);
 }
-extern struct file * get_empty_filp(void);
 extern void file_move(struct file *f, struct list_head *list);
 extern void file_kill(struct file *f);
 #ifdef CONFIG_BLOCK
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index 38f8d6553831..2233c98d80df 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -131,7 +131,7 @@ struct ftrace_event_call {
        void                    *mod;
        void                    *data;
-        atomic_t                profile_count;
+        int                     profile_count;
        int                     (*profile_enable)(struct ftrace_event_call *);
        void                    (*profile_disable)(struct ftrace_event_call *);
 };
@@ -158,7 +158,7 @@ enum {
        FILTER_PTR_STRING,
 };
-extern int trace_define_common_fields(struct ftrace_event_call *call);
+extern int trace_event_raw_init(struct ftrace_event_call *call);
 extern int trace_define_field(struct ftrace_event_call *call, const char *type,
                              const char *name, int offset, int size,
                              int is_signed, int filter_type);
diff --git a/include/linux/generic_acl.h b/include/linux/generic_acl.h
index 886f5faa08cb..ca666d18ed67 100644
--- a/include/linux/generic_acl.h
+++ b/include/linux/generic_acl.h
@@ -1,36 +1,15 @@
-/*
+#ifndef LINUX_GENERIC_ACL_H
- * include/linux/generic_acl.h
+#define LINUX_GENERIC_ACL_H
- *
- * (C) 2005 Andreas Gruenbacher <agruen@suse.de>
- *
- * This file is released under the GPL.
- */
-#ifndef GENERIC_ACL_H
+#include <linux/xattr.h>
-#define GENERIC_ACL_H
-#include <linux/posix_acl.h>
+struct inode;
-#include <linux/posix_acl_xattr.h>
-/**
+extern struct xattr_handler generic_acl_access_handler;
- * struct generic_acl_operations  -  filesystem operations
+extern struct xattr_handler generic_acl_default_handler;
- *
- * Filesystems must make these operations available to the generic
- * operations.
- */
-struct generic_acl_operations {
-        struct posix_acl *(*getacl)(struct inode *, int);
-        void (*setacl)(struct inode *, int, struct posix_acl *);
-};
-size_t generic_acl_list(struct inode *, struct generic_acl_operations *, int,
+int generic_acl_init(struct inode *, struct inode *);
-                        char *, size_t);
+int generic_acl_chmod(struct inode *);
-int generic_acl_get(struct inode *, struct generic_acl_operations *, int,
+int generic_check_acl(struct inode *inode, int mask);
-                    void *, size_t);
-int generic_acl_set(struct inode *, struct generic_acl_operations *, int,
-                    const void *, size_t);
-int generic_acl_init(struct inode *, struct inode *,
-                     struct generic_acl_operations *);
-int generic_acl_chmod(struct inode *, struct generic_acl_operations *);
-#endif
+#endif /* LINUX_GENERIC_ACL_H */
diff --git a/include/linux/ima.h b/include/linux/ima.h
index 0e3f2a4c25f6..99dc6d5cf7e5 100644
--- a/include/linux/ima.h
+++ b/include/linux/ima.h
@@ -13,18 +13,14 @@
 #include <linux/fs.h>
 struct linux_binprm;
-#define IMA_COUNT_UPDATE 1
-#define IMA_COUNT_LEAVE 0
 #ifdef CONFIG_IMA
 extern int ima_bprm_check(struct linux_binprm *bprm);
 extern int ima_inode_alloc(struct inode *inode);
 extern void ima_inode_free(struct inode *inode);
-extern int ima_path_check(struct path *path, int mask, int update_counts);
+extern int ima_path_check(struct path *path, int mask);
 extern void ima_file_free(struct file *file);
 extern int ima_file_mmap(struct file *file, unsigned long prot);
 extern void ima_counts_get(struct file *file);
-extern void ima_counts_put(struct path *path, int mask);
 #else
 static inline int ima_bprm_check(struct linux_binprm *bprm)
@@ -42,7 +38,7 @@ static inline void ima_inode_free(struct inode *inode)
        return;
 }
-static inline int ima_path_check(struct path *path, int mask, int update_counts)
+static inline int ima_path_check(struct path *path, int mask)
 {
        return 0;
 }
@@ -62,9 +58,5 @@ static inline void ima_counts_get(struct file *file)
        return;
 }
-static inline void ima_counts_put(struct path *path, int mask)
-{
-        return;
-}
 #endif /* CONFIG_IMA_H */
 #endif /* _LINUX_IMA_H */
diff --git a/include/linux/init.h b/include/linux/init.h
index ff8bde520d03..ab1d31f9352b 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -149,6 +149,8 @@ void prepare_namespace(void);
 extern void (*late_time_init)(void);
+extern int initcall_debug;
 #endif
  
 #ifndef MODULE
diff --git a/include/linux/kernel-page-flags.h b/include/linux/kernel-page-flags.h
new file mode 100644
index 000000000000..bd92a89f4b0a
--- /dev/null
+++ b/include/linux/kernel-page-flags.h
@@ -0,0 +1,46 @@
+#ifndef LINUX_KERNEL_PAGE_FLAGS_H
+#define LINUX_KERNEL_PAGE_FLAGS_H
+/*
+ * Stable page flag bits exported to user space
+ */
+#define KPF_LOCKED              0
+#define KPF_ERROR               1
+#define KPF_REFERENCED          2
+#define KPF_UPTODATE            3
+#define KPF_DIRTY               4
+#define KPF_LRU                 5
+#define KPF_ACTIVE              6
+#define KPF_SLAB                7
+#define KPF_WRITEBACK           8
+#define KPF_RECLAIM             9
+#define KPF_BUDDY               10
+/* 11-20: new additions in 2.6.31 */
+#define KPF_MMAP                11
+#define KPF_ANON                12
+#define KPF_SWAPCACHE           13
+#define KPF_SWAPBACKED          14
+#define KPF_COMPOUND_HEAD       15
+#define KPF_COMPOUND_TAIL       16
+#define KPF_HUGE                17
+#define KPF_UNEVICTABLE         18
+#define KPF_HWPOISON            19
+#define KPF_NOPAGE              20
+#define KPF_KSM                 21
+/* kernel hacking assistances
+ * WARNING: subject to change, never rely on them!
+ */
+#define KPF_RESERVED            32
+#define KPF_MLOCKED             33
+#define KPF_MAPPEDTODISK        34
+#define KPF_PRIVATE             35
+#define KPF_PRIVATE_2           36
+#define KPF_OWNER_PRIVATE       37
+#define KPF_ARCH                38
+#define KPF_UNCACHED            39
+#endif /* LINUX_KERNEL_PAGE_FLAGS_H */
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 4d9c916d06d9..3fc9f5aab5f8 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -535,6 +535,8 @@ extern int
 __trace_printk(unsigned long ip, const char *fmt, ...)
        __attribute__ ((format (printf, 2, 3)));
+extern void trace_dump_stack(void);
 /*
 * The double __builtin_constant_p is because gcc will give us an error
 * if we try to allocate the static variable to fmt if it is not a
@@ -568,6 +570,7 @@ trace_printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
 static inline void tracing_start(void) { }
 static inline void tracing_stop(void) { }
 static inline void ftrace_off_permanent(void) { }
+static inline void trace_dump_stack(void) { }
 static inline int
 trace_printk(const char *fmt, ...)
 {
diff --git a/include/linux/lmb.h b/include/linux/lmb.h
index 2442e3f3d033..ef82b8fcbddb 100644
--- a/include/linux/lmb.h
+++ b/include/linux/lmb.h
@@ -54,6 +54,7 @@ extern u64 __init lmb_phys_mem_size(void);
 extern u64 lmb_end_of_DRAM(void);
 extern void __init lmb_enforce_memory_limit(u64 memory_limit);
 extern int __init lmb_is_reserved(u64 addr);
+extern int lmb_is_region_reserved(u64 base, u64 size);
 extern int lmb_find(struct lmb_property *res);
 extern void lmb_dump_all(void);
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 0b46c2068b96..1f9b119f4ace 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -73,6 +73,7 @@ extern unsigned long mem_cgroup_isolate_pages(unsigned long nr_to_scan,
 extern void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask);
 int task_in_mem_cgroup(struct task_struct *task, const struct mem_cgroup *mem);
+extern struct mem_cgroup *try_get_mem_cgroup_from_page(struct page *page);
 extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p);
 static inline
@@ -85,6 +86,8 @@ int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
        return cgroup == mem;
 }
+extern struct cgroup_subsys_state *mem_cgroup_css(struct mem_cgroup *mem);
 extern int
 mem_cgroup_prepare_migration(struct page *page, struct mem_cgroup **ptr);
 extern void mem_cgroup_end_migration(struct mem_cgroup *mem,
@@ -202,6 +205,11 @@ mem_cgroup_move_lists(struct page *page, enum lru_list from, enum lru_list to)
 {
 }
+static inline struct mem_cgroup *try_get_mem_cgroup_from_page(struct page *page)
+{
+        return NULL;
+}
 static inline int mm_match_cgroup(struct mm_struct *mm, struct mem_cgroup *mem)
 {
        return 1;
@@ -213,6 +221,11 @@ static inline int task_in_mem_cgroup(struct task_struct *task,
        return 1;
 }
+static inline struct cgroup_subsys_state *mem_cgroup_css(struct mem_cgroup *mem)
+{
+        return NULL;
+}
 static inline int
 mem_cgroup_prepare_migration(struct page *page, struct mem_cgroup **ptr)
 {
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 9d65ae4ba0e0..849b4a61bd8f 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1331,11 +1331,17 @@ extern int account_locked_memory(struct mm_struct *mm, struct rlimit *rlim,
                                 size_t size);
 extern void refund_locked_memory(struct mm_struct *mm, size_t size);
+enum mf_flags {
+        MF_COUNT_INCREASED = 1 << 0,
+};
 extern void memory_failure(unsigned long pfn, int trapno);
-extern int __memory_failure(unsigned long pfn, int trapno, int ref);
+extern int __memory_failure(unsigned long pfn, int trapno, int flags);
+extern int unpoison_memory(unsigned long pfn);
 extern int sysctl_memory_failure_early_kill;
 extern int sysctl_memory_failure_recovery;
+extern void shake_page(struct page *p, int access);
 extern atomic_long_t mce_bad_pages;
+extern int soft_offline_page(struct page *page, int flags);
 #endif /* __KERNEL__ */
 #endif /* _LINUX_MM_H */
diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h
index d74785c2393a..d9ebf1037dfa 100644
--- a/include/linux/mnt_namespace.h
+++ b/include/linux/mnt_namespace.h
@@ -23,7 +23,6 @@ struct proc_mounts {
 struct fs_struct;
-extern struct mnt_namespace *create_mnt_ns(struct vfsmount *mnt);
 extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *,
                struct fs_struct *);
 extern void put_mnt_ns(struct mnt_namespace *ns);
diff --git a/include/linux/module.h b/include/linux/module.h
index 482efc865acf..6cb1a3cab5d3 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -25,8 +25,10 @@
 /* Not Yet Implemented */
 #define MODULE_SUPPORTED_DEVICE(name)
-/* some toolchains uses a `_' prefix for all user symbols */
+/* Some toolchains use a `_' prefix for all user symbols. */
-#ifndef MODULE_SYMBOL_PREFIX
+#ifdef CONFIG_SYMBOL_PREFIX
+#define MODULE_SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX
+#else
 #define MODULE_SYMBOL_PREFIX ""
 #endif
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 51071b335751..89b28812ec24 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -2,6 +2,7 @@
 #define _LINUX_NFS_XDR_H
 #include <linux/nfsacl.h>
+#include <linux/nfs3.h>
 /*
 * To change the maximum rsize and wsize supported by the NFS client, adjust
diff --git a/include/linux/nfsacl.h b/include/linux/nfsacl.h
index 43011b69297c..f321b578edeb 100644
--- a/include/linux/nfsacl.h
+++ b/include/linux/nfsacl.h
@@ -29,6 +29,7 @@
 #ifdef __KERNEL__
 #include <linux/posix_acl.h>
+#include <linux/sunrpc/xdr.h>
 /* Maximum number of ACL entries over NFS */
 #define NFS_ACL_MAX_ENTRIES     1024
diff --git a/include/linux/nfsd/cache.h b/include/linux/nfsd/cache.h
deleted file mode 100644
index 3a3f58934f5e..000000000000
--- a/include/linux/nfsd/cache.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * include/linux/nfsd/cache.h
- *
- * Request reply cache. This was heavily inspired by the
- * implementation in 4.3BSD/4.4BSD.
- *
- * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
- */
-#ifndef NFSCACHE_H
-#define NFSCACHE_H
-#include <linux/in.h>
-#include <linux/uio.h>
-/*
- * Representation of a reply cache entry.
- */
-struct svc_cacherep {
-        struct hlist_node       c_hash;
-        struct list_head        c_lru;
-        unsigned char           c_state,        /* unused, inprog, done */
-                                c_type,         /* status, buffer */
-                                c_secure : 1;   /* req came from port < 1024 */
-        struct sockaddr_in      c_addr;
-        __be32                  c_xid;
-        u32                     c_prot;
-        u32                     c_proc;
-        u32                     c_vers;
-        unsigned long           c_timestamp;
-        union {
-                struct kvec     u_vec;
-                __be32          u_status;
-        }                       c_u;
-};
-#define c_replvec               c_u.u_vec
-#define c_replstat              c_u.u_status
-/* cache entry states */
-enum {
-        RC_UNUSED,
-        RC_INPROG,
-        RC_DONE
-};
-/* return values */
-enum {
-        RC_DROPIT,
-        RC_REPLY,
-        RC_DOIT,
-        RC_INTR
-};
-/*
- * Cache types.
- * We may want to add more types one day, e.g. for diropres and
- * attrstat replies. Using cache entries with fixed length instead
- * of buffer pointers may be more efficient.
- */
-enum {
-        RC_NOCACHE,
-        RC_REPLSTAT,
-        RC_REPLBUFF,
-};
-/*
- * If requests are retransmitted within this interval, they're dropped.
- */
-#define RC_DELAY                (HZ/5)
-int     nfsd_reply_cache_init(void);
-void    nfsd_reply_cache_shutdown(void);
-int     nfsd_cache_lookup(struct svc_rqst *, int);
-void    nfsd_cache_update(struct svc_rqst *, int, __be32 *);
-#ifdef CONFIG_NFSD_V4
-void    nfsd4_set_statp(struct svc_rqst *rqstp, __be32 *statp);
-#else  /* CONFIG_NFSD_V4 */
-static inline void nfsd4_set_statp(struct svc_rqst *rqstp, __be32 *statp)
-{
-}
-#endif /* CONFIG_NFSD_V4 */
-#endif /* NFSCACHE_H */
diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h
index a6d9ef2bb34a..8ae78a61eea4 100644
--- a/include/linux/nfsd/export.h
+++ b/include/linux/nfsd/export.h
@@ -12,7 +12,7 @@
 # include <linux/types.h>
 #ifdef __KERNEL__
-# include <linux/in.h>
+# include <linux/nfsd/nfsfh.h>
 #endif
 /*
@@ -39,11 +39,23 @@
 #define NFSEXP_FSID             0x2000
 #define NFSEXP_CROSSMOUNT       0x4000
 #define NFSEXP_NOACL            0x8000  /* reserved for possible ACL related use */
-#define NFSEXP_ALLFLAGS         0xFE3F
+/*
+ * The NFSEXP_V4ROOT flag causes the kernel to give access only to NFSv4
+ * clients, and only to the single directory that is the root of the
+ * export; further lookup and readdir operations are treated as if every
+ * subdirectory was a mountpoint, and ignored if they are not themselves
+ * exported.  This is used by nfsd and mountd to construct the NFSv4
+ * pseudofilesystem, which provides access only to paths leading to each
+ * exported filesystem.
+ */
+#define NFSEXP_V4ROOT           0x10000
+/* All flags that we claim to support.  (Note we don't support NOACL.) */
+#define NFSEXP_ALLFLAGS         0x17E3F
 /* The flags that may vary depending on security flavor: */
 #define NFSEXP_SECINFO_FLAGS    (NFSEXP_READONLY | NFSEXP_ROOTSQUASH \
-                                        | NFSEXP_ALLSQUASH)
+                                        | NFSEXP_ALLSQUASH \
+                                        | NFSEXP_INSECURE_PORT)
 #ifdef __KERNEL__
@@ -108,7 +120,6 @@ struct svc_expkey {
        struct path             ek_path;
 };
-#define EX_SECURE(exp)          (!((exp)->ex_flags & NFSEXP_INSECURE_PORT))
 #define EX_ISSYNC(exp)          (!((exp)->ex_flags & NFSEXP_ASYNC))
 #define EX_NOHIDE(exp)          ((exp)->ex_flags & NFSEXP_NOHIDE)
 #define EX_WGATHER(exp)         ((exp)->ex_flags & NFSEXP_GATHERED_WRITES)
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
deleted file mode 100644
index 510ffdd5020e..000000000000
--- a/include/linux/nfsd/nfsd.h
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
- * linux/include/linux/nfsd/nfsd.h
- *
- * Hodge-podge collection of knfsd-related stuff.
- * I will sort this out later.
- *
- * Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de>
- */
-#ifndef LINUX_NFSD_NFSD_H
-#define LINUX_NFSD_NFSD_H
-#include <linux/types.h>
-#include <linux/unistd.h>
-#include <linux/fs.h>
-#include <linux/posix_acl.h>
-#include <linux/mount.h>
-#include <linux/nfsd/debug.h>
-#include <linux/nfsd/nfsfh.h>
-#include <linux/nfsd/export.h>
-#include <linux/nfsd/stats.h>
-/*
- * nfsd version
- */
-#define NFSD_SUPPORTED_MINOR_VERSION    1
-/*
- * Flags for nfsd_permission
- */
-#define NFSD_MAY_NOP            0
-#define NFSD_MAY_EXEC           1 /* == MAY_EXEC */
-#define NFSD_MAY_WRITE          2 /* == MAY_WRITE */
-#define NFSD_MAY_READ           4 /* == MAY_READ */
-#define NFSD_MAY_SATTR          8
-#define NFSD_MAY_TRUNC          16
-#define NFSD_MAY_LOCK           32
-#define NFSD_MAY_OWNER_OVERRIDE 64
-#define NFSD_MAY_LOCAL_ACCESS   128 /* IRIX doing local access check on device special file*/
-#define NFSD_MAY_BYPASS_GSS_ON_ROOT 256
-#define NFSD_MAY_CREATE         (NFSD_MAY_EXEC|NFSD_MAY_WRITE)
-#define NFSD_MAY_REMOVE         (NFSD_MAY_EXEC|NFSD_MAY_WRITE|NFSD_MAY_TRUNC)
-/*
- * Callback function for readdir
- */
-struct readdir_cd {
-        __be32                  err;    /* 0, nfserr, or nfserr_eof */
-};
-typedef int (*nfsd_dirop_t)(struct inode *, struct dentry *, int, int);
-extern struct svc_program       nfsd_program;
-extern struct svc_version       nfsd_version2, nfsd_version3,
-                                nfsd_version4;
-extern u32                      nfsd_supported_minorversion;
-extern struct mutex             nfsd_mutex;
-extern struct svc_serv          *nfsd_serv;
-extern spinlock_t               nfsd_drc_lock;
-extern unsigned int             nfsd_drc_max_mem;
-extern unsigned int             nfsd_drc_mem_used;
-extern const struct seq_operations nfs_exports_op;
-/*
- * Function prototypes.
- */
-int             nfsd_svc(unsigned short port, int nrservs);
-int             nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp);
-int             nfsd_nrthreads(void);
-int             nfsd_nrpools(void);
-int             nfsd_get_nrthreads(int n, int *);
-int             nfsd_set_nrthreads(int n, int *);
-/* nfsd/vfs.c */
-int             fh_lock_parent(struct svc_fh *, struct dentry *);
-int             nfsd_racache_init(int);
-void            nfsd_racache_shutdown(void);
-int             nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp,
-                                struct svc_export **expp);
-__be32          nfsd_lookup(struct svc_rqst *, struct svc_fh *,
-                                const char *, unsigned int, struct svc_fh *);
-__be32           nfsd_lookup_dentry(struct svc_rqst *, struct svc_fh *,
-                                const char *, unsigned int,
-                                struct svc_export **, struct dentry **);
-__be32          nfsd_setattr(struct svc_rqst *, struct svc_fh *,
-                                struct iattr *, int, time_t);
-#ifdef CONFIG_NFSD_V4
-__be32          nfsd4_set_nfs4_acl(struct svc_rqst *, struct svc_fh *,
-                    struct nfs4_acl *);
-int             nfsd4_get_nfs4_acl(struct svc_rqst *, struct dentry *, struct nfs4_acl **);
-#endif /* CONFIG_NFSD_V4 */
-__be32          nfsd_create(struct svc_rqst *, struct svc_fh *,
-                                char *name, int len, struct iattr *attrs,
-                                int type, dev_t rdev, struct svc_fh *res);
-#ifdef CONFIG_NFSD_V3
-__be32          nfsd_access(struct svc_rqst *, struct svc_fh *, u32 *, u32 *);
-__be32          nfsd_create_v3(struct svc_rqst *, struct svc_fh *,
-                                char *name, int len, struct iattr *attrs,
-                                struct svc_fh *res, int createmode,
-                                u32 *verifier, int *truncp, int *created);
-__be32          nfsd_commit(struct svc_rqst *, struct svc_fh *,
-                                loff_t, unsigned long);
-#endif /* CONFIG_NFSD_V3 */
-__be32          nfsd_open(struct svc_rqst *, struct svc_fh *, int,
-                                int, struct file **);
-void            nfsd_close(struct file *);
-__be32          nfsd_read(struct svc_rqst *, struct svc_fh *, struct file *,
-                                loff_t, struct kvec *, int, unsigned long *);
-__be32          nfsd_write(struct svc_rqst *, struct svc_fh *,struct file *,
-                                loff_t, struct kvec *,int, unsigned long *, int *);
-__be32          nfsd_readlink(struct svc_rqst *, struct svc_fh *,
-                                char *, int *);
-__be32          nfsd_symlink(struct svc_rqst *, struct svc_fh *,
-                                char *name, int len, char *path, int plen,
-                                struct svc_fh *res, struct iattr *);
-__be32          nfsd_link(struct svc_rqst *, struct svc_fh *,
-                                char *, int, struct svc_fh *);
-__be32          nfsd_rename(struct svc_rqst *,
-                                struct svc_fh *, char *, int,
-                                struct svc_fh *, char *, int);
-__be32          nfsd_remove(struct svc_rqst *,
-                                struct svc_fh *, char *, int);
-__be32          nfsd_unlink(struct svc_rqst *, struct svc_fh *, int type,
-                                char *name, int len);
-int             nfsd_truncate(struct svc_rqst *, struct svc_fh *,
-                                unsigned long size);
-__be32          nfsd_readdir(struct svc_rqst *, struct svc_fh *,
-                             loff_t *, struct readdir_cd *, filldir_t);
-__be32          nfsd_statfs(struct svc_rqst *, struct svc_fh *,
-                                struct kstatfs *, int access);
-int             nfsd_notify_change(struct inode *, struct iattr *);
-__be32          nfsd_permission(struct svc_rqst *, struct svc_export *,
-                                struct dentry *, int);
-int             nfsd_sync_dir(struct dentry *dp);
-#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)
-#ifdef CONFIG_NFSD_V2_ACL
-extern struct svc_version nfsd_acl_version2;
-#else
-#define nfsd_acl_version2 NULL
-#endif
-#ifdef CONFIG_NFSD_V3_ACL
-extern struct svc_version nfsd_acl_version3;
-#else
-#define nfsd_acl_version3 NULL
-#endif
-struct posix_acl *nfsd_get_posix_acl(struct svc_fh *, int);
-int nfsd_set_posix_acl(struct svc_fh *, int, struct posix_acl *);
-#endif
-enum vers_op {NFSD_SET, NFSD_CLEAR, NFSD_TEST, NFSD_AVAIL };
-int nfsd_vers(int vers, enum vers_op change);
-int nfsd_minorversion(u32 minorversion, enum vers_op change);
-void nfsd_reset_versions(void);
-int nfsd_create_serv(void);
-extern int nfsd_max_blksize;
-/* 
- * NFSv4 State
- */
-#ifdef CONFIG_NFSD_V4
-extern unsigned int max_delegations;
-int nfs4_state_init(void);
-void nfsd4_free_slabs(void);
-int nfs4_state_start(void);
-void nfs4_state_shutdown(void);
-time_t nfs4_lease_time(void);
-void nfs4_reset_lease(time_t leasetime);
-int nfs4_reset_recoverydir(char *recdir);
-#else
-static inline int nfs4_state_init(void) { return 0; }
-static inline void nfsd4_free_slabs(void) { }
-static inline int nfs4_state_start(void) { return 0; }
-static inline void nfs4_state_shutdown(void) { }
-static inline time_t nfs4_lease_time(void) { return 0; }
-static inline void nfs4_reset_lease(time_t leasetime) { }
-static inline int nfs4_reset_recoverydir(char *recdir) { return 0; }
-#endif
-/*
- * lockd binding
- */
-void            nfsd_lockd_init(void);
-void            nfsd_lockd_shutdown(void);
-/*
- * These macros provide pre-xdr'ed values for faster operation.
- */
-#define nfs_ok                  cpu_to_be32(NFS_OK)
-#define nfserr_perm             cpu_to_be32(NFSERR_PERM)
-#define nfserr_noent            cpu_to_be32(NFSERR_NOENT)
-#define nfserr_io               cpu_to_be32(NFSERR_IO)
-#define nfserr_nxio             cpu_to_be32(NFSERR_NXIO)
-#define nfserr_eagain           cpu_to_be32(NFSERR_EAGAIN)
-#define nfserr_acces            cpu_to_be32(NFSERR_ACCES)
-#define nfserr_exist            cpu_to_be32(NFSERR_EXIST)
-#define nfserr_xdev             cpu_to_be32(NFSERR_XDEV)
-#define nfserr_nodev            cpu_to_be32(NFSERR_NODEV)
-#define nfserr_notdir           cpu_to_be32(NFSERR_NOTDIR)
-#define nfserr_isdir            cpu_to_be32(NFSERR_ISDIR)
-#define nfserr_inval            cpu_to_be32(NFSERR_INVAL)
-#define nfserr_fbig             cpu_to_be32(NFSERR_FBIG)
-#define nfserr_nospc            cpu_to_be32(NFSERR_NOSPC)
-#define nfserr_rofs             cpu_to_be32(NFSERR_ROFS)
-#define nfserr_mlink            cpu_to_be32(NFSERR_MLINK)
-#define nfserr_opnotsupp        cpu_to_be32(NFSERR_OPNOTSUPP)
-#define nfserr_nametoolong      cpu_to_be32(NFSERR_NAMETOOLONG)
-#define nfserr_notempty         cpu_to_be32(NFSERR_NOTEMPTY)
-#define nfserr_dquot            cpu_to_be32(NFSERR_DQUOT)
-#define nfserr_stale            cpu_to_be32(NFSERR_STALE)
-#define nfserr_remote           cpu_to_be32(NFSERR_REMOTE)
-#define nfserr_wflush           cpu_to_be32(NFSERR_WFLUSH)
-#define nfserr_badhandle        cpu_to_be32(NFSERR_BADHANDLE)
-#define nfserr_notsync          cpu_to_be32(NFSERR_NOT_SYNC)
-#define nfserr_badcookie        cpu_to_be32(NFSERR_BAD_COOKIE)
-#define nfserr_notsupp          cpu_to_be32(NFSERR_NOTSUPP)
-#define nfserr_toosmall         cpu_to_be32(NFSERR_TOOSMALL)
-#define nfserr_serverfault      cpu_to_be32(NFSERR_SERVERFAULT)
-#define nfserr_badtype          cpu_to_be32(NFSERR_BADTYPE)
-#define nfserr_jukebox          cpu_to_be32(NFSERR_JUKEBOX)
-#define nfserr_denied           cpu_to_be32(NFSERR_DENIED)
-#define nfserr_deadlock         cpu_to_be32(NFSERR_DEADLOCK)
-#define nfserr_expired          cpu_to_be32(NFSERR_EXPIRED)
-#define nfserr_bad_cookie       cpu_to_be32(NFSERR_BAD_COOKIE)
-#define nfserr_same             cpu_to_be32(NFSERR_SAME)
-#define nfserr_clid_inuse       cpu_to_be32(NFSERR_CLID_INUSE)
-#define nfserr_stale_clientid   cpu_to_be32(NFSERR_STALE_CLIENTID)
-#define nfserr_resource         cpu_to_be32(NFSERR_RESOURCE)
-#define nfserr_moved            cpu_to_be32(NFSERR_MOVED)
-#define nfserr_nofilehandle     cpu_to_be32(NFSERR_NOFILEHANDLE)
-#define nfserr_minor_vers_mismatch      cpu_to_be32(NFSERR_MINOR_VERS_MISMATCH)
-#define nfserr_share_denied     cpu_to_be32(NFSERR_SHARE_DENIED)
-#define nfserr_stale_stateid    cpu_to_be32(NFSERR_STALE_STATEID)
-#define nfserr_old_stateid      cpu_to_be32(NFSERR_OLD_STATEID)
-#define nfserr_bad_stateid      cpu_to_be32(NFSERR_BAD_STATEID)
-#define nfserr_bad_seqid        cpu_to_be32(NFSERR_BAD_SEQID)
-#define nfserr_symlink          cpu_to_be32(NFSERR_SYMLINK)
-#define nfserr_not_same         cpu_to_be32(NFSERR_NOT_SAME)
-#define nfserr_restorefh        cpu_to_be32(NFSERR_RESTOREFH)
-#define nfserr_attrnotsupp      cpu_to_be32(NFSERR_ATTRNOTSUPP)
-#define nfserr_bad_xdr          cpu_to_be32(NFSERR_BAD_XDR)
-#define nfserr_openmode         cpu_to_be32(NFSERR_OPENMODE)
-#define nfserr_locks_held       cpu_to_be32(NFSERR_LOCKS_HELD)
-#define nfserr_op_illegal       cpu_to_be32(NFSERR_OP_ILLEGAL)
-#define nfserr_grace            cpu_to_be32(NFSERR_GRACE)
-#define nfserr_no_grace         cpu_to_be32(NFSERR_NO_GRACE)
-#define nfserr_reclaim_bad      cpu_to_be32(NFSERR_RECLAIM_BAD)
-#define nfserr_badname          cpu_to_be32(NFSERR_BADNAME)
-#define nfserr_cb_path_down     cpu_to_be32(NFSERR_CB_PATH_DOWN)
-#define nfserr_locked           cpu_to_be32(NFSERR_LOCKED)
-#define nfserr_wrongsec         cpu_to_be32(NFSERR_WRONGSEC)
-#define nfserr_badiomode                cpu_to_be32(NFS4ERR_BADIOMODE)
-#define nfserr_badlayout                cpu_to_be32(NFS4ERR_BADLAYOUT)
-#define nfserr_bad_session_digest       cpu_to_be32(NFS4ERR_BAD_SESSION_DIGEST)
-#define nfserr_badsession               cpu_to_be32(NFS4ERR_BADSESSION)
-#define nfserr_badslot                  cpu_to_be32(NFS4ERR_BADSLOT)
-#define nfserr_complete_already         cpu_to_be32(NFS4ERR_COMPLETE_ALREADY)
-#define nfserr_conn_not_bound_to_session cpu_to_be32(NFS4ERR_CONN_NOT_BOUND_TO_SESSION)
-#define nfserr_deleg_already_wanted     cpu_to_be32(NFS4ERR_DELEG_ALREADY_WANTED)
-#define nfserr_back_chan_busy           cpu_to_be32(NFS4ERR_BACK_CHAN_BUSY)
-#define nfserr_layouttrylater           cpu_to_be32(NFS4ERR_LAYOUTTRYLATER)
-#define nfserr_layoutunavailable        cpu_to_be32(NFS4ERR_LAYOUTUNAVAILABLE)
-#define nfserr_nomatching_layout        cpu_to_be32(NFS4ERR_NOMATCHING_LAYOUT)
-#define nfserr_recallconflict           cpu_to_be32(NFS4ERR_RECALLCONFLICT)
-#define nfserr_unknown_layouttype       cpu_to_be32(NFS4ERR_UNKNOWN_LAYOUTTYPE)
-#define nfserr_seq_misordered           cpu_to_be32(NFS4ERR_SEQ_MISORDERED)
-#define nfserr_sequence_pos             cpu_to_be32(NFS4ERR_SEQUENCE_POS)
-#define nfserr_req_too_big              cpu_to_be32(NFS4ERR_REQ_TOO_BIG)
-#define nfserr_rep_too_big              cpu_to_be32(NFS4ERR_REP_TOO_BIG)
-#define nfserr_rep_too_big_to_cache     cpu_to_be32(NFS4ERR_REP_TOO_BIG_TO_CACHE)
-#define nfserr_retry_uncached_rep       cpu_to_be32(NFS4ERR_RETRY_UNCACHED_REP)
-#define nfserr_unsafe_compound          cpu_to_be32(NFS4ERR_UNSAFE_COMPOUND)
-#define nfserr_too_many_ops             cpu_to_be32(NFS4ERR_TOO_MANY_OPS)
-#define nfserr_op_not_in_session        cpu_to_be32(NFS4ERR_OP_NOT_IN_SESSION)
-#define nfserr_hash_alg_unsupp          cpu_to_be32(NFS4ERR_HASH_ALG_UNSUPP)
-#define nfserr_clientid_busy            cpu_to_be32(NFS4ERR_CLIENTID_BUSY)
-#define nfserr_pnfs_io_hole             cpu_to_be32(NFS4ERR_PNFS_IO_HOLE)
-#define nfserr_seq_false_retry          cpu_to_be32(NFS4ERR_SEQ_FALSE_RETRY)
-#define nfserr_bad_high_slot            cpu_to_be32(NFS4ERR_BAD_HIGH_SLOT)
-#define nfserr_deadsession              cpu_to_be32(NFS4ERR_DEADSESSION)
-#define nfserr_encr_alg_unsupp          cpu_to_be32(NFS4ERR_ENCR_ALG_UNSUPP)
-#define nfserr_pnfs_no_layout           cpu_to_be32(NFS4ERR_PNFS_NO_LAYOUT)
-#define nfserr_not_only_op              cpu_to_be32(NFS4ERR_NOT_ONLY_OP)
-#define nfserr_wrong_cred               cpu_to_be32(NFS4ERR_WRONG_CRED)
-#define nfserr_wrong_type               cpu_to_be32(NFS4ERR_WRONG_TYPE)
-#define nfserr_dirdeleg_unavail         cpu_to_be32(NFS4ERR_DIRDELEG_UNAVAIL)
-#define nfserr_reject_deleg             cpu_to_be32(NFS4ERR_REJECT_DELEG)
-#define nfserr_returnconflict           cpu_to_be32(NFS4ERR_RETURNCONFLICT)
-#define nfserr_deleg_revoked            cpu_to_be32(NFS4ERR_DELEG_REVOKED)
-/* error codes for internal use */
-/* if a request fails due to kmalloc failure, it gets dropped.
- *  Client should resend eventually
- */
-#define nfserr_dropit           cpu_to_be32(30000)
-/* end-of-file indicator in readdir */
-#define nfserr_eof              cpu_to_be32(30001)
-/* replay detected */
-#define nfserr_replay_me        cpu_to_be32(11001)
-/* nfs41 replay detected */
-#define nfserr_replay_cache     cpu_to_be32(11002)
-/* Check for dir entries '.' and '..' */
-#define isdotent(n, l)  (l < 3 && n[0] == '.' && (l == 1 || n[1] == '.'))
-/*
- * Time of server startup
- */
-extern struct timeval   nfssvc_boot;
-#ifdef CONFIG_NFSD_V4
-/* before processing a COMPOUND operation, we have to check that there
- * is enough space in the buffer for XDR encode to succeed.  otherwise,
- * we might process an operation with side effects, and be unable to
- * tell the client that the operation succeeded.
- *
- * COMPOUND_SLACK_SPACE - this is the minimum bytes of buffer space
- * needed to encode an "ordinary" _successful_ operation.  (GETATTR,
- * READ, READDIR, and READLINK have their own buffer checks.)  if we
- * fall below this level, we fail the next operation with NFS4ERR_RESOURCE.
- *
- * COMPOUND_ERR_SLACK_SPACE - this is the minimum bytes of buffer space
- * needed to encode an operation which has failed with NFS4ERR_RESOURCE.
- * care is taken to ensure that we never fall below this level for any
- * reason.
- */
-#define COMPOUND_SLACK_SPACE            140    /* OP_GETFH */
-#define COMPOUND_ERR_SLACK_SPACE        12     /* OP_SETATTR */
-#define NFSD_LEASE_TIME                 (nfs4_lease_time())
-#define NFSD_LAUNDROMAT_MINTIMEOUT      10   /* seconds */
-/*
- * The following attributes are currently not supported by the NFSv4 server:
- *    ARCHIVE       (deprecated anyway)
- *    HIDDEN        (unlikely to be supported any time soon)
- *    MIMETYPE      (unlikely to be supported any time soon)
- *    QUOTA_*       (will be supported in a forthcoming patch)
- *    SYSTEM        (unlikely to be supported any time soon)
- *    TIME_BACKUP   (unlikely to be supported any time soon)
- *    TIME_CREATE   (unlikely to be supported any time soon)
- */
-#define NFSD4_SUPPORTED_ATTRS_WORD0                                                         \
-(FATTR4_WORD0_SUPPORTED_ATTRS   | FATTR4_WORD0_TYPE         | FATTR4_WORD0_FH_EXPIRE_TYPE   \
- | FATTR4_WORD0_CHANGE          | FATTR4_WORD0_SIZE         | FATTR4_WORD0_LINK_SUPPORT     \
- | FATTR4_WORD0_SYMLINK_SUPPORT | FATTR4_WORD0_NAMED_ATTR   | FATTR4_WORD0_FSID             \
- | FATTR4_WORD0_UNIQUE_HANDLES  | FATTR4_WORD0_LEASE_TIME   | FATTR4_WORD0_RDATTR_ERROR     \
- | FATTR4_WORD0_ACLSUPPORT      | FATTR4_WORD0_CANSETTIME   | FATTR4_WORD0_CASE_INSENSITIVE \
- | FATTR4_WORD0_CASE_PRESERVING | FATTR4_WORD0_CHOWN_RESTRICTED                             \
- | FATTR4_WORD0_FILEHANDLE      | FATTR4_WORD0_FILEID       | FATTR4_WORD0_FILES_AVAIL      \
- | FATTR4_WORD0_FILES_FREE      | FATTR4_WORD0_FILES_TOTAL  | FATTR4_WORD0_FS_LOCATIONS | FATTR4_WORD0_HOMOGENEOUS      \
- | FATTR4_WORD0_MAXFILESIZE     | FATTR4_WORD0_MAXLINK      | FATTR4_WORD0_MAXNAME          \
- | FATTR4_WORD0_MAXREAD         | FATTR4_WORD0_MAXWRITE     | FATTR4_WORD0_ACL)
-#define NFSD4_SUPPORTED_ATTRS_WORD1                                                         \
-(FATTR4_WORD1_MODE              | FATTR4_WORD1_NO_TRUNC     | FATTR4_WORD1_NUMLINKS         \
- | FATTR4_WORD1_OWNER           | FATTR4_WORD1_OWNER_GROUP  | FATTR4_WORD1_RAWDEV           \
- | FATTR4_WORD1_SPACE_AVAIL     | FATTR4_WORD1_SPACE_FREE   | FATTR4_WORD1_SPACE_TOTAL      \
- | FATTR4_WORD1_SPACE_USED      | FATTR4_WORD1_TIME_ACCESS  | FATTR4_WORD1_TIME_ACCESS_SET  \
- | FATTR4_WORD1_TIME_DELTA   | FATTR4_WORD1_TIME_METADATA    \
- | FATTR4_WORD1_TIME_MODIFY     | FATTR4_WORD1_TIME_MODIFY_SET | FATTR4_WORD1_MOUNTED_ON_FILEID)
-#define NFSD4_SUPPORTED_ATTRS_WORD2 0
-#define NFSD4_1_SUPPORTED_ATTRS_WORD0 \
-        NFSD4_SUPPORTED_ATTRS_WORD0
-#define NFSD4_1_SUPPORTED_ATTRS_WORD1 \
-        NFSD4_SUPPORTED_ATTRS_WORD1
-#define NFSD4_1_SUPPORTED_ATTRS_WORD2 \
-        (NFSD4_SUPPORTED_ATTRS_WORD2 | FATTR4_WORD2_SUPPATTR_EXCLCREAT)
-static inline u32 nfsd_suppattrs0(u32 minorversion)
-{
-        return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD0
-                            : NFSD4_SUPPORTED_ATTRS_WORD0;
-}
-static inline u32 nfsd_suppattrs1(u32 minorversion)
-{
-        return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD1
-                            : NFSD4_SUPPORTED_ATTRS_WORD1;
-}
-static inline u32 nfsd_suppattrs2(u32 minorversion)
-{
-        return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD2
-                            : NFSD4_SUPPORTED_ATTRS_WORD2;
-}
-/* These will return ERR_INVAL if specified in GETATTR or READDIR. */
-#define NFSD_WRITEONLY_ATTRS_WORD1                                                          \
-(FATTR4_WORD1_TIME_ACCESS_SET   | FATTR4_WORD1_TIME_MODIFY_SET)
-/* These are the only attrs allowed in CREATE/OPEN/SETATTR. */
-#define NFSD_WRITEABLE_ATTRS_WORD0                                                          \
-(FATTR4_WORD0_SIZE              | FATTR4_WORD0_ACL                                         )
-#define NFSD_WRITEABLE_ATTRS_WORD1                                                          \
-(FATTR4_WORD1_MODE              | FATTR4_WORD1_OWNER         | FATTR4_WORD1_OWNER_GROUP     \
- | FATTR4_WORD1_TIME_ACCESS_SET | FATTR4_WORD1_TIME_MODIFY_SET)
-#define NFSD_WRITEABLE_ATTRS_WORD2 0
-#define NFSD_SUPPATTR_EXCLCREAT_WORD0 \
-        NFSD_WRITEABLE_ATTRS_WORD0
-/*
- * we currently store the exclusive create verifier in the v_{a,m}time
- * attributes so the client can't set these at create time using EXCLUSIVE4_1
- */
-#define NFSD_SUPPATTR_EXCLCREAT_WORD1 \
-        (NFSD_WRITEABLE_ATTRS_WORD1 & \
-         ~(FATTR4_WORD1_TIME_ACCESS_SET | FATTR4_WORD1_TIME_MODIFY_SET))
-#define NFSD_SUPPATTR_EXCLCREAT_WORD2 \
-        NFSD_WRITEABLE_ATTRS_WORD2
-#endif /* CONFIG_NFSD_V4 */
-#endif /* LINUX_NFSD_NFSD_H */
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h
index 8f641c908450..65e333afaee4 100644
--- a/include/linux/nfsd/nfsfh.h
+++ b/include/linux/nfsd/nfsfh.h
@@ -16,11 +16,9 @@
 # include <linux/types.h>
 #ifdef __KERNEL__
-# include <linux/string.h>
+# include <linux/sunrpc/svc.h>
-# include <linux/fs.h>
 #endif
 #include <linux/nfsd/const.h>
-#include <linux/nfsd/debug.h>
 /*
 * This is the old "dentry style" Linux NFSv2 file handle.
@@ -164,208 +162,6 @@ typedef struct svc_fh {
 } svc_fh;
-enum nfsd_fsid {
-        FSID_DEV = 0,
-        FSID_NUM,
-        FSID_MAJOR_MINOR,
-        FSID_ENCODE_DEV,
-        FSID_UUID4_INUM,
-        FSID_UUID8,
-        FSID_UUID16,
-        FSID_UUID16_INUM,
-};
-enum fsid_source {
-        FSIDSOURCE_DEV,
-        FSIDSOURCE_FSID,
-        FSIDSOURCE_UUID,
-};
-extern enum fsid_source fsid_source(struct svc_fh *fhp);
-/* This might look a little large to "inline" but in all calls except
- * one, 'vers' is constant so moste of the function disappears.
- */
-static inline void mk_fsid(int vers, u32 *fsidv, dev_t dev, ino_t ino,
-                           u32 fsid, unsigned char *uuid)
-{
-        u32 *up;
-        switch(vers) {
-        case FSID_DEV:
-                fsidv[0] = htonl((MAJOR(dev)<<16) |
-                                 MINOR(dev));
-                fsidv[1] = ino_t_to_u32(ino);
-                break;
-        case FSID_NUM:
-                fsidv[0] = fsid;
-                break;
-        case FSID_MAJOR_MINOR:
-                fsidv[0] = htonl(MAJOR(dev));
-                fsidv[1] = htonl(MINOR(dev));
-                fsidv[2] = ino_t_to_u32(ino);
-                break;
-        case FSID_ENCODE_DEV:
-                fsidv[0] = new_encode_dev(dev);
-                fsidv[1] = ino_t_to_u32(ino);
-                break;
-        case FSID_UUID4_INUM:
-                /* 4 byte fsid and inode number */
-                up = (u32*)uuid;
-                fsidv[0] = ino_t_to_u32(ino);
-                fsidv[1] = up[0] ^ up[1] ^ up[2] ^ up[3];
-                break;
-        case FSID_UUID8:
-                /* 8 byte fsid  */
-                up = (u32*)uuid;
-                fsidv[0] = up[0] ^ up[2];
-                fsidv[1] = up[1] ^ up[3];
-                break;
-        case FSID_UUID16:
-                /* 16 byte fsid - NFSv3+ only */
-                memcpy(fsidv, uuid, 16);
-                break;
-        case FSID_UUID16_INUM:
-                /* 8 byte inode and 16 byte fsid */
-                *(u64*)fsidv = (u64)ino;
-                memcpy(fsidv+2, uuid, 16);
-                break;
-        default: BUG();
-        }
-}
-static inline int key_len(int type)
-{
-        switch(type) {
-        case FSID_DEV:          return 8;
-        case FSID_NUM:          return 4;
-        case FSID_MAJOR_MINOR:  return 12;
-        case FSID_ENCODE_DEV:   return 8;
-        case FSID_UUID4_INUM:   return 8;
-        case FSID_UUID8:        return 8;
-        case FSID_UUID16:       return 16;
-        case FSID_UUID16_INUM:  return 24;
-        default: return 0;
-        }
-}
-/*
- * Shorthand for dprintk()'s
- */
-extern char * SVCFH_fmt(struct svc_fh *fhp);
-/*
- * Function prototypes
- */
-__be32  fh_verify(struct svc_rqst *, struct svc_fh *, int, int);
-__be32  fh_compose(struct svc_fh *, struct svc_export *, struct dentry *, struct svc_fh *);
-__be32  fh_update(struct svc_fh *);
-void    fh_put(struct svc_fh *);
-static __inline__ struct svc_fh *
-fh_copy(struct svc_fh *dst, struct svc_fh *src)
-{
-        WARN_ON(src->fh_dentry || src->fh_locked);
-                        
-        *dst = *src;
-        return dst;
-}
-static inline void
-fh_copy_shallow(struct knfsd_fh *dst, struct knfsd_fh *src)
-{
-        dst->fh_size = src->fh_size;
-        memcpy(&dst->fh_base, &src->fh_base, src->fh_size);
-}
-static __inline__ struct svc_fh *
-fh_init(struct svc_fh *fhp, int maxsize)
-{
-        memset(fhp, 0, sizeof(*fhp));
-        fhp->fh_maxsize = maxsize;
-        return fhp;
-}
-#ifdef CONFIG_NFSD_V3
-/*
- * Fill in the pre_op attr for the wcc data
- */
-static inline void
-fill_pre_wcc(struct svc_fh *fhp)
-{
-        struct inode    *inode;
-        inode = fhp->fh_dentry->d_inode;
-        if (!fhp->fh_pre_saved) {
-                fhp->fh_pre_mtime = inode->i_mtime;
-                fhp->fh_pre_ctime = inode->i_ctime;
-                fhp->fh_pre_size  = inode->i_size;
-                fhp->fh_pre_change = inode->i_version;
-                fhp->fh_pre_saved = 1;
-        }
-}
-extern void fill_post_wcc(struct svc_fh *);
-#else
-#define fill_pre_wcc(ignored)
-#define fill_post_wcc(notused)
-#endif /* CONFIG_NFSD_V3 */
-/*
- * Lock a file handle/inode
- * NOTE: both fh_lock and fh_unlock are done "by hand" in
- * vfs.c:nfsd_rename as it needs to grab 2 i_mutex's at once
- * so, any changes here should be reflected there.
- */
-static inline void
-fh_lock_nested(struct svc_fh *fhp, unsigned int subclass)
-{
-        struct dentry   *dentry = fhp->fh_dentry;
-        struct inode    *inode;
-        dfprintk(FILEOP, "nfsd: fh_lock(%s) locked = %d\n",
-                        SVCFH_fmt(fhp), fhp->fh_locked);
-        BUG_ON(!dentry);
-        if (fhp->fh_locked) {
-                printk(KERN_WARNING "fh_lock: %s/%s already locked!\n",
-                        dentry->d_parent->d_name.name, dentry->d_name.name);
-                return;
-        }
-        inode = dentry->d_inode;
-        mutex_lock_nested(&inode->i_mutex, subclass);
-        fill_pre_wcc(fhp);
-        fhp->fh_locked = 1;
-}
-static inline void
-fh_lock(struct svc_fh *fhp)
-{
-        fh_lock_nested(fhp, I_MUTEX_NORMAL);
-}
-/*
- * Unlock a file handle/inode
- */
-static inline void
-fh_unlock(struct svc_fh *fhp)
-{
-        BUG_ON(!fhp->fh_dentry);
-        if (fhp->fh_locked) {
-                fill_post_wcc(fhp);
-                mutex_unlock(&fhp->fh_dentry->d_inode->i_mutex);
-                fhp->fh_locked = 0;
-        }
-}
 #endif /* __KERNEL__ */
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
deleted file mode 100644
index b38d11324189..000000000000
--- a/include/linux/nfsd/state.h
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- *  linux/include/nfsd/state.h
- *
- *  Copyright (c) 2001 The Regents of the University of Michigan.
- *  All rights reserved.
- *
- *  Kendrick Smith <kmsmith@umich.edu>
- *  Andy Adamson <andros@umich.edu>
- *  
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *  
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *  3. Neither the name of the University nor the names of its
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-#ifndef _NFSD4_STATE_H
-#define _NFSD4_STATE_H
-#include <linux/list.h>
-#include <linux/kref.h>
-#include <linux/sunrpc/clnt.h>
-typedef struct {
-        u32             cl_boot;
-        u32             cl_id;
-} clientid_t;
-typedef struct {
-        u32             so_boot;
-        u32             so_stateownerid;
-        u32             so_fileid;
-} stateid_opaque_t;
-typedef struct {
-        u32                     si_generation;
-        stateid_opaque_t        si_opaque;
-} stateid_t;
-#define si_boot           si_opaque.so_boot
-#define si_stateownerid   si_opaque.so_stateownerid
-#define si_fileid         si_opaque.so_fileid
-struct nfsd4_cb_sequence {
-        /* args/res */
-        u32                     cbs_minorversion;
-        struct nfs4_client      *cbs_clp;
-};
-struct nfs4_delegation {
-        struct list_head        dl_perfile;
-        struct list_head        dl_perclnt;
-        struct list_head        dl_recall_lru;  /* delegation recalled */
-        atomic_t                dl_count;       /* ref count */
-        struct nfs4_client      *dl_client;
-        struct nfs4_file        *dl_file;
-        struct file_lock        *dl_flock;
-        struct file             *dl_vfs_file;
-        u32                     dl_type;
-        time_t                  dl_time;
-/* For recall: */
-        u32                     dl_ident;
-        stateid_t               dl_stateid;
-        struct knfsd_fh         dl_fh;
-        int                     dl_retries;
-};
-/* client delegation callback info */
-struct nfs4_cb_conn {
-        /* SETCLIENTID info */
-        struct sockaddr_storage cb_addr;
-        size_t                  cb_addrlen;
-        u32                     cb_prog;
-        u32                     cb_minorversion;
-        u32                     cb_ident;       /* minorversion 0 only */
-        /* RPC client info */
-        atomic_t                cb_set;     /* successful CB_NULL call */
-        struct rpc_clnt *       cb_client;
-};
-/* Maximum number of slots per session. 160 is useful for long haul TCP */
-#define NFSD_MAX_SLOTS_PER_SESSION     160
-/* Maximum number of operations per session compound */
-#define NFSD_MAX_OPS_PER_COMPOUND       16
-/* Maximum  session per slot cache size */
-#define NFSD_SLOT_CACHE_SIZE            1024
-/* Maximum number of NFSD_SLOT_CACHE_SIZE slots per session */
-#define NFSD_CACHE_SIZE_SLOTS_PER_SESSION       32
-#define NFSD_MAX_MEM_PER_SESSION  \
-                (NFSD_CACHE_SIZE_SLOTS_PER_SESSION * NFSD_SLOT_CACHE_SIZE)
-struct nfsd4_slot {
-        bool    sl_inuse;
-        bool    sl_cachethis;
-        u16     sl_opcnt;
-        u32     sl_seqid;
-        __be32  sl_status;
-        u32     sl_datalen;
-        char    sl_data[];
-};
-struct nfsd4_channel_attrs {
-        u32             headerpadsz;
-        u32             maxreq_sz;
-        u32             maxresp_sz;
-        u32             maxresp_cached;
-        u32             maxops;
-        u32             maxreqs;
-        u32             nr_rdma_attrs;
-        u32             rdma_attrs;
-};
-struct nfsd4_create_session {
-        clientid_t                      clientid;
-        struct nfs4_sessionid           sessionid;
-        u32                             seqid;
-        u32                             flags;
-        struct nfsd4_channel_attrs      fore_channel;
-        struct nfsd4_channel_attrs      back_channel;
-        u32                             callback_prog;
-        u32                             uid;
-        u32                             gid;
-};
-/* The single slot clientid cache structure */
-struct nfsd4_clid_slot {
-        u32                             sl_seqid;
-        __be32                          sl_status;
-        struct nfsd4_create_session     sl_cr_ses;
-};
-struct nfsd4_session {
-        struct kref             se_ref;
-        struct list_head        se_hash;        /* hash by sessionid */
-        struct list_head        se_perclnt;
-        u32                     se_flags;
-        struct nfs4_client      *se_client;     /* for expire_client */
-        struct nfs4_sessionid   se_sessionid;
-        struct nfsd4_channel_attrs se_fchannel;
-        struct nfsd4_channel_attrs se_bchannel;
-        struct nfsd4_slot       *se_slots[];    /* forward channel slots */
-};
-static inline void
-nfsd4_put_session(struct nfsd4_session *ses)
-{
-        extern void free_session(struct kref *kref);
-        kref_put(&ses->se_ref, free_session);
-}
-static inline void
-nfsd4_get_session(struct nfsd4_session *ses)
-{
-        kref_get(&ses->se_ref);
-}
-/* formatted contents of nfs4_sessionid */
-struct nfsd4_sessionid {
-        clientid_t      clientid;
-        u32             sequence;
-        u32             reserved;
-};
-#define HEXDIR_LEN     33 /* hex version of 16 byte md5 of cl_name plus '\0' */
-/*
- * struct nfs4_client - one per client.  Clientids live here.
- *      o Each nfs4_client is hashed by clientid.
- *
- *      o Each nfs4_clients is also hashed by name 
- *        (the opaque quantity initially sent by the client to identify itself).
- *        
- *      o cl_perclient list is used to ensure no dangling stateowner references
- *        when we expire the nfs4_client
- */
-struct nfs4_client {
-        struct list_head        cl_idhash;      /* hash by cl_clientid.id */
-        struct list_head        cl_strhash;     /* hash by cl_name */
-        struct list_head        cl_openowners;
-        struct list_head        cl_delegations;
-        struct list_head        cl_lru;         /* tail queue */
-        struct xdr_netobj       cl_name;        /* id generated by client */
-        char                    cl_recdir[HEXDIR_LEN]; /* recovery dir */
-        nfs4_verifier           cl_verifier;    /* generated by client */
-        time_t                  cl_time;        /* time of last lease renewal */
-        struct sockaddr_storage cl_addr;        /* client ipaddress */
-        u32                     cl_flavor;      /* setclientid pseudoflavor */
-        char                    *cl_principal;  /* setclientid principal name */
-        struct svc_cred         cl_cred;        /* setclientid principal */
-        clientid_t              cl_clientid;    /* generated by server */
-        nfs4_verifier           cl_confirm;     /* generated by server */
-        struct nfs4_cb_conn     cl_cb_conn;     /* callback info */
-        atomic_t                cl_count;       /* ref count */
-        u32                     cl_firststate;  /* recovery dir creation */
-        /* for nfs41 */
-        struct list_head        cl_sessions;
-        struct nfsd4_clid_slot  cl_cs_slot;     /* create_session slot */
-        u32                     cl_exchange_flags;
-        struct nfs4_sessionid   cl_sessionid;
-        /* for nfs41 callbacks */
-        /* We currently support a single back channel with a single slot */
-        unsigned long           cl_cb_slot_busy;
-        u32                     cl_cb_seq_nr;
-        struct svc_xprt         *cl_cb_xprt;    /* 4.1 callback transport */
-        struct rpc_wait_queue   cl_cb_waitq;    /* backchannel callers may */
-                                                /* wait here for slots */
-};
-/* struct nfs4_client_reset
- * one per old client. Populates reset_str_hashtbl. Filled from conf_id_hashtbl
- * upon lease reset, or from upcall to state_daemon (to read in state
- * from non-volitile storage) upon reboot.
- */
-struct nfs4_client_reclaim {
-        struct list_head        cr_strhash;     /* hash by cr_name */
-        char                    cr_recdir[HEXDIR_LEN]; /* recover dir */
-};
-static inline void
-update_stateid(stateid_t *stateid)
-{
-        stateid->si_generation++;
-}
-/* A reasonable value for REPLAY_ISIZE was estimated as follows:  
- * The OPEN response, typically the largest, requires 
- *   4(status) + 8(stateid) + 20(changeinfo) + 4(rflags) +  8(verifier) + 
- *   4(deleg. type) + 8(deleg. stateid) + 4(deleg. recall flag) + 
- *   20(deleg. space limit) + ~32(deleg. ace) = 112 bytes 
- */
-#define NFSD4_REPLAY_ISIZE       112 
-/*
- * Replay buffer, where the result of the last seqid-mutating operation 
- * is cached. 
- */
-struct nfs4_replay {
-        __be32                  rp_status;
-        unsigned int            rp_buflen;
-        char                    *rp_buf;
-        unsigned                intrp_allocated;
-        struct knfsd_fh         rp_openfh;
-        char                    rp_ibuf[NFSD4_REPLAY_ISIZE];
-};
-/*
-* nfs4_stateowner can either be an open_owner, or a lock_owner
-*
-*    so_idhash:  stateid_hashtbl[] for open owner, lockstateid_hashtbl[]
-*         for lock_owner
-*    so_strhash: ownerstr_hashtbl[] for open_owner, lock_ownerstr_hashtbl[]
-*         for lock_owner
-*    so_perclient: nfs4_client->cl_perclient entry - used when nfs4_client
-*         struct is reaped.
-*    so_perfilestate: heads the list of nfs4_stateid (either open or lock) 
-*         and is used to ensure no dangling nfs4_stateid references when we 
-*         release a stateowner.
-*    so_perlockowner: (open) nfs4_stateid->st_perlockowner entry - used when
-*         close is called to reap associated byte-range locks
-*    so_close_lru: (open) stateowner is placed on this list instead of being
-*         reaped (when so_perfilestate is empty) to hold the last close replay.
-*         reaped by laundramat thread after lease period.
-*/
-struct nfs4_stateowner {
-        struct kref             so_ref;
-        struct list_head        so_idhash;   /* hash by so_id */
-        struct list_head        so_strhash;   /* hash by op_name */
-        struct list_head        so_perclient;
-        struct list_head        so_stateids;
-        struct list_head        so_perstateid; /* for lockowners only */
-        struct list_head        so_close_lru; /* tail queue */
-        time_t                  so_time; /* time of placement on so_close_lru */
-        int                     so_is_open_owner; /* 1=openowner,0=lockowner */
-        u32                     so_id;
-        struct nfs4_client *    so_client;
-        /* after increment in ENCODE_SEQID_OP_TAIL, represents the next
-         * sequence id expected from the client: */
-        u32                     so_seqid;
-        struct xdr_netobj       so_owner;     /* open owner name */
-        int                     so_confirmed; /* successful OPEN_CONFIRM? */
-        struct nfs4_replay      so_replay;
-};
-/*
-*  nfs4_file: a file opened by some number of (open) nfs4_stateowners.
-*    o fi_perfile list is used to search for conflicting 
-*      share_acces, share_deny on the file.
-*/
-struct nfs4_file {
-        atomic_t                fi_ref;
-        struct list_head        fi_hash;    /* hash by "struct inode *" */
-        struct list_head        fi_stateids;
-        struct list_head        fi_delegations;
-        struct inode            *fi_inode;
-        u32                     fi_id;      /* used with stateowner->so_id 
-                                             * for stateid_hashtbl hash */
-        bool                    fi_had_conflict;
-};
-/*
-* nfs4_stateid can either be an open stateid or (eventually) a lock stateid
-*
-* (open)nfs4_stateid: one per (open)nfs4_stateowner, nfs4_file
-*
-*       st_hash: stateid_hashtbl[] entry or lockstateid_hashtbl entry
-*       st_perfile: file_hashtbl[] entry.
-*       st_perfile_state: nfs4_stateowner->so_perfilestate
-*       st_perlockowner: (open stateid) list of lock nfs4_stateowners
-*       st_access_bmap: used only for open stateid
-*       st_deny_bmap: used only for open stateid
-*       st_openstp: open stateid lock stateid was derived from
-*
-* XXX: open stateids and lock stateids have diverged sufficiently that
-* we should consider defining separate structs for the two cases.
-*/
-struct nfs4_stateid {
-        struct list_head              st_hash; 
-        struct list_head              st_perfile;
-        struct list_head              st_perstateowner;
-        struct list_head              st_lockowners;
-        struct nfs4_stateowner      * st_stateowner;
-        struct nfs4_file            * st_file;
-        stateid_t                     st_stateid;
-        struct file                 * st_vfs_file;
-        unsigned long                 st_access_bmap;
-        unsigned long                 st_deny_bmap;
-        struct nfs4_stateid         * st_openstp;
-};
-/* flags for preprocess_seqid_op() */
-#define HAS_SESSION             0x00000001
-#define CONFIRM                 0x00000002
-#define OPEN_STATE              0x00000004
-#define LOCK_STATE              0x00000008
-#define RD_STATE                0x00000010
-#define WR_STATE                0x00000020
-#define CLOSE_STATE             0x00000040
-#define seqid_mutating_err(err)                       \
-        (((err) != nfserr_stale_clientid) &&    \
-        ((err) != nfserr_bad_seqid) &&          \
-        ((err) != nfserr_stale_stateid) &&      \
-        ((err) != nfserr_bad_stateid))
-struct nfsd4_compound_state;
-extern __be32 nfs4_preprocess_stateid_op(struct nfsd4_compound_state *cstate,
-                stateid_t *stateid, int flags, struct file **filp);
-extern void nfs4_lock_state(void);
-extern void nfs4_unlock_state(void);
-extern int nfs4_in_grace(void);
-extern __be32 nfs4_check_open_reclaim(clientid_t *clid);
-extern void put_nfs4_client(struct nfs4_client *clp);
-extern void nfs4_free_stateowner(struct kref *kref);
-extern int set_callback_cred(void);
-extern void nfsd4_probe_callback(struct nfs4_client *clp);
-extern void nfsd4_cb_recall(struct nfs4_delegation *dp);
-extern void nfs4_put_delegation(struct nfs4_delegation *dp);
-extern __be32 nfs4_make_rec_clidname(char *clidname, struct xdr_netobj *clname);
-extern void nfsd4_init_recdir(char *recdir_name);
-extern int nfsd4_recdir_load(void);
-extern void nfsd4_shutdown_recdir(void);
-extern int nfs4_client_to_reclaim(const char *name);
-extern int nfs4_has_reclaimed_state(const char *name, bool use_exchange_id);
-extern void nfsd4_recdir_purge_old(void);
-extern int nfsd4_create_clid_dir(struct nfs4_client *clp);
-extern void nfsd4_remove_clid_dir(struct nfs4_client *clp);
-static inline void
-nfs4_put_stateowner(struct nfs4_stateowner *so)
-{
-        kref_put(&so->so_ref, nfs4_free_stateowner);
-}
-static inline void
-nfs4_get_stateowner(struct nfs4_stateowner *so)
-{
-        kref_get(&so->so_ref);
-}
-#endif   /* NFSD4_STATE_H */
diff --git a/include/linux/nfsd/syscall.h b/include/linux/nfsd/syscall.h
index 7a3b565b898f..812bc1e160dc 100644
--- a/include/linux/nfsd/syscall.h
+++ b/include/linux/nfsd/syscall.h
@@ -9,14 +9,8 @@
 #ifndef NFSD_SYSCALL_H
 #define NFSD_SYSCALL_H
-# include <linux/types.h>
+#include <linux/types.h>
-#ifdef __KERNEL__
-# include <linux/in.h>
-#endif 
-#include <linux/posix_types.h>
-#include <linux/nfsd/const.h>
 #include <linux/nfsd/export.h>
-#include <linux/nfsd/nfsfh.h>
 /*
 * Version of the syscall interface
diff --git a/include/linux/nfsd/xdr.h b/include/linux/nfsd/xdr.h
deleted file mode 100644
index a0132ef58f21..000000000000
--- a/include/linux/nfsd/xdr.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * linux/include/linux/nfsd/xdr.h
- *
- * XDR types for nfsd. This is mainly a typing exercise.
- */
-#ifndef LINUX_NFSD_H
-#define LINUX_NFSD_H
-#include <linux/fs.h>
-#include <linux/vfs.h>
-#include <linux/nfs.h>
-struct nfsd_fhandle {
-        struct svc_fh           fh;
-};
-struct nfsd_sattrargs {
-        struct svc_fh           fh;
-        struct iattr            attrs;
-};
-struct nfsd_diropargs {
-        struct svc_fh           fh;
-        char *                  name;
-        unsigned int            len;
-};
-struct nfsd_readargs {
-        struct svc_fh           fh;
-        __u32                   offset;
-        __u32                   count;
-        int                     vlen;
-};
-struct nfsd_writeargs {
-        svc_fh                  fh;
-        __u32                   offset;
-        int                     len;
-        int                     vlen;
-};
-struct nfsd_createargs {
-        struct svc_fh           fh;
-        char *                  name;
-        unsigned int            len;
-        struct iattr            attrs;
-};
-struct nfsd_renameargs {
-        struct svc_fh           ffh;
-        char *                  fname;
-        unsigned int            flen;
-        struct svc_fh           tfh;
-        char *                  tname;
-        unsigned int            tlen;
-};
-struct nfsd_readlinkargs {
-        struct svc_fh           fh;
-        char *                  buffer;
-};
-        
-struct nfsd_linkargs {
-        struct svc_fh           ffh;
-        struct svc_fh           tfh;
-        char *                  tname;
-        unsigned int            tlen;
-};
-struct nfsd_symlinkargs {
-        struct svc_fh           ffh;
-        char *                  fname;
-        unsigned int            flen;
-        char *                  tname;
-        unsigned int            tlen;
-        struct iattr            attrs;
-};
-struct nfsd_readdirargs {
-        struct svc_fh           fh;
-        __u32                   cookie;
-        __u32                   count;
-        __be32 *                buffer;
-};
-struct nfsd_attrstat {
-        struct svc_fh           fh;
-        struct kstat            stat;
-};
-struct nfsd_diropres  {
-        struct svc_fh           fh;
-        struct kstat            stat;
-};
-struct nfsd_readlinkres {
-        int                     len;
-};
-struct nfsd_readres {
-        struct svc_fh           fh;
-        unsigned long           count;
-        struct kstat            stat;
-};
-struct nfsd_readdirres {
-        int                     count;
-        struct readdir_cd       common;
-        __be32 *                buffer;
-        int                     buflen;
-        __be32 *                offset;
-};
-struct nfsd_statfsres {
-        struct kstatfs          stats;
-};
-/*
- * Storage requirements for XDR arguments and results.
- */
-union nfsd_xdrstore {
-        struct nfsd_sattrargs   sattr;
-        struct nfsd_diropargs   dirop;
-        struct nfsd_readargs    read;
-        struct nfsd_writeargs   write;
-        struct nfsd_createargs  create;
-        struct nfsd_renameargs  rename;
-        struct nfsd_linkargs    link;
-        struct nfsd_symlinkargs symlink;
-        struct nfsd_readdirargs readdir;
-};
-#define NFS2_SVC_XDRSIZE        sizeof(union nfsd_xdrstore)
-int nfssvc_decode_void(struct svc_rqst *, __be32 *, void *);
-int nfssvc_decode_fhandle(struct svc_rqst *, __be32 *, struct nfsd_fhandle *);
-int nfssvc_decode_sattrargs(struct svc_rqst *, __be32 *,
-                                struct nfsd_sattrargs *);
-int nfssvc_decode_diropargs(struct svc_rqst *, __be32 *,
-                                struct nfsd_diropargs *);
-int nfssvc_decode_readargs(struct svc_rqst *, __be32 *,
-                                struct nfsd_readargs *);
-int nfssvc_decode_writeargs(struct svc_rqst *, __be32 *,
-                                struct nfsd_writeargs *);
-int nfssvc_decode_createargs(struct svc_rqst *, __be32 *,
-                                struct nfsd_createargs *);
-int nfssvc_decode_renameargs(struct svc_rqst *, __be32 *,
-                                struct nfsd_renameargs *);
-int nfssvc_decode_readlinkargs(struct svc_rqst *, __be32 *,
-                                struct nfsd_readlinkargs *);
-int nfssvc_decode_linkargs(struct svc_rqst *, __be32 *,
-                                struct nfsd_linkargs *);
-int nfssvc_decode_symlinkargs(struct svc_rqst *, __be32 *,
-                                struct nfsd_symlinkargs *);
-int nfssvc_decode_readdirargs(struct svc_rqst *, __be32 *,
-                                struct nfsd_readdirargs *);
-int nfssvc_encode_void(struct svc_rqst *, __be32 *, void *);
-int nfssvc_encode_attrstat(struct svc_rqst *, __be32 *, struct nfsd_attrstat *);
-int nfssvc_encode_diropres(struct svc_rqst *, __be32 *, struct nfsd_diropres *);
-int nfssvc_encode_readlinkres(struct svc_rqst *, __be32 *, struct nfsd_readlinkres *);
-int nfssvc_encode_readres(struct svc_rqst *, __be32 *, struct nfsd_readres *);
-int nfssvc_encode_statfsres(struct svc_rqst *, __be32 *, struct nfsd_statfsres *);
-int nfssvc_encode_readdirres(struct svc_rqst *, __be32 *, struct nfsd_readdirres *);
-int nfssvc_encode_entry(void *, const char *name,
-                        int namlen, loff_t offset, u64 ino, unsigned int);
-int nfssvc_release_fhandle(struct svc_rqst *, __be32 *, struct nfsd_fhandle *);
-/* Helper functions for NFSv2 ACL code */
-__be32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp);
-__be32 *nfs2svc_decode_fh(__be32 *p, struct svc_fh *fhp);
-#endif /* LINUX_NFSD_H */
diff --git a/include/linux/nfsd/xdr3.h b/include/linux/nfsd/xdr3.h
deleted file mode 100644
index 421eddd65a25..000000000000
--- a/include/linux/nfsd/xdr3.h
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * linux/include/linux/nfsd/xdr3.h
- *
- * XDR types for NFSv3 in nfsd.
- *
- * Copyright (C) 1996-1998, Olaf Kirch <okir@monad.swb.de>
- */
-#ifndef _LINUX_NFSD_XDR3_H
-#define _LINUX_NFSD_XDR3_H
-#include <linux/nfsd/xdr.h>
-struct nfsd3_sattrargs {
-        struct svc_fh           fh;
-        struct iattr            attrs;
-        int                     check_guard;
-        time_t                  guardtime;
-};
-struct nfsd3_diropargs {
-        struct svc_fh           fh;
-        char *                  name;
-        unsigned int            len;
-};
-struct nfsd3_accessargs {
-        struct svc_fh           fh;
-        unsigned int            access;
-};
-struct nfsd3_readargs {
-        struct svc_fh           fh;
-        __u64                   offset;
-        __u32                   count;
-        int                     vlen;
-};
-struct nfsd3_writeargs {
-        svc_fh                  fh;
-        __u64                   offset;
-        __u32                   count;
-        int                     stable;
-        __u32                   len;
-        int                     vlen;
-};
-struct nfsd3_createargs {
-        struct svc_fh           fh;
-        char *                  name;
-        unsigned int            len;
-        int                     createmode;
-        struct iattr            attrs;
-        __be32 *                verf;
-};
-struct nfsd3_mknodargs {
-        struct svc_fh           fh;
-        char *                  name;
-        unsigned int            len;
-        __u32                   ftype;
-        __u32                   major, minor;
-        struct iattr            attrs;
-};
-struct nfsd3_renameargs {
-        struct svc_fh           ffh;
-        char *                  fname;
-        unsigned int            flen;
-        struct svc_fh           tfh;
-        char *                  tname;
-        unsigned int            tlen;
-};
-struct nfsd3_readlinkargs {
-        struct svc_fh           fh;
-        char *                  buffer;
-};
-struct nfsd3_linkargs {
-        struct svc_fh           ffh;
-        struct svc_fh           tfh;
-        char *                  tname;
-        unsigned int            tlen;
-};
-struct nfsd3_symlinkargs {
-        struct svc_fh           ffh;
-        char *                  fname;
-        unsigned int            flen;
-        char *                  tname;
-        unsigned int            tlen;
-        struct iattr            attrs;
-};
-struct nfsd3_readdirargs {
-        struct svc_fh           fh;
-        __u64                   cookie;
-        __u32                   dircount;
-        __u32                   count;
-        __be32 *                verf;
-        __be32 *                buffer;
-};
-struct nfsd3_commitargs {
-        struct svc_fh           fh;
-        __u64                   offset;
-        __u32                   count;
-};
-struct nfsd3_getaclargs {
-        struct svc_fh           fh;
-        int                     mask;
-};
-struct posix_acl;
-struct nfsd3_setaclargs {
-        struct svc_fh           fh;
-        int                     mask;
-        struct posix_acl        *acl_access;
-        struct posix_acl        *acl_default;
-};
-struct nfsd3_attrstat {
-        __be32                  status;
-        struct svc_fh           fh;
-        struct kstat            stat;
-};
-/* LOOKUP, CREATE, MKDIR, SYMLINK, MKNOD */
-struct nfsd3_diropres  {
-        __be32                  status;
-        struct svc_fh           dirfh;
-        struct svc_fh           fh;
-};
-struct nfsd3_accessres {
-        __be32                  status;
-        struct svc_fh           fh;
-        __u32                   access;
-};
-struct nfsd3_readlinkres {
-        __be32                  status;
-        struct svc_fh           fh;
-        __u32                   len;
-};
-struct nfsd3_readres {
-        __be32                  status;
-        struct svc_fh           fh;
-        unsigned long           count;
-        int                     eof;
-};
-struct nfsd3_writeres {
-        __be32                  status;
-        struct svc_fh           fh;
-        unsigned long           count;
-        int                     committed;
-};
-struct nfsd3_renameres {
-        __be32                  status;
-        struct svc_fh           ffh;
-        struct svc_fh           tfh;
-};
-struct nfsd3_linkres {
-        __be32                  status;
-        struct svc_fh           tfh;
-        struct svc_fh           fh;
-};
-struct nfsd3_readdirres {
-        __be32                  status;
-        struct svc_fh           fh;
-        int                     count;
-        __be32                  verf[2];
-        struct readdir_cd       common;
-        __be32 *                buffer;
-        int                     buflen;
-        __be32 *                offset;
-        __be32 *                offset1;
-        struct svc_rqst *       rqstp;
-};
-struct nfsd3_fsstatres {
-        __be32                  status;
-        struct kstatfs          stats;
-        __u32                   invarsec;
-};
-struct nfsd3_fsinfores {
-        __be32                  status;
-        __u32                   f_rtmax;
-        __u32                   f_rtpref;
-        __u32                   f_rtmult;
-        __u32                   f_wtmax;
-        __u32                   f_wtpref;
-        __u32                   f_wtmult;
-        __u32                   f_dtpref;
-        __u64                   f_maxfilesize;
-        __u32                   f_properties;
-};
-struct nfsd3_pathconfres {
-        __be32                  status;
-        __u32                   p_link_max;
-        __u32                   p_name_max;
-        __u32                   p_no_trunc;
-        __u32                   p_chown_restricted;
-        __u32                   p_case_insensitive;
-        __u32                   p_case_preserving;
-};
-struct nfsd3_commitres {
-        __be32                  status;
-        struct svc_fh           fh;
-};
-struct nfsd3_getaclres {
-        __be32                  status;
-        struct svc_fh           fh;
-        int                     mask;
-        struct posix_acl        *acl_access;
-        struct posix_acl        *acl_default;
-};
-/* dummy type for release */
-struct nfsd3_fhandle_pair {
-        __u32                   dummy;
-        struct svc_fh           fh1;
-        struct svc_fh           fh2;
-};
-/*
- * Storage requirements for XDR arguments and results.
- */
-union nfsd3_xdrstore {
-        struct nfsd3_sattrargs          sattrargs;
-        struct nfsd3_diropargs          diropargs;
-        struct nfsd3_readargs           readargs;
-        struct nfsd3_writeargs          writeargs;
-        struct nfsd3_createargs         createargs;
-        struct nfsd3_renameargs         renameargs;
-        struct nfsd3_linkargs           linkargs;
-        struct nfsd3_symlinkargs        symlinkargs;
-        struct nfsd3_readdirargs        readdirargs;
-        struct nfsd3_diropres           diropres;
-        struct nfsd3_accessres          accessres;
-        struct nfsd3_readlinkres        readlinkres;
-        struct nfsd3_readres            readres;
-        struct nfsd3_writeres           writeres;
-        struct nfsd3_renameres          renameres;
-        struct nfsd3_linkres            linkres;
-        struct nfsd3_readdirres         readdirres;
-        struct nfsd3_fsstatres          fsstatres;
-        struct nfsd3_fsinfores          fsinfores;
-        struct nfsd3_pathconfres        pathconfres;
-        struct nfsd3_commitres          commitres;
-        struct nfsd3_getaclres          getaclres;
-};
-#define NFS3_SVC_XDRSIZE                sizeof(union nfsd3_xdrstore)
-int nfs3svc_decode_fhandle(struct svc_rqst *, __be32 *, struct nfsd_fhandle *);
-int nfs3svc_decode_sattrargs(struct svc_rqst *, __be32 *,
-                                struct nfsd3_sattrargs *);
-int nfs3svc_decode_diropargs(struct svc_rqst *, __be32 *,
-                                struct nfsd3_diropargs *);
-int nfs3svc_decode_accessargs(struct svc_rqst *, __be32 *,
-                                struct nfsd3_accessargs *);
-int nfs3svc_decode_readargs(struct svc_rqst *, __be32 *,
-                                struct nfsd3_readargs *);
-int nfs3svc_decode_writeargs(struct svc_rqst *, __be32 *,
-                                struct nfsd3_writeargs *);
-int nfs3svc_decode_createargs(struct svc_rqst *, __be32 *,
-                                struct nfsd3_createargs *);
-int nfs3svc_decode_mkdirargs(struct svc_rqst *, __be32 *,
-                                struct nfsd3_createargs *);
-int nfs3svc_decode_mknodargs(struct svc_rqst *, __be32 *,
-                                struct nfsd3_mknodargs *);
-int nfs3svc_decode_renameargs(struct svc_rqst *, __be32 *,
-                                struct nfsd3_renameargs *);
-int nfs3svc_decode_readlinkargs(struct svc_rqst *, __be32 *,
-                                struct nfsd3_readlinkargs *);
-int nfs3svc_decode_linkargs(struct svc_rqst *, __be32 *,
-                                struct nfsd3_linkargs *);
-int nfs3svc_decode_symlinkargs(struct svc_rqst *, __be32 *,
-                                struct nfsd3_symlinkargs *);
-int nfs3svc_decode_readdirargs(struct svc_rqst *, __be32 *,
-                                struct nfsd3_readdirargs *);
-int nfs3svc_decode_readdirplusargs(struct svc_rqst *, __be32 *,
-                                struct nfsd3_readdirargs *);
-int nfs3svc_decode_commitargs(struct svc_rqst *, __be32 *,
-                                struct nfsd3_commitargs *);
-int nfs3svc_encode_voidres(struct svc_rqst *, __be32 *, void *);
-int nfs3svc_encode_attrstat(struct svc_rqst *, __be32 *,
-                                struct nfsd3_attrstat *);
-int nfs3svc_encode_wccstat(struct svc_rqst *, __be32 *,
-                                struct nfsd3_attrstat *);
-int nfs3svc_encode_diropres(struct svc_rqst *, __be32 *,
-                                struct nfsd3_diropres *);
-int nfs3svc_encode_accessres(struct svc_rqst *, __be32 *,
-                                struct nfsd3_accessres *);
-int nfs3svc_encode_readlinkres(struct svc_rqst *, __be32 *,
-                                struct nfsd3_readlinkres *);
-int nfs3svc_encode_readres(struct svc_rqst *, __be32 *, struct nfsd3_readres *);
-int nfs3svc_encode_writeres(struct svc_rqst *, __be32 *, struct nfsd3_writeres *);
-int nfs3svc_encode_createres(struct svc_rqst *, __be32 *,
-                                struct nfsd3_diropres *);
-int nfs3svc_encode_renameres(struct svc_rqst *, __be32 *,
-                                struct nfsd3_renameres *);
-int nfs3svc_encode_linkres(struct svc_rqst *, __be32 *,
-                                struct nfsd3_linkres *);
-int nfs3svc_encode_readdirres(struct svc_rqst *, __be32 *,
-                                struct nfsd3_readdirres *);
-int nfs3svc_encode_fsstatres(struct svc_rqst *, __be32 *,
-                                struct nfsd3_fsstatres *);
-int nfs3svc_encode_fsinfores(struct svc_rqst *, __be32 *,
-                                struct nfsd3_fsinfores *);
-int nfs3svc_encode_pathconfres(struct svc_rqst *, __be32 *,
-                                struct nfsd3_pathconfres *);
-int nfs3svc_encode_commitres(struct svc_rqst *, __be32 *,
-                                struct nfsd3_commitres *);
-int nfs3svc_release_fhandle(struct svc_rqst *, __be32 *,
-                                struct nfsd3_attrstat *);
-int nfs3svc_release_fhandle2(struct svc_rqst *, __be32 *,
-                                struct nfsd3_fhandle_pair *);
-int nfs3svc_encode_entry(void *, const char *name,
-                                int namlen, loff_t offset, u64 ino,
-                                unsigned int);
-int nfs3svc_encode_entry_plus(void *, const char *name,
-                                int namlen, loff_t offset, u64 ino,
-                                unsigned int);
-/* Helper functions for NFSv3 ACL code */
-__be32 *nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, __be32 *p,
-                                struct svc_fh *fhp);
-__be32 *nfs3svc_decode_fh(__be32 *p, struct svc_fh *fhp);
-#endif /* _LINUX_NFSD_XDR3_H */
diff --git a/include/linux/nfsd/xdr4.h b/include/linux/nfsd/xdr4.h
deleted file mode 100644
index 73164c2b3d29..000000000000
--- a/include/linux/nfsd/xdr4.h
+++ /dev/null
@@ -1,563 +0,0 @@
-/*
- *  include/linux/nfsd/xdr4.h
- *
- *  Server-side types for NFSv4.
- *
- *  Copyright (c) 2002 The Regents of the University of Michigan.
- *  All rights reserved.
- *
- *  Kendrick Smith <kmsmith@umich.edu>
- *  Andy Adamson   <andros@umich.edu>
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *  3. Neither the name of the University nor the names of its
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-#ifndef _LINUX_NFSD_XDR4_H
-#define _LINUX_NFSD_XDR4_H
-#include <linux/nfs4.h>
-#define NFSD4_MAX_TAGLEN        128
-#define XDR_LEN(n)                     (((n) + 3) & ~3)
-struct nfsd4_compound_state {
-        struct svc_fh           current_fh;
-        struct svc_fh           save_fh;
-        struct nfs4_stateowner  *replay_owner;
-        /* For sessions DRC */
-        struct nfsd4_session    *session;
-        struct nfsd4_slot       *slot;
-        __be32                  *datap;
-        size_t                  iovlen;
-        u32                     minorversion;
-        u32                     status;
-};
-static inline bool nfsd4_has_session(struct nfsd4_compound_state *cs)
-{
-        return cs->slot != NULL;
-}
-struct nfsd4_change_info {
-        u32             atomic;
-        bool            change_supported;
-        u32             before_ctime_sec;
-        u32             before_ctime_nsec;
-        u64             before_change;
-        u32             after_ctime_sec;
-        u32             after_ctime_nsec;
-        u64             after_change;
-};
-struct nfsd4_access {
-        u32             ac_req_access;      /* request */
-        u32             ac_supported;       /* response */
-        u32             ac_resp_access;     /* response */
-};
-struct nfsd4_close {
-        u32             cl_seqid;           /* request */
-        stateid_t       cl_stateid;         /* request+response */
-        struct nfs4_stateowner * cl_stateowner; /* response */
-};
-struct nfsd4_commit {
-        u64             co_offset;          /* request */
-        u32             co_count;           /* request */
-        nfs4_verifier   co_verf;            /* response */
-};
-struct nfsd4_create {
-        u32             cr_namelen;         /* request */
-        char *          cr_name;            /* request */
-        u32             cr_type;            /* request */
-        union {                             /* request */
-                struct {
-                        u32 namelen;
-                        char *name;
-                } link;   /* NF4LNK */
-                struct {
-                        u32 specdata1;
-                        u32 specdata2;
-                } dev;    /* NF4BLK, NF4CHR */
-        } u;
-        u32             cr_bmval[3];        /* request */
-        struct iattr    cr_iattr;           /* request */
-        struct nfsd4_change_info  cr_cinfo; /* response */
-        struct nfs4_acl *cr_acl;
-};
-#define cr_linklen      u.link.namelen
-#define cr_linkname     u.link.name
-#define cr_specdata1    u.dev.specdata1
-#define cr_specdata2    u.dev.specdata2
-struct nfsd4_delegreturn {
-        stateid_t       dr_stateid;
-};
-struct nfsd4_getattr {
-        u32             ga_bmval[3];        /* request */
-        struct svc_fh   *ga_fhp;            /* response */
-};
-struct nfsd4_link {
-        u32             li_namelen;         /* request */
-        char *          li_name;            /* request */
-        struct nfsd4_change_info  li_cinfo; /* response */
-};
-struct nfsd4_lock_denied {
-        clientid_t      ld_clientid;
-        struct nfs4_stateowner   *ld_sop;
-        u64             ld_start;
-        u64             ld_length;
-        u32             ld_type;
-};
-struct nfsd4_lock {
-        /* request */
-        u32             lk_type;
-        u32             lk_reclaim;         /* boolean */
-        u64             lk_offset;
-        u64             lk_length;
-        u32             lk_is_new;
-        union {
-                struct {
-                        u32             open_seqid;
-                        stateid_t       open_stateid;
-                        u32             lock_seqid;
-                        clientid_t      clientid;
-                        struct xdr_netobj owner;
-                } new;
-                struct {
-                        stateid_t       lock_stateid;
-                        u32             lock_seqid;
-                } old;
-        } v;
-        /* response */
-        union {
-                struct {
-                        stateid_t               stateid;
-                } ok;
-                struct nfsd4_lock_denied        denied;
-        } u;
-        /* The lk_replay_owner is the open owner in the open_to_lock_owner
-         * case and the lock owner otherwise: */
-        struct nfs4_stateowner *lk_replay_owner;
-};
-#define lk_new_open_seqid       v.new.open_seqid
-#define lk_new_open_stateid     v.new.open_stateid
-#define lk_new_lock_seqid       v.new.lock_seqid
-#define lk_new_clientid         v.new.clientid
-#define lk_new_owner            v.new.owner
-#define lk_old_lock_stateid     v.old.lock_stateid
-#define lk_old_lock_seqid       v.old.lock_seqid
-#define lk_rflags       u.ok.rflags
-#define lk_resp_stateid u.ok.stateid
-#define lk_denied       u.denied
-struct nfsd4_lockt {
-        u32                             lt_type;
-        clientid_t                      lt_clientid;
-        struct xdr_netobj               lt_owner;
-        u64                             lt_offset;
-        u64                             lt_length;
-        struct nfs4_stateowner *        lt_stateowner;
-        struct nfsd4_lock_denied        lt_denied;
-};
- 
-struct nfsd4_locku {
-        u32             lu_type;
-        u32             lu_seqid;
-        stateid_t       lu_stateid;
-        u64             lu_offset;
-        u64             lu_length;
-        struct nfs4_stateowner  *lu_stateowner;
-};
-struct nfsd4_lookup {
-        u32             lo_len;             /* request */
-        char *          lo_name;            /* request */
-};
-struct nfsd4_putfh {
-        u32             pf_fhlen;           /* request */
-        char            *pf_fhval;          /* request */
-};
-struct nfsd4_open {
-        u32             op_claim_type;      /* request */
-        struct xdr_netobj op_fname;         /* request - everything but CLAIM_PREV */
-        u32             op_delegate_type;   /* request - CLAIM_PREV only */
-        stateid_t       op_delegate_stateid; /* request - response */
-        u32             op_create;          /* request */
-        u32             op_createmode;      /* request */
-        u32             op_bmval[3];        /* request */
-        struct iattr    iattr;              /* UNCHECKED4, GUARDED4, EXCLUSIVE4_1 */
-        nfs4_verifier   verf;               /* EXCLUSIVE4 */
-        clientid_t      op_clientid;        /* request */
-        struct xdr_netobj op_owner;           /* request */
-        u32             op_seqid;           /* request */
-        u32             op_share_access;    /* request */
-        u32             op_share_deny;      /* request */
-        stateid_t       op_stateid;         /* response */
-        u32             op_recall;          /* recall */
-        struct nfsd4_change_info  op_cinfo; /* response */
-        u32             op_rflags;          /* response */
-        int             op_truncate;        /* used during processing */
-        struct nfs4_stateowner *op_stateowner; /* used during processing */
-        struct nfs4_acl *op_acl;
-};
-#define op_iattr        iattr
-#define op_verf         verf
-struct nfsd4_open_confirm {
-        stateid_t       oc_req_stateid          /* request */;
-        u32             oc_seqid                /* request */;
-        stateid_t       oc_resp_stateid         /* response */;
-        struct nfs4_stateowner * oc_stateowner; /* response */
-};
-struct nfsd4_open_downgrade {
-        stateid_t       od_stateid;
-        u32             od_seqid;
-        u32             od_share_access;
-        u32             od_share_deny;
-        struct nfs4_stateowner *od_stateowner;
-};
-struct nfsd4_read {
-        stateid_t       rd_stateid;         /* request */
-        u64             rd_offset;          /* request */
-        u32             rd_length;          /* request */
-        int             rd_vlen;
-        struct file     *rd_filp;
-        
-        struct svc_rqst *rd_rqstp;          /* response */
-        struct svc_fh * rd_fhp;             /* response */
-};
-struct nfsd4_readdir {
-        u64             rd_cookie;          /* request */
-        nfs4_verifier   rd_verf;            /* request */
-        u32             rd_dircount;        /* request */
-        u32             rd_maxcount;        /* request */
-        u32             rd_bmval[3];        /* request */
-        struct svc_rqst *rd_rqstp;          /* response */
-        struct svc_fh * rd_fhp;             /* response */
-        struct readdir_cd       common;
-        __be32 *                buffer;
-        int                     buflen;
-        __be32 *                offset;
-};
-struct nfsd4_release_lockowner {
-        clientid_t        rl_clientid;
-        struct xdr_netobj rl_owner;
-};
-struct nfsd4_readlink {
-        struct svc_rqst *rl_rqstp;          /* request */
-        struct svc_fh * rl_fhp;             /* request */
-};
-struct nfsd4_remove {
-        u32             rm_namelen;         /* request */
-        char *          rm_name;            /* request */
-        struct nfsd4_change_info  rm_cinfo; /* response */
-};
-struct nfsd4_rename {
-        u32             rn_snamelen;        /* request */
-        char *          rn_sname;           /* request */
-        u32             rn_tnamelen;        /* request */
-        char *          rn_tname;           /* request */
-        struct nfsd4_change_info  rn_sinfo; /* response */
-        struct nfsd4_change_info  rn_tinfo; /* response */
-};
-struct nfsd4_secinfo {
-        u32 si_namelen;                                 /* request */
-        char *si_name;                                  /* request */
-        struct svc_export *si_exp;                      /* response */
-};
-struct nfsd4_setattr {
-        stateid_t       sa_stateid;         /* request */
-        u32             sa_bmval[3];        /* request */
-        struct iattr    sa_iattr;           /* request */
-        struct nfs4_acl *sa_acl;
-};
-struct nfsd4_setclientid {
-        nfs4_verifier   se_verf;            /* request */
-        u32             se_namelen;         /* request */
-        char *          se_name;            /* request */
-        u32             se_callback_prog;   /* request */
-        u32             se_callback_netid_len;  /* request */
-        char *          se_callback_netid_val;  /* request */
-        u32             se_callback_addr_len;   /* request */
-        char *          se_callback_addr_val;   /* request */
-        u32             se_callback_ident;  /* request */
-        clientid_t      se_clientid;        /* response */
-        nfs4_verifier   se_confirm;         /* response */
-};
-struct nfsd4_setclientid_confirm {
-        clientid_t      sc_clientid;
-        nfs4_verifier   sc_confirm;
-};
-/* also used for NVERIFY */
-struct nfsd4_verify {
-        u32             ve_bmval[3];        /* request */
-        u32             ve_attrlen;         /* request */
-        char *          ve_attrval;         /* request */
-};
-struct nfsd4_write {
-        stateid_t       wr_stateid;         /* request */
-        u64             wr_offset;          /* request */
-        u32             wr_stable_how;      /* request */
-        u32             wr_buflen;          /* request */
-        int             wr_vlen;
-        u32             wr_bytes_written;   /* response */
-        u32             wr_how_written;     /* response */
-        nfs4_verifier   wr_verifier;        /* response */
-};
-struct nfsd4_exchange_id {
-        nfs4_verifier   verifier;
-        struct xdr_netobj clname;
-        u32             flags;
-        clientid_t      clientid;
-        u32             seqid;
-        int             spa_how;
-};
-struct nfsd4_sequence {
-        struct nfs4_sessionid   sessionid;              /* request/response */
-        u32                     seqid;                  /* request/response */
-        u32                     slotid;                 /* request/response */
-        u32                     maxslots;               /* request/response */
-        u32                     cachethis;              /* request */
-#if 0
-        u32                     target_maxslots;        /* response */
-        u32                     status_flags;           /* response */
-#endif /* not yet */
-};
-struct nfsd4_destroy_session {
-        struct nfs4_sessionid   sessionid;
-};
-struct nfsd4_op {
-        int                                     opnum;
-        __be32                                  status;
-        union {
-                struct nfsd4_access             access;
-                struct nfsd4_close              close;
-                struct nfsd4_commit             commit;
-                struct nfsd4_create             create;
-                struct nfsd4_delegreturn        delegreturn;
-                struct nfsd4_getattr            getattr;
-                struct svc_fh *                 getfh;
-                struct nfsd4_link               link;
-                struct nfsd4_lock               lock;
-                struct nfsd4_lockt              lockt;
-                struct nfsd4_locku              locku;
-                struct nfsd4_lookup             lookup;
-                struct nfsd4_verify             nverify;
-                struct nfsd4_open               open;
-                struct nfsd4_open_confirm       open_confirm;
-                struct nfsd4_open_downgrade     open_downgrade;
-                struct nfsd4_putfh              putfh;
-                struct nfsd4_read               read;
-                struct nfsd4_readdir            readdir;
-                struct nfsd4_readlink           readlink;
-                struct nfsd4_remove             remove;
-                struct nfsd4_rename             rename;
-                clientid_t                      renew;
-                struct nfsd4_secinfo            secinfo;
-                struct nfsd4_setattr            setattr;
-                struct nfsd4_setclientid        setclientid;
-                struct nfsd4_setclientid_confirm setclientid_confirm;
-                struct nfsd4_verify             verify;
-                struct nfsd4_write              write;
-                struct nfsd4_release_lockowner  release_lockowner;
-                /* NFSv4.1 */
-                struct nfsd4_exchange_id        exchange_id;
-                struct nfsd4_create_session     create_session;
-                struct nfsd4_destroy_session    destroy_session;
-                struct nfsd4_sequence           sequence;
-        } u;
-        struct nfs4_replay *                    replay;
-};
-struct nfsd4_compoundargs {
-        /* scratch variables for XDR decode */
-        __be32 *                        p;
-        __be32 *                        end;
-        struct page **                  pagelist;
-        int                             pagelen;
-        __be32                          tmp[8];
-        __be32 *                        tmpp;
-        struct tmpbuf {
-                struct tmpbuf *next;
-                void (*release)(const void *);
-                void *buf;
-        }                               *to_free;
-        struct svc_rqst                 *rqstp;
-        u32                             taglen;
-        char *                          tag;
-        u32                             minorversion;
-        u32                             opcnt;
-        struct nfsd4_op                 *ops;
-        struct nfsd4_op                 iops[8];
-};
-struct nfsd4_compoundres {
-        /* scratch variables for XDR encode */
-        __be32 *                        p;
-        __be32 *                        end;
-        struct xdr_buf *                xbuf;
-        struct svc_rqst *               rqstp;
-        u32                             taglen;
-        char *                          tag;
-        u32                             opcnt;
-        __be32 *                        tagp; /* tag, opcount encode location */
-        struct nfsd4_compound_state     cstate;
-};
-static inline bool nfsd4_is_solo_sequence(struct nfsd4_compoundres *resp)
-{
-        struct nfsd4_compoundargs *args = resp->rqstp->rq_argp;
-        return resp->opcnt == 1 && args->ops[0].opnum == OP_SEQUENCE;
-}
-static inline bool nfsd4_not_cached(struct nfsd4_compoundres *resp)
-{
-        return !resp->cstate.slot->sl_cachethis || nfsd4_is_solo_sequence(resp);
-}
-#define NFS4_SVC_XDRSIZE                sizeof(struct nfsd4_compoundargs)
-static inline void
-set_change_info(struct nfsd4_change_info *cinfo, struct svc_fh *fhp)
-{
-        BUG_ON(!fhp->fh_pre_saved || !fhp->fh_post_saved);
-        cinfo->atomic = 1;
-        cinfo->change_supported = IS_I_VERSION(fhp->fh_dentry->d_inode);
-        if (cinfo->change_supported) {
-                cinfo->before_change = fhp->fh_pre_change;
-                cinfo->after_change = fhp->fh_post_change;
-        } else {
-                cinfo->before_ctime_sec = fhp->fh_pre_ctime.tv_sec;
-                cinfo->before_ctime_nsec = fhp->fh_pre_ctime.tv_nsec;
-                cinfo->after_ctime_sec = fhp->fh_post_attr.ctime.tv_sec;
-                cinfo->after_ctime_nsec = fhp->fh_post_attr.ctime.tv_nsec;
-        }
-}
-int nfs4svc_encode_voidres(struct svc_rqst *, __be32 *, void *);
-int nfs4svc_decode_compoundargs(struct svc_rqst *, __be32 *,
-                struct nfsd4_compoundargs *);
-int nfs4svc_encode_compoundres(struct svc_rqst *, __be32 *,
-                struct nfsd4_compoundres *);
-void nfsd4_encode_operation(struct nfsd4_compoundres *, struct nfsd4_op *);
-void nfsd4_encode_replay(struct nfsd4_compoundres *resp, struct nfsd4_op *op);
-__be32 nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
-                       struct dentry *dentry, __be32 *buffer, int *countp,
-                       u32 *bmval, struct svc_rqst *, int ignore_crossmnt);
-extern __be32 nfsd4_setclientid(struct svc_rqst *rqstp,
-                struct nfsd4_compound_state *,
-                struct nfsd4_setclientid *setclid);
-extern __be32 nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
-                struct nfsd4_compound_state *,
-                struct nfsd4_setclientid_confirm *setclientid_confirm);
-extern void nfsd4_store_cache_entry(struct nfsd4_compoundres *resp);
-extern __be32 nfsd4_replay_cache_entry(struct nfsd4_compoundres *resp,
-                struct nfsd4_sequence *seq);
-extern __be32 nfsd4_exchange_id(struct svc_rqst *rqstp,
-                struct nfsd4_compound_state *,
-struct nfsd4_exchange_id *);
-                extern __be32 nfsd4_create_session(struct svc_rqst *,
-                struct nfsd4_compound_state *,
-                struct nfsd4_create_session *);
-extern __be32 nfsd4_sequence(struct svc_rqst *,
-                struct nfsd4_compound_state *,
-                struct nfsd4_sequence *);
-extern __be32 nfsd4_destroy_session(struct svc_rqst *,
-                struct nfsd4_compound_state *,
-                struct nfsd4_destroy_session *);
-extern __be32 nfsd4_process_open1(struct nfsd4_compound_state *,
-                struct nfsd4_open *open);
-extern __be32 nfsd4_process_open2(struct svc_rqst *rqstp,
-                struct svc_fh *current_fh, struct nfsd4_open *open);
-extern __be32 nfsd4_open_confirm(struct svc_rqst *rqstp,
-                struct nfsd4_compound_state *, struct nfsd4_open_confirm *oc);
-extern __be32 nfsd4_close(struct svc_rqst *rqstp,
-                struct nfsd4_compound_state *,
-                struct nfsd4_close *close);
-extern __be32 nfsd4_open_downgrade(struct svc_rqst *rqstp,
-                struct nfsd4_compound_state *,
-                struct nfsd4_open_downgrade *od);
-extern __be32 nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *,
-                struct nfsd4_lock *lock);
-extern __be32 nfsd4_lockt(struct svc_rqst *rqstp,
-                struct nfsd4_compound_state *,
-                struct nfsd4_lockt *lockt);
-extern __be32 nfsd4_locku(struct svc_rqst *rqstp,
-                struct nfsd4_compound_state *,
-                struct nfsd4_locku *locku);
-extern __be32
-nfsd4_release_lockowner(struct svc_rqst *rqstp,
-                struct nfsd4_compound_state *,
-                struct nfsd4_release_lockowner *rlockowner);
-extern void nfsd4_release_compoundargs(struct nfsd4_compoundargs *);
-extern __be32 nfsd4_delegreturn(struct svc_rqst *rqstp,
-                struct nfsd4_compound_state *, struct nfsd4_delegreturn *dr);
-extern __be32 nfsd4_renew(struct svc_rqst *rqstp,
-                          struct nfsd4_compound_state *, clientid_t *clid);
-#endif
-/*
- * Local variables:
- *  c-basic-offset: 8
- * End:
- */
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 49e907bd067f..feee2ba8d06a 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -275,13 +275,15 @@ PAGEFLAG_FALSE(Uncached)
 #ifdef CONFIG_MEMORY_FAILURE
 PAGEFLAG(HWPoison, hwpoison)
-TESTSETFLAG(HWPoison, hwpoison)
+TESTSCFLAG(HWPoison, hwpoison)
 #define __PG_HWPOISON (1UL << PG_hwpoison)
 #else
 PAGEFLAG_FALSE(HWPoison)
 #define __PG_HWPOISON 0
 #endif
+u64 stable_page_flags(struct page *page);
 static inline int PageUptodate(struct page *page)
 {
        int ret = test_bit(PG_uptodate, &(page)->flags);
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index da7bdc23f279..c66b34f75eea 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -211,17 +211,11 @@ struct perf_event_attr {
                __u32           wakeup_watermark; /* bytes before wakeup   */
        };
-        struct { /* Hardware breakpoint info */
-                __u64           bp_addr;
-                __u32           bp_type;
-                __u32           bp_len;
-                __u64           __bp_reserved_1;
-                __u64           __bp_reserved_2;
-        };
        __u32                   __reserved_2;
-        __u64                   __reserved_3;
+        __u64                   bp_addr;
+        __u32                   bp_type;
+        __u32                   bp_len;
 };
 /*
diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index fddfafaed024..7c4193eb0072 100644
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -334,6 +334,19 @@ extern struct pnp_protocol pnpbios_protocol;
 #define pnp_device_is_pnpbios(dev) 0
 #endif
+#ifdef CONFIG_PNPACPI
+extern struct pnp_protocol pnpacpi_protocol;
+static inline struct acpi_device *pnp_acpi_device(struct pnp_dev *dev)
+{
+        if (dev->protocol == &pnpacpi_protocol)
+                return dev->data;
+        return NULL;
+}
+#else
+#define pnp_acpi_device(dev) 0
+#endif
 /* status */
 #define PNP_READY               0x0000
 #define PNP_ATTACHED            0x0001
diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
index deee7afd8d66..e164291fb3e7 100644
--- a/include/linux/shmem_fs.h
+++ b/include/linux/shmem_fs.h
@@ -41,20 +41,4 @@ static inline struct shmem_inode_info *SHMEM_I(struct inode *inode)
 extern int init_tmpfs(void);
 extern int shmem_fill_super(struct super_block *sb, void *data, int silent);
-#ifdef CONFIG_TMPFS_POSIX_ACL
-int shmem_check_acl(struct inode *, int);
-int shmem_acl_init(struct inode *, struct inode *);
-extern struct xattr_handler shmem_xattr_acl_access_handler;
-extern struct xattr_handler shmem_xattr_acl_default_handler;
-extern struct generic_acl_operations shmem_acl_ops;
-#else
-static inline int shmem_acl_init(struct inode *inode, struct inode *dir)
-{
-        return 0;
-}
-#endif  /* CONFIG_TMPFS_POSIX_ACL */
 #endif
diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h
index 10709cbe96fd..c2786f20016f 100644
--- a/include/linux/sunrpc/debug.h
+++ b/include/linux/sunrpc/debug.h
@@ -28,9 +28,6 @@
 #ifdef __KERNEL__
-#include <linux/timer.h>
-#include <linux/workqueue.h>
 /*
 * Enable RPC debugging/profiling.
 */
diff --git a/include/linux/sunrpc/rpc_rdma.h b/include/linux/sunrpc/rpc_rdma.h
index 87b895d5c786..b78f16b1dea3 100644
--- a/include/linux/sunrpc/rpc_rdma.h
+++ b/include/linux/sunrpc/rpc_rdma.h
@@ -40,6 +40,8 @@
 #ifndef _LINUX_SUNRPC_RPC_RDMA_H
 #define _LINUX_SUNRPC_RPC_RDMA_H
+#include <linux/types.h>
 struct rpcrdma_segment {
        __be32 rs_handle;       /* Registered memory handle */
        __be32 rs_length;       /* Length of the chunk in bytes */
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index 1906782ec86b..7bc7fd5291ce 100644
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -173,7 +173,8 @@ struct rpc_task_setup {
 #define RPC_PRIORITY_LOW        (-1)
 #define RPC_PRIORITY_NORMAL     (0)
 #define RPC_PRIORITY_HIGH       (1)
-#define RPC_NR_PRIORITY         (1 + RPC_PRIORITY_HIGH - RPC_PRIORITY_LOW)
+#define RPC_PRIORITY_PRIVILEGED (2)
+#define RPC_NR_PRIORITY         (1 + RPC_PRIORITY_PRIVILEGED - RPC_PRIORITY_LOW)
 struct rpc_timer {
        struct timer_list timer;
@@ -229,6 +230,7 @@ void		rpc_wake_up_queued_task(struct rpc_wait_queue *,
 void            rpc_wake_up(struct rpc_wait_queue *);
 struct rpc_task *rpc_wake_up_next(struct rpc_wait_queue *);
 void            rpc_wake_up_status(struct rpc_wait_queue *, int);
+int             rpc_queue_empty(struct rpc_wait_queue *);
 void            rpc_delay(struct rpc_task *, unsigned long);
 void *          rpc_malloc(struct rpc_task *, size_t);
 void            rpc_free(void *);
@@ -254,6 +256,16 @@ static inline int rpc_wait_for_completion_task(struct rpc_task *task)
        return __rpc_wait_for_completion_task(task, NULL);
 }
+static inline void rpc_task_set_priority(struct rpc_task *task, unsigned char prio)
+{
+        task->tk_priority = prio - RPC_PRIORITY_LOW;
+}
+static inline int rpc_task_has_priority(struct rpc_task *task, unsigned char prio)
+{
+        return (task->tk_priority + RPC_PRIORITY_LOW == prio);
+}
 #ifdef RPC_DEBUG
 static inline const char * rpc_qname(struct rpc_wait_queue *q)
 {
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 52e8cb0a7569..5a3085b9b394 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -29,7 +29,6 @@ struct svc_pool_stats {
        unsigned long   packets;
        unsigned long   sockets_queued;
        unsigned long   threads_woken;
-        unsigned long   overloads_avoided;
        unsigned long   threads_timedout;
 };
@@ -50,7 +49,6 @@ struct svc_pool {
        struct list_head        sp_sockets;     /* pending sockets */
        unsigned int            sp_nrthreads;   /* # of threads in pool */
        struct list_head        sp_all_threads; /* all server threads */
-        int                     sp_nwaking;     /* number of threads woken but not yet active */
        struct svc_pool_stats   sp_stats;       /* statistics on pool operation */
 } ____cacheline_aligned_in_smp;
@@ -275,16 +273,11 @@ struct svc_rqst {
        struct auth_domain *    rq_client;      /* RPC peer info */
        struct auth_domain *    rq_gssclient;   /* "gss/"-style peer info */
        struct svc_cacherep *   rq_cacherep;    /* cache info */
-        struct knfsd_fh *       rq_reffh;       /* Referrence filehandle, used to
-                                                 * determine what device number
-                                                 * to report (real or virtual)
-                                                 */
        int                     rq_splice_ok;   /* turned off in gss privacy
                                                 * to prevent encrypting page
                                                 * cache pages */
        wait_queue_head_t       rq_wait;        /* synchronization */
        struct task_struct      *rq_task;       /* service thread */
-        int                     rq_waking;      /* 1 if thread is being woken */
 };
 /*
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 939a61507ac5..65793e90d6f6 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -102,12 +102,10 @@ struct perf_event_attr;
 #ifdef CONFIG_EVENT_PROFILE
 #define TRACE_SYS_ENTER_PROFILE_INIT(sname)                                    \
-        .profile_count = ATOMIC_INIT(-1),                                      \
        .profile_enable = prof_sysenter_enable,                                \
        .profile_disable = prof_sysenter_disable,
 #define TRACE_SYS_EXIT_PROFILE_INIT(sname)                                     \
-        .profile_count = ATOMIC_INIT(-1),                                      \
        .profile_enable = prof_sysexit_enable,                                 \
        .profile_disable = prof_sysexit_disable,
 #else
@@ -145,7 +143,7 @@ struct perf_event_attr;
                .name                   = "sys_enter"#sname,            \
                .system                 = "syscalls",                   \
                .event                  = &enter_syscall_print_##sname, \
-                .raw_init               = init_syscall_trace,           \
+                .raw_init               = trace_event_raw_init,         \
                .show_format            = syscall_enter_format,         \
                .define_fields          = syscall_enter_define_fields,  \
                .regfunc                = reg_event_syscall_enter,      \
@@ -167,7 +165,7 @@ struct perf_event_attr;
                .name                   = "sys_exit"#sname,             \
                .system                 = "syscalls",                   \
                .event                  = &exit_syscall_print_##sname,  \
-                .raw_init               = init_syscall_trace,           \
+                .raw_init               = trace_event_raw_init,         \
                .show_format            = syscall_exit_format,          \
                .define_fields          = syscall_exit_define_fields,   \
                .regfunc                = reg_event_syscall_exit,       \
diff --git a/include/linux/xattr.h b/include/linux/xattr.h
index 5c84af8c5f6f..fb9b7e6e1e2d 100644
--- a/include/linux/xattr.h
+++ b/include/linux/xattr.h
@@ -38,12 +38,13 @@ struct dentry;
 struct xattr_handler {
        char *prefix;
-        size_t (*list)(struct inode *inode, char *list, size_t list_size,
+        int flags;      /* fs private flags passed back to the handlers */
-                       const char *name, size_t name_len);
+        size_t (*list)(struct dentry *dentry, char *list, size_t list_size,
-        int (*get)(struct inode *inode, const char *name, void *buffer,
+                       const char *name, size_t name_len, int handler_flags);
-                   size_t size);
+        int (*get)(struct dentry *dentry, const char *name, void *buffer,
-        int (*set)(struct inode *inode, const char *name, const void *buffer,
+                   size_t size, int handler_flags);
-                   size_t size, int flags);
+        int (*set)(struct dentry *dentry, const char *name, const void *buffer,
+                   size_t size, int flags, int handler_flags);
 };
 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index d1b3de9c1a71..73523151a731 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -436,10 +436,6 @@ ftrace_define_fields_##call(struct ftrace_event_call *event_call)	\
        struct ftrace_raw_##call field;                                 \
        int ret;                                                        \
                                                                        \
-        ret = trace_define_common_fields(event_call);                   \
-        if (ret)                                                        \
-                return ret;                                             \
-                                                                        \
        tstruct;                                                        \
                                                                        \
        return ret;                                                     \
@@ -559,13 +555,7 @@ static void ftrace_profile_disable_##name(struct ftrace_event_call *unused)\
 *
 * static int ftrace_reg_event_<call>(struct ftrace_event_call *unused)
 * {
- *      int ret;
+ *      return register_trace_<call>(ftrace_event_<call>);
- *
- *      ret = register_trace_<call>(ftrace_event_<call>);
- *      if (!ret)
- *              pr_info("event trace: Could not activate trace point "
- *                      "probe to  <call>");
- *      return ret;
 * }
 *
 * static void ftrace_unreg_event_<call>(struct ftrace_event_call *unused)
@@ -623,23 +613,12 @@ static void ftrace_profile_disable_##name(struct ftrace_event_call *unused)\
 *      .trace                  = ftrace_raw_output_<call>, <-- stage 2
 * };
 *
- * static int ftrace_raw_init_event_<call>(struct ftrace_event_call *unused)
- * {
- *      int id;
- *
- *      id = register_ftrace_event(&ftrace_event_type_<call>);
- *      if (!id)
- *              return -ENODEV;
- *      event_<call>.id = id;
- *      return 0;
- * }
- *
 * static struct ftrace_event_call __used
 * __attribute__((__aligned__(4)))
 * __attribute__((section("_ftrace_events"))) event_<call> = {
 *      .name                   = "<call>",
 *      .system                 = "<system>",
- *      .raw_init               = ftrace_raw_init_event_<call>,
+ *      .raw_init               = trace_event_raw_init,
 *      .regfunc                = ftrace_reg_event_<call>,
 *      .unregfunc              = ftrace_unreg_event_<call>,
 *      .show_format            = ftrace_format_<call>,
@@ -647,13 +626,9 @@ static void ftrace_profile_disable_##name(struct ftrace_event_call *unused)\
 *
 */
-#undef TP_FMT
-#define TP_FMT(fmt, args...)    fmt "\n", ##args
 #ifdef CONFIG_EVENT_PROFILE
 #define _TRACE_PROFILE_INIT(call)                                       \
-        .profile_count = ATOMIC_INIT(-1),                               \
        .profile_enable = ftrace_profile_enable_##call,                 \
        .profile_disable = ftrace_profile_disable_##call,
@@ -728,13 +703,7 @@ static void ftrace_raw_event_##call(proto)				\
                                                                        \
 static int ftrace_raw_reg_event_##call(struct ftrace_event_call *unused)\
 {                                                                       \
-        int ret;                                                        \
+        return register_trace_##call(ftrace_raw_event_##call);          \
-                                                                        \
-        ret = register_trace_##call(ftrace_raw_event_##call);           \
-        if (ret)                                                        \
-                pr_info("event trace: Could not activate trace point "  \
-                        "probe to " #call "\n");                        \
-        return ret;                                                     \
 }                                                                       \
                                                                        \
 static void ftrace_raw_unreg_event_##call(struct ftrace_event_call *unused)\
@@ -744,19 +713,7 @@ static void ftrace_raw_unreg_event_##call(struct ftrace_event_call *unused)\
                                                                        \
 static struct trace_event ftrace_event_type_##call = {                  \
        .trace                  = ftrace_raw_output_##call,             \
-};                                                                      \
+};
-                                                                        \
-static int ftrace_raw_init_event_##call(struct ftrace_event_call *unused)\
-{                                                                       \
-        int id;                                                         \
-                                                                        \
-        id = register_ftrace_event(&ftrace_event_type_##call);          \
-        if (!id)                                                        \
-                return -ENODEV;                                         \
-        event_##call.id = id;                                           \
-        INIT_LIST_HEAD(&event_##call.fields);                           \
-        return 0;                                                       \
-}
 #undef DEFINE_EVENT_PRINT
 #define DEFINE_EVENT_PRINT(template, name, proto, args, print)  \
@@ -776,7 +733,7 @@ __attribute__((section("_ftrace_events"))) event_##call = {		\
        .name                   = #call,                                \
        .system                 = __stringify(TRACE_SYSTEM),            \
        .event                  = &ftrace_event_type_##call,            \
-        .raw_init               = ftrace_raw_init_event_##call,         \
+        .raw_init               = trace_event_raw_init,                 \
        .regfunc                = ftrace_raw_reg_event_##call,          \
        .unregfunc              = ftrace_raw_unreg_event_##call,        \
        .show_format            = ftrace_format_##template,             \
@@ -793,7 +750,7 @@ __attribute__((section("_ftrace_events"))) event_##call = {		\
        .name                   = #call,                                \
        .system                 = __stringify(TRACE_SYSTEM),            \
        .event                  = &ftrace_event_type_##call,            \
-        .raw_init               = ftrace_raw_init_event_##call,         \
+        .raw_init               = trace_event_raw_init,                 \
        .regfunc                = ftrace_raw_reg_event_##call,          \
        .unregfunc              = ftrace_raw_unreg_event_##call,        \
        .show_format            = ftrace_format_##call,                 \
@@ -953,7 +910,6 @@ end:									\
        perf_swevent_put_recursion_context(rctx);                       \
 end_recursion:                                                          \
        local_irq_restore(irq_flags);                                   \
-                                                                        \
 }
 #undef DEFINE_EVENT