Merge remote-tracking branch 'rcu/rcu/next'

[karo-tx-linux.git] / fs / f2fs / crypto.c

diff --git a/fs/f2fs/crypto.c b/fs/f2fs/crypto.c
index 4a62ef14e93275a881f967ceabd66c6bd306345c..95c5cf039711c6c994ef8b4a04d0ef37f777591d 100644 (file)
--- a/fs/f2fs/crypto.c
+++ b/fs/f2fs/crypto.c
@@ -23,11 +23,9 @@
  * The usage of AES-XTS should conform to recommendations in NIST
  * Special Publication 800-38E and IEEE P1619/D16.
  */
-#include <crypto/hash.h>
-#include <crypto/sha.h>
+#include <crypto/skcipher.h>
 #include <keys/user-type.h>
 #include <keys/encrypted-type.h>
-#include <linux/crypto.h>
 #include <linux/ecryptfs.h>
 #include <linux/gfp.h>
 #include <linux/kernel.h>
@@ -328,21 +326,21 @@ static int f2fs_page_crypto(struct f2fs_crypto_ctx *ctx,
                                struct page *dest_page)
 {
        u8 xts_tweak[F2FS_XTS_TWEAK_SIZE];
-       struct ablkcipher_request *req = NULL;
+       struct skcipher_request *req = NULL;
        DECLARE_F2FS_COMPLETION_RESULT(ecr);
        struct scatterlist dst, src;
        struct f2fs_crypt_info *ci = F2FS_I(inode)->i_crypt_info;
-       struct crypto_ablkcipher *tfm = ci->ci_ctfm;
+       struct crypto_skcipher *tfm = ci->ci_ctfm;
        int res = 0;
 
-       req = ablkcipher_request_alloc(tfm, GFP_NOFS);
+       req = skcipher_request_alloc(tfm, GFP_NOFS);
        if (!req) {
                printk_ratelimited(KERN_ERR
                                "%s: crypto_request_alloc() failed\n",
                                __func__);
                return -ENOMEM;
        }
-       ablkcipher_request_set_callback(
+       skcipher_request_set_callback(
                req, CRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,
                f2fs_crypt_complete, &ecr);
 
@@ -355,21 +353,21 @@ static int f2fs_page_crypto(struct f2fs_crypto_ctx *ctx,
        sg_set_page(&dst, dest_page, PAGE_CACHE_SIZE, 0);
        sg_init_table(&src, 1);
        sg_set_page(&src, src_page, PAGE_CACHE_SIZE, 0);
-       ablkcipher_request_set_crypt(req, &src, &dst, PAGE_CACHE_SIZE,
-                                       xts_tweak);
+       skcipher_request_set_crypt(req, &src, &dst, PAGE_CACHE_SIZE,
+                                  xts_tweak);
        if (rw == F2FS_DECRYPT)
-               res = crypto_ablkcipher_decrypt(req);
+               res = crypto_skcipher_decrypt(req);
        else
-               res = crypto_ablkcipher_encrypt(req);
+               res = crypto_skcipher_encrypt(req);
        if (res == -EINPROGRESS || res == -EBUSY) {
                BUG_ON(req->base.data != &ecr);
                wait_for_completion(&ecr.completion);
                res = ecr.res;
        }
-       ablkcipher_request_free(req);
+       skcipher_request_free(req);
        if (res) {
                printk_ratelimited(KERN_ERR
-                       "%s: crypto_ablkcipher_encrypt() returned %d\n",
+                       "%s: crypto_skcipher_encrypt() returned %d\n",
                        __func__, res);
                return res;
        }