git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-5.12/block-2021-02-17' of git://git.kernel.dk/linux-block
[sfrench/cifs-2.6.git]
/
fs
/
btrfs
/
volumes.c
diff --git
a/fs/btrfs/volumes.c
b/fs/btrfs/volumes.c
index b8fab44394f5a5a4666a769a60de3d8cdc3c3516..bc3b33efddc5694df8afef1e481c8969829b11ff 100644
(file)
--- a/
fs/btrfs/volumes.c
+++ b/
fs/btrfs/volumes.c
@@
-421,7
+421,7
@@
static struct btrfs_device *__alloc_device(struct btrfs_fs_info *fs_info)
* Preallocate a bio that's always going to be used for flushing device
* barriers and matches the device lifespan
*/
* Preallocate a bio that's always going to be used for flushing device
* barriers and matches the device lifespan
*/
- dev->flush_bio = bio_
alloc_bioset(GFP_KERNEL, 0, NULL
);
+ dev->flush_bio = bio_
kmalloc(GFP_KERNEL, 0
);
if (!dev->flush_bio) {
kfree(dev);
return ERR_PTR(-ENOMEM);
if (!dev->flush_bio) {
kfree(dev);
return ERR_PTR(-ENOMEM);