aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMiklos Szeredi <miklos@szeredi.hu>2006-01-17 01:14:27 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-17 02:15:29 -0500
commitb3bebd94bbe4e59dfa23d85b0296a4ce8ebcc6c7 (patch)
tree87618ca8f6eb1a0317262610dd588af76201b186 /fs
parentf43b155a5a8a95b06bc0b4474fbb7311c7e9709a (diff)
[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)
153 int i; 153 int i;
154 struct fuse_init_out *arg = &req->misc.init_out; 154 struct fuse_init_out *arg = &req->misc.init_out;
155 155
156 if (arg->major != FUSE_KERNEL_VERSION) 156 if (req->out.h.error || arg->major != FUSE_KERNEL_VERSION)
157 fc->conn_error = 1; 157 fc->conn_error = 1;
158 else { 158 else {
159 fc->minor = arg->minor; 159 fc->minor = arg->minor;