diff options
| author | Linus Walleij | 2018-03-18 17:48:59 +0100 |
|---|---|---|
| committer | Linus Walleij | 2018-03-18 17:48:59 +0100 |
| commit | 95260c17b27e4bdacf85022e629fb701b42cc190 (patch) | |
| tree | cfc6963180d99e5f36752ca028821aaa109e860d /fs/btrfs/super.c | |
| parent | gpio: mockup: Update Bamvors mail address (diff) | |
| parent | Linux 4.16-rc5 (diff) | |
| download | kernel-qcow2-linux-95260c17b27e4bdacf85022e629fb701b42cc190.tar.gz kernel-qcow2-linux-95260c17b27e4bdacf85022e629fb701b42cc190.tar.xz kernel-qcow2-linux-95260c17b27e4bdacf85022e629fb701b42cc190.zip | |
Merge tag 'v4.16-rc5' into devel
Linux 4.16-rc5 merged into the GPIO devel branch to resolve
a nasty conflict between fixes and devel in the RCAR driver.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 6e71a2a78363..4b817947e00f 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -1545,7 +1545,7 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type, * it for searching for existing supers, so this lets us do that and * then open_ctree will properly initialize everything later. */ - fs_info = kzalloc(sizeof(struct btrfs_fs_info), GFP_KERNEL); + fs_info = kvzalloc(sizeof(struct btrfs_fs_info), GFP_KERNEL); if (!fs_info) { error = -ENOMEM; goto error_sec_opts; |