diff options
Diffstat (limited to 'fs/jbd')
-rw-r--r-- | fs/jbd/journal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index 2613fca92740..88d970e09ce6 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c | |||
@@ -271,7 +271,7 @@ static void journal_kill_thread(journal_t *journal) | |||
271 | int journal_write_metadata_buffer(transaction_t *transaction, | 271 | int journal_write_metadata_buffer(transaction_t *transaction, |
272 | struct journal_head *jh_in, | 272 | struct journal_head *jh_in, |
273 | struct journal_head **jh_out, | 273 | struct journal_head **jh_out, |
274 | int blocknr) | 274 | unsigned long blocknr) |
275 | { | 275 | { |
276 | int need_copy_out = 0; | 276 | int need_copy_out = 0; |
277 | int done_copy_out = 0; | 277 | int done_copy_out = 0; |
@@ -696,7 +696,7 @@ fail: | |||
696 | * @bdev: Block device on which to create the journal | 696 | * @bdev: Block device on which to create the journal |
697 | * @fs_dev: Device which hold journalled filesystem for this journal. | 697 | * @fs_dev: Device which hold journalled filesystem for this journal. |
698 | * @start: Block nr Start of journal. | 698 | * @start: Block nr Start of journal. |
699 | * @len: Lenght of the journal in blocks. | 699 | * @len: Length of the journal in blocks. |
700 | * @blocksize: blocksize of journalling device | 700 | * @blocksize: blocksize of journalling device |
701 | * @returns: a newly created journal_t * | 701 | * @returns: a newly created journal_t * |
702 | * | 702 | * |
@@ -820,7 +820,7 @@ static void journal_fail_superblock (journal_t *journal) | |||
820 | static int journal_reset(journal_t *journal) | 820 | static int journal_reset(journal_t *journal) |
821 | { | 821 | { |
822 | journal_superblock_t *sb = journal->j_superblock; | 822 | journal_superblock_t *sb = journal->j_superblock; |
823 | unsigned int first, last; | 823 | unsigned long first, last; |
824 | 824 | ||
825 | first = be32_to_cpu(sb->s_first); | 825 | first = be32_to_cpu(sb->s_first); |
826 | last = be32_to_cpu(sb->s_maxlen); | 826 | last = be32_to_cpu(sb->s_maxlen); |