Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag '9p-for-6.9-rc3' of https://github.com/martinetd/linux
Pull minor 9p cleanups from Dominique Martinet:
- kernel doc fix & removal of unused flag
- fix some bogus debug statement for read/write
* tag '9p-for-6.9-rc3' of https://github.com/martinetd/linux:
9p: remove SLAB_MEM_SPREAD flag usage
9p: Fix read/write debug statements to report server reply
9p/trans_fd: remove Excess kernel-doc comment
+5
-6
+5
-5
net/9p/client.c
+5
-5
net/9p/client.c
···
1583
1583
received = rsize;
1584
1584
}
1585
1585
1586
-
p9_debug(P9_DEBUG_9P, "<<< RREAD count %d\n", count);
1586
+
p9_debug(P9_DEBUG_9P, "<<< RREAD count %d\n", received);
1587
1587
1588
1588
if (non_zc) {
1589
1589
int n = copy_to_iter(dataptr, received, to);
···
1609
1609
int total = 0;
1610
1610
*err = 0;
1611
1611
1612
-
p9_debug(P9_DEBUG_9P, ">>> TWRITE fid %d offset %llu count %zd\n",
1613
-
fid->fid, offset, iov_iter_count(from));
1614
-
1615
1612
while (iov_iter_count(from)) {
1616
1613
int count = iov_iter_count(from);
1617
1614
int rsize = fid->iounit;
···
1619
1622
1620
1623
if (count < rsize)
1621
1624
rsize = count;
1625
+
1626
+
p9_debug(P9_DEBUG_9P, ">>> TWRITE fid %d offset %llu count %d (/%d)\n",
1627
+
fid->fid, offset, rsize, count);
1622
1628
1623
1629
/* Don't bother zerocopy for small IO (< 1024) */
1624
1630
if (clnt->trans_mod->zc_request && rsize > 1024) {
···
1650
1650
written = rsize;
1651
1651
}
1652
1652
1653
-
p9_debug(P9_DEBUG_9P, "<<< RWRITE count %d\n", count);
1653
+
p9_debug(P9_DEBUG_9P, "<<< RWRITE count %d\n", written);
1654
1654
1655
1655
p9_req_put(clnt, req);
1656
1656
iov_iter_revert(from, count - written - iov_iter_count(from));
-1
net/9p/trans_fd.c
-1
net/9p/trans_fd.c
···
95
95
* @unsent_req_list: accounting for requests that haven't been sent
96
96
* @rreq: read request
97
97
* @wreq: write request
98
-
* @req: current request being processed (if any)
99
98
* @tmp_buf: temporary buffer to read in header
100
99
* @rc: temporary fcall for reading current frame
101
100
* @wpos: write position for current frame