diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:05:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:05:56 -0500 |
| commit | 008d23e4852d78bb2618f2035f8b2110b6a6b968 (patch) | |
| tree | 81c88f744f6f3fc84132527c1ddc0b4da410c5e2 /fs/ext4/extents.c | |
| parent | 8f685fbda43deccd130d192c9fcef1444649eaca (diff) | |
| parent | bfc672dcf323877228682aff79dff8ecd9f30ff8 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
Documentation/trace/events.txt: Remove obsolete sched_signal_send.
writeback: fix global_dirty_limits comment runtime -> real-time
ppc: fix comment typo singal -> signal
drivers: fix comment typo diable -> disable.
m68k: fix comment typo diable -> disable.
wireless: comment typo fix diable -> disable.
media: comment typo fix diable -> disable.
remove doc for obsolete dynamic-printk kernel-parameter
remove extraneous 'is' from Documentation/iostats.txt
Fix spelling milisec -> ms in snd_ps3 module parameter description
Fix spelling mistakes in comments
Revert conflicting V4L changes
i7core_edac: fix typos in comments
mm/rmap.c: fix comment
sound, ca0106: Fix assignment to 'channel'.
hrtimer: fix a typo in comment
init/Kconfig: fix typo
anon_inodes: fix wrong function name in comment
fix comment typos concerning "consistent"
poll: fix a typo in comment
...
Fix up trivial conflicts in:
- drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
- fs/ext4/ext4.h
Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
Diffstat (limited to 'fs/ext4/extents.c')
| -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 e910720e8bb8..d202d765dad2 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c | |||
| @@ -2845,14 +2845,14 @@ fix_extent_len: | |||
| 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 uninitized extent may result in splitting the uninitialized |
| 2848 | * extent into multiple /intialized unintialized 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 |
| 2851 | * b> Splits in two extents: Write is happening at either end of the extent | 2851 | * b> Splits in two extents: Write is happening at either end of the extent |
| 2852 | * c> Splits in three extents: Somone is writing in middle of the extent | 2852 | * c> Splits in three extents: Somone is writing in middle of the extent |
| 2853 | * | 2853 | * |
| 2854 | * One of more index blocks maybe needed if the extent tree grow after | 2854 | * One of more index blocks maybe needed if the extent tree grow after |
| 2855 | * the unintialized extent split. To prevent ENOSPC occur at the IO | 2855 | * the uninitialized extent split. To prevent ENOSPC occur at the IO |
| 2856 | * complete, we need to split the uninitialized extent before DIO submit | 2856 | * complete, we need to split the uninitialized extent before DIO submit |
| 2857 | * the IO. The uninitialized extent called at this time will be split | 2857 | * the IO. The uninitialized extent called at this time will be split |
| 2858 | * into three uninitialized extent(at most). After IO complete, the part | 2858 | * into three uninitialized extent(at most). After IO complete, the part |