diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:37:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:37:40 -0400 |
| commit | e16b396ce314b2bcdfe6c173fe075bf8e3432368 (patch) | |
| tree | 640f0f56f2ea676647af4eb42d32fa56be2ee549 /fs/ext4 | |
| parent | 7fd23a24717a327a66f3c32d11a20a2f169c824f (diff) | |
| parent | e6e8dd5055a974935af1398c8648d4a9359b0ecb (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: (47 commits)
doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
Update cpuset info & webiste for cgroups
dcdbas: force SMI to happen when expected
arch/arm/Kconfig: remove one to many l's in the word.
asm-generic/user.h: Fix spelling in comment
drm: fix printk typo 'sracth'
Remove one to many n's in a word
Documentation/filesystems/romfs.txt: fixing link to genromfs
drivers:scsi Change printk typo initate -> initiate
serial, pch uart: Remove duplicate inclusion of linux/pci.h header
fs/eventpoll.c: fix spelling
mm: Fix out-of-date comments which refers non-existent functions
drm: Fix printk typo 'failled'
coh901318.c: Change initate to initiate.
mbox-db5500.c Change initate to initiate.
edac: correct i82975x error-info reported
edac: correct i82975x mci initialisation
edac: correct commented info
fs: update comments to point correct document
target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
...
Trivial conflict in fs/eventpoll.c (spelling vs addition)
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/extents.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index ccce8a7e94ed..7516fb9c0bd5 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c | |||
| @@ -131,7 +131,7 @@ static ext4_fsblk_t ext4_ext_find_goal(struct inode *inode, | |||
| 131 | * fragmenting the file system's free space. Maybe we | 131 | * fragmenting the file system's free space. Maybe we |
| 132 | * should have some hueristics or some way to allow | 132 | * should have some hueristics or some way to allow |
| 133 | * userspace to pass a hint to file system, | 133 | * userspace to pass a hint to file system, |
| 134 | * especiially if the latter case turns out to be | 134 | * especially if the latter case turns out to be |
| 135 | * common. | 135 | * common. |
| 136 | */ | 136 | */ |
| 137 | ex = path[depth].p_ext; | 137 | ex = path[depth].p_ext; |
| @@ -2844,7 +2844,7 @@ fix_extent_len: | |||
| 2844 | * ext4_get_blocks_dio_write() when DIO to write | 2844 | * ext4_get_blocks_dio_write() when DIO to write |
| 2845 | * to an uninitialized extent. | 2845 | * to an uninitialized extent. |
| 2846 | * | 2846 | * |
| 2847 | * Writing to an uninitized extent may result in splitting the uninitialized | 2847 | * Writing to an uninitialized extent may result in splitting the uninitialized |
| 2848 | * extent into multiple /initialized uninitialized extents (up to three) | 2848 | * extent into multiple /initialized uninitialized extents (up to three) |
| 2849 | * There are three possibilities: | 2849 | * There are three possibilities: |
| 2850 | * a> There is no split required: Entire extent should be uninitialized | 2850 | * a> There is no split required: Entire extent should be uninitialized |