diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2009-08-27 12:24:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2009-08-27 12:24:08 -0700 |
| commit | cf481442f2e086316ed8a1b3046f00ad23632ac4 (patch) | |
| tree | 2edd0fb64549dfb6388e39d86e8965908dfcb925 /net/9p/error.c | |
| parent | ipv4: make ip_append_data() handle NULL routing table (diff) | |
| parent | 9p: update documentation pointers (diff) | |
| download | linux-cf481442f2e086316ed8a1b3046f00ad23632ac4.tar.gz linux-cf481442f2e086316ed8a1b3046f00ad23632ac4.tar.bz2 linux-cf481442f2e086316ed8a1b3046f00ad23632ac4.zip | |
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: update documentation pointers
9p: remove unnecessary v9fses->options which duplicates the mount string
net/9p: insulate the client against an invalid error code sent by a 9p server
9p: Add missing cast for the error return value in v9fs_get_inode
9p: Remove redundant inode uid/gid assignment
9p: Fix possible regressions when ->get_sb fails.
9p: Fix v9fs show_options
9p: Fix possible memleak in v9fs_inode_from fid.
9p: minor comment fixes
9p: Fix possible inode leak in v9fs_get_inode.
9p: Check for error in return value of v9fs_fid_add
Diffstat (limited to 'net/9p/error.c')
| -rw-r--r-- | net/9p/error.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/9p/error.c b/net/9p/error.c index fdebe4314062..52518512a93e 100644 --- a/net/9p/error.c +++ b/net/9p/error.c @@ -239,7 +239,7 @@ int p9_errstr2errno(char *errstr, int len) errstr[len] = 0; printk(KERN_ERR "%s: server reported unknown error %s\n", __func__, errstr); - errno = 1; + errno = ESERVERFAULT; } return -errno; |