Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de155226 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fuse: check conn_error earlier 



fc->conn_error is set once in FUSE_INIT reply and never cleared.  Check it
in request allocation, there's no sense in doing all the preparation if
sending will surely fail.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Reviewed-by: default avatarAshish Samant <ashish.samant@oracle.com>
parent 5437f241

fs/fuse/dev.c

+4 −2
Original line number Diff line number Diff line
@@ -168,6 +168,10 @@ static struct fuse_req *__fuse_get_req(struct fuse_conn *fc, unsigned npages, 
	if (!fc->connected)

		goto out;



	err = -ECONNREFUSED;

	if (fc->conn_error)

		goto out;



	req = fuse_request_alloc(npages);

	err = -ENOMEM;

	if (!req) {
@@ -498,8 +502,6 @@ static void __fuse_request_send(struct fuse_conn *fc, struct fuse_req *req) 
	spin_lock(&fc->lock);

	if (!fc->connected)

		req->out.h.error = -ENOTCONN;

	else if (fc->conn_error)

		req->out.h.error = -ECONNREFUSED;

	else {

		req->in.h.unique = fuse_get_unique(fc);

		queue_request(fc, req);