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

Commit bbbd27e6 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 

Pull ext2, ext3, udf updates from Jan Kara:
 "Several UDF fixes, a support for UDF extent cache, and couple of ext2
  and ext3 cleanups and minor fixes"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  Ext2: remove the static function release_blocks to optimize the kernel
  Ext2: mark inode dirty after the function dquot_free_block_nodirty is called
  Ext2: remove the overhead check about sb in the function ext2_new_blocks
  udf: Remove unused s_extLength from udf_bitmap
  udf: Make s_block_bitmap standard array
  udf: Fix bitmap overflow on large filesystems with small block size
  udf: add extent cache support in case of file reading
  udf: Write LVID to disk after opening / closing
  Ext3: return ENOMEM rather than EIO if sb_getblk fails
  Ext2: return ENOMEM rather than EIO if sb_getblk fails
  Ext3: use unlikely to improve the efficiency of the kernel
  Ext2: use unlikely to improve the efficiency of the kernel
  Ext3: add necessary check in case IO error happens
  Ext2: free memory allocated and forget buffer head when io error happens
  ext3: Fix memory leak when quota options are specified multiple times
  ext3, ext4, ocfs2: remove unused macro NAMEI_RA_INDEX
parents a6590b9f 712ddc52

fs/ext2/balloc.c

+10 −18
Original line number Diff line number Diff line
@@ -159,15 +159,6 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group) 
	return bh;

}



static void release_blocks(struct super_block *sb, int count)

{

	if (count) {

		struct ext2_sb_info *sbi = EXT2_SB(sb);



		percpu_counter_add(&sbi->s_freeblocks_counter, count);

	}

}



static void group_adjust_blocks(struct super_block *sb, int group_no,

	struct ext2_group_desc *desc, struct buffer_head *bh, int count)

{
@@ -568,8 +559,11 @@ void ext2_free_blocks (struct inode * inode, unsigned long block, 
	}

error_return:

	brelse(bitmap_bh);

	release_blocks(sb, freed);

	if (freed) {

		percpu_counter_add(&sbi->s_freeblocks_counter, freed);

		dquot_free_block_nodirty(inode, freed);

		mark_inode_dirty(inode);

	}

}



/**
@@ -1239,10 +1233,6 @@ ext2_fsblk_t ext2_new_blocks(struct inode *inode, ext2_fsblk_t goal, 


	*errp = -ENOSPC;

	sb = inode->i_sb;

	if (!sb) {

		printk("ext2_new_blocks: nonexistent device");

		return 0;

	}



	/*

	 * Check quota for allocation of this block.
@@ -1416,9 +1406,11 @@ ext2_fsblk_t ext2_new_blocks(struct inode *inode, ext2_fsblk_t goal, 


	*errp = 0;

	brelse(bitmap_bh);

	if (num < *count) {

		dquot_free_block_nodirty(inode, *count-num);

		mark_inode_dirty(inode);

		*count = num;

	}

	return ret_block;



io_error:

fs/ext2/inode.c

+12 −0
Original line number Diff line number Diff line
@@ -495,6 +495,10 @@ static int ext2_alloc_branch(struct inode *inode, 
		 * parent to disk.

		 */

		bh = sb_getblk(inode->i_sb, new_blocks[n-1]);

		if (unlikely(!bh)) {

			err = -ENOMEM;

			goto failed;

		}

		branch[n].bh = bh;

		lock_buffer(bh);

		memset(bh->b_data, 0, blocksize);
@@ -523,6 +527,14 @@ static int ext2_alloc_branch(struct inode *inode, 
	}

	*blks = num;

	return err;



failed:

	for (i = 1; i < n; i++)

		bforget(branch[i].bh);

	for (i = 0; i < indirect_blks; i++)

		ext2_free_blocks(inode, new_blocks[i], 1);

	ext2_free_blocks(inode, new_blocks[i], num);

	return err;

}



/**

fs/ext2/super.c

+1 −1
Original line number Diff line number Diff line
@@ -1500,7 +1500,7 @@ static ssize_t ext2_quota_write(struct super_block *sb, int type, 
			bh = sb_bread(sb, tmp_bh.b_blocknr);

		else

			bh = sb_getblk(sb, tmp_bh.b_blocknr);

		if (!bh) {

		if (unlikely(!bh)) {

			err = -EIO;

			goto out;

		}

fs/ext2/xattr.c

+2 −2
Original line number Diff line number Diff line
@@ -662,10 +662,10 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh, 
			ea_idebug(inode, "creating block %d", block);



			new_bh = sb_getblk(sb, block);

			if (!new_bh) {

			if (unlikely(!new_bh)) {

				ext2_free_blocks(inode, block, 1);

				mark_inode_dirty(inode);

				error = -EIO;

				error = -ENOMEM;

				goto cleanup;

			}

			lock_buffer(new_bh);

fs/ext3/inode.c

+10 −6
Original line number Diff line number Diff line
@@ -676,6 +676,10 @@ static int ext3_alloc_branch(handle_t *handle, struct inode *inode, 
		 * parent to disk.

		 */

		bh = sb_getblk(inode->i_sb, new_blocks[n-1]);

		if (unlikely(!bh)) {

			err = -ENOMEM;

			goto failed;

		}

		branch[n].bh = bh;

		lock_buffer(bh);

		BUFFER_TRACE(bh, "call get_create_access");
@@ -1078,8 +1082,8 @@ struct buffer_head *ext3_getblk(handle_t *handle, struct inode *inode, 
	if (!err && buffer_mapped(&dummy)) {

		struct buffer_head *bh;

		bh = sb_getblk(inode->i_sb, dummy.b_blocknr);

		if (!bh) {

			*errp = -EIO;

		if (unlikely(!bh)) {

			*errp = -ENOMEM;

			goto err;

		}

		if (buffer_new(&dummy)) {
@@ -2729,12 +2733,12 @@ static int __ext3_get_inode_loc(struct inode *inode, 
		return -EIO;



	bh = sb_getblk(inode->i_sb, block);

	if (!bh) {

	if (unlikely(!bh)) {

		ext3_error (inode->i_sb, "ext3_get_inode_loc",

				"unable to read inode block - "

				"inode=%lu, block="E3FSBLK,

				 inode->i_ino, block);

		return -EIO;

		return -ENOMEM;

	}

	if (!buffer_uptodate(bh)) {

		lock_buffer(bh);
@@ -2783,7 +2787,7 @@ static int __ext3_get_inode_loc(struct inode *inode, 


			bitmap_bh = sb_getblk(inode->i_sb,

					le32_to_cpu(desc->bg_inode_bitmap));

			if (!bitmap_bh)

			if (unlikely(!bitmap_bh))

				goto make_io;



			/*