[11/36] fs: update documentation for __poll_t

Message ID	20180122201243.31610-12-hch@lst.de
State	Not Applicable, archived
Delegated to:	David Miller
Headers	show Return-Path: <netdev-owner@vger.kernel.org> 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 11/36] fs: update documentation for __poll_t Date: Mon, 22 Jan 2018 21:12:18 +0100 Message-Id: <20180122201243.31610-12-hch@lst.de> In-Reply-To: <20180122201243.31610-1-hch@lst.de> References: <20180122201243.31610-1-hch@lst.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	[01/36] aio: don't print the page size at boot time \| expand [01/36] aio: don't print the page size at boot time [02/36] aio: remove an outdated comment in aio_complete [03/36] aio: refactor read/write iocb setup [04/36] aio: sanitize ki_list handling [05/36] aio: simplify cancellation [06/36] aio: delete iocbs from the active_reqs list in kiocb_cancel [07/36] aio: add delayed cancel support [08/36] aio: implement io_pgetevents [09/36] fs: unexport poll_schedule_timeout [10/36] fs: cleanup do_pollfd [11/36] fs: update documentation for __poll_t [12/36] fs: add new vfs_poll and file_can_poll helpers [13/36] fs: introduce new ->get_poll_head and ->poll_mask methods [14/36] aio: implement IOCB_CMD_POLL [15/36] net: refactor socket_poll [16/36] net: add support for ->poll_mask in proto_ops [17/36] net: remove sock_no_poll [18/36] net/tcp: convert to ->poll_mask [19/36] net/unix: convert to ->poll_mask [20/36] net: convert datagram_poll users tp ->poll_mask [21/36] net/dccp: convert to ->poll_mask [22/36] net/atm: convert to ->poll_mask [23/36] net/vmw_vsock: convert to ->poll_mask [24/36] net/tipc: convert to ->poll_mask [25/36] net/sctp: convert to ->poll_mask [26/36] net/bluetooth: convert to ->poll_mask [27/36] net/caif: convert to ->poll_mask [28/36] net/nfc: convert to ->poll_mask [29/36] net/phonet: convert to ->poll_mask [30/36] net/iucv: convert to ->poll_mask [31/36] net/rxrpc: convert to ->poll_mask [32/36] crypto: af_alg: convert to ->poll_mask [33/36] pipe: convert to ->poll_mask [34/36] eventfd: switch to ->poll_mask [35/36] timerfd: convert to ->poll_mask [36/36] random: convert to ->poll_mask

Message ID

20180122201243.31610-12-hch@lst.de

State

Not Applicable, archived

Delegated to:

David Miller

Headers

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 11/36] fs: update documentation for __poll_t
Date: Mon, 22 Jan 2018 21:12:18 +0100
Message-Id: <20180122201243.31610-12-hch@lst.de>
In-Reply-To: <20180122201243.31610-1-hch@lst.de>
References: <20180122201243.31610-1-hch@lst.de>
Sender: netdev-owner@vger.kernel.org
Precedence: bulk

Series

[01/36] aio: don't print the page size at boot time | expand

Commit Message

Christoph Hellwig Jan. 22, 2018, 8:12 p.m. UTC

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 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 *);

[11/36] fs: update documentation for __poll_t

Commit Message

Patch