diff options
Diffstat (limited to 'fs/jbd')
| -rw-r--r-- | fs/jbd/commit.c | 1 | ||||
| -rw-r--r-- | fs/jbd/recovery.c | 1 | ||||
| -rw-r--r-- | fs/jbd/transaction.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index 2c90e3ef625f..ecb44c94ba8d 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
| 18 | #include <linux/jbd.h> | 18 | #include <linux/jbd.h> |
| 19 | #include <linux/errno.h> | 19 | #include <linux/errno.h> |
| 20 | #include <linux/slab.h> | ||
| 21 | #include <linux/mm.h> | 20 | #include <linux/mm.h> |
| 22 | #include <linux/pagemap.h> | 21 | #include <linux/pagemap.h> |
| 23 | #include <linux/bio.h> | 22 | #include <linux/bio.h> |
diff --git a/fs/jbd/recovery.c b/fs/jbd/recovery.c index cb1a49ae605e..54c9bc9e1b17 100644 --- a/fs/jbd/recovery.c +++ b/fs/jbd/recovery.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/fs.h> | 20 | #include <linux/fs.h> |
| 21 | #include <linux/jbd.h> | 21 | #include <linux/jbd.h> |
| 22 | #include <linux/errno.h> | 22 | #include <linux/errno.h> |
| 23 | #include <linux/slab.h> | ||
| 24 | #endif | 23 | #endif |
| 25 | 24 | ||
| 26 | /* | 25 | /* |
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index 99e9fea11077..5ae71e75a491 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c | |||
| @@ -1398,7 +1398,7 @@ int journal_stop(handle_t *handle) | |||
| 1398 | * the case where our storage is so fast that it is more optimal to go | 1398 | * the case where our storage is so fast that it is more optimal to go |
| 1399 | * ahead and force a flush and wait for the transaction to be committed | 1399 | * ahead and force a flush and wait for the transaction to be committed |
| 1400 | * than it is to wait for an arbitrary amount of time for new writers to | 1400 | * than it is to wait for an arbitrary amount of time for new writers to |
| 1401 | * join the transaction. We acheive this by measuring how long it takes | 1401 | * join the transaction. We achieve this by measuring how long it takes |
| 1402 | * to commit a transaction, and compare it with how long this | 1402 | * to commit a transaction, and compare it with how long this |
| 1403 | * transaction has been running, and if run time < commit time then we | 1403 | * transaction has been running, and if run time < commit time then we |
| 1404 | * sleep for the delta and commit. This greatly helps super fast disks | 1404 | * sleep for the delta and commit. This greatly helps super fast disks |