From: Christoph Hellwig <hch@lst.de>
To: viro@zeniv.linux.org.uk
Cc: Avi Kivity <avi@scylladb.com>,
linux-aio@kvack.org, linux-fsdevel@vger.kernel.org,
netdev@vger.kernel.org, linux-api@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 03/30] fs: update documentation to mention __poll_t and match the code
Date: Thu, 29 Mar 2018 22:33:01 +0200 [thread overview]
Message-ID: <20180329203328.3248-4-hch@lst.de> (raw)
In-Reply-To: <20180329203328.3248-1-hch@lst.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
Documentation/filesystems/Locking | 2 +-
Documentation/filesystems/vfs.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index 75d2d57e2c44..220bba28f72b 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -439,7 +439,7 @@ prototypes:
ssize_t (*read_iter) (struct kiocb *, struct iov_iter *);
ssize_t (*write_iter) (struct kiocb *, struct iov_iter *);
int (*iterate) (struct file *, struct dir_context *);
- unsigned int (*poll) (struct file *, struct poll_table_struct *);
+ __poll_t (*poll) (struct file *, struct poll_table_struct *);
long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
int (*mmap) (struct file *, struct vm_area_struct *);
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index 5fd325df59e2..f608180ad59d 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -856,7 +856,7 @@ struct file_operations {
ssize_t (*read_iter) (struct kiocb *, struct iov_iter *);
ssize_t (*write_iter) (struct kiocb *, struct iov_iter *);
int (*iterate) (struct file *, struct dir_context *);
- unsigned int (*poll) (struct file *, struct poll_table_struct *);
+ __poll_t (*poll) (struct file *, struct poll_table_struct *);
long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
int (*mmap) (struct file *, struct vm_area_struct *);
--
2.14.2
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in
the body to majordomo@kvack.org. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"aart@kvack.org">aart@kvack.org</a>
next prev parent reply other threads:[~2018-03-29 20:33 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-29 20:32 aio poll and a new in-kernel poll API V8 Christoph Hellwig
2018-03-29 20:32 ` [PATCH 01/30] fs: unexport poll_schedule_timeout Christoph Hellwig
2018-03-29 20:33 ` [PATCH 02/30] fs: cleanup do_pollfd Christoph Hellwig
2018-03-29 20:33 ` Christoph Hellwig [this message]
2018-03-29 20:33 ` [PATCH 04/30] fs: add new vfs_poll and file_can_poll helpers Christoph Hellwig
2018-03-29 20:33 ` [PATCH 05/30] fs: introduce new ->get_poll_head and ->poll_mask methods Christoph Hellwig
2018-03-29 20:33 ` [PATCH 06/30] aio: simplify cancellation Christoph Hellwig
2018-03-29 20:33 ` [PATCH 07/30] aio: add delayed cancel support Christoph Hellwig
2018-03-29 22:35 ` Al Viro
2018-03-30 7:14 ` Christoph Hellwig
2018-03-29 20:33 ` [PATCH 08/30] aio: implement IOCB_CMD_POLL Christoph Hellwig
2018-03-29 20:33 ` [PATCH 09/30] net: refactor socket_poll Christoph Hellwig
2018-03-29 20:33 ` [PATCH 10/30] net: add support for ->poll_mask in proto_ops Christoph Hellwig
2018-03-29 20:33 ` [PATCH 11/30] net: remove sock_no_poll Christoph Hellwig
2018-03-29 20:33 ` [PATCH 12/30] net/tcp: convert to ->poll_mask Christoph Hellwig
2018-03-29 20:33 ` [PATCH 13/30] net/unix: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 14/30] net: convert datagram_poll users tp ->poll_mask Christoph Hellwig
2018-03-29 20:33 ` [PATCH 15/30] net/dccp: convert to ->poll_mask Christoph Hellwig
2018-03-29 20:33 ` [PATCH 16/30] net/atm: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 17/30] net/vmw_vsock: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 18/30] net/tipc: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 19/30] net/sctp: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 20/30] net/bluetooth: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 21/30] net/caif: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 22/30] net/nfc: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 23/30] net/phonet: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 24/30] net/iucv: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 25/30] net/rxrpc: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 26/30] crypto: af_alg: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 27/30] pipe: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 28/30] eventfd: switch " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 29/30] timerfd: convert " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 30/30] random: " Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2018-03-28 7:28 aio poll and a new in-kernel poll API V7 Christoph Hellwig
2018-03-28 7:28 ` [PATCH 03/30] fs: update documentation to mention __poll_t and match the code Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180329203328.3248-4-hch@lst.de \
--to=hch@lst.de \
--cc=avi@scylladb.com \
--cc=linux-aio@kvack.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).