linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: viro@zeniv.linux.org.uk, 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: Re: [PATCH 03/28] fs: update documentation to mention __poll_t
Date: Wed, 21 Mar 2018 09:28:42 -0700	[thread overview]
Message-ID: <20180321162842.GF4807@magnolia> (raw)
In-Reply-To: <20180321074032.14211-4-hch@lst.de>

On Wed, Mar 21, 2018 at 08:40:07AM +0100, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch@lst.de>

It still would be nice to have a commit message to note that we're
merely updating the documentation to reflect what's currently in the C
headers (as opposed to a mangled patch that updated the docs but dropped
the actual code update)...

...so with that fixed,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
>  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-21 16:32 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-21  7:40 aio poll and a new in-kernel poll API V6 Christoph Hellwig
2018-03-21  7:40 ` [PATCH 01/28] fs: unexport poll_schedule_timeout Christoph Hellwig
2018-03-21  9:05   ` Greg KH
2018-03-21  7:40 ` [PATCH 02/28] fs: cleanup do_pollfd Christoph Hellwig
2018-03-21  9:06   ` Greg KH
2018-03-21  7:40 ` [PATCH 03/28] fs: update documentation to mention __poll_t Christoph Hellwig
2018-03-21  9:06   ` Greg KH
2018-03-21 16:28   ` Darrick J. Wong [this message]
2018-03-21  7:40 ` [PATCH 04/28] fs: add new vfs_poll and file_can_poll helpers Christoph Hellwig
2018-03-21  9:07   ` Greg KH
2018-03-21  7:40 ` [PATCH 05/28] fs: introduce new ->get_poll_head and ->poll_mask methods Christoph Hellwig
2018-03-21  9:08   ` Greg KH
2018-03-21 16:29   ` Darrick J. Wong
2018-03-21  7:40 ` [PATCH 06/28] aio: implement IOCB_CMD_POLL Christoph Hellwig
2018-03-21  9:09   ` Greg KH
2018-03-21 16:31   ` Darrick J. Wong
2018-03-22 16:52   ` Al Viro
2018-03-22 17:24     ` Christoph Hellwig
2018-03-22 18:16       ` Al Viro
2018-03-23 18:05         ` Christoph Hellwig
2018-03-21  7:40 ` [PATCH 07/28] net: refactor socket_poll Christoph Hellwig
2018-03-21  7:40 ` [PATCH 08/28] net: add support for ->poll_mask in proto_ops Christoph Hellwig
2018-03-21  7:40 ` [PATCH 09/28] net: remove sock_no_poll Christoph Hellwig
2018-03-21  7:40 ` [PATCH 10/28] net/tcp: convert to ->poll_mask Christoph Hellwig
2018-03-21  7:40 ` [PATCH 11/28] net/unix: " Christoph Hellwig
2018-03-21  7:40 ` [PATCH 12/28] net: convert datagram_poll users tp ->poll_mask Christoph Hellwig
2018-03-21  9:11   ` Greg KH
2018-03-21  7:40 ` [PATCH 13/28] net/dccp: convert to ->poll_mask Christoph Hellwig
2018-03-21  7:40 ` [PATCH 14/28] net/atm: " Christoph Hellwig
2018-03-21  7:40 ` [PATCH 15/28] net/vmw_vsock: " Christoph Hellwig
2018-03-21  7:40 ` [PATCH 16/28] net/tipc: " Christoph Hellwig
2018-03-21  7:40 ` [PATCH 17/28] net/sctp: " Christoph Hellwig
2018-03-21  7:40 ` [PATCH 18/28] net/bluetooth: " Christoph Hellwig
2018-03-21  7:40 ` [PATCH 19/28] net/caif: " Christoph Hellwig
2018-03-21  7:40 ` [PATCH 20/28] net/nfc: " Christoph Hellwig
2018-03-21  7:40 ` [PATCH 21/28] net/phonet: " Christoph Hellwig
2018-03-21  7:40 ` [PATCH 22/28] net/iucv: " Christoph Hellwig
2018-03-21  7:40 ` [PATCH 23/28] net/rxrpc: " Christoph Hellwig
2018-03-21  7:40 ` [PATCH 24/28] crypto: af_alg: " Christoph Hellwig
2018-03-21  7:40 ` [PATCH 25/28] pipe: " Christoph Hellwig
2018-03-21  7:40 ` [PATCH 26/28] eventfd: switch " Christoph Hellwig
2018-03-21  7:40 ` [PATCH 27/28] timerfd: convert " Christoph Hellwig
2018-03-21  7:40 ` [PATCH 28/28] random: " Christoph Hellwig
2018-03-21  9:10   ` Greg KH
2018-03-22 13:49   ` Theodore Y. Ts'o

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=20180321162842.GF4807@magnolia \
    --to=darrick.wong@oracle.com \
    --cc=avi@scylladb.com \
    --cc=hch@lst.de \
    --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).