diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-23 00:08:41 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-23 00:08:41 +0200 |
commit | 805c6d3c19210c90c109107d189744e960eae025 (patch) | |
tree | 51591467a218a58df9dd5f239561b02e1e6ce996 /fs/vboxsf | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
parent | fuse: fix the ->direct_IO() treatment of iov_iter (diff) | |
download | linux-805c6d3c19210c90c109107d189744e960eae025.tar.xz linux-805c6d3c19210c90c109107d189744e960eae025.zip |
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 'fs/vboxsf')
-rw-r--r-- | fs/vboxsf/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/vboxsf/super.c b/fs/vboxsf/super.c index 8fe03b4a0d2b..25aade344192 100644 --- a/fs/vboxsf/super.c +++ b/fs/vboxsf/super.c @@ -384,7 +384,7 @@ fail_nomem: static int vboxsf_parse_monolithic(struct fs_context *fc, void *data) { - char *options = data; + unsigned char *options = data; if (options && options[0] == VBSF_MOUNT_SIGNATURE_BYTE_0 && options[1] == VBSF_MOUNT_SIGNATURE_BYTE_1 && |