Merge commit '24bab491220f' into client-4.2

- Pull in patch 'NFSD: Implement SEEK' from Bruce's nfsd-next tree
  for dependencies.

3 files changed, 25 insertions, 4 deletions

diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index a1e3064a8d99..026b0c042c40 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -110,6 +110,20 @@ enum nfs_opnum4 {
         OP_DESTROY_CLIENTID = 57,
         OP_RECLAIM_COMPLETE = 58,
 
+        /* nfs42 */
+        OP_ALLOCATE = 59,
+        OP_COPY = 60,
+        OP_COPY_NOTIFY = 61,
+        OP_DEALLOCATE = 62,
+        OP_IO_ADVISE = 63,
+        OP_LAYOUTERROR = 64,
+        OP_LAYOUTSTATS = 65,
+        OP_OFFLOAD_CANCEL = 66,
+        OP_OFFLOAD_STATUS = 67,
+        OP_READ_PLUS = 68,
+        OP_SEEK = 69,
+        OP_WRITE_SAME = 70,
+
         OP_ILLEGAL = 10044,
 };
 
@@ -117,10 +131,10 @@ enum nfs_opnum4 {
 Needs to be updated if more operations are defined in future.*/
 
 #define FIRST_NFS4_OP   OP_ACCESS
-#define LAST_NFS4_OP    OP_RECLAIM_COMPLETE
+#define LAST_NFS4_OP    OP_WRITE_SAME
 #define LAST_NFS40_OP   OP_RELEASE_LOCKOWNER
 #define LAST_NFS41_OP   OP_RECLAIM_COMPLETE
-#define LAST_NFS42_OP   OP_RECLAIM_COMPLETE
+#define LAST_NFS42_OP   OP_WRITE_SAME
 
 enum nfsstat4 {
         NFS4_OK = 0,
@@ -235,10 +249,11 @@ enum nfsstat4 {
         /* nfs42 */
         NFS4ERR_PARTNER_NOTSUPP = 10088,
         NFS4ERR_PARTNER_NO_AUTH = 10089,
-        NFS4ERR_METADATA_NOTSUPP = 10090,
+        NFS4ERR_UNION_NOTSUPP = 10090,
         NFS4ERR_OFFLOAD_DENIED = 10091,
         NFS4ERR_WRONG_LFS = 10092,
         NFS4ERR_BADLABEL = 10093,
+        NFS4ERR_OFFLOAD_NO_REQS = 10094,
 };
 
 static inline bool seqid_mutating_err(u32 err)
@@ -535,4 +550,9 @@ struct nfs4_deviceid {
         char data[NFS4_DEVICEID4_SIZE];
 };
 
+enum data_content4 {
+        NFS4_CONTENT_DATA               = 0,
+        NFS4_CONTENT_HOLE               = 1,
+};
+
 #endif
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 9d117f61d976..b97bf2ef996e 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -74,6 +74,8 @@ static inline int remove_proc_subtree(const char *name, struct proc_dir_entry *p
 
 #endif /* CONFIG_PROC_FS */
 
+struct net;
+
 static inline struct proc_dir_entry *proc_net_mkdir(
         struct net *net, const char *name, struct proc_dir_entry *parent)
 {
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index cf61ecd148e0..21678464883a 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -280,7 +280,6 @@ struct svc_rqst {
         bool                    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 */
 };