diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 19:04:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 19:04:50 -0500 |
| commit | c32da02342b7521df25fefc2ef20aee0e61cf887 (patch) | |
| tree | 7e38f664fa3e13602c357d37f77d8adcf82fccc2 /fs/ext4 | |
| parent | dca1d9f6d7ae428c193f32bd3e9a4ca13176648b (diff) | |
| parent | 318ae2edc3b29216abd8a2510f3f80b764f06858 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits)
doc: fix typo in comment explaining rb_tree usage
Remove fs/ntfs/ChangeLog
doc: fix console doc typo
doc: cpuset: Update the cpuset flag file
Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed
Remove drivers/parport/ChangeLog
Remove drivers/char/ChangeLog
doc: typo - Table 1-2 should refer to "status", not "statm"
tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments
No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h
devres/irq: Fix devm_irq_match comment
Remove reference to kthread_create_on_cpu
tree-wide: Assorted spelling fixes
tree-wide: fix 'lenght' typo in comments and code
drm/kms: fix spelling in error message
doc: capitalization and other minor fixes in pnp doc
devres: typo fix s/dev/devm/
Remove redundant trailing semicolons from macros
fix typo "definetly" -> "definitely" in comment
tree-wide: s/widht/width/g typo in comments
...
Fix trivial conflict in Documentation/laptops/00-INDEX
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/mballoc.c | 2 | ||||
| -rw-r--r-- | fs/ext4/super.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 506713a2ebd8..54df209d2eed 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c | |||
| @@ -69,7 +69,7 @@ | |||
| 69 | * | 69 | * |
| 70 | * pa_lstart -> the logical start block for this prealloc space | 70 | * pa_lstart -> the logical start block for this prealloc space |
| 71 | * pa_pstart -> the physical start block for this prealloc space | 71 | * pa_pstart -> the physical start block for this prealloc space |
| 72 | * pa_len -> lenght for this prealloc space | 72 | * pa_len -> length for this prealloc space |
| 73 | * pa_free -> free space available in this prealloc space | 73 | * pa_free -> free space available in this prealloc space |
| 74 | * | 74 | * |
| 75 | * The inode preallocation space is used looking at the _logical_ start | 75 | * The inode preallocation space is used looking at the _logical_ start |
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index ce84a6ed4a48..ba191dae8730 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
| @@ -302,7 +302,7 @@ void ext4_journal_abort_handle(const char *caller, const char *err_fn, | |||
| 302 | * write out the superblock safely. | 302 | * write out the superblock safely. |
| 303 | * | 303 | * |
| 304 | * We'll just use the jbd2_journal_abort() error code to record an error in | 304 | * We'll just use the jbd2_journal_abort() error code to record an error in |
| 305 | * the journal instead. On recovery, the journal will compain about | 305 | * the journal instead. On recovery, the journal will complain about |
| 306 | * that error until we've noted it down and cleared it. | 306 | * that error until we've noted it down and cleared it. |
| 307 | */ | 307 | */ |
| 308 | 308 | ||