aboutsummaryrefslogtreecommitdiffstats
path: root/fs/fuse/dev.c
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2007-10-17 02:31:05 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:43:04 -0400
commitc9c9d7df5f8aed8b738f1ace45700e2001c1faeb (patch)
tree04b7ef11d49758152c80c010f6a287f83d53299d /fs/fuse/dev.c
parenta131de0a482ac95e6469f56981c7b063593fdc5d (diff)
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/dev.c')
-rw-r--r--fs/fuse/dev.c9
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,
747 fuse_copy_finish(&cs); 747 fuse_copy_finish(&cs);
748 spin_lock(&fc->lock); 748 spin_lock(&fc->lock);
749 req->locked = 0; 749 req->locked = 0;
750 if (!err && req->aborted) 750 if (req->aborted) {
751 err = -ENOENT; 751 request_end(fc, req);
752 return -ENODEV;
753 }
752 if (err) { 754 if (err) {
753 if (!req->aborted) 755 req->out.h.error = -EIO;
754 req->out.h.error = -EIO;
755 request_end(fc, req); 756 request_end(fc, req);
756 return err; 757 return err;
757 } 758 }