[PATCH] jbd2: sector_t conversion
JBD layer in-kernel block varibles type fixes to support >32 bit block number
and convert to sector_t type.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
diff --git a/include/linux/ext4_jbd2.h b/include/linux/ext4_jbd2.h
index f69af60..72dd631 100644
--- a/include/linux/ext4_jbd2.h
+++ b/include/linux/ext4_jbd2.h
@@ -154,7 +154,7 @@
static inline int
__ext4_journal_revoke(const char *where, handle_t *handle,
- unsigned long blocknr, struct buffer_head *bh)
+ ext4_fsblk_t blocknr, struct buffer_head *bh)
{
int err = jbd2_journal_revoke(handle, blocknr, bh);
if (err)
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index 5e5aa64..3c939c8 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -741,7 +741,7 @@
*/
struct block_device *j_dev;
int j_blocksize;
- unsigned long j_blk_offset;
+ sector_t j_blk_offset;
/*
* Device which holds the client fs. For internal journal this will be
@@ -860,7 +860,7 @@
/* Log buffer allocation */
extern struct journal_head * jbd2_journal_get_descriptor_buffer(journal_t *);
-int jbd2_journal_next_log_block(journal_t *, unsigned long *);
+int jbd2_journal_next_log_block(journal_t *, sector_t *);
/* Commit management */
extern void jbd2_journal_commit_transaction(journal_t *);
@@ -875,7 +875,7 @@
jbd2_journal_write_metadata_buffer(transaction_t *transaction,
struct journal_head *jh_in,
struct journal_head **jh_out,
- unsigned long blocknr);
+ sector_t blocknr);
/* Transaction locking */
extern void __wait_on_journal (journal_t *);
@@ -923,7 +923,7 @@
extern journal_t * jbd2_journal_init_dev(struct block_device *bdev,
struct block_device *fs_dev,
- int start, int len, int bsize);
+ sector_t start, int len, int bsize);
extern journal_t * jbd2_journal_init_inode (struct inode *);
extern int jbd2_journal_update_format (journal_t *);
extern int jbd2_journal_check_used_features
@@ -944,7 +944,7 @@
extern int jbd2_journal_errno (journal_t *);
extern void jbd2_journal_ack_err (journal_t *);
extern int jbd2_journal_clear_err (journal_t *);
-extern int jbd2_journal_bmap(journal_t *, unsigned long, unsigned long *);
+extern int jbd2_journal_bmap(journal_t *, unsigned long, sector_t *);
extern int jbd2_journal_force_commit(journal_t *);
/*
@@ -977,14 +977,13 @@
extern int jbd2_journal_init_revoke_caches(void);
extern void jbd2_journal_destroy_revoke(journal_t *);
-extern int jbd2_journal_revoke (handle_t *,
- unsigned long, struct buffer_head *);
+extern int jbd2_journal_revoke (handle_t *, sector_t, struct buffer_head *);
extern int jbd2_journal_cancel_revoke(handle_t *, struct journal_head *);
extern void jbd2_journal_write_revoke_records(journal_t *, transaction_t *);
/* Recovery revoke support */
-extern int jbd2_journal_set_revoke(journal_t *, unsigned long, tid_t);
-extern int jbd2_journal_test_revoke(journal_t *, unsigned long, tid_t);
+extern int jbd2_journal_set_revoke(journal_t *, sector_t, tid_t);
+extern int jbd2_journal_test_revoke(journal_t *, sector_t, tid_t);
extern void jbd2_journal_clear_revoke(journal_t *);
extern void jbd2_journal_switch_revoke_table(journal_t *journal);