From 112c641a6d6811e4a38f8ffed03157242feb642c Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Wed, 19 Mar 2008 17:00:44 -0700 Subject: [PATCH] --- yaml --- r: 87494 b: refs/heads/master c: 0cf01f6685bef41dea37bbec606f375b7a98fd98 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jbd/journal.c | 5 +++-- trunk/fs/jbd/transaction.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ecad50bd336f..7e49c06a530f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e82989d95cc46cc58622381eafa54f7428ee679 +refs/heads/master: 0cf01f6685bef41dea37bbec606f375b7a98fd98 diff --git a/trunk/fs/jbd/journal.c b/trunk/fs/jbd/journal.c index 3943a8905eb2..9816293442ab 100644 --- a/trunk/fs/jbd/journal.c +++ b/trunk/fs/jbd/journal.c @@ -697,13 +697,14 @@ static journal_t * journal_init_common (void) */ /** - * journal_t * journal_init_dev() - creates an initialises a journal structure + * journal_t * 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 * * * journal_init_dev creates a journal which maps a fixed contiguous * range of blocks on an arbitrary block device. diff --git a/trunk/fs/jbd/transaction.c b/trunk/fs/jbd/transaction.c index c6cbb6cd59b2..4c895044c7d6 100644 --- a/trunk/fs/jbd/transaction.c +++ b/trunk/fs/jbd/transaction.c @@ -1426,7 +1426,8 @@ int journal_stop(handle_t *handle) return err; } -/**int journal_force_commit() - force any uncommitted transactions +/** + * int journal_force_commit() - force any uncommitted transactions * @journal: journal to force * * For synchronous operations: force any uncommitted transactions