Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block

[~andy/linux] / net / 9p / error.c

diff --git a/net/9p/error.c b/net/9p/error.c
index 2ab2de76010f0d47f67ee4a79aaf567f97026ed9..126fd0dceea2e7c01117d1b1c6a5ab70b550daa0 100644 (file)
--- a/net/9p/error.c
+++ b/net/9p/error.c
@@ -221,15 +221,13 @@ EXPORT_SYMBOL(p9_error_init);
 int p9_errstr2errno(char *errstr, int len)
 {
        int errno;
-       struct hlist_node *p;
        struct errormap *c;
        int bucket;
 
        errno = 0;
-       p = NULL;
        c = NULL;
        bucket = jhash(errstr, len, 0) % ERRHASHSZ;
-       hlist_for_each_entry(c, p, &hash_errmap[bucket], list) {
+       hlist_for_each_entry(c, &hash_errmap[bucket], list) {
                if (c->namelen == len && !memcmp(c->name, errstr, len)) {
                        errno = c->val;
                        break;