diff options
| author |   Christoph Hellwig <hch@lst.de> | 2017-05-10 15:16:44 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2017-06-05 16:59:10 +0200 |
| commit | 1dd771eb0b09fe9c12ea58b18c676b32a528be39 (patch) | |
| tree | 3ecf6db352ea013e300645c63b75f3c6c9a5ba44 | |
| parent | xfs: use the common helper uuid_is_null() (diff) | |
| download | linux-dev-1dd771eb0b09fe9c12ea58b18c676b32a528be39.tar.xz linux-dev-1dd771eb0b09fe9c12ea58b18c676b32a528be39.zip | |
block: remove blk_part_pack_uuid
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>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
| -rw-r--r-- | include/linux/genhd.h | 11 | ||||
| -rw-r--r-- | security/integrity/ima/ima_policy.c | 3 |
2 files changed, 1 insertions, 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..1431ada649e5 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_parse(args[0].from, (uuid_t *)&entry->fsuuid); if (!result) entry->flags |= IMA_FSUUID; break; |