Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23a28913 authored by David Howells's avatar David Howells
Browse files

afs: Use afs_extract_discard() rather than iov_iter_discard() 



Use afs_extract_discard() rather than iov_iter_discard() as the former is a
wrapper for the latter, providing a place to put tracepoints.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 52c9c130

fs/afs/fsclient.c

+2 −2
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static int afs_deliver_fs_fetch_data(struct afs_call *call) 
			goto no_more_data;



		/* Discard any excess data the server gave us */

		iov_iter_discard(&call->iter, READ, req->actual_len - req->len);

		afs_extract_discard(call, req->actual_len - req->len);

		call->unmarshall = 3;

		/* Fall through */
@@ -1870,7 +1870,7 @@ static int afs_deliver_fs_get_capabilities(struct afs_call *call) 


		call->count = count;

		call->count2 = count;

		iov_iter_discard(&call->iter, READ, count * sizeof(__be32));

		afs_extract_discard(call, count * sizeof(__be32));

		call->unmarshall++;

		/* Fall through */

fs/afs/yfsclient.c

+3 −3
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ static int yfs_deliver_fs_fetch_data64(struct afs_call *call) 
			goto no_more_data;



		/* Discard any excess data the server gave us */

		iov_iter_discard(&call->iter, READ, req->actual_len - req->len);

		afs_extract_discard(call, req->actual_len - req->len);

		call->unmarshall = 3;

		/* Fall through */
@@ -2007,7 +2007,7 @@ static int yfs_deliver_fs_fetch_opaque_acl(struct afs_call *call) 
			acl->size = call->count2;

			afs_extract_begin(call, acl->data, size);

		} else {

			iov_iter_discard(&call->iter, READ, size);

			afs_extract_discard(call, size);

		}

		call->unmarshall++;

		/* Fall through */
@@ -2039,7 +2039,7 @@ static int yfs_deliver_fs_fetch_opaque_acl(struct afs_call *call) 
			acl->size = call->count2;

			afs_extract_begin(call, acl->data, size);

		} else {

			iov_iter_discard(&call->iter, READ, size);

			afs_extract_discard(call, size);

		}

		call->unmarshall++;

		/* Fall through */