Add prefix to storage wrapper flags and dremove unused DISABLE_USPACE

Userspace wrapper must be always enabled anyway.

Author: mbroz

lib/luks2/luks2_reencrypt.c

@@ -1411,20 +1411,20 @@ static int reencrypt_init_storage_wrappers(struct crypt_device *cd,
 {
 	int r;
 	struct volume_key *vk;
-	uint32_t wrapper_flags = (getuid() || geteuid()) ? 0 : DISABLE_KCAPI;
+	uint32_t wrapper_flags = (getuid() || geteuid()) ? 0 : CSW_DISABLE_KCAPI;
 
 	vk = crypt_volume_key_by_id(vks, rh->digest_old);
 	r = crypt_storage_wrapper_init(cd, &rh->cw1, crypt_data_device(cd),
 			reencrypt_get_data_offset_old(hdr),
 			crypt_get_iv_offset(cd),
 			reencrypt_get_sector_size_old(hdr),
 			reencrypt_segment_cipher_old(hdr),
-			vk, wrapper_flags | OPEN_READONLY);
+			vk, wrapper_flags | CSW_OPEN_READONLY);
 	if (r) {
 		log_err(cd, _("Failed to initialize old segment storage wrapper."));
 		return r;
 	}
-	rh->wflags1 = wrapper_flags | OPEN_READONLY;
+	rh->wflags1 = wrapper_flags | CSW_OPEN_READONLY;
 	log_dbg(cd, "Old cipher storage wrapper type: %d.", crypt_storage_wrapper_get_type(rh->cw1));
 
 	vk = crypt_volume_key_by_id(vks, rh->digest_new);

lib/utils_storage_wrappers.c

@@ -51,11 +51,11 @@ static int crypt_storage_backend_init(struct crypt_device *cd,
 	/* iv_start, sector_size */
 	r = crypt_storage_init(&s, sector_size, cipher, cipher_mode,
 			       crypt_volume_key_get_key(vk),
-			       crypt_volume_key_length(vk), flags & LARGE_IV);
+			       crypt_volume_key_length(vk), flags & CSW_LARGE_IV);
 	if (r)
 		return r;
 
-	if ((flags & DISABLE_KCAPI) && crypt_storage_kernel_only(s)) {
+	if ((flags & CSW_DISABLE_KCAPI) && crypt_storage_kernel_only(s)) {
 		log_dbg(cd, "Could not initialize userspace block cipher and kernel fallback is disabled.");
 		crypt_storage_destroy(s);
 		return -ENOTSUP;
@@ -159,7 +159,7 @@ int crypt_storage_wrapper_init(struct crypt_device *cd,
 	if (crypt_parse_name_and_mode(cipher, _cipher, NULL, mode))
 		return -EINVAL;
 
-	open_flags = O_CLOEXEC | ((flags & OPEN_READONLY) ? O_RDONLY : O_RDWR);
+	open_flags = O_CLOEXEC | ((flags & CSW_OPEN_READONLY) ? O_RDONLY : O_RDWR);
 
 	w = malloc(sizeof(*w));
 	if (!w)
@@ -202,7 +202,7 @@ int crypt_storage_wrapper_init(struct crypt_device *cd,
 
 	log_dbg(cd, "Failed to initialize userspace block cipher.");
 
-	if ((r != -ENOTSUP && r != -ENOENT) || (flags & DISABLE_DMCRYPT))
+	if ((r != -ENOTSUP && r != -ENOENT) || (flags & CSW_DISABLE_DMCRYPT))
 		goto err;
 
 	r = crypt_storage_dmcrypt_init(cd, w, device, data_offset >> SECTOR_SHIFT, iv_start,

lib/utils_storage_wrappers.h

@@ -17,11 +17,10 @@ struct device;
 struct volume_key;
 struct crypt_device;
 
-#define DISABLE_USPACE	(1 << 0)
-#define DISABLE_KCAPI	(1 << 1)
-#define DISABLE_DMCRYPT	(1 << 2)
-#define OPEN_READONLY	(1 << 3)
-#define LARGE_IV	(1 << 4)
+#define CSW_DISABLE_KCAPI   (1 << 0)
+#define CSW_DISABLE_DMCRYPT (1 << 1)
+#define CSW_OPEN_READONLY   (1 << 2)
+#define CSW_LARGE_IV        (1 << 3)
 
 typedef enum {
 	NONE = 0,