Pull misc-for-upstream into release branch

[powerpc.git] / fs / 9p / error.h

diff --git a/fs/9p/error.h b/fs/9p/error.h
index 78f89ac..5f3ca52 100644 (file)
--- a/fs/9p/error.h
+++ b/fs/9p/error.h
@@ -12,9 +12,8 @@
  *  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
@@ -36,6 +35,7 @@ struct errormap {
        char *name;
        int val;
 
+       int namelen;
        struct hlist_node list;
 };
 
@@ -175,4 +175,3 @@ static struct errormap errmap[] = {
 };
 
 extern int v9fs_error_init(void);
-extern int v9fs_errstr2errno(char *errstr);