tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

dm-ima: drop a useless argument

The "gfp_t flags" is always GFP_KERNEL, so it can be removed.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>

Mikulas Patocka d4f00a58 c3797175

+15 -15
+15 -15
drivers/md/dm-ima.c
··· 45 45 /* 46 46 * Internal function to allocate memory for IMA measurements. 47 47 */ 48 - static void *dm_ima_alloc(size_t len, gfp_t flags, bool noio) 48 + static void *dm_ima_alloc(size_t len, bool noio) 49 49 { 50 50 unsigned int noio_flag; 51 51 void *ptr; ··· 53 53 if (noio) 54 54 noio_flag = memalloc_noio_save(); 55 55 56 - ptr = kzalloc(len, flags); 56 + ptr = kzalloc(len, GFP_KERNEL); 57 57 58 58 if (noio) 59 59 memalloc_noio_restore(noio_flag); ··· 68 68 char **dev_uuid, bool noio) 69 69 { 70 70 int r; 71 - *dev_name = dm_ima_alloc(DM_NAME_LEN*2, GFP_KERNEL, noio); 71 + *dev_name = dm_ima_alloc(DM_NAME_LEN*2, noio); 72 72 if (!(*dev_name)) { 73 73 r = -ENOMEM; 74 74 goto error; 75 75 } 76 76 77 - *dev_uuid = dm_ima_alloc(DM_UUID_LEN*2, GFP_KERNEL, noio); 77 + *dev_uuid = dm_ima_alloc(DM_UUID_LEN*2, noio); 78 78 if (!(*dev_uuid)) { 79 79 r = -ENOMEM; 80 80 goto error; ··· 109 109 if (r) 110 110 return r; 111 111 112 - *device_data = dm_ima_alloc(DM_IMA_DEVICE_BUF_LEN, GFP_KERNEL, noio); 112 + *device_data = dm_ima_alloc(DM_IMA_DEVICE_BUF_LEN, noio); 113 113 if (!(*device_data)) { 114 114 r = -ENOMEM; 115 115 goto error; ··· 153 153 154 154 capacity = get_capacity(md->disk); 155 155 156 - *capacity_str = dm_ima_alloc(DM_IMA_DEVICE_CAPACITY_BUF_LEN, GFP_KERNEL, noio); 156 + *capacity_str = dm_ima_alloc(DM_IMA_DEVICE_CAPACITY_BUF_LEN, noio); 157 157 if (!(*capacity_str)) 158 158 return -ENOMEM; 159 159 ··· 193 193 const size_t hash_alg_prefix_len = strlen(DM_IMA_TABLE_HASH_ALG) + 1; 194 194 char table_load_event_name[] = "dm_table_load"; 195 195 196 - ima_buf = dm_ima_alloc(DM_IMA_MEASUREMENT_BUF_LEN, GFP_KERNEL, noio); 196 + ima_buf = dm_ima_alloc(DM_IMA_MEASUREMENT_BUF_LEN, noio); 197 197 if (!ima_buf) 198 198 return; 199 199 200 - target_metadata_buf = dm_ima_alloc(DM_IMA_TARGET_METADATA_BUF_LEN, GFP_KERNEL, noio); 200 + target_metadata_buf = dm_ima_alloc(DM_IMA_TARGET_METADATA_BUF_LEN, noio); 201 201 if (!target_metadata_buf) 202 202 goto error; 203 203 204 - target_data_buf = dm_ima_alloc(DM_IMA_TARGET_DATA_BUF_LEN, GFP_KERNEL, noio); 204 + target_data_buf = dm_ima_alloc(DM_IMA_TARGET_DATA_BUF_LEN, noio); 205 205 if (!target_data_buf) 206 206 goto error; 207 207 ··· 216 216 217 217 shash->tfm = tfm; 218 218 digest_size = crypto_shash_digestsize(tfm); 219 - digest = dm_ima_alloc(digest_size, GFP_KERNEL, noio); 219 + digest = dm_ima_alloc(digest_size, noio); 220 220 if (!digest) 221 221 goto error; 222 222 ··· 325 325 if (r < 0) 326 326 goto error; 327 327 328 - digest_buf = dm_ima_alloc((digest_size*2) + hash_alg_prefix_len + 1, GFP_KERNEL, noio); 328 + digest_buf = dm_ima_alloc((digest_size*2) + hash_alg_prefix_len + 1, noio); 329 329 330 330 if (!digest_buf) 331 331 goto error; ··· 375 375 bool nodata = true; 376 376 int capacity_len; 377 377 378 - device_table_data = dm_ima_alloc(DM_IMA_DEVICE_BUF_LEN, GFP_KERNEL, noio); 378 + device_table_data = dm_ima_alloc(DM_IMA_DEVICE_BUF_LEN, noio); 379 379 if (!device_table_data) 380 380 return; 381 381 ··· 484 484 bool nodata = true; 485 485 int capacity_len; 486 486 487 - device_table_data = dm_ima_alloc(DM_IMA_DEVICE_BUF_LEN*2, GFP_KERNEL, noio); 487 + device_table_data = dm_ima_alloc(DM_IMA_DEVICE_BUF_LEN*2, noio); 488 488 if (!device_table_data) 489 489 goto exit; 490 490 ··· 604 604 bool nodata = true; 605 605 int capacity_len; 606 606 607 - device_table_data = dm_ima_alloc(DM_IMA_DEVICE_BUF_LEN, GFP_KERNEL, noio); 607 + device_table_data = dm_ima_alloc(DM_IMA_DEVICE_BUF_LEN, noio); 608 608 if (!device_table_data) 609 609 return; 610 610 ··· 705 705 if (dm_ima_alloc_and_copy_name_uuid(md, &new_dev_name, &new_dev_uuid, noio)) 706 706 goto error; 707 707 708 - combined_device_data = dm_ima_alloc(DM_IMA_DEVICE_BUF_LEN * 2, GFP_KERNEL, noio); 708 + combined_device_data = dm_ima_alloc(DM_IMA_DEVICE_BUF_LEN * 2, noio); 709 709 if (!combined_device_data) 710 710 goto error; 711 711