Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

* git://git.linux-nfs.org/pub/linux/nfs-2.6: (74 commits)
  NFS: unmark NFS direct I/O as experimental
  NFS: add comments clarifying the use of nfs_post_op_update()
  NFSv4: rpc_mkpipe creating socket inodes w/out sk buffers
  NFS: Use SEEK_END instead of hardcoded value
  NFSv4: When mounting with a port=0 argument, substitute port=2049
  NFSv4: Poll more aggressively when handling NFS4ERR_DELAY
  NFSv4: Handle the condition NFS4ERR_FILE_OPEN
  NFSv4: Retry lease recovery if it failed during a synchronous operation.
  NFS: Don't invalidate the symlink we just stuffed into the cache
  NFS: Make read() return an ESTALE if the file has been deleted
  NFSv4: It's perfectly legal for clp to be NULL here....
  NFS: nfs_lookup - don't hash dentry when optimising away the lookup
  SUNRPC: Fix Oops in pmap_getport_done
  SUNRPC: Add refcounting to the struct rpc_xprt
  SUNRPC: Clean up soft task error handling
  SUNRPC: Handle ENETUNREACH, EHOSTUNREACH and EHOSTDOWN socket errors
  SUNRPC: rpc_delay() should not clobber the rpc_task->tk_status
  Fix a referral error Oops
  NFS: NFS_ROOT should use the new rpc_create API
  NFS: Fix up compiler warnings on 64-bit platforms in client.c
  ...

Manually resolved conflict in net/sunrpc/xprtsock.c

11 files changed, 187 insertions, 77 deletions

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index aafe82788b4e..96c9040c00a8 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -746,6 +746,7 @@ extern void blk_queue_free_tags(request_queue_t *);
 extern int blk_queue_resize_tags(request_queue_t *, int);
 extern void blk_queue_invalidate_tags(request_queue_t *);
 extern long blk_congestion_wait(int rw, long timeout);
+extern void blk_congestion_end(int rw);
 
 extern void blk_rq_bio_prep(request_queue_t *, struct request *, struct bio *);
 extern int blkdev_issue_flush(struct block_device *, sector_t *);
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 471781ffeab1..44605be59409 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -221,6 +221,7 @@ static inline int dname_external(struct dentry *dentry)
  */
 extern void d_instantiate(struct dentry *, struct inode *);
 extern struct dentry * d_instantiate_unique(struct dentry *, struct inode *);
+extern struct dentry * d_materialise_unique(struct dentry *, struct inode *);
 extern void d_delete(struct dentry *);
 
 /* allocate/de-allocate */
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 6c2066caeaab..3b5b04193fee 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -42,6 +42,7 @@
 #include <linux/in.h>
 #include <linux/mm.h>
 #include <linux/pagemap.h>
+#include <linux/rbtree.h>
 #include <linux/rwsem.h>
 #include <linux/wait.h>
 
