memory hotplug: fix page_zone() calculation in test_pages_isolated()

[linux-2.6-omap-h63xx.git] / include / linux / nfs_fs_sb.h

diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 3423c6761bf7b561ad1ea4f4f7fce48f6541137e..4e477ae58699b59a3e4a011bb5447ccce1d5bc4b 100644 (file)
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -32,6 +32,8 @@ struct nfs_client {
        const struct nfs_rpc_ops *rpc_ops;      /* NFS protocol vector */
        int                     cl_proto;       /* Network transport protocol */
 
+       struct rpc_cred         *cl_machine_cred;
+
 #ifdef CONFIG_NFS_V4
        u64                     cl_clientid;    /* constant */
        nfs4_verifier           cl_confirm;
@@ -93,6 +95,7 @@ struct nfs_server {
        unsigned int            wpages;         /* write size (in pages) */
        unsigned int            wtmult;         /* server disk block size */
        unsigned int            dtsize;         /* readdir size */
+       unsigned short          port;           /* "port=" setting */
        unsigned int            bsize;          /* server block size */
        unsigned int            acregmin;       /* attr cache timeouts */
        unsigned int            acregmax;
@@ -116,7 +119,13 @@ struct nfs_server {
        void (*destroy)(struct nfs_server *);
 
        atomic_t active; /* Keep trace of any activity to this server */
-       wait_queue_head_t active_wq;  /* Wait for any activity to stop  */
+
+       /* mountd-related mount options */
+       struct sockaddr_storage mountd_address;
+       size_t                  mountd_addrlen;
+       u32                     mountd_version;
+       unsigned short          mountd_port;
+       unsigned short          mountd_protocol;
 };
 
 /* Server capabilities */