diff options
| author | Linus Torvalds | 2019-04-10 04:20:59 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2019-04-10 04:20:59 +0200 |
| commit | 972acfb49446b30a3533ceb5682bf8350c786bc8 (patch) | |
| tree | 27f194c8b6e171bb800bfd611b8c7529ddff10b5 /lib | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | aio: use kmem_cache_free() instead of kfree() (diff) | |
| download | kernel-qcow2-linux-972acfb49446b30a3533ceb5682bf8350c786bc8.tar.gz kernel-qcow2-linux-972acfb49446b30a3533ceb5682bf8350c786bc8.tar.xz kernel-qcow2-linux-972acfb49446b30a3533ceb5682bf8350c786bc8.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc fixes from Al Viro:
"A few regression fixes from this cycle"
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
aio: use kmem_cache_free() instead of kfree()
iov_iter: Fix build error without CONFIG_CRYPTO
aio: Fix an error code in __io_submit_one()
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/iov_iter.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/iov_iter.c b/lib/iov_iter.c index ea36dc355da1..b396d328a764 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -1528,6 +1528,7 @@ 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) { +#ifdef CONFIG_CRYPTO struct ahash_request *hash = hashp; struct scatterlist sg; size_t copied; @@ -1537,6 +1538,9 @@ size_t hash_and_copy_to_iter(const void *addr, size_t bytes, void *hashp, ahash_request_set_crypt(hash, &sg, NULL, copied); crypto_ahash_update(hash); return copied; +#else + return 0; +#endif } EXPORT_SYMBOL(hash_and_copy_to_iter); |