Merge branch 'topic/core-cleanup' into for-linus
[safe/jmp/linux-2.6] / fs / 9p / v9fs.c
index 14d663e..f8b86e9 100644 (file)
@@ -3,13 +3,12 @@
  *
  *  This file contains functions assisting in mapping VFS to 9P2000
  *
- *  Copyright (C) 2004 by Eric Van Hensbergen <ericvh@gmail.com>
+ *  Copyright (C) 2004-2008 by Eric Van Hensbergen <ericvh@gmail.com>
  *  Copyright (C) 2002 by Ron Minnich <rminnich@lanl.gov>
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 2
+ *  as published by the Free Software Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
+#include <linux/sched.h>
 #include <linux/parser.h>
 #include <linux/idr.h>
-
-#include "debug.h"
+#include <linux/slab.h>
+#include <net/9p/9p.h>
+#include <net/9p/client.h>
+#include <net/9p/transport.h>
 #include "v9fs.h"
-#include "9p.h"
 #include "v9fs_vfs.h"
-#include "transport.h"
-#include "mux.h"
-#include "conv.h"
+#include "cache.h"
 
-/* TODO: sysfs or debugfs interface */
-int v9fs_debug_level = 0;      /* feature-rific global debug level  */
+static DEFINE_SPINLOCK(v9fs_sessionlist_lock);
+static LIST_HEAD(v9fs_sessionlist);
 
 /*
 * Option Parsing (code inspired by NFS code)
-  *
 */
+ * Option Parsing (code inspired by NFS code)
+ *  NOTE: each transport will parse its own options
+ */
 
 enum {
        /* Options that take integer arguments */
-       Opt_port, Opt_msize, Opt_uid, Opt_gid, Opt_afid, Opt_debug,
-       Opt_rfdno, Opt_wfdno,
+       Opt_debug, Opt_dfltuid, Opt_dfltgid, Opt_afid,
        /* String options */
-       Opt_name, Opt_remotename,
+       Opt_uname, Opt_remotename, Opt_trans, Opt_cache, Opt_cachetag,
        /* Options that take no arguments */
-       Opt_legacy, Opt_nodevmap, Opt_unix, Opt_tcp, Opt_fd,
+       Opt_nodevmap,
+       /* Cache options */
+       Opt_cache_loose, Opt_fscache,
+       /* Access options */
+       Opt_access,
        /* Error token */
        Opt_err
 };
 
