diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2007-10-17 08:31:05 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 17:43:04 +0200 |
| commit | c9c9d7df5f8aed8b738f1ace45700e2001c1faeb (patch) | |
| tree | 04b7ef11d49758152c80c010f6a287f83d53299d /fs/fuse | |
| parent | fuse: no abort on interrupt (diff) | |
| download | linux-c9c9d7df5f8aed8b738f1ace45700e2001c1faeb.tar.xz linux-c9c9d7df5f8aed8b738f1ace45700e2001c1faeb.zip | |
fuse: no ENOENT from fuse device read
Don't return -ENOENT for a read() on the fuse device when the request was
aborted. Instead return -ENODEV, meaning the filesystem has been
force-umounted or aborted.
Previously ENOENT meant that the request was interrupted, but now the
'aborted' flag is not set in case of interrupts.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/fuse')
| -rw-r--r-- | fs/fuse/dev.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index cc6c2908fb12..db534bcde45f 100644 --- a/fs/fuse/dev.c +++ b/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; } |