summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMiklos Szeredi <miklos@szeredi.hu>2006-01-17 07:14:27 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-17 08:15:29 +0100
commitb3bebd94bbe4e59dfa23d85b0296a4ce8ebcc6c7 (patch)
tree87618ca8f6eb1a0317262610dd588af76201b186 /fs
parent[PATCH] fuse: fix request_end() (diff)
downloadlinux-b3bebd94bbe4e59dfa23d85b0296a4ce8ebcc6c7.tar.xz
linux-b3bebd94bbe4e59dfa23d85b0296a4ce8ebcc6c7.zip
[PATCH] fuse: handle error INIT reply
Handle the case when the INIT request is answered with an error. Signed-off-by: Miklos Szeredi <miklos@szeredi.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/fuse/dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index de402e4d8bce..8244e89a8dd6 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -153,7 +153,7 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req)
int i;
struct fuse_init_out *arg = &req->misc.init_out;
- if (arg->major != FUSE_KERNEL_VERSION)
+ if (req->out.h.error || arg->major != FUSE_KERNEL_VERSION)
fc->conn_error = 1;
else {
fc->minor = arg->minor;