From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Sun, 1 Sep 2024 19:09:11 +0000 (-0400)
Subject: bcachefs: kill redundant is_vmalloc_addr()
X-Git-Tag: v6.12-rc1~101^2~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da2d20c98d32bbedc187f2b8fdb70d08fdeff057;p=thirdparty%2Fkernel%2Flinux.git

bcachefs: kill redundant is_vmalloc_addr()

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/checksum.c b/fs/bcachefs/checksum.c
index 398177eb9c66e..ce8fc677bef90 100644
--- a/fs/bcachefs/checksum.c
+++ b/fs/bcachefs/checksum.c
@@ -117,14 +117,10 @@ static inline int do_encrypt(struct crypto_sync_skcipher *tfm,
 			      void *buf, size_t len)
 {
 	if (!is_vmalloc_addr(buf)) {
-		struct scatterlist sg;
-
-		sg_init_table(&sg, 1);
-		sg_set_page(&sg,
-			    is_vmalloc_addr(buf)
-			    ? vmalloc_to_page(buf)
-			    : virt_to_page(buf),
-			    len, offset_in_page(buf));
+		struct scatterlist sg = {};
+
+		sg_mark_end(&sg);
+		sg_set_page(&sg, virt_to_page(buf), len, offset_in_page(buf));
 		return do_encrypt_sg(tfm, nonce, &sg, len);
 	} else {
 		DARRAY_PREALLOCATED(struct scatterlist, 4) sgl;