Merge branch 'nfs-for-2.6.39' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* 'nfs-for-2.6.39' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (28 commits)
  Cleanup XDR parsing for LAYOUTGET, GETDEVICEINFO
  NFSv4.1 convert layoutcommit sync to boolean
  NFSv4.1 pnfs_layoutcommit_inode fixes
  NFS: Determine initial mount security
  NFS: use secinfo when crossing mountpoints
  NFS: Add secinfo procedure
  NFS: lookup supports alternate client
  NFS: convert call_sync() to a function
  NFSv4.1 remove temp code that prevented ds commits
  NFSv4.1: layoutcommit
  NFSv4.1: filelayout driver specific code for COMMIT
  NFSv4.1: remove GETATTR from ds commits
  NFSv4.1: add generic layer hooks for pnfs COMMIT
  NFSv4.1: alloc and free commit_buckets
  NFSv4.1: shift filelayout_free_lseg
  NFSv4.1: pull out code from nfs_commit_release
  NFSv4.1: pull error handling out of nfs_commit_list
  NFSv4.1: add callback to nfs4_commit_done
  NFSv4.1: rearrange nfs_commit_rpcsetup
  NFSv4.1: don't send COMMIT to ds for data sync writes
  ...

5 files changed, 88 insertions, 4 deletions

diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index 134716e5e350..b528f6d4b860 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -550,6 +550,7 @@ enum {
         NFSPROC4_CLNT_SETACL,
         NFSPROC4_CLNT_FS_LOCATIONS,
         NFSPROC4_CLNT_RELEASE_LOCKOWNER,
+        NFSPROC4_CLNT_SECINFO,
 
         /* nfs41 */
         NFSPROC4_CLNT_EXCHANGE_ID,
@@ -560,6 +561,7 @@ enum {
         NFSPROC4_CLNT_RECLAIM_COMPLETE,
         NFSPROC4_CLNT_LAYOUTGET,
         NFSPROC4_CLNT_GETDEVICEINFO,
+        NFSPROC4_CLNT_LAYOUTCOMMIT,
 };
 
 /* nfs41 types */
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index f88522b10a38..1b93b9c60e55 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -33,6 +33,8 @@
 #define FLUSH_STABLE            4       /* commit to stable storage */
 #define FLUSH_LOWPRI            8       /* low priority background flush */
 #define FLUSH_HIGHPRI           16      /* high priority memory reclaim flush */
+#define FLUSH_COND_STABLE       32      /* conditional stable write - only stable
+                                         * if everything fits in one RPC */
 
 #ifdef __KERNEL__
 
@@ -93,8 +95,13 @@ struct nfs_open_context {
         int error;
 
         struct list_head list;
+};
 
+struct nfs_open_dir_context {
+        struct rpc_cred *cred;
         __u64 dir_cookie;
+        __u64 dup_cookie;
+        int duped;
 };
 
 /*
@@ -191,6 +198,7 @@ struct nfs_inode {
 
         /* pNFS layout information */
         struct pnfs_layout_hdr *layout;
+        atomic_t                commits_outstanding;
 #endif /* CONFIG_NFS_V4*/
 #ifdef CONFIG_NFS_FSCACHE
         struct fscache_cookie   *fscache;
@@ -219,6 +227,8 @@ struct nfs_inode {
 #define NFS_INO_FSCACHE         (5)             /* inode can be cached by FS-Cache */
 #define NFS_INO_FSCACHE_LOCK    (6)             /* FS-Cache cookie management lock */
 #define NFS_INO_COMMIT          (7)             /* inode is committing unstable writes */
+#define NFS_INO_PNFS_COMMIT     (8)             /* use pnfs code for commit */
+#define NFS_INO_LAYOUTCOMMIT    (9)             /* layoutcommit required */
 
 static inline struct nfs_inode *NFS_I(const struct inode *inode)
 {
diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
index 90907ada6d52..8023e4e25133 100644
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
@@ -33,11 +33,15 @@ enum {
         PG_CLEAN,
         PG_NEED_COMMIT,
         PG_NEED_RESCHED,
+        PG_PNFS_COMMIT,
 };
 
 struct nfs_inode;
 struct nfs_page {
-        struct list_head        wb_list;        /* Defines state of page: */
+        union {
+                struct list_head        wb_list;        /* Defines state of page: */
+                struct pnfs_layout_segment *wb_commit_lseg; /* Used when PG_PNFS_COMMIT set */
+        };
         struct page             *wb_page;       /* page to read in/write out */
         struct nfs_open_context *wb_context;    /* File state context info */
         struct nfs_lock_context *wb_lock_context;       /* lock context info */
@@ -57,6 +61,7 @@ struct nfs_pageio_descriptor {
         size_t                  pg_count;
         size_t                  pg_bsize;
         unsigned int            pg_base;
+        char                    pg_moreio;
 
         struct inode            *pg_inode;
         int                     (*pg_doio)(struct nfs_pageio_descriptor *);
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 2c2c67d2eb42..78b101e487ea 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -3,6 +3,7 @@
 
 #include <linux/nfsacl.h>
 #include <linux/nfs3.h>
+#include <linux/sunrpc/gss_api.h>
 
 /*
  * To change the maximum rsize and wsize supported by the NFS client, adjust
@@ -14,6 +15,9 @@
 #define NFS_DEF_FILE_IO_SIZE    (4096U)
 #define NFS_MIN_FILE_IO_SIZE    (1024U)
 
+/* Forward declaration for NFS v3 */
+struct nfs4_secinfo_flavors;
+
 struct nfs_fsid {
         uint64_t                major;
         uint64_t                minor;
@@ -78,6 +82,7 @@ struct nfs_fattr {
 #define NFS_ATTR_FATTR_CHANGE           (1U << 17)
 #define NFS_ATTR_FATTR_PRECHANGE        (1U << 18)
 #define NFS_ATTR_FATTR_V4_REFERRAL      (1U << 19)      /* NFSv4 referral */
+#define NFS_ATTR_FATTR_MOUNTPOINT       (1U << 20)      /* Treat as mountpoint */
 
 #define NFS_ATTR_FATTR (NFS_ATTR_FATTR_TYPE \
                 | NFS_ATTR_FATTR_MODE \
@@ -190,8 +195,9 @@ struct nfs4_get_lease_time_res {
 #define PNFS_LAYOUT_MAXSIZE 4096
 
 struct nfs4_layoutdriver_data {
+        struct page **pages;
+        __u32 pglen;
         __u32 len;
-        void *buf;
 };
 
 struct pnfs_layout_range {
@@ -209,6 +215,7 @@ struct nfs4_layoutget_args {
         struct nfs_open_context *ctx;
         struct nfs4_sequence_args seq_args;
         nfs4_stateid stateid;
+        struct nfs4_layoutdriver_data layout;
 };
 
 struct nfs4_layoutget_res {
@@ -216,8 +223,8 @@ struct nfs4_layoutget_res {
         struct pnfs_layout_range range;
         __u32 type;
         nfs4_stateid stateid;
-        struct nfs4_layoutdriver_data layout;
         struct nfs4_sequence_res seq_res;
+        struct nfs4_layoutdriver_data *layoutp;
 };
 
 struct nfs4_layoutget {
@@ -236,6 +243,29 @@ struct nfs4_getdeviceinfo_res {
         struct nfs4_sequence_res seq_res;
 };
 
+struct nfs4_layoutcommit_args {
+        nfs4_stateid stateid;
+        __u64 lastbytewritten;
+        struct inode *inode;
+        const u32 *bitmask;
+        struct nfs4_sequence_args seq_args;
+};
+
+struct nfs4_layoutcommit_res {
+        struct nfs_fattr *fattr;
+        const struct nfs_server *server;
+        struct nfs4_sequence_res seq_res;
+};
+
+struct nfs4_layoutcommit_data {
+        struct rpc_task task;
+        struct nfs_fattr fattr;
+        struct pnfs_layout_segment *lseg;
+        struct rpc_cred *cred;
+        struct nfs4_layoutcommit_args args;
+        struct nfs4_layoutcommit_res res;
+};
+
 /*
  * Arguments to the open call.
  */
@@ -936,6 +966,38 @@ struct nfs4_fs_locations_res {
         struct nfs4_sequence_res        seq_res;
 };
 
+struct nfs4_secinfo_oid {
+        unsigned int len;
+        char data[GSS_OID_MAX_LEN];
+};
+
+struct nfs4_secinfo_gss {
+        struct nfs4_secinfo_oid sec_oid4;
+        unsigned int qop4;
+        unsigned int service;
+};
+
+struct nfs4_secinfo_flavor {
+        unsigned int            flavor;
+        struct nfs4_secinfo_gss gss;
+};
+
+struct nfs4_secinfo_flavors {
+        unsigned int num_flavors;
+        struct nfs4_secinfo_flavor flavors[0];
+};
+
+struct nfs4_secinfo_arg {
+        const struct nfs_fh             *dir_fh;
+        const struct qstr               *name;
+        struct nfs4_sequence_args       seq_args;
+};
+
+struct nfs4_secinfo_res {
+        struct nfs4_secinfo_flavors     *flavors;
+        struct nfs4_sequence_res        seq_res;
+};
+
 #endif /* CONFIG_NFS_V4 */
 
 struct nfstime4 {
@@ -1040,6 +1102,7 @@ struct nfs_write_data {
         struct nfs_writeres     res;            /* result struct */
         struct pnfs_layout_segment *lseg;
         struct nfs_client       *ds_clp;        /* pNFS data server */
+        int                     ds_commit_index;
         const struct rpc_call_ops *mds_ops;
         int (*write_done_cb) (struct rpc_task *task, struct nfs_write_data *data);
 #ifdef CONFIG_NFS_V4
@@ -1071,7 +1134,7 @@ struct nfs_rpc_ops {
                             struct nfs_fattr *);
         int     (*setattr) (struct dentry *, struct nfs_fattr *,
                             struct iattr *);
-        int     (*lookup)  (struct inode *, struct qstr *,
+        int     (*lookup)  (struct rpc_clnt *clnt, struct inode *, struct qstr *,
                             struct nfs_fh *, struct nfs_fattr *);
         int     (*access)  (struct inode *, struct nfs_access_entry *);
         int     (*readlink)(struct inode *, struct page *, unsigned int,
@@ -1118,6 +1181,7 @@ struct nfs_rpc_ops {
                                 struct iattr *iattr);
         int     (*init_client) (struct nfs_client *, const struct rpc_timeout *,
                                 const char *, rpc_authflavor_t, int);
+        int     (*secinfo)(struct inode *, const struct qstr *, struct nfs4_secinfo_flavors *);
 };
 
 /*
diff --git a/include/linux/sunrpc/gss_api.h b/include/linux/sunrpc/gss_api.h
index 5d8048beb051..332da61cf8b7 100644
--- a/include/linux/sunrpc/gss_api.h
+++ b/include/linux/sunrpc/gss_api.h
@@ -126,6 +126,9 @@ struct gss_api_mech *gss_mech_get_by_name(const char *);
 /* Similar, but get by pseudoflavor. */
 struct gss_api_mech *gss_mech_get_by_pseudoflavor(u32);
 
+/* Fill in an array with a list of supported pseudoflavors */
+int gss_mech_list_pseudoflavors(u32 *);
+
 /* Just increments the mechanism's reference count and returns its input: */
 struct gss_api_mech * gss_mech_get(struct gss_api_mech *);