diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-12-04 10:47:50 -0700 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2023-12-05 11:57:37 +0100 |
| commit | 9fd7874c0e5c89d7da0b4442271696ec0f8edcba (patch) | |
| tree | 02f05ac2574b38dcc3b39a942c34c0d4b04c29f7 /net/socket.c | |
| parent | 6ac805d13870925c787a28e3fe5cc73610cacd03 (diff) | |
| download | linux-9fd7874c0e5c89d7da0b4442271696ec0f8edcba.tar.gz | |
iov_iter: replace import_single_range() with import_ubuf()
With the removal of the 'iov' argument to import_single_range(), the two
functions are now fully identical. Convert the import_single_range()
callers to import_ubuf(), and remove the former fully.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Link: https://lore.kernel.org/r/20231204174827.1258875-3-axboe@kernel.dk
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/socket.c b/net/socket.c index 1f0d0e8d0a504..5d49ae0c1b792 100644 --- a/net/socket.c +++ b/net/socket.c @@ -2163,7 +2163,7 @@ int __sys_sendto(int fd, void __user *buff, size_t len, unsigned int flags, struct msghdr msg; int fput_needed; - err = import_single_range(ITER_SOURCE, buff, len, &msg.msg_iter); + err = import_ubuf(ITER_SOURCE, buff, len, &msg.msg_iter); if (unlikely(err)) return err; sock = sockfd_lookup_light(fd, &err, &fput_needed); @@ -2228,7 +2228,7 @@ int __sys_recvfrom(int fd, void __user *ubuf, size_t size, unsigned int flags, int err, err2; int fput_needed; - err = import_single_range(ITER_DEST, ubuf, size, &msg.msg_iter); + err = import_ubuf(ITER_DEST, ubuf, size, &msg.msg_iter); if (unlikely(err)) return err; sock = sockfd_lookup_light(fd, &err, &fput_needed); |