diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-07-03 08:02:18 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-11-28 00:20:05 +0300 |
| commit | 076ccb76e1a6cf0aa5371132efdd502a11e806f1 (patch) | |
| tree | 6917e5c6896f75226fe97e09a236c502fe0637f5 /fs/proc | |
| parent | 9dd957485d7d896ec18d8e2f9dd410efe71eca34 (diff) | |
| download | linux-076ccb76e1a6cf0aa5371132efdd502a11e806f1.tar.xz | |
fs: annotate ->poll() instances
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/inode.c | 2 | ||||
| -rw-r--r-- | fs/proc/kmsg.c | 2 | ||||
| -rw-r--r-- | fs/proc/proc_sysctl.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/proc/inode.c b/fs/proc/inode.c index 149fd4d75db6..5e6f160d96a2 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -234,7 +234,7 @@ static ssize_t proc_reg_write(struct file *file, const char __user *buf, size_t return rv; } -static unsigned int proc_reg_poll(struct file *file, struct poll_table_struct *pts) +static __poll_t proc_reg_poll(struct file *file, struct poll_table_struct *pts) { struct proc_dir_entry *pde = PDE(file_inode(file)); __poll_t rv = DEFAULT_POLLMASK; diff --git a/fs/proc/kmsg.c b/fs/proc/kmsg.c index e0f8774acd65..f0bfb45c3f9f 100644 --- a/fs/proc/kmsg.c +++ b/fs/proc/kmsg.c @@ -40,7 +40,7 @@ static ssize_t kmsg_read(struct file *file, char __user *buf, return do_syslog(SYSLOG_ACTION_READ, buf, count, SYSLOG_FROM_PROC); } -static unsigned int kmsg_poll(struct file *file, poll_table *wait) +static __poll_t kmsg_poll(struct file *file, poll_table *wait) { poll_wait(file, &log_wait, wait); if (do_syslog(SYSLOG_ACTION_SIZE_UNREAD, NULL, 0, SYSLOG_FROM_PROC)) diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index c5cbbdff3c3d..63325377621a 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -630,12 +630,12 @@ static int proc_sys_open(struct inode *inode, struct file *filp) return 0; } -static unsigned int proc_sys_poll(struct file *filp, poll_table *wait) +static __poll_t proc_sys_poll(struct file *filp, poll_table *wait) { struct inode *inode = file_inode(filp); struct ctl_table_header *head = grab_header(inode); struct ctl_table *table = PROC_I(inode)->sysctl_entry; - unsigned int ret = DEFAULT_POLLMASK; + __poll_t ret = DEFAULT_POLLMASK; unsigned long event; /* sysctl was unregistered */ |