writer: Use blocksize constant

Drive by cleanup. Signed-off-by: Colin Walters <[email protected]>
containers · Oct 28, 2024 · 5c17ca4 · 5c17ca4
1 parent 8cedf32
commit 5c17ca4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/libcomposefs/lcfs-fsverity.c b/libcomposefs/lcfs-fsverity.c
@@ -304,7 +304,6 @@ struct fsverity_descriptor {
 	uint8_t reserved2[144];
 };
 
-#define FSVERITY_BLOCK_SIZE 4096
 #define FSVERITY_MAX_LEVELS 8 /* enough for 64bit file size */
 
 struct FsVerityContext {

diff --git a/libcomposefs/lcfs-internal.h b/libcomposefs/lcfs-internal.h
@@ -30,6 +30,8 @@ typedef int errint_t;
 
 /* What may be returned by the kernel for digests */
 #define MAX_DIGEST_SIZE 64
+/* We picked this default block size */
+#define FSVERITY_BLOCK_SIZE 4096
 
 #define OVERLAY_XATTR_USER_PREFIX "user."
 #define OVERLAY_XATTR_TRUSTED_PREFIX "trusted."

diff --git a/libcomposefs/lcfs-writer.c b/libcomposefs/lcfs-writer.c
@@ -674,7 +674,7 @@ int lcfs_fd_enable_fsverity(int fd)
 
 	arg.version = 1;
 	arg.hash_algorithm = FS_VERITY_HASH_ALG_SHA256;
-	arg.block_size = 4096;
+	arg.block_size = FSVERITY_BLOCK_SIZE;
 	arg.salt_size = 0;
 	arg.salt_ptr = 0;
 	arg.sig_size = 0;