Received-SPF: pass (google.com: domain of linux-kernel+bounces-141129-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Jens Axboe <axboe@kernel.dk>
To: linux-kernel@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>
Subject: [PATCH 350/437] s390: monwriter: convert to read/write iterators
Date: Thu, 11 Apr 2024 09:18:10 -0600
Message-ID: <20240411153126.16201-351-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/s390/char/monwriter.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c
index bc5193d81f9c..8baf04d05748 100644
--- a/drivers/s390/char/monwriter.c
+++ b/drivers/s390/char/monwriter.c
@@ -216,10 +216,10 @@ static int monwrite_close(struct inode *inode, struct file *filp)
 	return 0;
 }
 
-static ssize_t monwrite_write(struct file *filp, const char __user *data,
-			      size_t count, loff_t *ppos)
+static ssize_t monwrite_write(struct kiocb *iocb, struct iov_iter *from)
 {
-	struct mon_private *monpriv = filp->private_data;
+	struct mon_private *monpriv = iocb->ki_filp->private_data;
+	size_t count = iov_iter_count(from);
 	size_t len, written;
 	void *to;
 	int rc;
@@ -230,7 +230,7 @@ static ssize_t monwrite_write(struct file *filp, const char __user *data,
 			len = min(count - written, monpriv->hdr_to_read);
 			to = (char *) &monpriv->hdr +
 				sizeof(monpriv->hdr) - monpriv->hdr_to_read;
-			if (copy_from_user(to, data + written, len)) {
+			if (!copy_from_iter_full(to, len, from)) {
 				rc = -EFAULT;
 				goto out_error;
 			}
@@ -249,7 +249,7 @@ static ssize_t monwrite_write(struct file *filp, const char __user *data,
 			len = min(count - written, monpriv->data_to_read);
 			to = monpriv->current_buf->data +
 				monpriv->hdr.datalen - monpriv->data_to_read;
-			if (copy_from_user(to, data + written, len)) {
+			if (!copy_from_iter_full(to, len, from)) {
 				rc = -EFAULT;
 				goto out_error;
 			}
@@ -277,7 +277,7 @@ static const struct file_operations monwrite_fops = {
 	.owner	 = THIS_MODULE,
 	.open	 = &monwrite_open,
 	.release = &monwrite_close,
-	.write	 = &monwrite_write,
+	.write_iter	 = &monwrite_write,
 	.llseek  = noop_llseek,
 };
 
-- 
2.43.0