Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[pandora-kernel.git] / include / linux / nfsd / cache.h

diff --git a/include/linux/nfsd/cache.h b/include/linux/nfsd/cache.h
index c3a3557..5bccaab 100644 (file)
--- a/include/linux/nfsd/cache.h
+++ b/include/linux/nfsd/cache.h
@@ -10,7 +10,6 @@
 #ifndef NFSCACHE_H
 #define NFSCACHE_H
 
-#ifdef __KERNEL__
 #include <linux/in.h>
 #include <linux/uio.h>
 
@@ -26,14 +25,14 @@ struct svc_cacherep {
                                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 kvec     u_vec;
-               u32             u_status;
+               __be32          u_status;
        }                       c_u;
 };
 
@@ -72,10 +71,17 @@ enum {
  */
 #define RC_DELAY               (HZ/5)
 
-void   nfsd_cache_init(void);
-void   nfsd_cache_shutdown(void);
+int    nfsd_reply_cache_init(void);
+void   nfsd_reply_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 *);
+
+#ifdef CONFIG_NFSD_V4
+void   nfsd4_set_statp(struct svc_rqst *rqstp, __be32 *statp);
+#else  /* CONFIG_NFSD_V4 */
+static inline void nfsd4_set_statp(struct svc_rqst *rqstp, __be32 *statp)
+{
+}
+#endif /* CONFIG_NFSD_V4 */
 
-#endif /* __KERNEL__ */
 #endif /* NFSCACHE_H */