diff --git a/[refs] b/[refs] index 8740827b2ce9..2c105045aeb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a9362eb405e380432e6883cb83830df3b6cdf78 +refs/heads/master: 5648ba5b2dc0d07a8108fabc7b9100962e9e1d88 diff --git a/trunk/fs/jbd2/journal.c b/trunk/fs/jbd2/journal.c index 2dbf23e82c6f..d707a219e21b 100644 --- a/trunk/fs/jbd2/journal.c +++ b/trunk/fs/jbd2/journal.c @@ -997,13 +997,14 @@ static journal_t * journal_init_common (void) */ /** - * journal_t * jbd2_journal_init_dev() - creates an initialises a journal structure + * journal_t * jbd2_journal_init_dev() - creates and initialises a journal structure * @bdev: Block device on which to create the journal * @fs_dev: Device which hold journalled filesystem for this journal. * @start: Block nr Start of journal. * @len: Length of the journal in blocks. * @blocksize: blocksize of journalling device - * @returns: a newly created journal_t * + * + * Returns: a newly created journal_t * * * jbd2_journal_init_dev creates a journal which maps a fixed contiguous * range of blocks on an arbitrary block device. diff --git a/trunk/fs/jbd2/transaction.c b/trunk/fs/jbd2/transaction.c index 70245d6638b7..401bf9d23656 100644 --- a/trunk/fs/jbd2/transaction.c +++ b/trunk/fs/jbd2/transaction.c @@ -1462,7 +1462,8 @@ int jbd2_journal_stop(handle_t *handle) return err; } -/**int jbd2_journal_force_commit() - force any uncommitted transactions +/** + * int jbd2_journal_force_commit() - force any uncommitted transactions * @journal: journal to force * * For synchronous operations: force any uncommitted transactions