[AF_RXRPC]: Make the in-kernel AFS filesystem use AF_RXRPC.

Make the in-kernel AFS filesystem use AF_RXRPC instead of the old RxRPC code.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 22 insertions, 113 deletions

diff --git a/fs/afs/main.c b/fs/afs/main.c
index 5bf39f66f4ce..0cf1b021ad54 100644
--- a/fs/afs/main.c
+++ b/fs/afs/main.c
@@ -13,43 +13,21 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/completion.h>
-#include <rxrpc/rxrpc.h>
-#include <rxrpc/transport.h>
-#include <rxrpc/call.h>
-#include <rxrpc/peer.h>
-#include "cache.h"
-#include "cell.h"
-#include "server.h"
-#include "fsclient.h"
-#include "cmservice.h"
-#include "kafstimod.h"
-#include "kafsasyncd.h"
 #include "internal.h"
 
-struct rxrpc_transport *afs_transport;
-
-static int afs_adding_peer(struct rxrpc_peer *peer);
-static void afs_discarding_peer(struct rxrpc_peer *peer);
-
-
 MODULE_DESCRIPTION("AFS Client File System");
 MODULE_AUTHOR("Red Hat, Inc.");
 MODULE_LICENSE("GPL");
 
+unsigned afs_debug;
+module_param_named(debug, afs_debug, uint, S_IWUSR | S_IRUGO);
+MODULE_PARM_DESC(afs_debug, "AFS debugging mask");
+
 static char *rootcell;
 
 module_param(rootcell, charp, 0);
 MODULE_PARM_DESC(rootcell, "root AFS cell name and VL server IP addr list");
 
-
-static struct rxrpc_peer_ops afs_peer_ops = {
-        .adding         = afs_adding_peer,
-        .discarding     = afs_discarding_peer,
-};
-
-struct list_head afs_cb_hash_tbl[AFS_CB_HASH_COUNT];
-DEFINE_SPINLOCK(afs_cb_hash_lock);
-
 #ifdef AFS_CACHING_SUPPORT
 static struct cachefs_netfs_operations afs_cache_ops = {
         .get_page_cookie        = afs_cache_get_page_cookie,
@@ -67,15 +45,10 @@ struct cachefs_netfs afs_cache_netfs = {
  */
 static int __init afs_init(void)
 {
-        int loop, ret;
+        int ret;
 
         printk(KERN_INFO "kAFS: Red Hat AFS client v0.1 registering.\n");
 
-        /* initialise the callback hash table */
-        spin_lock_init(&afs_cb_hash_lock);
-        for (loop = AFS_CB_HASH_COUNT - 1; loop >= 0; loop--)
-                INIT_LIST_HEAD(&afs_cb_hash_tbl[loop]);
-
         /* register the /proc stuff */
         ret = afs_proc_init();
         if (ret < 0)
@@ -94,22 +67,18 @@ static int __init afs_init(void)
         if (ret < 0)
                 goto error_cell_init;
 
-        /* start the timeout daemon */
-        ret = afs_kafstimod_start();
+        /* initialise the VL update process */
+        ret = afs_vlocation_update_init();
         if (ret < 0)
-                goto error_kafstimod;
+                goto error_vl_update_init;
 
-        /* start the async operation daemon */
-        ret = afs_kafsasyncd_start();
-        if (ret < 0)
-                goto error_kafsasyncd;
+        /* initialise the callback update process */
+        ret = afs_callback_update_init();
 
         /* create the RxRPC transport */
-        ret = rxrpc_create_transport(7001, &afs_transport);
+        ret = afs_open_socket();
         if (ret < 0)
-                goto error_transport;
-
-        afs_transport->peer_ops = &afs_peer_ops;
+                goto error_open_socket;
 
         /* register the filesystems */
         ret = afs_fs_init();
@@ -119,17 +88,16 @@ static int __init afs_init(void)
         return ret;
 
 error_fs:
-        rxrpc_put_transport(afs_transport);
-error_transport:
-        afs_kafsasyncd_stop();
-error_kafsasyncd:
-        afs_kafstimod_stop();
-error_kafstimod:
+        afs_close_socket();
+error_open_socket:
+error_vl_update_init:
 error_cell_init:
 #ifdef AFS_CACHING_SUPPORT
         cachefs_unregister_netfs(&afs_cache_netfs);
 error_cache:
 #endif
+        afs_callback_update_kill();
+        afs_vlocation_purge();
         afs_cell_purge();
         afs_proc_cleanup();
         printk(KERN_ERR "kAFS: failed to register: %d\n", ret);
@@ -149,9 +117,11 @@ static void __exit afs_exit(void)
         printk(KERN_INFO "kAFS: Red Hat AFS client v0.1 unregistering.\n");
 
         afs_fs_exit();
-        rxrpc_put_transport(afs_transport);
-        afs_kafstimod_stop();
-        afs_kafsasyncd_stop();
+        afs_close_socket();
+        afs_purge_servers();
+        afs_callback_update_kill();
+        afs_vlocation_purge();
+        flush_scheduled_work();
         afs_cell_purge();
 #ifdef AFS_CACHING_SUPPORT
         cachefs_unregister_netfs(&afs_cache_netfs);
@@ -160,64 +130,3 @@ static void __exit afs_exit(void)
 }
 
 module_exit(afs_exit);
-
-/*
- * notification that new peer record is being added
- * - called from krxsecd
- * - return an error to induce an abort
- * - mustn't sleep (caller holds an rwlock)
- */
-static int afs_adding_peer(struct rxrpc_peer *peer)
-{
-        struct afs_server *server;
-        int ret;
-
-        _debug("kAFS: Adding new peer %08x\n", ntohl(peer->addr.s_addr));
-
-        /* determine which server the peer resides in (if any) */
-        ret = afs_server_find_by_peer(peer, &server);
-        if (ret < 0)
-                return ret; /* none that we recognise, so abort */
-
-        _debug("Server %p{u=%d}\n", server, atomic_read(&server->usage));
-
-        _debug("Cell %p{u=%d}\n",
-               server->cell, atomic_read(&server->cell->usage));
-
-        /* cross-point the structs under a global lock */
-        spin_lock(&afs_server_peer_lock);
-        peer->user = server;
-        server->peer = peer;
-        spin_unlock(&afs_server_peer_lock);
-
-        afs_put_server(server);
-
-        return 0;
-}
-
-/*
- * notification that a peer record is being discarded
- * - called from krxiod or krxsecd
- */
-static void afs_discarding_peer(struct rxrpc_peer *peer)
-{
-        struct afs_server *server;
-
-        _enter("%p",peer);
-
-        _debug("Discarding peer %08x (rtt=%lu.%lumS)\n",
-               ntohl(peer->addr.s_addr),
-               (long) (peer->rtt / 1000),
-               (long) (peer->rtt % 1000));
-
-        /* uncross-point the structs under a global lock */
-        spin_lock(&afs_server_peer_lock);
-        server = peer->user;
-        if (server) {
-                peer->user = NULL;
-                server->peer = NULL;
-        }
-        spin_unlock(&afs_server_peer_lock);
-
-        _leave("");
-}