3e3ef4b62e
* aosp/upstream-f2fs-stable-linux-4.19.y:
fscrypt: remove stale definition
fs-verity: remove unnecessary extern keywords
fs-verity: fix all kerneldoc warnings
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
Conflicts:
fs/crypto/fscrypt_private.h
fs/crypto/keyring.c
fs/crypto/keysetup.c
fs/ext4/ext4.h
fs/ext4/super.c
fs/f2fs/f2fs.h
fs/f2fs/super.c
include/linux/fscrypt.h
Resolved the conflicts as per the corresponding android-mainline change,
I7198edbca759839aceeec2598e7a81305756c4d7.
Bug: 154167995
Test: kvm-xfstests -c ext4,f2fs,ext4/encrypt,f2fs/encrypt \
-g encrypt -g verity -g casefold
kvm-xfstests -c ext4,f2fs,ext4/encrypt,f2fs/encrypt \
-g encrypt -g verity -g casefold -m inlinecrypt
Change-Id: Id12839f7948374575f9d15eee6a9c6a9382eacf3
Signed-off-by: Eric Biggers <ebiggers@google.com>
40 lines
1.1 KiB
C
40 lines
1.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* linux/include/linux/parser.h
|
|
*
|
|
* Header for lib/parser.c
|
|
* Intended use of these functions is parsing filesystem argument lists,
|
|
* 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 {
|
|
int token;
|
|
const char *pattern;
|
|
};
|
|
|
|
typedef struct match_token match_table_t[];
|
|
|
|
/* Maximum number of arguments that match_token will find in a pattern */
|
|
enum {MAX_OPT_ARGS = 3};
|
|
|
|
/* Describe the location within a string of a substring */
|
|
typedef struct {
|
|
char *from;
|
|
char *to;
|
|
} substring_t;
|
|
|
|
int match_token(char *, const match_table_t table, substring_t args[]);
|
|
int match_int(substring_t *, int *result);
|
|
int match_u64(substring_t *, u64 *result);
|
|
int match_octal(substring_t *, int *result);
|
|
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 */
|