diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-01 12:10:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-01 12:10:17 -0700 |
| commit | afdb0f2ec57d4899eda2c5e09fc3a005f2119690 (patch) | |
| tree | b3524b7683a710ad45c158114df3ac0a4fd36bd9 /include/linux/parser.h | |
| parent | 829f3b9401fe7cc3c1f3642bb2520751a42a87df (diff) | |
| parent | e3b1078bedd323df343894a27eb3b3c34944dfd1 (diff) | |
| download | cachepc-linux-afdb0f2ec57d4899eda2c5e09fc3a005f2119690.tar.gz cachepc-linux-afdb0f2ec57d4899eda2c5e09fc3a005f2119690.zip | |
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
Pull fscrypt updates from Eric Biggers:
- Add the IV_INO_LBLK_32 encryption policy flag which modifies the
encryption to be optimized for eMMC inline encryption hardware.
- Make the test_dummy_encryption mount option for ext4 and f2fs support
v2 encryption policies.
- Fix kerneldoc warnings and some coding style inconsistencies.
* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
fscrypt: add support for IV_INO_LBLK_32 policies
fscrypt: make test_dummy_encryption use v2 by default
fscrypt: support test_dummy_encryption=v2
fscrypt: add fscrypt_add_test_dummy_key()
linux/parser.h: add include guards
fscrypt: remove unnecessary extern keywords
fscrypt: name all function parameters
fscrypt: fix all kerneldoc warnings
Diffstat (limited to 'include/linux/parser.h')
| -rw-r--r-- | include/linux/parser.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/parser.h b/include/linux/parser.h index 12fc3482f5fc..89e2b23fb888 100644 --- a/include/linux/parser.h +++ b/include/linux/parser.h @@ -7,7 +7,8 @@ * but could potentially be used anywhere else that simple option=arg * parsing is required. */ - +#ifndef _LINUX_PARSER_H +#define _LINUX_PARSER_H /* associates an integer enumerator with a pattern string. */ struct match_token { @@ -34,3 +35,5 @@ int match_hex(substring_t *, int *result); bool match_wildcard(const char *pattern, const char *str); size_t match_strlcpy(char *, const substring_t *, size_t); char *match_strdup(const substring_t *); + +#endif /* _LINUX_PARSER_H */ |