linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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/32] fs: update documentation to mention __poll_t and match the code
Date: Fri, 30 Mar 2018 17:07:40 +0200	[thread overview]
Message-ID: <20180330150809.28094-4-hch@lst.de> (raw)
In-Reply-To: <20180330150809.28094-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

  parent reply	other threads:[~2018-03-30 15:34 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-30 15:07 aio poll and a new in-kernel poll API V9 Christoph Hellwig
2018-03-30 15:07 ` [PATCH 01/32] fs: unexport poll_schedule_timeout Christoph Hellwig
2018-03-30 15:07 ` [PATCH 02/32] fs: cleanup do_pollfd Christoph Hellwig
2018-03-30 15:07 ` Christoph Hellwig [this message]
2018-03-30 15:07 ` [PATCH 04/32] fs: add new vfs_poll and file_can_poll helpers Christoph Hellwig
2018-03-30 15:07 ` [PATCH 05/32] fs: introduce new ->get_poll_head and ->poll_mask methods Christoph Hellwig
2018-04-06  4:58   ` Al Viro
2018-03-30 15:07 ` [PATCH 06/32] aio: simplify KIOCB_KEY handling Christoph Hellwig
2018-03-30 15:07 ` [PATCH 07/32] aio: simplify cancellation Christoph Hellwig
2018-03-30 15:07 ` [PATCH 08/32] aio: replace kiocb_set_cancel_fn with a cancel_kiocb file operation Christoph Hellwig
2018-04-06  2:15   ` Al Viro
2018-03-30 15:07 ` [PATCH 09/32] aio: add delayed cancel support Christoph Hellwig
2018-03-30 15:07 ` [PATCH 10/32] aio: implement IOCB_CMD_POLL Christoph Hellwig
2018-03-30 15:07 ` [PATCH 11/32] net: refactor socket_poll Christoph Hellwig
2018-03-30 15:07 ` [PATCH 12/32] net: add support for ->poll_mask in proto_ops Christoph Hellwig
2018-03-30 15:07 ` [PATCH 13/32] net: remove sock_no_poll Christoph Hellwig
2018-03-30 15:07 ` [PATCH 14/32] net/tcp: convert to ->poll_mask Christoph Hellwig
2018-03-30 15:07 ` [PATCH 15/32] net/unix: " Christoph Hellwig
2018-03-30 15:07 ` [PATCH 16/32] net: convert datagram_poll users tp ->poll_mask Christoph Hellwig
2018-03-30 15:07 ` [PATCH 17/32] net/dccp: convert to ->poll_mask Christoph Hellwig
2018-03-30 15:07 ` [PATCH 18/32] net/atm: " Christoph Hellwig
2018-03-30 15:07 ` [PATCH 19/32] net/vmw_vsock: " Christoph Hellwig
2018-03-30 15:07 ` [PATCH 20/32] net/tipc: " Christoph Hellwig
2018-03-30 15:07 ` [PATCH 21/32] net/sctp: " Christoph Hellwig
2018-03-30 15:07 ` [PATCH 22/32] net/bluetooth: " Christoph Hellwig
2018-03-30 15:08 ` [PATCH 23/32] net/caif: " Christoph Hellwig
2018-03-30 15:08 ` [PATCH 24/32] net/nfc: " Christoph Hellwig
2018-03-30 15:08 ` [PATCH 25/32] net/phonet: " Christoph Hellwig
2018-03-30 15:08 ` [PATCH 26/32] net/iucv: " Christoph Hellwig
2018-03-30 15:08 ` [PATCH 27/32] net/rxrpc: " Christoph Hellwig
2018-03-30 15:08 ` [PATCH 28/32] crypto: af_alg: " Christoph Hellwig
2018-03-30 15:08 ` [PATCH 29/32] pipe: " Christoph Hellwig
2018-03-30 15:08 ` [PATCH 30/32] eventfd: switch " Christoph Hellwig
2018-03-30 15:08 ` [PATCH 31/32] timerfd: convert " Christoph Hellwig
2018-03-30 15:08 ` [PATCH 32/32] random: " Christoph Hellwig
2018-05-11 11:07 aio poll and a new in-kernel poll API V10 Christoph Hellwig
2018-05-11 11:07 ` [PATCH 03/32] fs: update documentation to mention __poll_t and match the code Christoph Hellwig
2018-05-15 19:48 aio poll and a new in-kernel poll API V11 Christoph Hellwig
2018-05-15 19:48 ` [PATCH 03/32] 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=20180330150809.28094-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).