Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fix from Chris Mason:
"I'm still testing more fixes, but I wanted to get out the fix for the
btrfs raid5/6 memory corruption I mentioned in my merge window pull"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix allocation size calculations in alloc_btrfs_bio
+8
-1
+8
-1
fs/btrfs/volumes.c
+8
-1
fs/btrfs/volumes.c
···
4903
4903
static struct btrfs_bio *alloc_btrfs_bio(int total_stripes, int real_stripes)
4904
4904
{
4905
4905
struct btrfs_bio *bbio = kzalloc(
4906
+
/* the size of the btrfs_bio */
4906
4907
sizeof(struct btrfs_bio) +
4908
+
/* plus the variable array for the stripes */
4907
4909
sizeof(struct btrfs_bio_stripe) * (total_stripes) +
4910
+
/* plus the variable array for the tgt dev */
4908
4911
sizeof(int) * (real_stripes) +
4909
-
sizeof(u64) * (real_stripes),
4912
+
/*
4913
+
* plus the raid_map, which includes both the tgt dev
4914
+
* and the stripes
4915
+
*/
4916
+
sizeof(u64) * (total_stripes),
4910
4917
GFP_NOFS);
4911
4918
if (!bbio)
4912
4919
return NULL;