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

Commit 7d2f280e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: (24 commits)
  quota: Fix possible oops in __dquot_initialize()
  ext3: Update kernel-doc comments
  jbd/2: fixed typos
  ext2: fixed typo.
  ext3: Fix debug messages in ext3_group_extend()
  jbd: Convert atomic_inc() to get_bh()
  ext3: Remove misplaced BUFFER_TRACE() in ext3_truncate()
  jbd: Fix debug message in do_get_write_access()
  jbd: Check return value of __getblk()
  ext3: Use DIV_ROUND_UP() on group desc block counting
  ext3: Return proper error code on ext3_fill_super()
  ext3: Remove unnecessary casts on bh->b_data
  ext3: Cleanup ext3_setup_super()
  quota: Fix issuing of warnings from dquot_transfer
  quota: fix dquot_disable vs dquot_transfer race v2
  jbd: Convert bitops to buffer fns
  ext3/jbd: Avoid WARN() messages when failing to write the superblock
  jbd: Use offset_in_page() instead of manual calculation
  jbd: Remove unnecessary goto statement
  jbd: Use printk_ratelimited() in journal_alloc_journal_head()
  ...
parents e3e1288e 4408ea41

fs/ext2/balloc.c

+1 −2
Original line number Diff line number Diff line
@@ -646,10 +646,9 @@ find_next_usable_block(int start, struct buffer_head *bh, int maxblocks) 
	return here;

}



/*

/**

 * ext2_try_to_allocate()

 * @sb:			superblock

 * @handle:		handle to this transaction

 * @group:		given allocation block group

 * @bitmap_bh:		bufferhead holds the block bitmap

 * @grp_goal:		given target block within the group

fs/ext3/balloc.c

+10 −7
Original line number Diff line number Diff line
@@ -792,9 +792,9 @@ find_next_usable_block(ext3_grpblk_t start, struct buffer_head *bh, 
	if (here < 0)

		here = 0;



	p = ((char *)bh->b_data) + (here >> 3);

	p = bh->b_data + (here >> 3);

	r = memscan(p, 0, ((maxblocks + 7) >> 3) - (here >> 3));

	next = (r - ((char *)bh->b_data)) << 3;

	next = (r - bh->b_data) << 3;



	if (next < maxblocks && next >= start && ext3_test_allocatable(next, bh))

		return next;
@@ -810,8 +810,9 @@ find_next_usable_block(ext3_grpblk_t start, struct buffer_head *bh, 


/**

 * claim_block()

 * @lock:		the spin lock for this block group

 * @block:		the free block (group relative) to allocate

 * @bh:			the bufferhead containts the block group bitmap

 * @bh:			the buffer_head contains the block group bitmap

 *

 * We think we can allocate this block in this bitmap.  Try to set the bit.

 * If that succeeds then check that nobody has allocated and then freed the
@@ -956,9 +957,11 @@ ext3_try_to_allocate(struct super_block *sb, handle_t *handle, int group, 
 *		but we will shift to the place where start_block is,

 *		then start from there, when looking for a reservable space.

 *

 *	@size: the target new reservation window size

 *	@my_rsv: the reservation window

 *

 *	@group_first_block: the first block we consider to start

 *	@sb: the super block

 *

 *	@start_block: the first block we consider to start

 *			the real search from

 *

 *	@last_block:
@@ -1084,7 +1087,7 @@ static int find_next_reservable_window( 
 *

 *	failed: we failed to find a reservation window in this group

 *

 *	@rsv: the reservation

 *	@my_rsv: the reservation window

 *

 *	@grp_goal: The goal (group-relative).  It is where the search for a

 *		free reservable space should start from.
@@ -1273,8 +1276,8 @@ static void try_to_extend_reservation(struct ext3_reserve_window_node *my_rsv, 
 * @group:		given allocation block group

 * @bitmap_bh:		bufferhead holds the block bitmap

 * @grp_goal:		given target block within the group

 * @count:		target number of blocks to allocate

 * @my_rsv:		reservation window

 * @count:		target number of blocks to allocate

 * @errp:		pointer to store the error code

 *

 * This is the main function used to allocate a new block and its reservation

fs/ext3/ialloc.c

+8 −3
Original line number Diff line number Diff line
@@ -570,9 +570,14 @@ struct inode *ext3_new_inode(handle_t *handle, struct inode * dir, int mode) 
	ei->i_state_flags = 0;

	ext3_set_inode_state(inode, EXT3_STATE_NEW);



	/* See comment in ext3_iget for explanation */

	if (ino >= EXT3_FIRST_INO(sb) + 1 &&

	    EXT3_INODE_SIZE(sb) > EXT3_GOOD_OLD_INODE_SIZE) {

		ei->i_extra_isize =

		(EXT3_INODE_SIZE(inode->i_sb) > EXT3_GOOD_OLD_INODE_SIZE) ?

		sizeof(struct ext3_inode) - EXT3_GOOD_OLD_INODE_SIZE : 0;

			sizeof(struct ext3_inode) - EXT3_GOOD_OLD_INODE_SIZE;

	} else {

		ei->i_extra_isize = 0;

	}



	ret = inode;

	dquot_initialize(inode);

