diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-23 01:08:41 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-23 01:08:41 +0300 |
| commit | 805c6d3c19210c90c109107d189744e960eae025 (patch) | |
| tree | 51591467a218a58df9dd5f239561b02e1e6ce996 /include | |
| parent | d3017135c43373b06eef1eb70dfeb948b8ae159f (diff) | |
| parent | 933a3752babcf6513117d5773d2b70782d6ad149 (diff) | |
| download | linux-805c6d3c19210c90c109107d189744e960eae025.tar.xz | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"No common topic, just assorted fixes"
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fuse: fix the ->direct_IO() treatment of iov_iter
fs: fix cast in fsparam_u32hex() macro
vboxsf: Fix the check for the old binary mount-arguments struct
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs_parser.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fs_parser.h b/include/linux/fs_parser.h index 2eab6d5f6736..aab0ffc6bac6 100644 --- a/include/linux/fs_parser.h +++ b/include/linux/fs_parser.h @@ -120,7 +120,7 @@ static inline bool fs_validate_description(const char *name, #define fsparam_u32oct(NAME, OPT) \ __fsparam(fs_param_is_u32, NAME, OPT, 0, (void *)8) #define fsparam_u32hex(NAME, OPT) \ - __fsparam(fs_param_is_u32_hex, NAME, OPT, 0, (void *16)) + __fsparam(fs_param_is_u32_hex, NAME, OPT, 0, (void *)16) #define fsparam_s32(NAME, OPT) __fsparam(fs_param_is_s32, NAME, OPT, 0, NULL) #define fsparam_u64(NAME, OPT) __fsparam(fs_param_is_u64, NAME, OPT, 0, NULL) #define fsparam_enum(NAME, OPT, array) __fsparam(fs_param_is_enum, NAME, OPT, 0, array) |