diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 16:21:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 16:21:22 -0500 |
| commit | 98793265b429a3f0b3f1750e74d67cd4d740d162 (patch) | |
| tree | b0bd717673f0c21845cf053f3fb6b75d42530af5 /fs/ext4 | |
| parent | b4a133da2eaccb844a7beaef16ffd9c76a0d21d3 (diff) | |
| parent | bd1b2a555952d959f47169056fca05acf7eff81f (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: (53 commits)
Kconfig: acpi: Fix typo in comment.
misc latin1 to utf8 conversions
devres: Fix a typo in devm_kfree comment
btrfs: free-space-cache.c: remove extra semicolon.
fat: Spelling s/obsolate/obsolete/g
SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
tools/power turbostat: update fields in manpage
mac80211: drop spelling fix
types.h: fix comment spelling for 'architectures'
typo fixes: aera -> area, exntension -> extension
devices.txt: Fix typo of 'VMware'.
sis900: Fix enum typo 'sis900_rx_bufer_status'
decompress_bunzip2: remove invalid vi modeline
treewide: Fix comment and string typo 'bufer'
hyper-v: Update MAINTAINERS
treewide: Fix typos in various parts of the kernel, and fix some comments.
clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
leds: Kconfig: Fix typo 'D2NET_V2'
sound: Kconfig: drop unknown symbol ARCH_CLPS7500
...
Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 92655fd89657..7dbcc3e84570 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
| @@ -1881,7 +1881,7 @@ static void ext4_end_io_buffer_write(struct buffer_head *bh, int uptodate); | |||
| 1881 | * a[0] = 'a'; | 1881 | * a[0] = 'a'; |
| 1882 | * truncate(f, 4096); | 1882 | * truncate(f, 4096); |
| 1883 | * we have in the page first buffer_head mapped via page_mkwrite call back | 1883 | * we have in the page first buffer_head mapped via page_mkwrite call back |
| 1884 | * but other bufer_heads would be unmapped but dirty(dirty done via the | 1884 | * but other buffer_heads would be unmapped but dirty (dirty done via the |
| 1885 | * do_wp_page). So writepage should write the first block. If we modify | 1885 | * do_wp_page). So writepage should write the first block. If we modify |
| 1886 | * the mmap area beyond 1024 we will again get a page_fault and the | 1886 | * the mmap area beyond 1024 we will again get a page_fault and the |
| 1887 | * page_mkwrite callback will do the block allocation and mark the | 1887 | * page_mkwrite callback will do the block allocation and mark the |
| @@ -3469,7 +3469,7 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) | |||
| 3469 | * transaction, and VFS/VM ensures that ext4_truncate() cannot run | 3469 | * transaction, and VFS/VM ensures that ext4_truncate() cannot run |
| 3470 | * simultaneously on behalf of the same inode. | 3470 | * simultaneously on behalf of the same inode. |
| 3471 | * | 3471 | * |
| 3472 | * As we work through the truncate and commmit bits of it to the journal there | 3472 | * As we work through the truncate and commit bits of it to the journal there |
| 3473 | * is one core, guiding principle: the file's tree must always be consistent on | 3473 | * is one core, guiding principle: the file's tree must always be consistent on |
| 3474 | * disk. We must be able to restart the truncate after a crash. | 3474 | * disk. We must be able to restart the truncate after a crash. |
| 3475 | * | 3475 | * |