diff --git a/[refs] b/[refs] index 84dae069ba57..ad403d5da15f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f43b155a5a8a95b06bc0b4474fbb7311c7e9709a +refs/heads/master: b3bebd94bbe4e59dfa23d85b0296a4ce8ebcc6c7 diff --git a/trunk/fs/fuse/dev.c b/trunk/fs/fuse/dev.c index de402e4d8bce..8244e89a8dd6 100644 --- a/trunk/fs/fuse/dev.c +++ b/trunk/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;