Skip to content

Commit a9e6d79

Browse files
author
Ronnie Sahlberg
committed
use less confusing names for iov_iter direction initializers
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2218388 commit de4eda9 RHEL: The core of this patch was already backported in 0d33f8e. This patch is just a backport of the CIFS part of the upstream patch that was not part of 0d33... READ/WRITE proved to be actively confusing - the meanings are "data destination, as used with read(2)" and "data source, as used with write(2)", but people keep interpreting those as "we read data from it" and "we write data to it", i.e. exactly the wrong way. Call them ITER_DEST and ITER_SOURCE - at least that is harder to misinterpret... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> (cherry picked from commit de4eda9) Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
1 parent e1c72cb commit a9e6d79

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

fs/cifs/connect.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ cifs_read_from_socket(struct TCP_Server_Info *server, char *buf,
734734
{
735735
struct msghdr smb_msg = {};
736736
struct kvec iov = {.iov_base = buf, .iov_len = to_read};
737-
iov_iter_kvec(&smb_msg.msg_iter, READ, &iov, 1, to_read);
737+
iov_iter_kvec(&smb_msg.msg_iter, ITER_DEST, &iov, 1, to_read);
738738

739739
return cifs_readv_from_socket(server, &smb_msg);
740740
}
@@ -749,7 +749,7 @@ cifs_discard_from_socket(struct TCP_Server_Info *server, size_t to_read)
749749
* and cifs_readv_from_socket sets msg_control and msg_controllen
750750
* so little to initialize in struct msghdr
751751
*/
752-
iov_iter_discard(&smb_msg.msg_iter, READ, to_read);
752+
iov_iter_discard(&smb_msg.msg_iter, ITER_DEST, to_read);
753753

754754
return cifs_readv_from_socket(server, &smb_msg);
755755
}
@@ -761,7 +761,7 @@ cifs_read_page_from_socket(struct TCP_Server_Info *server, struct page *page,
761761
struct msghdr smb_msg = {};
762762
struct bio_vec bv = {
763763
.bv_page = page, .bv_len = to_read, .bv_offset = page_offset};
764-
iov_iter_bvec(&smb_msg.msg_iter, READ, &bv, 1, to_read);
764+
iov_iter_bvec(&smb_msg.msg_iter, ITER_DEST, &bv, 1, to_read);
765765
return cifs_readv_from_socket(server, &smb_msg);
766766
}
767767

fs/cifs/file.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3542,7 +3542,7 @@ static ssize_t __cifs_writev(
35423542
ctx->iter = *from;
35433543
ctx->len = len;
35443544
} else {
3545-
rc = setup_aio_ctx_iter(ctx, from, WRITE);
3545+
rc = setup_aio_ctx_iter(ctx, from, ITER_SOURCE);
35463546
if (rc) {
35473547
kref_put(&ctx->refcount, cifs_aio_ctx_release);
35483548
return rc;
@@ -4287,7 +4287,7 @@ static ssize_t __cifs_readv(
42874287
ctx->iter = *to;
42884288
ctx->len = len;
42894289
} else {
4290-
rc = setup_aio_ctx_iter(ctx, to, READ);
4290+
rc = setup_aio_ctx_iter(ctx, to, ITER_DEST);
42914291
if (rc) {
42924292
kref_put(&ctx->refcount, cifs_aio_ctx_release);
42934293
return rc;

fs/cifs/fscache.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ static int fscache_fallback_read_page(struct inode *inode, struct page *page)
150150
bvec[0].bv_page = page;
151151
bvec[0].bv_offset = 0;
152152
bvec[0].bv_len = PAGE_SIZE;
153-
iov_iter_bvec(&iter, READ, bvec, ARRAY_SIZE(bvec), PAGE_SIZE);
153+
iov_iter_bvec(&iter, ITER_DEST, bvec, ARRAY_SIZE(bvec), PAGE_SIZE);
154154

155155
ret = fscache_begin_read_operation(&cres, cookie);
156156
if (ret < 0)
@@ -180,7 +180,7 @@ static int fscache_fallback_write_page(struct inode *inode, struct page *page,
180180
bvec[0].bv_page = page;
181181
bvec[0].bv_offset = 0;
182182
bvec[0].bv_len = PAGE_SIZE;
183-
iov_iter_bvec(&iter, WRITE, bvec, ARRAY_SIZE(bvec), PAGE_SIZE);
183+
iov_iter_bvec(&iter, ITER_SOURCE, bvec, ARRAY_SIZE(bvec), PAGE_SIZE);
184184

185185
ret = fscache_begin_write_operation(&cres, cookie);
186186
if (ret < 0)

fs/cifs/smb2ops.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4741,13 +4741,13 @@ handle_read_data(struct TCP_Server_Info *server, struct mid_q_entry *mid,
47414741
return 0;
47424742
}
47434743

4744-
iov_iter_bvec(&iter, WRITE, bvec, npages, data_len);
4744+
iov_iter_bvec(&iter, ITER_SOURCE, bvec, npages, data_len);
47454745
} else if (buf_len >= data_offset + data_len) {
47464746
/* read response payload is in buf */
47474747
WARN_ONCE(npages > 0, "read data can be either in buf or in pages");
47484748
iov.iov_base = buf + data_offset;
47494749
iov.iov_len = data_len;
4750-
iov_iter_kvec(&iter, WRITE, &iov, 1, data_len);
4750+
iov_iter_kvec(&iter, ITER_SOURCE, &iov, 1, data_len);
47514751
} else {
47524752
/* read response payload cannot be in both buf and pages */
47534753
WARN_ONCE(1, "buf can not contain only a part of read data");

fs/cifs/transport.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,
347347
.iov_base = &rfc1002_marker,
348348
.iov_len = 4
349349
};
350-
iov_iter_kvec(&smb_msg.msg_iter, WRITE, &hiov, 1, 4);
350+
iov_iter_kvec(&smb_msg.msg_iter, ITER_SOURCE, &hiov, 1, 4);
351351
rc = smb_send_kvec(server, &smb_msg, &sent);
352352
if (rc < 0)
353353
goto unmask;
@@ -368,7 +368,7 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,
368368
size += iov[i].iov_len;
369369
}
370370

371-
iov_iter_kvec(&smb_msg.msg_iter, WRITE, iov, n_vec, size);
371+
iov_iter_kvec(&smb_msg.msg_iter, ITER_SOURCE, iov, n_vec, size);
372372

373373
rc = smb_send_kvec(server, &smb_msg, &sent);
374374
if (rc < 0)
@@ -384,7 +384,7 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,
384384
rqst_page_get_length(&rqst[j], i, &bvec.bv_len,
385385
&bvec.bv_offset);
386386

387-
iov_iter_bvec(&smb_msg.msg_iter, WRITE,
387+
iov_iter_bvec(&smb_msg.msg_iter, ITER_SOURCE,
388388
&bvec, 1, bvec.bv_len);
389389
rc = smb_send_kvec(server, &smb_msg, &sent);
390390
if (rc < 0)

0 commit comments

Comments
 (0)