aboutsummaryrefslogtreecommitdiffstats
path: root/fs/fuse
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-07-03 01:02:18 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2017-11-27 16:20:05 -0500
commit076ccb76e1a6cf0aa5371132efdd502a11e806f1 (patch)
tree6917e5c6896f75226fe97e09a236c502fe0637f5 /fs/fuse
parent9dd957485d7d896ec18d8e2f9dd410efe71eca34 (diff)
fs: annotate ->poll() instances
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/fuse')
-rw-r--r--fs/fuse/dev.c4
-rw-r--r--fs/fuse/file.c2
-rw-r--r--fs/fuse/fuse_i.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 17f0d05bfd4c..aa089a6925d0 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -2004,9 +2004,9 @@ out:
2004 return ret; 2004 return ret;
2005} 2005}
2006 2006
2007static unsigned fuse_dev_poll(struct file *file, poll_table *wait) 2007static __poll_t fuse_dev_poll(struct file *file, poll_table *wait)
2008{ 2008{
2009 unsigned mask = POLLOUT | POLLWRNORM; 2009 __poll_t mask = POLLOUT | POLLWRNORM;
2010 struct fuse_iqueue *fiq; 2010 struct fuse_iqueue *fiq;
2011 struct fuse_dev *fud = fuse_get_dev(file); 2011 struct fuse_dev *fud = fuse_get_dev(file);
2012 2012
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index cb7dff5c45d7..fa4ca6bd2c96 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -2751,7 +2751,7 @@ static void fuse_register_polled_file(struct fuse_conn *fc,
2751 spin_unlock(&fc->lock); 2751 spin_unlock(&fc->lock);
2752} 2752}
2753 2753
2754unsigned fuse_file_poll(struct file *file, poll_table *wait) 2754__poll_t fuse_file_poll(struct file *file, poll_table *wait)
2755{ 2755{
2756 struct fuse_file *ff = file->private_data; 2756 struct fuse_file *ff = file->private_data;
2757 struct fuse_conn *fc = ff->fc; 2757 struct fuse_conn *fc = ff->fc;
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index d5773ca67ad2..c4c093bbf456 100644
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -951,7 +951,7 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,
951 unsigned int flags); 951 unsigned int flags);
952long fuse_ioctl_common(struct file *file, unsigned int cmd, 952long fuse_ioctl_common(struct file *file, unsigned int cmd,
953 unsigned long arg, unsigned int flags); 953 unsigned long arg, unsigned int flags);
954unsigned fuse_file_poll(struct file *file, poll_table *wait); 954__poll_t fuse_file_poll(struct file *file, poll_table *wait);
955int fuse_dev_release(struct inode *inode, struct file *file); 955int fuse_dev_release(struct inode *inode, struct file *file);
956 956
957bool fuse_write_update_size(struct inode *inode, loff_t pos); 957bool fuse_write_update_size(struct inode *inode, loff_t pos);