Received-SPF: pass (google.com: domain of linux-kernel+bounces-141096-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Jens Axboe <axboe@kernel.dk>
To: linux-kernel@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>
Subject: [PATCH 318/437] drivers/net/xen-netback: convert to read/write iterators
Date: Thu, 11 Apr 2024 09:17:38 -0600
Message-ID: <20240411153126.16201-319-axboe@kernel.dk>
In-Reply-To: <20240411153126.16201-1-axboe@kernel.dk>
References: <20240411153126.16201-1-axboe@kernel.dk>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
 drivers/net/xen-netback/xenbus.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
index a78a25b87240..5f2ef4d6bb17 100644
--- a/drivers/net/xen-netback/xenbus.c
+++ b/drivers/net/xen-netback/xenbus.c
@@ -102,26 +102,21 @@ static int xenvif_read_io_ring(struct seq_file *m, void *v)
 #define XENVIF_KICK_STR "kick"
 #define BUFFER_SIZE     32
 
-static ssize_t
-xenvif_write_io_ring(struct file *filp, const char __user *buf, size_t count,
-		     loff_t *ppos)
+static ssize_t xenvif_write_io_ring(struct kiocb *iocb, struct iov_iter *from)
 {
 	struct xenvif_queue *queue =
-		((struct seq_file *)filp->private_data)->private;
+		((struct seq_file *)iocb->ki_filp->private_data)->private;
+	size_t count = iov_iter_count(from);
 	int len;
 	char write[BUFFER_SIZE];
 
 	/* don't allow partial writes and check the length */
-	if (*ppos != 0)
+	if (iocb->ki_pos != 0)
 		return 0;
 	if (count >= sizeof(write))
 		return -ENOSPC;
 
-	len = simple_write_to_buffer(write,
-				     sizeof(write) - 1,
-				     ppos,
-				     buf,
-				     count);
+	len = simple_copy_from_iter(write, &iocb->ki_pos, sizeof(write) - 1, from);
 	if (len < 0)
 		return len;
 
@@ -152,10 +147,10 @@ static int xenvif_io_ring_open(struct inode *inode, struct file *filp)
 static const struct file_operations xenvif_dbg_io_ring_ops_fops = {
 	.owner = THIS_MODULE,
 	.open = xenvif_io_ring_open,
-	.read = seq_read,
+	.read_iter = seq_read_iter,
 	.llseek = seq_lseek,
 	.release = single_release,
-	.write = xenvif_write_io_ring,
+	.write_iter = xenvif_write_io_ring,
 };
 
 static int xenvif_ctrl_show(struct seq_file *m, void *v)
-- 
2.43.0