diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-03 16:13:20 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-03 16:13:20 -0500 |
| commit | 1c82315a12144cde732636e259d39e3ee81b3c5b (patch) | |
| tree | 904770abe925abf1e37bad1a6d7d7f576257b194 /fs | |
| parent | 530ede14cf63ef4a207b0003e14af2f750484180 (diff) | |
| parent | d7011f5b9dd3c88feb5cebad7d0b719ed6816ebd (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixup from Chris Mason:
"Geert and James both sent this one in, sorry guys"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
btrfs/raid56: Add missing #include <linux/vmalloc.h>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/raid56.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index 07222053c7d8..9a79fb790adb 100644 --- a/fs/btrfs/raid56.c +++ b/fs/btrfs/raid56.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/hash.h> | 31 | #include <linux/hash.h> |
| 32 | #include <linux/list_sort.h> | 32 | #include <linux/list_sort.h> |
| 33 | #include <linux/raid/xor.h> | 33 | #include <linux/raid/xor.h> |
| 34 | #include <linux/vmalloc.h> | ||
| 34 | #include <asm/div64.h> | 35 | #include <asm/div64.h> |
| 35 | #include "compat.h" | 36 | #include "compat.h" |
| 36 | #include "ctree.h" | 37 | #include "ctree.h" |