diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /fs/affs/bitmap.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'fs/affs/bitmap.c')
| -rw-r--r-- | fs/affs/bitmap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/affs/bitmap.c b/fs/affs/bitmap.c index dc5ef14bdc1c..3e262711ae06 100644 --- a/fs/affs/bitmap.c +++ b/fs/affs/bitmap.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | * block allocation, deallocation, calculation of free space. | 7 | * block allocation, deallocation, calculation of free space. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/slab.h> | ||
| 10 | #include "affs.h" | 11 | #include "affs.h" |
| 11 | 12 | ||
| 12 | /* This is, of course, shamelessly stolen from fs/minix */ | 13 | /* This is, of course, shamelessly stolen from fs/minix */ |
| @@ -128,7 +129,7 @@ err_range: | |||
| 128 | /* | 129 | /* |
| 129 | * Allocate a block in the given allocation zone. | 130 | * Allocate a block in the given allocation zone. |
| 130 | * Since we have to byte-swap the bitmap on little-endian | 131 | * Since we have to byte-swap the bitmap on little-endian |
| 131 | * machines, this is rather expensive. Therefor we will | 132 | * machines, this is rather expensive. Therefore we will |
| 132 | * preallocate up to 16 blocks from the same word, if | 133 | * preallocate up to 16 blocks from the same word, if |
| 133 | * possible. We are not doing preallocations in the | 134 | * possible. We are not doing preallocations in the |
| 134 | * header zone, though. | 135 | * header zone, though. |