X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Flibcfs%2Flinux%2Flinux-crypto.c;h=aaffa61866174727d85bda8811d61c865bc91101;hp=002b24111c218fc86fa8856b2d71dee9d0d36907;hb=d3972843ae3ba829f821bd135d5ba97d4b0356f3;hpb=e6d5d5508231fca83cb306af69a877a7101de37a

diff --git a/libcfs/libcfs/linux/linux-crypto.c b/libcfs/libcfs/linux/linux-crypto.c
index 002b241..aaffa61 100644
--- a/libcfs/libcfs/linux/linux-crypto.c
+++ b/libcfs/libcfs/linux/linux-crypto.c
@@ -167,7 +167,7 @@ int cfs_crypto_hash_digest(unsigned char alg_id,
 			   unsigned char *key, unsigned int key_len,
 			   unsigned char *hash, unsigned int *hash_len)
 {
-	struct scatterlist	sl = {0};
+	struct scatterlist	sl;
 	struct hash_desc	hdesc;
 	int			err;
 	const struct cfs_crypto_hash_type	*type;
@@ -184,7 +184,7 @@ int cfs_crypto_hash_digest(unsigned char alg_id,
 		crypto_free_hash(hdesc.tfm);
 		return -ENOSPC;
 	}
-	sg_set_buf(&sl, (void *)buf, buf_len);
+	sg_init_one(&sl, (void *)buf, buf_len);
 
 	hdesc.flags = 0;
 	err = crypto_hash_digest(&hdesc, &sl, sl.length, hash);
@@ -221,8 +221,9 @@ int cfs_crypto_hash_update_page(struct cfs_crypto_hash_desc *hdesc,
 				cfs_page_t *page, unsigned int offset,
 				unsigned int len)
 {
-	struct scatterlist      sl = {0};
+	struct scatterlist sl;
 
+	sg_init_table(&sl, 1);
 	sg_set_page(&sl, page, len, offset & ~CFS_PAGE_MASK);
 
 	return crypto_hash_update((struct hash_desc *)hdesc, &sl, sl.length);
@@ -232,9 +233,9 @@ EXPORT_SYMBOL(cfs_crypto_hash_update_page);
 int cfs_crypto_hash_update(struct cfs_crypto_hash_desc *hdesc,
 			   const void *buf, unsigned int buf_len)
 {
-	struct scatterlist      sl = {0};
+	struct scatterlist sl;
 
-	sg_set_buf(&sl, (void *)buf, buf_len);
+	sg_init_one(&sl, (void *)buf, buf_len);
 
 	return crypto_hash_update((struct hash_desc *)hdesc, &sl, sl.length);
 }