1 files changed, 24 insertions, 0 deletions

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 49f52c8f4422..3ccfcecf8999 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -591,6 +591,13 @@ struct nfs_renameres {
         struct nfs_fattr                *new_fattr;
 };
 
+/* parsed sec= options */
+#define NFS_AUTH_INFO_MAX_FLAVORS 12 /* see fs/nfs/super.c */
+struct nfs_auth_info {
+        unsigned int            flavor_len;
+        rpc_authflavor_t        flavors[NFS_AUTH_INFO_MAX_FLAVORS];
+};
+
 /*
  * Argument struct for decode_entry function
  */
@@ -1053,14 +1060,18 @@ struct nfs4_fs_locations {
 struct nfs4_fs_locations_arg {
         struct nfs4_sequence_args       seq_args;
         const struct nfs_fh *dir_fh;
+        const struct nfs_fh *fh;
         const struct qstr *name;
         struct page *page;
         const u32 *bitmask;
+        clientid4 clientid;
+        unsigned char migration:1, renew:1;
 };
 
 struct nfs4_fs_locations_res {
         struct nfs4_sequence_res        seq_res;
         struct nfs4_fs_locations       *fs_locations;
+        unsigned char                   migration:1, renew:1;
 };
 
 struct nfs4_secinfo4 {
@@ -1084,6 +1095,19 @@ struct nfs4_secinfo_res {
         struct nfs4_secinfo_flavors     *flavors;
 };
 
+struct nfs4_fsid_present_arg {
+        struct nfs4_sequence_args       seq_args;
+        const struct nfs_fh             *fh;
+        clientid4                       clientid;
+        unsigned char                   renew:1;
+};
+
+struct nfs4_fsid_present_res {
+        struct nfs4_sequence_res        seq_res;
+        struct nfs_fh                   *fh;
+        unsigned char                   renew:1;
+};
+
 #endif /* CONFIG_NFS_V4 */
 
 struct nfstime4 {