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

1 files changed, 10 insertions, 3 deletions

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__