diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 20:13:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 20:13:18 -0700 |
| commit | 7d2f280e75f05919314e250cadf361a327ed555c (patch) | |
| tree | 47db5a9a0ceaf31adf49c18b663b1e08184f7cff /fs/jbd2 | |
| parent | e3e1288e86a07cdeb0aee5860a2dff111c6eff79 (diff) | |
| parent | 4408ea41c0ab4b711d4da44dd954fb06dce6c3f8 (diff) | |
| download | kernel_samsung_smdk4412-7d2f280e75f05919314e250cadf361a327ed555c.zip kernel_samsung_smdk4412-7d2f280e75f05919314e250cadf361a327ed555c.tar.gz kernel_samsung_smdk4412-7d2f280e75f05919314e250cadf361a327ed555c.tar.bz2 | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: (24 commits)
quota: Fix possible oops in __dquot_initialize()
ext3: Update kernel-doc comments
jbd/2: fixed typos
ext2: fixed typo.
ext3: Fix debug messages in ext3_group_extend()
jbd: Convert atomic_inc() to get_bh()
ext3: Remove misplaced BUFFER_TRACE() in ext3_truncate()
jbd: Fix debug message in do_get_write_access()
jbd: Check return value of __getblk()
ext3: Use DIV_ROUND_UP() on group desc block counting
ext3: Return proper error code on ext3_fill_super()
ext3: Remove unnecessary casts on bh->b_data
ext3: Cleanup ext3_setup_super()
quota: Fix issuing of warnings from dquot_transfer
quota: fix dquot_disable vs dquot_transfer race v2
jbd: Convert bitops to buffer fns
ext3/jbd: Avoid WARN() messages when failing to write the superblock
jbd: Use offset_in_page() instead of manual calculation
jbd: Remove unnecessary goto statement
jbd: Use printk_ratelimited() in journal_alloc_journal_head()
...
Diffstat (limited to 'fs/jbd2')
| -rw-r--r-- | fs/jbd2/journal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 262419f..168d189 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -478,7 +478,7 @@ int __jbd2_log_start_commit(journal_t *journal, tid_t target) */ if (!tid_geq(journal->j_commit_request, target)) { /* - * We want a new commit: OK, mark the request and wakup the + * We want a new commit: OK, mark the request and wakeup the * commit thread. We do _not_ do the commit ourselves. */ |