Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-block.git] / lib / iov_iter.c

diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 54c248526b55fc498c996f2a5ea651262fcc7f61..1928009f506e8e4531cea681257da6df4b8a8024 100644 (file)
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -6,6 +6,7 @@
 #include <linux/vmalloc.h>
 #include <linux/splice.h>
 #include <net/checksum.h>
+#include <linux/scatterlist.h>
 
 #define PIPE_PARANOIA /* for now */
 
@@ -1464,10 +1465,11 @@ bool csum_and_copy_from_iter_full(void *addr, size_t bytes, __wsum *csum,
 }
 EXPORT_SYMBOL(csum_and_copy_from_iter_full);
 
-size_t csum_and_copy_to_iter(const void *addr, size_t bytes, __wsum *csum,
+size_t csum_and_copy_to_iter(const void *addr, size_t bytes, void *csump,
                             struct iov_iter *i)
 {
        const char *from = addr;
+       __wsum *csum = csump;
        __wsum sum, next;
        size_t off = 0;
 
@@ -1510,6 +1512,21 @@ size_t csum_and_copy_to_iter(const void *addr, size_t bytes, __wsum *csum,
 }
 EXPORT_SYMBOL(csum_and_copy_to_iter);
 
+size_t hash_and_copy_to_iter(const void *addr, size_t bytes, void *hashp,
+               struct iov_iter *i)
+{
+       struct ahash_request *hash = hashp;
+       struct scatterlist sg;
+       size_t copied;
+
+       copied = copy_to_iter(addr, bytes, i);
+       sg_init_one(&sg, addr, copied);
+       ahash_request_set_crypt(hash, &sg, NULL, copied);
+       crypto_ahash_update(hash);
+       return copied;
+}
+EXPORT_SYMBOL(hash_and_copy_to_iter);
+
 int iov_iter_npages(const struct iov_iter *i, int maxpages)
 {
        size_t size = i->count;