@@ -69,6 +70,8 @@
  * NFSv3/v4 Access mode cache entry
  */
 struct nfs_access_entry {
+        struct rb_node          rb_node;
+        struct list_head        lru;
         unsigned long           jiffies;
         struct rpc_cred *       cred;
         int                     mask;
@@ -145,7 +148,9 @@ struct nfs_inode {
          */
         atomic_t                data_updates;
 
-        struct nfs_access_entry cache_access;
+        struct rb_root          access_cache;
+        struct list_head        access_cache_entry_lru;
+        struct list_head        access_cache_inode_lru;
 #ifdef CONFIG_NFS_V3_ACL
         struct posix_acl        *acl_access;
         struct posix_acl        *acl_default;
@@ -199,6 +204,7 @@ struct nfs_inode {
 #define NFS_INO_REVALIDATING    (0)             /* revalidating attrs */
 #define NFS_INO_ADVISE_RDPLUS   (1)             /* advise readdirplus */
 #define NFS_INO_STALE           (2)             /* possible stale inode */
+#define NFS_INO_ACL_LRU_SET     (3)             /* Inode is on the LRU list */
 
 static inline struct nfs_inode *NFS_I(struct inode *inode)
 {
@@ -209,8 +215,7 @@ static inline struct nfs_inode *NFS_I(struct inode *inode)
 #define NFS_FH(inode)                   (&NFS_I(inode)->fh)
 #define NFS_SERVER(inode)               (NFS_SB(inode->i_sb))
 #define NFS_CLIENT(inode)               (NFS_SERVER(inode)->client)
-#define NFS_PROTO(inode)                (NFS_SERVER(inode)->rpc_ops)
-#define NFS_ADDR(inode)                 (RPC_PEERADDR(NFS_CLIENT(inode)))
+#define NFS_PROTO(inode)                (NFS_SERVER(inode)->nfs_client->rpc_ops)
 #define NFS_COOKIEVERF(inode)           (NFS_I(inode)->cookieverf)
 #define NFS_READTIME(inode)             (NFS_I(inode)->read_cache_jiffies)
 #define NFS_CHANGE_ATTR(inode)          (NFS_I(inode)->change_attr)
@@ -297,6 +302,7 @@ extern int nfs_getattr(struct vfsmount *, struct dentry *, struct kstat *);
 extern int nfs_permission(struct inode *, int, struct nameidata *);
 extern int nfs_access_get_cached(struct inode *, struct rpc_cred *, struct nfs_access_entry *);
 extern void nfs_access_add_cache(struct inode *, struct nfs_access_entry *);
+extern void nfs_access_zap_cache(struct inode *inode);
 extern int nfs_open(struct inode *, struct file *);
 extern int nfs_release(struct inode *, struct file *);
 extern int nfs_attribute_timeout(struct inode *inode);
@@ -579,6 +585,7 @@ extern void * nfs_root_data(void);
 #define NFSDBG_FILE             0x0040
 #define NFSDBG_ROOT             0x0080
 #define NFSDBG_CALLBACK         0x0100
+#define NFSDBG_CLIENT           0x0200
 #define NFSDBG_ALL              0xFFFF
 
 #ifdef __KERNEL__
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 6b4a13c79474..7ccfc7ef0a83 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -7,13 +7,79 @@
 struct nfs_iostats;
 
 /*
+ * The nfs_client identifies our client state to the server.
+ */
+struct nfs_client {
+        atomic_t                cl_count;
+        int                     cl_cons_state;  /* current construction state (-ve: init error) */
+#define NFS_CS_READY            0               /* ready to be used */
+#define NFS_CS_INITING          1               /* busy initialising */
+        int                     cl_nfsversion;  /* NFS protocol version */
+        unsigned long           cl_res_state;   /* NFS resources state */
+#define NFS_CS_RPCIOD           0               /* - rpciod started */
+#define NFS_CS_CALLBACK         1               /* - callback started */
+#define NFS_CS_IDMAP            2               /* - idmap started */
+#define NFS_CS_RENEWD           3               /* - renewd started */
+        struct sockaddr_in      cl_addr;        /* server identifier */
+        char *                  cl_hostname;    /* hostname of server */
+        struct list_head        cl_share_link;  /* link in global client list */
+        struct list_head        cl_superblocks; /* List of nfs_server structs */
+
+        struct rpc_clnt *       cl_rpcclient;
+        const struct nfs_rpc_ops *rpc_ops;      /* NFS protocol vector */
+        unsigned long           retrans_timeo;  /* retransmit timeout */
+        unsigned int            retrans_count;  /* number of retransmit tries */
+
+#ifdef CONFIG_NFS_V4
+        u64                     cl_clientid;    /* constant */
+        nfs4_verifier           cl_confirm;
+        unsigned long           cl_state;
+
+        u32                     cl_lockowner_id;
+
+        /*
+         * The following rwsem ensures exclusive access to the server
+         * while we recover the state following a lease expiration.
+         */
+        struct rw_semaphore     cl_sem;
+
+        struct list_head        cl_delegations;
+        struct list_head        cl_state_owners;
+        struct list_head        cl_unused;
+        int                     cl_nunused;
+        spinlock_t              cl_lock;
+
+        unsigned long           cl_lease_time;
+        unsigned long           cl_last_renewal;
+        struct work_struct      cl_renewd;
+
+        struct rpc_wait_queue   cl_rpcwaitq;
+
+        /* used for the setclientid verifier */
+        struct timespec         cl_boot_time;
+
+        /* idmapper */
+        struct idmap *          cl_idmap;
+
+        /* Our own IP address, as a null-terminated string.
+         * This is used to generate the clientid, and the callback address.
+         */
+        char                    cl_ipaddr[16];
+        unsigned char           cl_id_uniquifier;
+#endif
+};
+
+/*
  * NFS client parameters stored in the superblock.
  */
 struct nfs_server {
+        struct nfs_client *     nfs_client;     /* shared client and NFS4 state */
+        struct list_head        client_link;    /* List of other nfs_server structs