diff --git a/[refs] b/[refs] index d763b1fbe3cf..d0d78acc5aff 100644 --- 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 index cc6c2908fb12..db534bcde45f 100644 --- 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; }