Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18eba7aa authored by Mingming Cao's avatar Mingming Cao Committed by Linus Torvalds
Browse files

[PATCH] jbd2: switch blks_type from sector_t to ull 



Similar to ext4, change blocks in JBD2 from sector_t to unsigned long long.

Signed-off-by: default avatarMingming Cao <cmm@us.ibm.com>
Signed-off-by: default avatarDave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9b8f1f01

fs/jbd2/commit.c

+2 −2
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static void journal_submit_data_buffers(journal_t *journal, 
}



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;

	sector_t blocknr;

	unsigned long long blocknr;

	char *tagp = NULL;

	journal_header_t *header;

	journal_block_tag_t *tag = NULL;

fs/jbd2/journal.c

+9 −9
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static void journal_kill_thread(journal_t *journal) 
int jbd2_journal_write_metadata_buffer(transaction_t *transaction,

				  struct journal_head  *jh_in,

				  struct journal_head **jh_out,

				  sector_t blocknr)

				  unsigned long long blocknr)

{

	int need_copy_out = 0;

	int done_copy_out = 0;
@@ -555,7 +555,7 @@ int jbd2_log_wait_commit(journal_t *journal, tid_t tid) 
 * Log buffer allocation routines:

 */



int jbd2_journal_next_log_block(journal_t *journal, sector_t *retp)

int jbd2_journal_next_log_block(journal_t *journal, unsigned long long *retp)

{

	unsigned long blocknr;
@@ -579,10 +579,10 @@ int jbd2_journal_next_log_block(journal_t *journal, sector_t *retp) 
 * ready.

 */

int jbd2_journal_bmap(journal_t *journal, unsigned long blocknr,

		 sector_t *retp)

		 unsigned long long *retp)

{

	int err = 0;

	sector_t ret;

	unsigned long long ret;



	if (journal->j_inode) {

		ret = bmap(journal->j_inode, blocknr);
@@ -618,7 +618,7 @@ int jbd2_journal_bmap(journal_t *journal, unsigned long blocknr, 
struct journal_head *jbd2_journal_get_descriptor_buffer(journal_t *journal)

{

	struct buffer_head *bh;

	sector_t blocknr;

	unsigned long long blocknr;

	int err;



	err = jbd2_journal_next_log_block(journal, &blocknr);
@@ -706,7 +706,7 @@ static journal_t * journal_init_common (void) 
 */

journal_t * jbd2_journal_init_dev(struct block_device *bdev,

			struct block_device *fs_dev,

			sector_t start, int len, int blocksize)

			unsigned long long start, int len, int blocksize)

{

	journal_t *journal = journal_init_common();

	struct buffer_head *bh;
@@ -753,7 +753,7 @@ journal_t * jbd2_journal_init_inode (struct inode *inode) 
	journal_t *journal = journal_init_common();

	int err;

	int n;

	sector_t blocknr;

	unsigned long long blocknr;



	if (!journal)

		return NULL;
@@ -819,7 +819,7 @@ static void journal_fail_superblock (journal_t *journal) 
static int journal_reset(journal_t *journal)

{

	journal_superblock_t *sb = journal->j_superblock;

	sector_t first, last;

	unsigned long long first, last;



	first = be32_to_cpu(sb->s_first);

	last = be32_to_cpu(sb->s_maxlen);
@@ -853,7 +853,7 @@ static int journal_reset(journal_t *journal) 
 **/

int jbd2_journal_create(journal_t *journal)

{

	sector_t blocknr;

	unsigned long long blocknr;

	struct buffer_head *bh;

	journal_superblock_t *sb;

	int i, err;

fs/jbd2/recovery.c

+6 −6
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static int do_readahead(journal_t *journal, unsigned int start) 
{

	int err;

	unsigned int max, nbufs, next;

	sector_t blocknr;

	unsigned long long blocknr;

	struct buffer_head *bh;



	struct buffer_head * bufs[MAXBUF];
@@ -132,7 +132,7 @@ static int jread(struct buffer_head **bhp, journal_t *journal, 
		 unsigned int offset)

{

	int err;

	sector_t blocknr;

	unsigned long long blocknr;

	struct buffer_head *bh;



	*bhp = NULL;
@@ -308,9 +308,9 @@ int jbd2_journal_skip_recovery(journal_t *journal) 
	return err;

}



static inline sector_t read_tag_block(int tag_bytes, journal_block_tag_t *tag)

static inline unsigned long long read_tag_block(int tag_bytes, journal_block_tag_t *tag)

{

	sector_t block = be32_to_cpu(tag->t_blocknr);

	unsigned long long block = be32_to_cpu(tag->t_blocknr);

	if (tag_bytes > JBD_TAG_SIZE32)

		block |= (u64)be32_to_cpu(tag->t_blocknr_high) << 32;

	return block;
@@ -452,7 +452,7 @@ static int do_one_pass(journal_t *journal, 
						"block %ld in log\n",

						err, io_block);

				} else {

					sector_t blocknr;

					unsigned long long blocknr;



					J_ASSERT(obh != NULL);

					blocknr = read_tag_block(tag_bytes,
@@ -592,7 +592,7 @@ static int scan_revoke_records(journal_t *journal, struct buffer_head *bh, 
		record_len = 8;



	while (offset + record_len <= max) {

		sector_t blocknr;

		unsigned long long blocknr;

		int err;



		if (record_len == 4)

fs/jbd2/revoke.c

+7 −7
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ struct jbd2_revoke_record_s 
{

	struct list_head  hash;

	tid_t		  sequence;	/* Used for recovery only */

	sector_t	  blocknr;

	unsigned long long	  blocknr;

};
@@ -106,7 +106,7 @@ static void flush_descriptor(journal_t *, struct journal_head *, int); 
/* Utility functions to maintain the revoke table */



/* Borrowed from buffer.c: this is a tried and tested block hash function */

static inline int hash(journal_t *journal, sector_t block)

static inline int hash(journal_t *journal, unsigned long long block)

{

	struct jbd2_revoke_table_s *table = journal->j_revoke;

	int hash_shift = table->hash_shift;
@@ -117,7 +117,7 @@ static inline int hash(journal_t *journal, sector_t block) 
		(hash << (hash_shift - 12))) & (table->hash_size - 1);

}



static int insert_revoke_hash(journal_t *journal, sector_t blocknr,

static int insert_revoke_hash(journal_t *journal, unsigned long long blocknr,

			      tid_t seq)

{

	struct list_head *hash_list;
@@ -147,7 +147,7 @@ static int insert_revoke_hash(journal_t *journal, sector_t blocknr, 
/* Find a revoke record in the journal's hash table. */



static struct jbd2_revoke_record_s *find_revoke_record(journal_t *journal,

						      sector_t blocknr)

						      unsigned long long blocknr)

{

	struct list_head *hash_list;

	struct jbd2_revoke_record_s *record;
@@ -326,7 +326,7 @@ void jbd2_journal_destroy_revoke(journal_t *journal) 
 * by one.

 */



int jbd2_journal_revoke(handle_t *handle, sector_t blocknr,

int jbd2_journal_revoke(handle_t *handle, unsigned long long blocknr,

		   struct buffer_head *bh_in)

{

	struct buffer_head *bh = NULL;
@@ -650,7 +650,7 @@ static void flush_descriptor(journal_t *journal, 
 */



int jbd2_journal_set_revoke(journal_t *journal,

		       sector_t blocknr,

		       unsigned long long blocknr,

		       tid_t sequence)

{

	struct jbd2_revoke_record_s *record;
@@ -674,7 +674,7 @@ int jbd2_journal_set_revoke(journal_t *journal, 
 */



int jbd2_journal_test_revoke(journal_t *journal,

			sector_t blocknr,

			unsigned long long blocknr,

			tid_t sequence)

{

	struct jbd2_revoke_record_s *record;

include/linux/jbd2.h

+8 −8
Original line number Diff line number Diff line
@@ -741,7 +741,7 @@ struct journal_s 
	 */

	struct block_device	*j_dev;

	int			j_blocksize;

	sector_t		j_blk_offset;

	unsigned long long		j_blk_offset;



	/*

	 * Device which holds the client fs.  For internal journal this will be
@@ -860,7 +860,7 @@ extern void __journal_clean_data_list(transaction_t *transaction); 


/* Log buffer allocation */

extern struct journal_head * jbd2_journal_get_descriptor_buffer(journal_t *);

int jbd2_journal_next_log_block(journal_t *, sector_t *);

int jbd2_journal_next_log_block(journal_t *, unsigned long long *);



/* Commit management */

extern void jbd2_journal_commit_transaction(journal_t *);
@@ -875,7 +875,7 @@ extern int 
jbd2_journal_write_metadata_buffer(transaction_t	  *transaction,

			      struct journal_head  *jh_in,

			      struct journal_head **jh_out,

			      sector_t	   blocknr);

			      unsigned long long   blocknr);



/* Transaction locking */

extern void		__wait_on_journal (journal_t *);
@@ -923,7 +923,7 @@ extern void jbd2_journal_unlock_updates (journal_t *); 


extern journal_t * jbd2_journal_init_dev(struct block_device *bdev,

				struct block_device *fs_dev,

				sector_t start, int len, int bsize);

				unsigned long long 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 void jbd2_journal_abort (journal_t *, int); 
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, sector_t *);

extern int	   jbd2_journal_bmap(journal_t *, unsigned long, unsigned long long *);

extern int	   jbd2_journal_force_commit(journal_t *);



/*
@@ -977,13 +977,13 @@ extern void jbd2_journal_destroy_revoke_caches(void); 
extern int	   jbd2_journal_init_revoke_caches(void);



extern void	   jbd2_journal_destroy_revoke(journal_t *);

extern int	   jbd2_journal_revoke (handle_t *, sector_t, struct buffer_head *);

extern int	   jbd2_journal_revoke (handle_t *, unsigned long long, 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 *, sector_t, tid_t);

extern int	jbd2_journal_test_revoke(journal_t *, sector_t, tid_t);

extern int	jbd2_journal_set_revoke(journal_t *, unsigned long long, tid_t);

extern int	jbd2_journal_test_revoke(journal_t *, unsigned long long, tid_t);

extern void	jbd2_journal_clear_revoke(journal_t *);

extern void	jbd2_journal_switch_revoke_table(journal_t *journal);