Эх сурвалжийг харах

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: Miklos Szeredi <mszeredi@suse.cz>
Reviewed-by: Ashish Samant <ashish.samant@oracle.com>
Miklos Szeredi 10 жил өмнө
parent
commit
de15522646
1 өөрчлөгдсөн 4 нэмэгдсэн , 2 устгасан
  1. 4 2
      fs/fuse/dev.c

+ 4 - 2
fs/fuse/dev.c

@@ -168,6 +168,10 @@ static struct fuse_req *__fuse_get_req(struct fuse_conn *fc, unsigned npages,
 	if (!fc->connected)
 	if (!fc->connected)
 		goto out;
 		goto out;
 
 
+	err = -ECONNREFUSED;
+	if (fc->conn_error)
+		goto out;
+
 	req = fuse_request_alloc(npages);
 	req = fuse_request_alloc(npages);
 	err = -ENOMEM;
 	err = -ENOMEM;
 	if (!req) {
 	if (!req) {
@@ -498,8 +502,6 @@ static void __fuse_request_send(struct fuse_conn *fc, struct fuse_req *req)
 	spin_lock(&fc->lock);
 	spin_lock(&fc->lock);
 	if (!fc->connected)
 	if (!fc->connected)
 		req->out.h.error = -ENOTCONN;
 		req->out.h.error = -ENOTCONN;
-	else if (fc->conn_error)
-		req->out.h.error = -ECONNREFUSED;
 	else {
 	else {
 		req->in.h.unique = fuse_get_unique(fc);
 		req->in.h.unique = fuse_get_unique(fc);
 		queue_request(fc, req);
 		queue_request(fc, req);