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: David Howells <dhowells@redhat.com>

diff --git a/fs/afs/fsclient.c b/fs/afs/fsclient.c
index 67af0682342e3720710df3f3e52e0d6d7c0412e1..6f84231f11a5d7c8eadda8758ffae0c37e0d06fe 100644 (file)
--- a/fs/afs/fsclient.c
+++ b/fs/afs/fsclient.c
@@ -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 */
 

diff --git a/fs/afs/yfsclient.c b/fs/afs/yfsclient.c
index ca2452806ebf12ad0081c31ad0bd815cb9c01343..3ee7abf4b2d02e73ecfc3225bcce9a30a374a855 100644 (file)
--- a/fs/afs/yfsclient.c
+++ b/fs/afs/yfsclient.c
@@ -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 */