summaryrefslogtreecommitdiff
path: root/fs/fuse
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2009-06-30 20:06:24 +0200
committerMiklos Szeredi <mszeredi@suse.cz>2009-06-30 20:06:24 +0200
commit201fa69a2849536ef2912e8e971ec0b01c04eff4 (patch)
tree78912c9cffd801c24bdf738d4842678308e520e4 /fs/fuse
parentb4c458b3a23d76936e76678f2074b1528f129f7a (diff)
downloadlinux-3.10-201fa69a2849536ef2912e8e971ec0b01c04eff4.tar.gz
linux-3.10-201fa69a2849536ef2912e8e971ec0b01c04eff4.tar.bz2
linux-3.10-201fa69a2849536ef2912e8e971ec0b01c04eff4.zip
fuse: fix bad return value in fuse_file_poll()
Fix fuse_file_poll() which returned a -errno value instead of a poll mask. Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> CC: stable@kernel.org
Diffstat (limited to 'fs/fuse')
-rw-r--r--fs/fuse/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index fce6ce694fd..cbc464043b6 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1922,7 +1922,7 @@ unsigned fuse_file_poll(struct file *file, poll_table *wait)
req = fuse_get_req(fc);
if (IS_ERR(req))
- return PTR_ERR(req);
+ return POLLERR;
req->in.h.opcode = FUSE_POLL;
req->in.h.nodeid = ff->nodeid;