diff options
| author | Benjamin Marzinski <bmarzins@redhat.com> | 2026-04-29 23:21:01 +0300 |
|---|---|---|
| committer | Mikulas Patocka <mpatocka@redhat.com> | 2026-05-04 15:52:37 +0300 |
| commit | b1a80737a9af17c72103cd4cde4f3449bfac595a (patch) | |
| tree | 1363950c109bd95f92487b0942c1fa361ca1071a | |
| parent | c21e67983c4da178930e21d35a292114e3c5b818 (diff) | |
| download | linux-b1a80737a9af17c72103cd4cde4f3449bfac595a.tar.xz | |
dm-ima: Remove status_flags from dm_ima_measure_on_table_load()
There is no status flag that is is used for STATUSTYPE_IMA type
status() calls, and STATUSTYPE_IMA itself is not a valid
status flag.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
| -rw-r--r-- | drivers/md/dm-ima.c | 4 | ||||
| -rw-r--r-- | drivers/md/dm-ima.h | 4 | ||||
| -rw-r--r-- | drivers/md/dm-ioctl.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/md/dm-ima.c b/drivers/md/dm-ima.c index 209221fa8bc5..8b84b676cad4 100644 --- a/drivers/md/dm-ima.c +++ b/drivers/md/dm-ima.c @@ -162,7 +162,7 @@ static int dm_ima_alloc_and_copy_capacity_str(struct mapped_device *md, char **c /* * Build up the IMA data for each target, and finally measure. */ -void dm_ima_measure_on_table_load(struct dm_table *table, unsigned int status_flags) +void dm_ima_measure_on_table_load(struct dm_table *table) { size_t device_data_buf_len, target_metadata_buf_len, target_data_buf_len, l = 0; char *target_metadata_buf = NULL, *target_data_buf = NULL, *digest_buf = NULL; @@ -217,7 +217,7 @@ void dm_ima_measure_on_table_load(struct dm_table *table, unsigned int status_fl * Then retrieve the actual target data. */ if (ti->type->status) - ti->type->status(ti, type, status_flags, target_data_buf, + ti->type->status(ti, type, 0, target_data_buf, DM_IMA_TARGET_DATA_BUF_LEN); else target_data_buf[0] = '\0'; diff --git a/drivers/md/dm-ima.h b/drivers/md/dm-ima.h index b0b166aa2283..c0548492bef0 100644 --- a/drivers/md/dm-ima.h +++ b/drivers/md/dm-ima.h @@ -54,7 +54,7 @@ struct dm_ima_measurements { struct dm_ima_device_table_metadata inactive_table; }; -void dm_ima_measure_on_table_load(struct dm_table *table, unsigned int status_flags); +void dm_ima_measure_on_table_load(struct dm_table *table); void dm_ima_measure_on_device_resume(struct mapped_device *md, bool swap); void dm_ima_measure_on_device_remove(struct mapped_device *md, bool remove_all); void dm_ima_measure_on_table_clear(struct mapped_device *md, bool new_map); @@ -62,7 +62,7 @@ void dm_ima_measure_on_device_rename(struct mapped_device *md); #else -static inline void dm_ima_measure_on_table_load(struct dm_table *table, unsigned int status_flags) {} +static inline void dm_ima_measure_on_table_load(struct dm_table *table) {} static inline void dm_ima_measure_on_device_resume(struct mapped_device *md, bool swap) {} static inline void dm_ima_measure_on_device_remove(struct mapped_device *md, bool remove_all) {} static inline void dm_ima_measure_on_table_clear(struct mapped_device *md, bool new_map) {} diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index a529174c94cf..074a3c71297e 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c @@ -1552,7 +1552,7 @@ static int table_load(struct file *filp, struct dm_ioctl *param, size_t param_si if (r) goto err_unlock_md_type; - dm_ima_measure_on_table_load(t, STATUSTYPE_IMA); + dm_ima_measure_on_table_load(t); immutable_target_type = dm_get_immutable_target_type(md); if (immutable_target_type && |
