LU-8602 gss: get rid of cfs_crypto_hash_desc

[fs/lustre-release.git] / lustre / osc / osc_request.c

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 3ca65ba..0b8e290 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -817,6 +817,11 @@ int osc_shrink_grant_to_target(struct client_obd *cli, __u64 target_bytes)
        osc_announce_cached(cli, &body->oa, 0);
 
        spin_lock(&cli->cl_loi_list_lock);
+       if (target_bytes >= cli->cl_avail_grant) {
+               /* available grant has changed since target calculation */
+               spin_unlock(&cli->cl_loi_list_lock);
+               GOTO(out_free, rc = 0);
+       }
        body->oa.o_grant = cli->cl_avail_grant - target_bytes;
        cli->cl_avail_grant = target_bytes;
        spin_unlock(&cli->cl_loi_list_lock);
@@ -832,6 +837,7 @@ int osc_shrink_grant_to_target(struct client_obd *cli, __u64 target_bytes)
                                 sizeof(*body), body, NULL);
         if (rc != 0)
                 __osc_update_grant(cli, body->oa.o_grant);
+out_free:
         OBD_FREE_PTR(body);
         RETURN(rc);
 }
@@ -1100,7 +1106,7 @@ static int osc_checksum_bulk_t10pi(const char *obd_name, int nob,
                                   int sector_size,
                                   u32 *check_sum)
 {
-       struct cfs_crypto_hash_desc *hdesc;
+       struct ahash_request *req;
        /* Used Adler as the default checksum type on top of DIF tags */
        unsigned char cfs_alg = cksum_obd2cfs(OBD_CKSUM_T10_TOP);
        struct page *__page;
@@ -1120,9 +1126,9 @@ static int osc_checksum_bulk_t10pi(const char *obd_name, int nob,
        if (__page == NULL)
                return -ENOMEM;
 
-       hdesc = cfs_crypto_hash_init(cfs_alg, NULL, 0);
-       if (IS_ERR(hdesc)) {
-               rc = PTR_ERR(hdesc);
+       req = cfs_crypto_hash_init(cfs_alg, NULL, 0);
+       if (IS_ERR(req)) {
+               rc = PTR_ERR(req);
                CERROR("%s: unable to initialize checksum hash %s: rc = %d\n",
                       obd_name, cfs_crypto_hash_name(cfs_alg), rc);
                GOTO(out, rc);
@@ -1160,7 +1166,7 @@ static int osc_checksum_bulk_t10pi(const char *obd_name, int nob,
 
                used_number += used;
                if (used_number == guard_number) {
-                       cfs_crypto_hash_update_page(hdesc, __page, 0,
+                       cfs_crypto_hash_update_page(req, __page, 0,
                                used_number * sizeof(*guard_start));
                        used_number = 0;
                }
@@ -1174,11 +1180,11 @@ static int osc_checksum_bulk_t10pi(const char *obd_name, int nob,
                GOTO(out, rc);
 
        if (used_number != 0)
-               cfs_crypto_hash_update_page(hdesc, __page, 0,
+               cfs_crypto_hash_update_page(req, __page, 0,
                        used_number * sizeof(*guard_start));
 
        bufsize = sizeof(cksum);
-       cfs_crypto_hash_final(hdesc, (unsigned char *)&cksum, &bufsize);
+       cfs_crypto_hash_final(req, (unsigned char *)&cksum, &bufsize);
 
        /* For sending we only compute the wrong checksum instead
         * of corrupting the data so it is still correct on a redo */
@@ -1197,17 +1203,17 @@ static int osc_checksum_bulk(int nob, size_t pg_count,
                             u32 *cksum)
 {
        int                             i = 0;
-       struct cfs_crypto_hash_desc     *hdesc;
+       struct ahash_request           *req;
        unsigned int                    bufsize;
        unsigned char                   cfs_alg = cksum_obd2cfs(cksum_type);
 
        LASSERT(pg_count > 0);
 
-       hdesc = cfs_crypto_hash_init(cfs_alg, NULL, 0);
-       if (IS_ERR(hdesc)) {
+       req = cfs_crypto_hash_init(cfs_alg, NULL, 0);
+       if (IS_ERR(req)) {
                CERROR("Unable to initialize checksum hash %s\n",
                       cfs_crypto_hash_name(cfs_alg));
-               return PTR_ERR(hdesc);
+               return PTR_ERR(req);
        }
 
        while (nob > 0 && pg_count > 0) {
@@ -1223,7 +1229,7 @@ static int osc_checksum_bulk(int nob, size_t pg_count,
                        memcpy(ptr + off, "bad1", min_t(typeof(nob), 4, nob));
                        kunmap(pga[i]->pg);
                }
-               cfs_crypto_hash_update_page(hdesc, pga[i]->pg,
+               cfs_crypto_hash_update_page(req, pga[i]->pg,
                                            pga[i]->off & ~PAGE_MASK,
                                            count);
                LL_CDEBUG_PAGE(D_PAGE, pga[i]->pg, "off %d\n",
@@ -1235,7 +1241,7 @@ static int osc_checksum_bulk(int nob, size_t pg_count,
        }
 
        bufsize = sizeof(*cksum);
-       cfs_crypto_hash_final(hdesc, (unsigned char *)cksum, &bufsize);
+       cfs_crypto_hash_final(req, (unsigned char *)cksum, &bufsize);
 
        /* For sending we only compute the wrong checksum instead
         * of corrupting the data so it is still correct on a redo */
@@ -1317,9 +1323,9 @@ osc_brw_prep_request(int cmd, struct client_obd *cli, struct obdo *oa,
        for (i = 0; i < page_count; i++)
                short_io_size += pga[i]->count;
 
-       /* Check if we can do a short io. */
-       if (!(short_io_size <= cli->cl_short_io_bytes && niocount == 1 &&
-           imp_connect_shortio(cli->cl_import)))
+       /* Check if read/write is small enough to be a short io. */
+       if (short_io_size > cli->cl_max_short_io_bytes || niocount > 1 ||
+           !imp_connect_shortio(cli->cl_import))
                short_io_size = 0;
 
        req_capsule_set_size(pill, &RMF_SHORT_IO, RCL_CLIENT,