aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2009-06-30 20:06:24 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-07-19 20:38:55 -0700
commitf4d8cd6481fab1e7651e342b87c4828c548cbc52 (patch)
treea8fe8cab7727ccbf41c70d64b41edf3f6b8e55ea /fs
parentbfa4144ee21b9830a5c3d1e4b5d4e3d214275d3b (diff)
fuse: fix bad return value in fuse_file_poll()
commit 201fa69a2849536ef2912e8e971ec0b01c04eff4 upstream. Fix fuse_file_poll() which returned a -errno value instead of a poll mask. Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
-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 06f30e96567..053ff1cbef6 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1867,7 +1867,7 @@ static 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 = get_node_id(inode);