瀏覽代碼

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>
Christoph Hellwig 8 年之前
父節點
當前提交
1dd771eb0b
共有 2 個文件被更改,包括 1 次插入13 次删除
  1. 0 11
      include/linux/genhd.h
  2. 1 2
      security/integrity/ima/ima_policy.c

+ 0 - 11
include/linux/genhd.h

@@ -219,12 +219,6 @@ static inline struct gendisk *part_to_disk(struct hd_struct *part)
 	return NULL;
 	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)
 static inline int disk_max_parts(struct gendisk *disk)
 {
 {
 	if (disk->flags & GENHD_FL_EXT_DEVT)
 	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);
 	dev_t devt = MKDEV(0, 0);
 	return devt;
 	return devt;
 }
 }
-
-static inline int blk_part_pack_uuid(const u8 *uuid_str, u8 *to)
-{
-	return -EINVAL;
-}
 #endif /* CONFIG_BLOCK */
 #endif /* CONFIG_BLOCK */
 
 
 #endif /* _LINUX_GENHD_H */
 #endif /* _LINUX_GENHD_H */

+ 1 - 2
security/integrity/ima/ima_policy.c

@@ -717,8 +717,7 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)
 				break;
 				break;
 			}
 			}
 
 
-			result = blk_part_pack_uuid(args[0].from,
-						    entry->fsuuid);
+			result = uuid_parse(args[0].from, (uuid_t *)&entry->fsuuid);
 			if (!result)
 			if (!result)
 				entry->flags |= IMA_FSUUID;
 				entry->flags |= IMA_FSUUID;
 			break;
 			break;