Received-SPF: pass (google.com: domain of linux-kernel+bounces-141135-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Jens Axboe <axboe@kernel.dk>
To: linux-kernel@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>
Subject: [PATCH 356/437] arch/sparc: convert to read/write iterators
Date: Thu, 11 Apr 2024 09:18:16 -0600
Message-ID: <20240411153126.16201-357-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>
---
 arch/sparc/kernel/mdesc.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index 30f171b7b00c..bcc3afbc8760 100644
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -1261,24 +1261,24 @@ static int mdesc_open(struct inode *inode, struct file *file)
 	return 0;
 }
 
-static ssize_t mdesc_read(struct file *file, char __user *buf,
-			  size_t len, loff_t *offp)
+static ssize_t mdesc_read(struct kiocb *iocb, struct iov_iter *to)
 {
-	struct mdesc_handle *hp = file->private_data;
+	struct mdesc_handle *hp = iocb->ki_filp->private_data;
+	size_t len = iov_iter_count(to);
 	unsigned char *mdesc;
 	int bytes_left, count = len;
 
-	if (*offp >= hp->handle_size)
+	if (iocb->ki_pos >= hp->handle_size)
 		return 0;
 
-	bytes_left = hp->handle_size - *offp;
+	bytes_left = hp->handle_size - iocb->ki_pos;
 	if (count > bytes_left)
 		count = bytes_left;
 
 	mdesc = (unsigned char *)&hp->mdesc;
-	mdesc += *offp;
-	if (!copy_to_user(buf, mdesc, count)) {
-		*offp += count;
+	mdesc += iocb->ki_pos;
+	if (!copy_to_iter_full(mdesc, count, to)) {
+		iocb->ki_pos += count;
 		return count;
 	} else {
 		return -EFAULT;
@@ -1303,7 +1303,7 @@ static int mdesc_close(struct inode *inode, struct file *file)
 
 static const struct file_operations mdesc_fops = {
 	.open    = mdesc_open,
-	.read	 = mdesc_read,
+	.read_iter	 = mdesc_read,
 	.llseek  = mdesc_llseek,
 	.release = mdesc_close,
 	.owner	 = THIS_MODULE,
-- 
2.43.0