Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / fs / jbd2 / commit.c

diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 44d68a113c73bd06560a5b004eba5942ec37c908..70b2ae1ef2810e1a8fea2a557bfa5f5e7a395190 100644 (file)
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -272,7 +272,7 @@ write_out_data:
 }
 
 static inline void write_tag_block(int tag_bytes, journal_block_tag_t *tag,
-                                  sector_t block)
+                                  unsigned long long block)
 {
        tag->t_blocknr = cpu_to_be32(block & (u32)~0);
        if (tag_bytes > JBD_TAG_SIZE32)
@@ -293,7 +293,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
        int bufs;
        int flags;
        int err;
-       unsigned long blocknr;
+       unsigned long long blocknr;
        char *tagp = NULL;
        journal_header_t *header;
        journal_block_tag_t *tag = NULL;