fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / linux / nfsd / cache.h

diff --git a/include/linux/nfsd/cache.h b/include/linux/nfsd/cache.h
index 25d2c09..007480c 100644 (file)
--- a/include/linux/nfsd/cache.h
+++ b/include/linux/nfsd/cache.h
@@ -19,22 +19,21 @@
  * be hash_next and hash_prev.
  */
 struct svc_cacherep {
-       struct svc_cacherep *   c_hash_next;
-       struct svc_cacherep *   c_hash_prev;
-       struct svc_cacherep *   c_lru_next;
-       struct svc_cacherep *   c_lru_prev;
+       struct hlist_node       c_hash;
+       struct list_head        c_lru;
+
        unsigned char           c_state,        /* unused, inprog, done */
                                c_type,         /* status, buffer */
                                c_secure : 1;   /* req came from port < 1024 */
        struct sockaddr_in      c_addr;
-       u32                     c_xid;
+       __be32                  c_xid;
        u32                     c_prot;
        u32                     c_proc;
        u32                     c_vers;
        unsigned long           c_timestamp;
        union {
-               struct iovec    u_vec;
-               u32             u_status;
+               struct kvec     u_vec;
+               __be32          u_status;
        }                       c_u;
 };
 
@@ -76,7 +75,7 @@ enum {
 void   nfsd_cache_init(void);
 void   nfsd_cache_shutdown(void);
 int    nfsd_cache_lookup(struct svc_rqst *, int);
-void   nfsd_cache_update(struct svc_rqst *, int, u32 *);
+void   nfsd_cache_update(struct svc_rqst *, int, __be32 *);
 
 #endif /* __KERNEL__ */
 #endif /* NFSCACHE_H */