mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2025-12-23 05:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix swapped sendmsg nr_segs/count

Browse Source 
When the msg_iter compat was added the iter was initialized with nr_segs
and count swapped.  I'm not convinced this had any effect because the
kernel_{send,recv}msg() call would initialize msg_iter again with the
correct arguments.

Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2025-09-29 10:30:30 -07:00
parent 45e815bf76
commit e79086f381
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kmod/src/net.c
View File

@@ -808,7 +808,7 @@ static int sendmsg_full(struct socket *sock, void *buf, unsigned len)
msg.msg_iov = (struct iovec *)&kv;
msg.msg_iovlen = 1;
#else
iov_iter_init(&msg.msg_iter, WRITE, (struct iovec *)&kv, len, 1);
iov_iter_init(&msg.msg_iter, WRITE, (struct iovec *)&kv, 1, len);
#endif
ret = kernel_sendmsg(sock, &msg, &kv, 1, len);
if (ret <= 0)

4
kmod/src/quorum.c
View File

@@ -269,7 +269,7 @@ static int send_msg_members(struct super_block *sb, int type, u64 term, int only
scoutfs_quorum_slot_sin(&qinf->qconf, i, &sin);
now = ktime_get();
#ifdef KC_MSGHDR_STRUCT_IOV_ITER
iov_iter_init(&mh.msg_iter, WRITE, (struct iovec *)&kv, sizeof(qmes), 1);
iov_iter_init(&mh.msg_iter, WRITE, (struct iovec *)&kv, 1, sizeof(qmes));
#endif
ret = kernel_sendmsg(qinf->sock, &mh, &kv, 1, kv.iov_len);
if (ret != kv.iov_len)
@@ -334,7 +334,7 @@ static int recv_msg(struct super_block *sb, struct quorum_host_msg *msg,
}
#ifdef KC_MSGHDR_STRUCT_IOV_ITER
iov_iter_init(&mh.msg_iter, READ, (struct iovec *)&kv, sizeof(struct scoutfs_quorum_message), 1);
iov_iter_init(&mh.msg_iter, READ, (struct iovec *)&kv, 1, sizeof(struct scoutfs_quorum_message));
#endif
ret = kernel_recvmsg(qinf->sock, &mh, &kv, 1, kv.iov_len, mh.msg_flags);
if (ret < 0)