summaryrefslogtreecommitdiff
path: root/fs/jbd2/journal.c
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2011-03-17 16:44:22 +0100
committerJan Kara <jack@suse.cz>2011-03-17 16:44:22 +0100
commit0c755de03e69619c768867d89e6d827d3afa13d9 (patch)
tree7c9f061ba67aa2672038c7913c66eed4c9584d6d /fs/jbd2/journal.c
parente8a80c6f769dd4622d8b211b398452158ee60c0b (diff)
parentd7433142b63d727b5a217c37b1a1468b116a9771 (diff)
Merge branch 'for_next' into for_linus
Diffstat (limited to 'fs/jbd2/journal.c')
-rw-r--r--fs/jbd2/journal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 97e73469b2c..90407b8fece 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -991,7 +991,7 @@ journal_t * jbd2_journal_init_inode (struct inode *inode)
err = jbd2_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;
}