| Message ID | 20170518062705.25902-16-hch@lst.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Thu, 2017-05-18 at 08:26 +0200, Christoph Hellwig wrote: > This helper was only used by IMA of all things, which would get spurious > errors if CONFIG_BLOCK is disabled. Just opencode the call there. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > --- > include/linux/genhd.h | 11 ----------- > security/integrity/ima/ima_policy.c | 3 +-- > 2 files changed, 1 insertion(+), 13 deletions(-) > > diff --git a/include/linux/genhd.h b/include/linux/genhd.h > index acff9437e5c3..e619fae2f037 100644 > --- a/include/linux/genhd.h > +++ b/include/linux/genhd.h > @@ -219,12 +219,6 @@ static inline struct gendisk *part_to_disk(struct hd_struct *part) > return NULL; > } > > -static inline int blk_part_pack_uuid(const u8 *uuid_str, u8 *to) > -{ > - uuid_be_to_bin(uuid_str, (uuid_be *)to); > - return 0; > -} > - > static inline int disk_max_parts(struct gendisk *disk) > { > if (disk->flags & GENHD_FL_EXT_DEVT) > @@ -736,11 +730,6 @@ static inline dev_t blk_lookup_devt(const char *name, int partno) > dev_t devt = MKDEV(0, 0); > return devt; > } > - > -static inline int blk_part_pack_uuid(const u8 *uuid_str, u8 *to) > -{ > - return -EINVAL; > -} > #endif /* CONFIG_BLOCK */ > > #endif /* _LINUX_GENHD_H */ > diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c > index 3ab1067db624..49fbc3e8f012 100644 > --- a/security/integrity/ima/ima_policy.c > +++ b/security/integrity/ima/ima_policy.c > @@ -717,8 +717,7 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) > break; > } > > - result = blk_part_pack_uuid(args[0].from, > - entry->fsuuid); > + result = uuid_to_bin(args[0].from, (uuid_t *)&entry->fsuuid); > if (!result) > entry->flags |= IMA_FSUUID; > break;
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index acff9437e5c3..e619fae2f037 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -219,12 +219,6 @@ static inline struct gendisk *part_to_disk(struct hd_struct *part) return NULL; } -static inline int blk_part_pack_uuid(const u8 *uuid_str, u8 *to) -{ - uuid_be_to_bin(uuid_str, (uuid_be *)to); - return 0; -} - static inline int disk_max_parts(struct gendisk *disk) { if (disk->flags & GENHD_FL_EXT_DEVT) @@ -736,11 +730,6 @@ static inline dev_t blk_lookup_devt(const char *name, int partno) dev_t devt = MKDEV(0, 0); return devt; } - -static inline int blk_part_pack_uuid(const u8 *uuid_str, u8 *to) -{ - return -EINVAL; -} #endif /* CONFIG_BLOCK */ #endif /* _LINUX_GENHD_H */ diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 3ab1067db624..49fbc3e8f012 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -717,8 +717,7 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) break; } - result = blk_part_pack_uuid(args[0].from, - entry->fsuuid); + result = uuid_to_bin(args[0].from, (uuid_t *)&entry->fsuuid); if (!result) entry->flags |= IMA_FSUUID; break;
This helper was only used by IMA of all things, which would get spurious errors if CONFIG_BLOCK is disabled. Just opencode the call there. Signed-off-by: Christoph Hellwig <hch@lst.de> --- include/linux/genhd.h | 11 ----------- security/integrity/ima/ima_policy.c | 3 +-- 2 files changed, 1 insertion(+), 13 deletions(-)