crypto: remove redundant backlog checks on EBUSY

Now that -EBUSY return code only indicates backlog queueing
we can safely remove the now redundant check for the
CRYPTO_TFM_REQ_MAY_BACKLOG flag when -EBUSY is returned.

Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/ahash.c b/crypto/ahash.c
index 5e8666e6ccaeaa430f85266ee92f73178c993f6a..3a35d67de7d933dfdf4d1908ded5fead53c9a335 100644 (file)
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -334,9 +334,7 @@ static int ahash_op_unaligned(struct ahash_request *req,
                return err;
 
        err = op(req);
-       if (err == -EINPROGRESS ||
-           (err == -EBUSY && (ahash_request_flags(req) &
-                              CRYPTO_TFM_REQ_MAY_BACKLOG)))
+       if (err == -EINPROGRESS || err == -EBUSY)
                return err;
 
        ahash_restore_req(req, err);
@@ -394,9 +392,7 @@ static int ahash_def_finup_finish1(struct ahash_request *req, int err)
        req->base.complete = ahash_def_finup_done2;
 
        err = crypto_ahash_reqtfm(req)->final(req);
-       if (err == -EINPROGRESS ||
-           (err == -EBUSY && (ahash_request_flags(req) &
-                              CRYPTO_TFM_REQ_MAY_BACKLOG)))
+       if (err == -EINPROGRESS || err == -EBUSY)
                return err;
 
 out:
@@ -432,9 +428,7 @@ static int ahash_def_finup(struct ahash_request *req)
                return err;
 
        err = tfm->update(req);
-       if (err == -EINPROGRESS ||
-           (err == -EBUSY && (ahash_request_flags(req) &
-                              CRYPTO_TFM_REQ_MAY_BACKLOG)))
+       if (err == -EINPROGRESS || err == -EBUSY)
                return err;
 
        return ahash_def_finup_finish1(req, err);

diff --git a/crypto/cts.c b/crypto/cts.c
index 243f591dc4091a7e4dec269d4e9a11b0133539cc..4773c188e6d9281fe7cc2dc7c1ba569e2d500f8b 100644 (file)
--- a/crypto/cts.c
+++ b/crypto/cts.c
@@ -136,8 +136,7 @@ static void crypto_cts_encrypt_done(struct crypto_async_request *areq, int err)
                goto out;
 
        err = cts_cbc_encrypt(req);
-       if (err == -EINPROGRESS ||
-           (err == -EBUSY && req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))
+       if (err == -EINPROGRESS || err == -EBUSY)
                return;
 
 out:
@@ -229,8 +228,7 @@ static void crypto_cts_decrypt_done(struct crypto_async_request *areq, int err)
                goto out;
 
        err = cts_cbc_decrypt(req);
-       if (err == -EINPROGRESS ||
-           (err == -EBUSY && req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))
+       if (err == -EINPROGRESS || err == -EBUSY)
                return;
 
 out:

diff --git a/crypto/lrw.c b/crypto/lrw.c
index 92df312b8c6e2f86d3a242ebdf4b6cc135548855..cbbd7c50ad19b306cf0e424ad24533beade38764 100644 (file)
--- a/crypto/lrw.c
+++ b/crypto/lrw.c
@@ -328,9 +328,7 @@ static int do_encrypt(struct skcipher_request *req, int err)
                      crypto_skcipher_encrypt(subreq) ?:
                      post_crypt(req);
 
-               if (err == -EINPROGRESS ||
-                   (err == -EBUSY &&
-                    req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))
+               if (err == -EINPROGRESS || err == -EBUSY)
                        return err;
        }
 
@@ -380,9 +378,7 @@ static int do_decrypt(struct skcipher_request *req, int err)
                      crypto_skcipher_decrypt(subreq) ?:
                      post_crypt(req);
 
-               if (err == -EINPROGRESS ||
-                   (err == -EBUSY &&
-                    req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))
+               if (err == -EINPROGRESS || err == -EBUSY)
                        return err;
        }
 

diff --git a/crypto/rsa-pkcs1pad.c b/crypto/rsa-pkcs1pad.c
index 407c64bdcdd9a39cb7c00ab4338fa0cc395dec58..2908f93c3e554482b0e4ca1d2061a9dac2910438 100644 (file)
--- a/crypto/rsa-pkcs1pad.c
+++ b/crypto/rsa-pkcs1pad.c
@@ -279,9 +279,7 @@ static int pkcs1pad_encrypt(struct akcipher_request *req)
                                   req->dst, ctx->key_size - 1, req->dst_len);
 
        err = crypto_akcipher_encrypt(&req_ctx->child_req);
-       if (err != -EINPROGRESS &&
-                       (err != -EBUSY ||
-                        !(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))
+       if (err != -EINPROGRESS && err != -EBUSY)
                return pkcs1pad_encrypt_sign_complete(req, err);
 
        return err;
@@ -383,9 +381,7 @@ static int pkcs1pad_decrypt(struct akcipher_request *req)
                                   ctx->key_size);
 
        err = crypto_akcipher_decrypt(&req_ctx->child_req);
-       if (err != -EINPROGRESS &&
-                       (err != -EBUSY ||
-                        !(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))
+       if (err != -EINPROGRESS && err != -EBUSY)
                return pkcs1pad_decrypt_complete(req, err);
 
        return err;
@@ -440,9 +436,7 @@ static int pkcs1pad_sign(struct akcipher_request *req)
                                   req->dst, ctx->key_size - 1, req->dst_len);
 
        err = crypto_akcipher_sign(&req_ctx->child_req);
-       if (err != -EINPROGRESS &&
-                       (err != -EBUSY ||
-                        !(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))
+       if (err != -EINPROGRESS && err != -EBUSY)
                return pkcs1pad_encrypt_sign_complete(req, err);
 
        return err;
@@ -561,9 +555,7 @@ static int pkcs1pad_verify(struct akcipher_request *req)
                                   ctx->key_size);
 
        err = crypto_akcipher_verify(&req_ctx->child_req);
-       if (err != -EINPROGRESS &&
-                       (err != -EBUSY ||
-                        !(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))
+       if (err != -EINPROGRESS && err != -EBUSY)
                return pkcs1pad_verify_complete(req, err);
 
        return err;

diff --git a/crypto/xts.c b/crypto/xts.c
index d86c11a8c882c37ee7a7c2c18e41d54aaec25af8..af68012dfab373612fa398002a7eb4cb65273452 100644 (file)
--- a/crypto/xts.c
+++ b/crypto/xts.c
@@ -269,9 +269,7 @@ static int do_encrypt(struct skcipher_request *req, int err)
                      crypto_skcipher_encrypt(subreq) ?:
                      post_crypt(req);
 
-               if (err == -EINPROGRESS ||
-                   (err == -EBUSY &&
-                    req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))
+               if (err == -EINPROGRESS || err == -EBUSY)
                        return err;
        }
 
@@ -321,9 +319,7 @@ static int do_decrypt(struct skcipher_request *req, int err)
                      crypto_skcipher_decrypt(subreq) ?:
                      post_crypt(req);
 
-               if (err == -EINPROGRESS ||
-                   (err == -EBUSY &&
-                    req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))
+               if (err == -EINPROGRESS || err == -EBUSY)
                        return err;
        }