nfs4.1: Minimal SP4_MACH_CRED implementation

[linux-2.6-block.git] / include / linux / nfs_fs_sb.h

diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 3b7fa2abecca690e0d007a4aa97fded3e1a1bad3..9f7b9192cf5edb6a917e998fab58af755d02bfa2 100644 (file)
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -78,6 +78,9 @@ struct nfs_client {
        u32                     cl_cb_ident;    /* v4.0 callback identifier */
        const struct nfs4_minor_version_ops *cl_mvops;
 
+       /* NFSv4.0 transport blocking */
+       struct nfs4_slot_table  *cl_slot_tbl;
+
        /* The sequence id to use for the next CREATE_SESSION */
        u32                     cl_seqid;
        /* The flags used for obtaining the clientid during EXCHANGE_ID */
@@ -87,6 +90,10 @@ struct nfs_client {
        struct nfs41_server_owner *cl_serverowner;
        struct nfs41_server_scope *cl_serverscope;
        struct nfs41_impl_id    *cl_implid;
+       /* nfs 4.1+ state protection modes: */
+       unsigned long           cl_sp4_flags;
+#define NFS_SP4_MACH_CRED_MINIMAL  1   /* Minimal sp4_mach_cred - state ops
+                                        * must use machine cred */
 #endif /* CONFIG_NFS_V4 */
 
 #ifdef CONFIG_NFS_FSCACHE
@@ -146,7 +153,12 @@ struct nfs_server {
        u32                     attr_bitmask[3];/* V4 bitmask representing the set
                                                   of attributes supported on this
                                                   filesystem */
-       u32                     cache_consistency_bitmask[2];
+       u32                     attr_bitmask_nl[3];
+                                               /* V4 bitmask representing the
+                                                  set of attributes supported
+                                                  on this filesystem excluding
+                                                  the label support bit. */
+       u32                     cache_consistency_bitmask[3];
                                                /* V4 bitmask representing the subset
                                                   of change attribute, size, ctime
                                                   and mtime attributes supported by
@@ -200,5 +212,6 @@ struct nfs_server {
 #define NFS_CAP_UIDGID_NOMAP   (1U << 15)
 #define NFS_CAP_STATEID_NFSV41 (1U << 16)
 #define NFS_CAP_ATOMIC_OPEN_V1 (1U << 17)
+#define NFS_CAP_SECURITY_LABEL (1U << 18)
 
 #endif