-static match_table_t tokens = {
-       {Opt_port, "port=%u"},
-       {Opt_msize, "msize=%u"},
-       {Opt_uid, "uid=%u"},
-       {Opt_gid, "gid=%u"},
+static const match_table_t tokens = {
+       {Opt_debug, "debug=%x"},
+       {Opt_dfltuid, "dfltuid=%u"},
+       {Opt_dfltgid, "dfltgid=%u"},
        {Opt_afid, "afid=%u"},
-       {Opt_rfdno, "rfdno=%u"},
-       {Opt_wfdno, "wfdno=%u"},
-       {Opt_debug, "debug=%u"},
-       {Opt_name, "name=%s"},
+       {Opt_uname, "uname=%s"},
        {Opt_remotename, "aname=%s"},
-       {Opt_unix, "proto=unix"},
-       {Opt_tcp, "proto=tcp"},
-       {Opt_fd, "proto=fd"},
-       {Opt_tcp, "tcp"},
-       {Opt_unix, "unix"},
-       {Opt_fd, "fd"},
-       {Opt_legacy, "noextend"},
        {Opt_nodevmap, "nodevmap"},
+       {Opt_cache, "cache=%s"},
+       {Opt_cache_loose, "loose"},
+       {Opt_fscache, "fscache"},
+       {Opt_cachetag, "cachetag=%s"},
+       {Opt_access, "access=%s"},
        {Opt_err, NULL}
 };
 
-/*
- *  Parse option string.
- */
-
 /**
  * v9fs_parse_options - parse mount options into session structure
- * @options: options string passed from mount
  * @v9ses: existing v9fs session information
  *
+ * Return 0 upon success, -ERRNO upon failure.
  */
 
-static void v9fs_parse_options(char *options, struct v9fs_session_info *v9ses)
+static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
 {
-       char *p;
+       char *options, *tmp_options;
        substring_t args[MAX_OPT_ARGS];
-       int option;
-       int ret;
+       char *p;
+       int option = 0;
+       char *s, *e;
+       int ret = 0;
 
        /* setup defaults */
-       v9ses->port = V9FS_PORT;
-       v9ses->maxdata = 9000;
-       v9ses->proto = PROTO_TCP;
-       v9ses->extended = 1;
        v9ses->afid = ~0;
        v9ses->debug = 0;
-       v9ses->rfdno = ~0;
-       v9ses->wfdno = ~0;
+       v9ses->cache = 0;
+#ifdef CONFIG_9P_FSCACHE
+       v9ses->cachetag = NULL;
+#endif
+
+       if (!opts)
+               return 0;
 
-       if (!options)
-               return;
+       tmp_options = kstrdup(opts, GFP_KERNEL);
+       if (!tmp_options) {
+               ret = -ENOMEM;
+               goto fail_option_alloc;
+       }
+       options = tmp_options;
 
        while ((p = strsep(&options, ",")) != NULL) {
                int token;
                if (!*p)
                        continue;
                token = match_token(p, tokens, args);
-               if (token < Opt_name) {
-                       if ((ret = match_int(&args[0], &option)) < 0) {
-                               dprintk(DEBUG_ERROR,
+               if (token < Opt_uname) {
+                       int r = match_int(&args[0], &option);
+                       if (r < 0) {
+                               P9_DPRINTK(P9_DEBUG_ERROR,
                                        "integer field, but no integer?\n");
+                               ret = r;
                                continue;
                        }
-
                }
                switch (token) {
-               case Opt_port:
-                       v9ses->port = option;
-                       break;
-               case Opt_msize:
-                       v9ses->maxdata = option;
+               case Opt_debug:
+                       v9ses->debug = option;
+#ifdef CONFIG_NET_9P_DEBUG
+                       p9_debug_level = option;
+#endif
                        break;
-               case Opt_uid:
-                       v9ses->uid = option;
+
+               case Opt_dfltuid:
+                       v9ses->dfltuid = option;
                        break;
-               case Opt_gid:
-                       v9ses->gid = option;
+               case Opt_dfltgid:
+                       v9ses->dfltgid = option;
                        break;
                case Opt_afid:
                        v9ses->afid = option;
                        break;
-               case Opt_rfdno:
-                       v9ses->rfdno = option;
-                       break;
-               case Opt_wfdno:
-                       v9ses->wfdno = option;
+               case Opt_uname:
+                       match_strlcpy(v9ses->uname, &args[0], PATH_MAX);
                        break;
-               case Opt_debug:
-                       v9ses->debug = option;
-                       break;
-               case Opt_tcp:
-                       v9ses->proto = PROTO_TCP;
+               case Opt_remotename:
+                       match_strlcpy(v9ses->aname, &args[0], PATH_MAX);
                        break;
-               case Opt_unix:
-                       v9ses->proto = PROTO_UNIX;
+               case Opt_nodevmap:
+                       v9ses->nodev = 1;
                        break;
-               case Opt_fd:
-                       v9ses->proto = PROTO_FD;
+               case Opt_cache_loose:
+                       v9ses->cache = CACHE_LOOSE;
                        break;
-               case Opt_name:
-                       match_strcpy(v9ses->name, &args[0]);
+               case Opt_fscache:
+                       v9ses->cache = CACHE_FSCACHE;
                        break;
-               case Opt_remotename:
-                       match_strcpy(v9ses->remotename, &args[0]);
+               case Opt_cachetag:
+#ifdef CONFIG_9P_FSCACHE
+                       v9ses->cachetag = match_strdup(&args[0]);
+#endif
                        break;
-               case Opt_legacy:
-                       v9ses->extended = 0;
+               case Opt_cache:
+                       s = match_strdup(&args[0]);
+                       if (!s) {
+                               ret = -ENOMEM;
+                               P9_DPRINTK(P9_DEBUG_ERROR,
+                                 "problem allocating copy of cache arg\n");
+                               goto free_and_return;
+                       }
+
+                       if (strcmp(s, "loose") == 0)
+                               v9ses->cache = CACHE_LOOSE;
+                       else if (strcmp(s, "fscache") == 0)
+                               v9ses->cache = CACHE_FSCACHE;
+                       else
+                               v9ses->cache = CACHE_NONE;
+                       kfree(s);
                        break;
-               case Opt_nodevmap:
-                       v9ses->nodev = 1;
+
+               case Opt_access:
+                       s = match_strdup(&args[0]);
+                       if (!s) {
+                               ret = -ENOMEM;
+                               P9_DPRINTK(P9_DEBUG_ERROR,
+                                 "problem allocating copy of access arg\n");
+                               goto free_and_return;
+                       }
+
+                       v9ses->flags &= ~V9FS_ACCESS_MASK;
+                       if (strcmp(s, "user") == 0)
+                               v9ses->flags |= V9FS_ACCESS_USER;
+                       else if (strcmp(s, "any") == 0)
+                               v9ses->flags |= V9FS_ACCESS_ANY;
+                       else {
+                               v9ses->flags |= V9FS_ACCESS_SINGLE;
+                               v9ses->uid = simple_strtoul(s, &e, 10);
+                               if (*e != '\0')
+                                       v9ses->uid = ~0;
+                       }
+                       kfree(s);
                        break;
+
                default:
                        continue;
                }
        }
+
+free_and_return:
+       kfree(tmp_options);
+fail_option_alloc:
+       return ret;
 }
 
 /**
- * v9fs_inode2v9ses - safely extract v9fs session info from super block
- * @inode: inode to extract information from
- *
- * Paranoid function to extract v9ses information from superblock,
- * if anything is missing it will report an error.
+ * v9fs_session_init - initialize session
+ * @v9ses: session information structure
+ * @dev_name: device being mounted
+ * @data: options
  *
  */
 
-struct v9fs_session_info *v9fs_inode2v9ses(struct inode *inode)
+struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses,
+                 const char *dev_name, char *data)
 {
-       return (inode->i_sb->s_fs_info);
+       int retval = -EINVAL;
+       struct p9_fid *fid;
+       int rc;
+
+       v9ses->uname = __getname();
+       if (!v9ses->uname)
+               return ERR_PTR(-ENOMEM);
+
+       v9ses->aname = __getname();
+       if (!v9ses->aname) {
+               __putname(v9ses->uname);
+               return ERR_PTR(-ENOMEM);
+       }
+
+       rc = bdi_setup_and_register(&v9ses->bdi, "9p", BDI_CAP_MAP_COPY);
+       if (rc) {
+               __putname(v9ses->aname);
+               __putname(v9ses->uname);
+               return ERR_PTR(rc);
+       }
+
+       spin_lock(&v9fs_sessionlist_lock);
+       list_add(&v9ses->slist, &v9fs_sessionlist);
+       spin_unlock(&v9fs_sessionlist_lock);
+
+       v9ses->flags = V9FS_ACCESS_USER;
+       strcpy(v9ses->uname, V9FS_DEFUSER);
+       strcpy(v9ses->aname, V9FS_DEFANAME);
+       v9ses->uid = ~0;
+       v9ses->dfltuid = V9FS_DEFUID;
+       v9ses->dfltgid = V9FS_DEFGID;
+
+       rc = v9fs_parse_options(v9ses, data);
+       if (rc < 0) {
+               retval = rc;
+               goto error;
+       }
+
+       v9ses->clnt = p9_client_create(dev_name, data);
+       if (IS_ERR(v9ses->clnt)) {
+               retval = PTR_ERR(v9ses->clnt);
+               v9ses->clnt = NULL;
+               P9_DPRINTK(P9_DEBUG_ERROR, "problem initializing 9p client\n");
+               goto error;
+       }
+
+       if (p9_is_proto_dotl(v9ses->clnt))
+               v9ses->flags |= V9FS_PROTO_2000L;
+       else if (p9_is_proto_dotu(v9ses->clnt))
+               v9ses->flags |= V9FS_PROTO_2000U;
+
+       v9ses->maxdata = v9ses->clnt->msize - P9_IOHDRSZ;
+
+       /* for legacy mode, fall back to V9FS_ACCESS_ANY */
+       if (!v9fs_proto_dotu(v9ses) &&
+               ((v9ses->flags&V9FS_ACCESS_MASK) == V9FS_ACCESS_USER)) {
+
+               v9ses->flags &= ~V9FS_ACCESS_MASK;
+               v9ses->flags |= V9FS_ACCESS_ANY;
+               v9ses->uid = ~0;
+       }
+
+       fid = p9_client_attach(v9ses->clnt, NULL, v9ses->uname, ~0,
+                                                       v9ses->aname);
+       if (IS_ERR(fid)) {
+               retval = PTR_ERR(fid);
+               fid = NULL;
+               P9_DPRINTK(P9_DEBUG_ERROR, "cannot attach\n");
+               goto error;
+       }
+
+       if ((v9ses->flags & V9FS_ACCESS_MASK) == V9FS_ACCESS_SINGLE)
+               fid->uid = v9ses->uid;
+       else
+               fid->uid = ~0;
+
+#ifdef CONFIG_9P_FSCACHE
+       /* register the session for caching */
+       v9fs_cache_session_get_cookie(v9ses);
+#endif
+
+       return fid;
+
+error:
+       bdi_destroy(&v9ses->bdi);
+       return ERR_PTR(retval);
 }
 
 /**
- * v9fs_get_idpool - allocate numeric id from pool
- * @p - pool to allocate from
+ * v9fs_session_close - shutdown a session
+ * @v9ses: session information structure
  *
- * XXX - This seems to be an awful generic function, should it be in idr.c with
- *            the lock included in struct idr?
  */
 
-int v9fs_get_idpool(struct v9fs_idpool *p)
+void v9fs_session_close(struct v9fs_session_info *v9ses)
 {
-       int i = 0;
-       int error;
-
-retry:
-       if (idr_pre_get(&p->pool, GFP_KERNEL) == 0)
-               return 0;
-
-       if (down_interruptible(&p->lock) == -EINTR) {
-               eprintk(KERN_WARNING, "Interrupted while locking\n");
-               return -1;
+       if (v9ses->clnt) {
+               p9_client_destroy(v9ses->clnt);
+               v9ses->clnt = NULL;
        }
 
-       error = idr_get_new(&p->pool, NULL, &i);
-       up(&p->lock);
+#ifdef CONFIG_9P_FSCACHE
+       if (v9ses->fscache) {
+               v9fs_cache_session_put_cookie(v9ses);
+               kfree(v9ses->cachetag);
+       }
+#endif
+       __putname(v9ses->uname);
+       __putname(v9ses->aname);
 
-       if (error == -EAGAIN)
-               goto retry;
-       else if (error)
-               return -1;
+       bdi_destroy(&v9ses->bdi);
 
-       return i;
+       spin_lock(&v9fs_sessionlist_lock);
+       list_del(&v9ses->slist);
+       spin_unlock(&v9fs_sessionlist_lock);
 }
 
 /**
- * v9fs_put_idpool - release numeric id from pool
- * @p - pool to allocate from
+ * v9fs_session_cancel - terminate a session
+ * @v9ses: session to terminate
  *
- * XXX - This seems to be an awful generic function, should it be in idr.c with
- *            the lock included in struct idr?
+ * mark transport as disconnected and cancel all pending requests.
  */
 
-void v9fs_put_idpool(int id, struct v9fs_idpool *p)
-{
-       if (down_interruptible(&p->lock) == -EINTR) {
-               eprintk(KERN_WARNING, "Interrupted while locking\n");
-               return;
-       }
-       idr_remove(&p->pool, id);
-       up(&p->lock);
+void v9fs_session_cancel(struct v9fs_session_info *v9ses) {
+       P9_DPRINTK(P9_DEBUG_ERROR, "cancel session %p\n", v9ses);
+       p9_client_disconnect(v9ses->clnt);
 }
 
 /**
- * v9fs_session_init - initialize session
- * @v9ses: session information structure
- * @dev_name: device being mounted
- * @data: options
+ * v9fs_session_begin_cancel - Begin terminate of a session
+ * @v9ses: session to terminate
  *
+ * After this call we don't allow any request other than clunk.
  */
 
-int
-v9fs_session_init(struct v9fs_session_info *v9ses,
-                 const char *dev_name, char *data)
+void v9fs_session_begin_cancel(struct v9fs_session_info *v9ses)
 {
-       struct v9fs_fcall *fcall = NULL;
-       struct v9fs_transport *trans_proto;
-       int n = 0;
-       int newfid = -1;
-       int retval = -EINVAL;
+       P9_DPRINTK(P9_DEBUG_ERROR, "begin cancel session %p\n", v9ses);
+       p9_client_begin_disconnect(v9ses->clnt);
+}
 
-       v9ses->name = __getname();
-       if (!v9ses->name)
-               return -ENOMEM;
+extern int v9fs_error_init(void);
 
-       v9ses->remotename = __getname();
-       if (!v9ses->remotename) {
-               putname(v9ses->name);
-               return -ENOMEM;
-       }
+static struct kobject *v9fs_kobj;
 
-       strcpy(v9ses->name, V9FS_DEFUSER);
-       strcpy(v9ses->remotename, V9FS_DEFANAME);
-
-       v9fs_parse_options(data, v9ses);
-
-       /* set global debug level */
-       v9fs_debug_level = v9ses->debug;
-
-       /* id pools that are session-dependent: FIDs and TIDs */
-       idr_init(&v9ses->fidpool.pool);
-       init_MUTEX(&v9ses->fidpool.lock);
-       idr_init(&v9ses->tidpool.pool);
-       init_MUTEX(&v9ses->tidpool.lock);
-
-
-       switch (v9ses->proto) {
-       case PROTO_TCP:
-               trans_proto = &v9fs_trans_tcp;
-               break;
-       case PROTO_UNIX:
-               trans_proto = &v9fs_trans_unix;
-               *v9ses->remotename = 0;
-               break;
-       case PROTO_FD:
-               trans_proto = &v9fs_trans_fd;
-               *v9ses->remotename = 0;
-               if((v9ses->wfdno == ~0) || (v9ses->rfdno == ~0)) {
-                       printk(KERN_ERR "v9fs: Insufficient options for proto=fd\n");
-                       retval = -ENOPROTOOPT;
-                       goto SessCleanUp;
-               }
-               break;
-       default:
-               printk(KERN_ERR "v9fs: Bad mount protocol %d\n", v9ses->proto);
-               retval = -ENOPROTOOPT;
-               goto SessCleanUp;
-       };
-
-       v9ses->transport = trans_proto;
-
-       if ((retval = v9ses->transport->init(v9ses, dev_name, data)) < 0) {
-               eprintk(KERN_ERR, "problem initializing transport\n");
-               goto SessCleanUp;
-       }
+#ifdef CONFIG_9P_FSCACHE
+/**
+ * caches_show - list caches associated with a session
+ *
+ * Returns the size of buffer written.
+ */
 
-       v9ses->inprogress = 0;
-       v9ses->shutdown = 0;
-       v9ses->session_hung = 0;
+static ssize_t caches_show(struct kobject *kobj,
+                          struct kobj_attribute *attr,
+                          char *buf)
+{
+       ssize_t n = 0, count = 0, limit = PAGE_SIZE;
+       struct v9fs_session_info *v9ses;
+
+       spin_lock(&v9fs_sessionlist_lock);
+       list_for_each_entry(v9ses, &v9fs_sessionlist, slist) {
+               if (v9ses->cachetag) {
+                       n = snprintf(buf, limit, "%s\n", v9ses->cachetag);
+                       if (n < 0) {
+                               count = n;
+                               break;
+                       }
 
-       if ((retval = v9fs_mux_init(v9ses, dev_name)) < 0) {
-               dprintk(DEBUG_ERROR, "problem initializing mux\n");
-               goto SessCleanUp;
+                       count += n;
+                       limit -= n;
+               }
        }
 
-       if (v9ses->afid == ~0) {
-               if (v9ses->extended)
-                       retval =
-                           v9fs_t_version(v9ses, v9ses->maxdata, "9P2000.u",
-                                          &fcall);
-               else
-                       retval = v9fs_t_version(v9ses, v9ses->maxdata, "9P2000",
-                                               &fcall);
-
-               if (retval < 0) {
-                       dprintk(DEBUG_ERROR, "v9fs_t_version failed\n");
-                       goto FreeFcall;
-               }
+       spin_unlock(&v9fs_sessionlist_lock);
+       return count;
+}
 
-               /* Really should check for 9P1 and report error */
-               if (!strcmp(fcall->params.rversion.version, "9P2000.u")) {
-                       dprintk(DEBUG_9P, "9P2000 UNIX extensions enabled\n");
-                       v9ses->extended = 1;
-               } else {
-                       dprintk(DEBUG_9P, "9P2000 legacy mode enabled\n");
-                       v9ses->extended = 0;
-               }
+static struct kobj_attribute v9fs_attr_cache = __ATTR_RO(caches);
+#endif /* CONFIG_9P_FSCACHE */
 
-               n = fcall->params.rversion.msize;
-               kfree(fcall);
+static struct attribute *v9fs_attrs[] = {
+#ifdef CONFIG_9P_FSCACHE
+       &v9fs_attr_cache.attr,
+#endif
+       NULL,
+};
 
-               if (n < v9ses->maxdata)
-                       v9ses->maxdata = n;
-       }
+static struct attribute_group v9fs_attr_group = {
+       .attrs = v9fs_attrs,
+};
 
-       newfid = v9fs_get_idpool(&v9ses->fidpool);
-       if (newfid < 0) {
-               eprintk(KERN_WARNING, "couldn't allocate FID\n");
-               retval = -ENOMEM;
-               goto SessCleanUp;
-       }
-       /* it is a little bit ugly, but we have to prevent newfid */
-       /* being the same as afid, so if it is, get a new fid     */
-       if (v9ses->afid != ~0 && newfid == v9ses->afid) {
-               newfid = v9fs_get_idpool(&v9ses->fidpool);
-               if (newfid < 0) {
-                       eprintk(KERN_WARNING, "couldn't allocate FID\n");
-                       retval = -ENOMEM;
-                       goto SessCleanUp;
-               }
-       }
+/**
+ * v9fs_sysfs_init - Initialize the v9fs sysfs interface
+ *
+ */
 
-       if ((retval =
-            v9fs_t_attach(v9ses, v9ses->name, v9ses->remotename, newfid,
-                          v9ses->afid, NULL))
-           < 0) {
-               dprintk(DEBUG_ERROR, "cannot attach\n");
-               goto SessCleanUp;
-       }
+static int v9fs_sysfs_init(void)
+{
+       v9fs_kobj = kobject_create_and_add("9p", fs_kobj);
+       if (!v9fs_kobj)
+               return -ENOMEM;
 
-       if (v9ses->afid != ~0) {
-               if (v9fs_t_clunk(v9ses, v9ses->afid, NULL))
-                       dprintk(DEBUG_ERROR, "clunk failed\n");
+       if (sysfs_create_group(v9fs_kobj, &v9fs_attr_group)) {
+               kobject_put(v9fs_kobj);
+               return -ENOMEM;
        }
 
-       return newfid;
-
-      FreeFcall:
-       kfree(fcall);
-
-      SessCleanUp:
-       v9fs_session_close(v9ses);
-       return retval;
+       return 0;
 }
 
 /**
- * v9fs_session_close - shutdown a session
- * @v9ses: session information structure
+ * v9fs_sysfs_cleanup - Unregister the v9fs sysfs interface
  *
  */
 
-void v9fs_session_close(struct v9fs_session_info *v9ses)
+static void v9fs_sysfs_cleanup(void)
 {
-       if (v9ses->recvproc) {
-               send_sig(SIGKILL, v9ses->recvproc, 1);
-               wait_for_completion(&v9ses->proccmpl);
-       }
-
-       if (v9ses->transport)
-               v9ses->transport->close(v9ses->transport);
-
-       putname(v9ses->name);
-       putname(v9ses->remotename);
+       sysfs_remove_group(v9fs_kobj, &v9fs_attr_group);
+       kobject_put(v9fs_kobj);
 }
 
-extern int v9fs_error_init(void);
-
 /**
- * v9fs_init - Initialize module
+ * init_v9fs - Initialize module
  *
  */
 
 static int __init init_v9fs(void)
 {
-       v9fs_error_init();
+       int err;
+       printk(KERN_INFO "Installing v9fs 9p2000 file system support\n");
+       /* TODO: Setup list of registered trasnport modules */
+       err = register_filesystem(&v9fs_fs_type);
+       if (err < 0) {
+               printk(KERN_ERR "Failed to register filesystem\n");
+               return err;
+       }
 
-       printk(KERN_INFO "Installing v9fs 9P2000 file system support\n");
+       err = v9fs_cache_register();
+       if (err < 0) {
+               printk(KERN_ERR "Failed to register v9fs for caching\n");
+               goto out_fs_unreg;
+       }
+
+       err = v9fs_sysfs_init();
+       if (err < 0) {
+               printk(KERN_ERR "Failed to register with sysfs\n");
+               goto out_sysfs_cleanup;
+       }
+
+       return 0;
+
+out_sysfs_cleanup:
+       v9fs_sysfs_cleanup();
+
+out_fs_unreg:
+       unregister_filesystem(&v9fs_fs_type);
 
-       return register_filesystem(&v9fs_fs_type);
+       return err;
 }
 
 /**
- * v9fs_init - shutdown module
+ * exit_v9fs - shutdown module
  *
  */
 
 static void __exit exit_v9fs(void)
 {
+       v9fs_sysfs_cleanup();
+       v9fs_cache_unregister();
        unregister_filesystem(&v9fs_fs_type);
 }
 
 module_init(init_v9fs)
 module_exit(exit_v9fs)
 
+MODULE_AUTHOR("Latchesar Ionkov <lucho@ionkov.net>");
 MODULE_AUTHOR("Eric Van Hensbergen <ericvh@gmail.com>");
 MODULE_AUTHOR("Ron Minnich <rminnich@lanl.gov>");
 MODULE_LICENSE("GPL");