summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMiklos Szeredi <miklos@szeredi.hu>2006-01-16 22:14:27 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-16 23:15:29 -0800
commitb3bebd94bbe4e59dfa23d85b0296a4ce8ebcc6c7 (patch)
tree87618ca8f6eb1a0317262610dd588af76201b186 /fs
parentf43b155a5a8a95b06bc0b4474fbb7311c7e9709a (diff)
downloadop-kernel-dev-b3bebd94bbe4e59dfa23d85b0296a4ce8ebcc6c7.zip
op-kernel-dev-b3bebd94bbe4e59dfa23d85b0296a4ce8ebcc6c7.tar.gz
[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 de402e4..8244e89 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;
OpenPOWER on IntegriCloud