vserver 1.9.3

[linux-2.6.git] / fs / afs / vlclient.c

diff --git a/fs/afs/vlclient.c b/fs/afs/vlclient.c
index 6a663ce..7b0e319 100644 (file)
--- a/fs/afs/vlclient.c
+++ b/fs/afs/vlclient.c
@@ -89,18 +89,19 @@ static void afs_rxvl_aemap(struct rxrpc_call *call)
        }
 } /* end afs_rxvl_aemap() */
 
+#if 0
 /*****************************************************************************/
 /*
- * probe a volume location server to see if it is still alive
+ * probe a volume location server to see if it is still alive -- unused
  */
-int afs_rxvl_probe(struct afs_server *server, int alloc_flags)
+static int afs_rxvl_probe(struct afs_server *server, int alloc_flags)
 {
        struct rxrpc_connection *conn;
        struct rxrpc_call *call;
        struct kvec piov[1];
        size_t sent;
        int ret;
-       u32 param[1];
+       __be32 param[1];
 
        DECLARE_WAITQUEUE(myself, current);
 
@@ -173,6 +174,7 @@ int afs_rxvl_probe(struct afs_server *server, int alloc_flags)
        return ret;
 
 } /* end afs_rxvl_probe() */
+#endif
 
 /*****************************************************************************/
 /*
@@ -191,7 +193,7 @@ int afs_rxvl_get_entry_by_name(struct afs_server *server,
        unsigned tmp;
        size_t sent;
        int ret, loop;
-       u32 *bp, param[2], zero;
+       __be32 *bp, param[2], zero;
 
        _enter(",%*.*s,%u,", volnamesz, volnamesz, volname, volnamesz);
 
@@ -326,7 +328,7 @@ int afs_rxvl_get_entry_by_id(struct afs_server *server,
        unsigned tmp;
        size_t sent;
        int ret, loop;
-       u32 *bp, param[3];
+       __be32 *bp, param[3];
 
        _enter(",%x,%d,", volid, voltype);
 
@@ -462,7 +464,7 @@ int afs_rxvl_get_entry_by_id_async(struct afs_async_op *op,
        struct kvec piov[1];
        size_t sent;
        int ret;
-       u32 param[3];
+       __be32 param[3];
 
        _enter(",%x,%d,", volid, voltype);
 
@@ -545,7 +547,8 @@ int afs_rxvl_get_entry_by_id_async(struct afs_async_op *op,
 int afs_rxvl_get_entry_by_id_async2(struct afs_async_op *op,
                                    struct afs_cache_vlocation *entry)
 {
-       unsigned *bp, tmp;
+       __be32 *bp;
+       __u32 tmp;
        int loop, ret;
 
        _enter("{op=%p cst=%u}", op, op->call->app_call_state);