diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 17:41:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 17:41:19 -0700 |
| commit | 77aa56ba09b7416764aec2e3f7b41e023cf30602 (patch) | |
| tree | d4247c8ee6b7371e60dcadaf1540c943ed7a9801 /fs/jbd | |
| parent | 179198373cf374f0ef793f1023c1cdd83b53674d (diff) | |
| parent | 0c755de03e69619c768867d89e6d827d3afa13d9 (diff) | |
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:
ext3: Always set dx_node's fake_dirent explicitly.
ext3: Fix an overflow in ext3_trim_fs.
jbd: Remove one to many n's in a word.
ext3: skip orphan cleanup on rocompat fs
ext2: Fix link count corruption under heavy link+rename load
ext3: speed up group trim with the right free block count.
ext3: Adjust trim start with first_data_block.
quota: return -ENOMEM when memory allocation fails
Diffstat (limited to 'fs/jbd')
| -rw-r--r-- | fs/jbd/journal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index da1b5e4ffce..eb11601f2e0 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c @@ -839,7 +839,7 @@ journal_t * journal_init_inode (struct inode *inode) err = journal_bmap(journal, 0, &blocknr); /* If that failed, give up */ if (err) { - printk(KERN_ERR "%s: Cannnot locate journal superblock\n", + printk(KERN_ERR "%s: Cannot locate journal superblock\n", __func__); goto out_err; } |