Received-SPF: pass (google.com: domain of linux-kernel+bounces-140859-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Jens Axboe <axboe@kernel.dk>
To: linux-kernel@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>
Subject: [PATCH 097/437] aoe: convert to read/write iterators
Date: Thu, 11 Apr 2024 09:13:57 -0600
Message-ID: <20240411153126.16201-98-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/block/aoe/aoechr.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
index a42c4bcc85ba..828499156a5f 100644
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
@@ -192,6 +192,7 @@ aoechr_write(struct file *filp, const char __user *buf, size_t cnt, loff_t *offp
 		ret = cnt;
 	return ret;
 }
+FOPS_WRITE_ITER_HELPER(aoechr_write);
 
 static int
 aoechr_open(struct inode *inode, struct file *filp)
@@ -217,16 +218,16 @@ aoechr_rel(struct inode *inode, struct file *filp)
 	return 0;
 }
 
-static ssize_t
-aoechr_read(struct file *filp, char __user *buf, size_t cnt, loff_t *off)
+static ssize_t aoechr_read(struct kiocb *iocb, struct iov_iter *to)
 {
+	size_t cnt = iov_iter_count(to);
 	unsigned long n;
 	char *mp;
 	struct ErrMsg *em;
 	ssize_t len;
 	ulong flags;
 
-	n = (unsigned long) filp->private_data;
+	n = (unsigned long) iocb->ki_filp->private_data;
 	if (n != MINOR_ERR)
 		return -EFAULT;
 
@@ -236,7 +237,7 @@ aoechr_read(struct file *filp, char __user *buf, size_t cnt, loff_t *off)
 		em = emsgs + emsgs_head_idx;
 		if ((em->flags & EMFL_VALID) != 0)
 			break;
-		if (filp->f_flags & O_NDELAY) {
+		if (iocb->ki_filp->f_flags & O_NDELAY) {
 			spin_unlock_irqrestore(&emsgs_lock, flags);
 			return -EAGAIN;
 		}
@@ -269,14 +270,14 @@ aoechr_read(struct file *filp, char __user *buf, size_t cnt, loff_t *off)
 
 	spin_unlock_irqrestore(&emsgs_lock, flags);
 
-	n = copy_to_user(buf, mp, len);
+	n = !copy_to_iter_full(mp, len, to);
 	kfree(mp);
 	return n == 0 ? len : -EFAULT;
 }
 
 static const struct file_operations aoe_fops = {
-	.write = aoechr_write,
-	.read = aoechr_read,
+	.write_iter = aoechr_write_iter,
+	.read_iter = aoechr_read,
 	.open = aoechr_open,
 	.release = aoechr_rel,
 	.owner = THIS_MODULE,
-- 
2.43.0