diff options
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/ext4.h | 6 | ||||
| -rw-r--r-- | fs/ext4/inode.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index b0537c827024..6c46c648430d 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
| @@ -1225,11 +1225,11 @@ do { \ | |||
| 1225 | } while (0) | 1225 | } while (0) |
| 1226 | 1226 | ||
| 1227 | #ifdef CONFIG_SMP | 1227 | #ifdef CONFIG_SMP |
| 1228 | /* Each CPU can accumulate FBC_BATCH blocks in their local | 1228 | /* Each CPU can accumulate percpu_counter_batch blocks in their local |
| 1229 | * counters. So we need to make sure we have free blocks more | 1229 | * counters. So we need to make sure we have free blocks more |
| 1230 | * than FBC_BATCH * nr_cpu_ids. Also add a window of 4 times. | 1230 | * than percpu_counter_batch * nr_cpu_ids. Also add a window of 4 times. |
| 1231 | */ | 1231 | */ |
| 1232 | #define EXT4_FREEBLOCKS_WATERMARK (4 * (FBC_BATCH * nr_cpu_ids)) | 1232 | #define EXT4_FREEBLOCKS_WATERMARK (4 * (percpu_counter_batch * nr_cpu_ids)) |
| 1233 | #else | 1233 | #else |
| 1234 | #define EXT4_FREEBLOCKS_WATERMARK 0 | 1234 | #define EXT4_FREEBLOCKS_WATERMARK 0 |
| 1235 | #endif | 1235 | #endif |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 6702a49992a6..98d3fe7057ef 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
| @@ -2498,7 +2498,7 @@ static int ext4_nonda_switch(struct super_block *sb) | |||
| 2498 | /* | 2498 | /* |
| 2499 | * switch to non delalloc mode if we are running low | 2499 | * switch to non delalloc mode if we are running low |
| 2500 | * on free block. The free block accounting via percpu | 2500 | * on free block. The free block accounting via percpu |
| 2501 | * counters can get slightly wrong with FBC_BATCH getting | 2501 | * counters can get slightly wrong with percpu_counter_batch getting |
| 2502 | * accumulated on each CPU without updating global counters | 2502 | * accumulated on each CPU without updating global counters |
| 2503 | * Delalloc need an accurate free block accounting. So switch | 2503 | * Delalloc need an accurate free block accounting. So switch |
| 2504 | * to non delalloc when we are near to error range. | 2504 | * to non delalloc when we are near to error range. |