Commit e8b0ccb2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 405ac6a5 2a0505cd

net/9p/client.c

+5 −5
Original line number Diff line number Diff line
@@ -1583,7 +1583,7 @@ p9_client_read_once(struct p9_fid *fid, u64 offset, struct iov_iter *to, 
		received = rsize;

	}



	p9_debug(P9_DEBUG_9P, "<<< RREAD count %d\n", count);

	p9_debug(P9_DEBUG_9P, "<<< RREAD count %d\n", received);



	if (non_zc) {

		int n = copy_to_iter(dataptr, received, to);
@@ -1609,9 +1609,6 @@ p9_client_write(struct p9_fid *fid, u64 offset, struct iov_iter *from, int *err) 
	int total = 0;

	*err = 0;



	p9_debug(P9_DEBUG_9P, ">>> TWRITE fid %d offset %llu count %zd\n",

		 fid->fid, offset, iov_iter_count(from));



	while (iov_iter_count(from)) {

		int count = iov_iter_count(from);

		int rsize = fid->iounit;
@@ -1623,6 +1620,9 @@ p9_client_write(struct p9_fid *fid, u64 offset, struct iov_iter *from, int *err) 
		if (count < rsize)

			rsize = count;



		p9_debug(P9_DEBUG_9P, ">>> TWRITE fid %d offset %llu count %d (/%d)\n",

			 fid->fid, offset, rsize, count);



		/* Don't bother zerocopy for small IO (< 1024) */

		if (clnt->trans_mod->zc_request && rsize > 1024) {

			req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, from, 0,
@@ -1650,7 +1650,7 @@ p9_client_write(struct p9_fid *fid, u64 offset, struct iov_iter *from, int *err) 
			written = rsize;

		}



		p9_debug(P9_DEBUG_9P, "<<< RWRITE count %d\n", count);

		p9_debug(P9_DEBUG_9P, "<<< RWRITE count %d\n", written);



		p9_req_put(clnt, req);

		iov_iter_revert(from, count - written - iov_iter_count(from));

net/9p/trans_fd.c

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ struct p9_poll_wait { 
 * @unsent_req_list: accounting for requests that haven't been sent

 * @rreq: read request

 * @wreq: write request

 * @req: current request being processed (if any)

 * @tmp_buf: temporary buffer to read in header

 * @rc: temporary fcall for reading current frame

 * @wpos: write position for current frame