Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9p: fix a race condition bug in umount which caused a segfault
  9p: re-enable mount time debug option
  9p: cache meta-data when cache=loose
  net/9p: set error to EREMOTEIO if trans->write returns zero
  net/9p: change net/9p module name to 9pnet
  9p: Reorganization of 9p file system code

1 files changed, 0 insertions, 93 deletions

diff --git a/fs/9p/error.c b/fs/9p/error.c
deleted file mode 100644
index 0d7fa4e08812..000000000000
--- a/fs/9p/error.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * linux/fs/9p/error.c
- *
- * Error string handling
- *
- * Plan 9 uses error strings, Unix uses error numbers.  These functions
- * try to help manage that and provide for dynamically adding error
- * mappings.
- *
- *  Copyright (C) 2004 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 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
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to:
- *  Free Software Foundation
- *  51 Franklin Street, Fifth Floor
- *  Boston, MA  02111-1301  USA
- *
- */
-
-#include <linux/module.h>
-
-#include <linux/list.h>
-#include <linux/jhash.h>
-
-#include "debug.h"
-#include "error.h"
-
-/**
- * v9fs_error_init - preload
- * @errstr: error string
- *
- */
-
-int v9fs_error_init(void)
-{
-        struct errormap *c;
-        int bucket;
-
-        /* initialize hash table */
-        for (bucket = 0; bucket < ERRHASHSZ; bucket++)
-                INIT_HLIST_HEAD(&hash_errmap[bucket]);
-
-        /* load initial error map into hash table */
-        for (c = errmap; c->name != NULL; c++) {
-                c->namelen = strlen(c->name);
-                bucket = jhash(c->name, c->namelen, 0) % ERRHASHSZ;
-                INIT_HLIST_NODE(&c->list);
-                hlist_add_head(&c->list, &hash_errmap[bucket]);
-        }
-
-        return 1;
-}
-
-/**
- * errstr2errno - convert error string to error number
- * @errstr: error string
- *
- */
-
-int v9fs_errstr2errno(char *errstr, int len)
-{
-        int errno = 0;
-        struct hlist_node *p = NULL;
-        struct errormap *c = NULL;
-        int bucket = jhash(errstr, len, 0) % ERRHASHSZ;
-
-        hlist_for_each_entry(c, p, &hash_errmap[bucket], list) {
-                if (c->namelen==len && !memcmp(c->name, errstr, len)) {
-                        errno = c->val;
-                        break;
-                }
-        }
-
-        if (errno == 0) {
-                /* TODO: if error isn't found, add it dynamically */
-                errstr[len] = 0;
-                printk(KERN_ERR "%s: errstr :%s: not found\n", __FUNCTION__,
-                       errstr);
-                errno = 1;
-        }
-
-        return -errno;
-}