fs/ext3/inode.c

+12 −8
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static ext3_fsblk_t ext3_find_goal(struct inode *inode, long block, 
}



/**

 *	ext3_blks_to_allocate: Look up the block map and count the number

 *	ext3_blks_to_allocate - Look up the block map and count the number

 *	of direct blocks need to be allocated for the given branch.

 *

 *	@branch: chain of indirect blocks
@@ -536,14 +536,18 @@ static int ext3_blks_to_allocate(Indirect *branch, int k, unsigned long blks, 
}



/**

 *	ext3_alloc_blocks: multiple allocate blocks needed for a branch

 *	ext3_alloc_blocks - multiple allocate blocks needed for a branch

 *	@handle: handle for this transaction

 *	@inode: owner

 *	@goal: preferred place for allocation

 *	@indirect_blks: the number of blocks need to allocate for indirect

 *			blocks

 *

 *	@blks:	number of blocks need to allocated for direct blocks

 *	@new_blocks: on return it will store the new block numbers for

 *	the indirect blocks(if needed) and the first direct block,

 *	@blks:	on return it will store the total number of allocated

 *		direct blocks

 *	@err: here we store the error value

 *

 *	return the number of direct blocks allocated

 */

static int ext3_alloc_blocks(handle_t *handle, struct inode *inode,

			ext3_fsblk_t goal, int indirect_blks, int blks,
@@ -598,9 +602,11 @@ static int ext3_alloc_blocks(handle_t *handle, struct inode *inode, 


/**

 *	ext3_alloc_branch - allocate and set up a chain of blocks.

 *	@handle: handle for this transaction

 *	@inode: owner

 *	@indirect_blks: number of allocated indirect blocks

 *	@blks: number of allocated direct blocks

 *	@goal: preferred place for allocation

 *	@offsets: offsets (in the blocks) to store the pointers to next.

 *	@branch: place to store the chain in.

 *
@@ -700,10 +706,9 @@ static int ext3_alloc_branch(handle_t *handle, struct inode *inode, 


/**

 * ext3_splice_branch - splice the allocated branch onto inode.

 * @handle: handle for this transaction

 * @inode: owner

 * @block: (logical) number of block we are adding

 * @chain: chain of indirect blocks (with a missing link - see

 *	ext3_alloc_branch)

 * @where: location of missing link

 * @num:   number of indirect blocks we are adding

 * @blks:  number of direct blocks we are adding
@@ -2530,7 +2535,6 @@ void ext3_truncate(struct inode *inode) 
			 */

		} else {

			/* Shared branch grows from an indirect block */

			BUFFER_TRACE(partial->bh, "get_write_access");

			ext3_free_branches(handle, inode, partial->bh,

					partial->p,

					partial->p+1, (chain+n-1) - partial);

fs/ext3/resize.c

+7 −6
Original line number Diff line number Diff line
@@ -977,7 +977,8 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es, 
	o_blocks_count = le32_to_cpu(es->s_blocks_count);



	if (test_opt(sb, DEBUG))

		printk(KERN_DEBUG "EXT3-fs: extending last group from "E3FSBLK" uto "E3FSBLK" blocks\n",

		printk(KERN_DEBUG "EXT3-fs: extending last group from "E3FSBLK

		       " upto "E3FSBLK" blocks\n",

		       o_blocks_count, n_blocks_count);



	if (n_blocks_count == 0 || n_blocks_count == o_blocks_count)
@@ -985,7 +986,7 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es, 


	if (n_blocks_count > (sector_t)(~0ULL) >> (sb->s_blocksize_bits - 9)) {

		printk(KERN_ERR "EXT3-fs: filesystem on %s:"

			" too large to resize to %lu blocks safely\n",

			" too large to resize to "E3FSBLK" blocks safely\n",

			sb->s_id, n_blocks_count);

		if (sizeof(sector_t) < 8)

			ext3_warning(sb, __func__,
@@ -1065,11 +1066,11 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es, 
	es->s_blocks_count = cpu_to_le32(o_blocks_count + add);

	ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh);

	mutex_unlock(&EXT3_SB(sb)->s_resize_lock);

	ext3_debug("freeing blocks %lu through "E3FSBLK"\n", o_blocks_count,

		   o_blocks_count + add);

	ext3_debug("freeing blocks "E3FSBLK" through "E3FSBLK"\n",

		   o_blocks_count, o_blocks_count + add);

	ext3_free_blocks_sb(handle, sb, o_blocks_count, add, &freed_blocks);

	ext3_debug("freed blocks "E3FSBLK" through "E3FSBLK"\n", o_blocks_count,

		   o_blocks_count + add);

	ext3_debug("freed blocks "E3FSBLK" through "E3FSBLK"\n",

		   o_blocks_count, o_blocks_count + add);

	if ((err = ext3_journal_stop(handle)))

		goto exit_put;

	if (test_opt(sb, DEBUG))