Merge branch 'master' of /home/aia21/ntfs-2.6/

[linux-2.6-omap-h63xx.git] / fs / 9p / error.h

diff --git a/fs/9p/error.h b/fs/9p/error.h
index 6dbb66f5b28fa29de1e4cd061a10ed9ce88c66c0..a9794e85fe51015383736e290ad4b57e44658c89 100644 (file)
--- a/fs/9p/error.h
+++ b/fs/9p/error.h
@@ -36,6 +36,7 @@ struct errormap {
        char *name;
        int val;
 
+       int namelen;
        struct hlist_node list;
 };
 
@@ -47,6 +48,7 @@ static struct errormap errmap[] = {
        {"Operation not permitted", EPERM},
        {"wstat prohibited", EPERM},
        {"No such file or directory", ENOENT},
+       {"directory entry not found", ENOENT},
        {"file not found", ENOENT},
        {"Interrupted system call", EINTR},
        {"Input/output error", EIO},
@@ -139,7 +141,7 @@ static struct errormap errmap[] = {
        {"illegal mode", EINVAL},
        {"illegal name", ENAMETOOLONG},
        {"not a directory", ENOTDIR},
-       {"not a member of proposed group", EINVAL},
+       {"not a member of proposed group", EPERM},
        {"not owner", EACCES},
        {"only owner can change group in wstat", EACCES},
        {"read only file system", EROFS},
@@ -174,4 +176,3 @@ static struct errormap errmap[] = {
 };
 
 extern int v9fs_error_init(void);
-extern int v9fs_errstr2errno(char *errstr);