---

yaml --- r: 70760 b: refs/heads/master c: c9c9d7d h: refs/heads/master v: v3
git-mirror · Oct 17, 2007 · d65d0e0 · d65d0e0
1 parent e2db253
commit d65d0e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a131de0a482ac95e6469f56981c7b063593fdc5d
+refs/heads/master: c9c9d7df5f8aed8b738f1ace45700e2001c1faeb
diff --git a/trunk/fs/fuse/dev.c b/trunk/fs/fuse/dev.c
@@ -747,11 +747,12 @@ static ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov,
 	fuse_copy_finish(&cs);
 	spin_lock(&fc->lock);
 	req->locked = 0;
-	if (!err && req->aborted)
-		err = -ENOENT;
+	if (req->aborted) {
+		request_end(fc, req);
+		return -ENODEV;
+	}
 	if (err) {
-		if (!req->aborted)
-			req->out.h.error = -EIO;
+		req->out.h.error = -EIO;
 		request_end(fc, req);
 		return err;
 	}