diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-25 15:45:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-25 15:45:29 -0800 |
| commit | f6d43b93bd07cf3e430f426ee8f1330cb8d5d8c9 (patch) | |
| tree | 284d1fc1e6954b747eb3c68dcb77a704e9a6b579 /include | |
| parent | c69d0a15d240a854f6d620ac7d5238a41883a920 (diff) | |
| parent | 446d64e3e1154806092ac27de198dff1225797d9 (diff) | |
| download | linux-f6d43b93bd07cf3e430f426ee8f1330cb8d5d8c9.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security subsystem fixes from James Morris:
"From Mimi:
Both of these patches are bug fixes for patches, which were
upstreamed in this open window. The first patch addresses a merge
issue. The second patch addresses a CONFIG_BLOCK dependency."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
block: fix part_pack_uuid() build error
ima: "remove enforce checking duplication" merge fix
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/genhd.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 79b8bba19363..9f3c275e053e 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -231,6 +231,12 @@ static inline void part_pack_uuid(const u8 *uuid_str, u8 *to) } } +static inline int blk_part_pack_uuid(const u8 *uuid_str, u8 *to) +{ + part_pack_uuid(uuid_str, to); + return 0; +} + static inline int disk_max_parts(struct gendisk *disk) { if (disk->flags & GENHD_FL_EXT_DEVT) @@ -718,6 +724,10 @@ static inline dev_t blk_lookup_devt(const char *name, int partno) return devt; } +static inline int blk_part_pack_uuid(const u8 *uuid_str, u8 *to) +{ + return -EINVAL; +} #endif /* CONFIG_BLOCK */ #endif /* _LINUX_GENHD_H */ |