Commit c01a25e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: Remove bogus BUG() check in ext4_bmap()
  ext4: Fix building with EXT4FS_DEBUG
  ext4: Initialize the new group descriptor when resizing the filesystem
  ext4: Fix ext4_free_blocks() w/o a journal when files have indirect blocks
  jbd2: On a __journal_expect() assertion failure printk "JBD2", not "EXT3-fs"
  ext3: Add sanity check to make_indexed_dir
  ext4: Add sanity check to make_indexed_dir
  ext4: only use i_size_high for regular files
  ext4: fix wrong use of do_div
parents ae704e9f b9ec63f7

fs/ext3/namei.c

+14 −6
Original line number Diff line number Diff line
@@ -1358,7 +1358,7 @@ static int make_indexed_dir(handle_t *handle, struct dentry *dentry, 
	struct fake_dirent *fde;



	blocksize =  dir->i_sb->s_blocksize;

	dxtrace(printk("Creating index\n"));

	dxtrace(printk(KERN_DEBUG "Creating index: inode %lu\n", dir->i_ino));

	retval = ext3_journal_get_write_access(handle, bh);

	if (retval) {

		ext3_std_error(dir->i_sb, retval);
@@ -1367,6 +1367,19 @@ static int make_indexed_dir(handle_t *handle, struct dentry *dentry, 
	}

	root = (struct dx_root *) bh->b_data;



	/* The 0th block becomes the root, move the dirents out */

	fde = &root->dotdot;

	de = (struct ext3_dir_entry_2 *)((char *)fde +

			ext3_rec_len_from_disk(fde->rec_len));

	if ((char *) de >= (((char *) root) + blocksize)) {

		ext3_error(dir->i_sb, __func__,

			   "invalid rec_len for '..' in inode %lu",

			   dir->i_ino);

		brelse(bh);

		return -EIO;

	}

	len = ((char *) root) + blocksize - (char *) de;



	bh2 = ext3_append (handle, dir, &block, &retval);

	if (!(bh2)) {

		brelse(bh);
@@ -1375,11 +1388,6 @@ static int make_indexed_dir(handle_t *handle, struct dentry *dentry, 
	EXT3_I(dir)->i_flags |= EXT3_INDEX_FL;

	data1 = bh2->b_data;



	/* The 0th block becomes the root, move the dirents out */

	fde = &root->dotdot;

	de = (struct ext3_dir_entry_2 *)((char *)fde +

			ext3_rec_len_from_disk(fde->rec_len));

	len = ((char *) root) + blocksize - (char *) de;

	memcpy (data1, de, len);

	de = (struct ext3_dir_entry_2 *) data1;

	top = data1 + len;

fs/ext4/balloc.c

+3 −3
Original line number Diff line number Diff line
@@ -684,15 +684,15 @@ ext4_fsblk_t ext4_count_free_blocks(struct super_block *sb) 
		gdp = ext4_get_group_desc(sb, i, NULL);

		if (!gdp)

			continue;

		desc_count += le16_to_cpu(gdp->bg_free_blocks_count);

		desc_count += ext4_free_blks_count(sb, gdp);

		brelse(bitmap_bh);

		bitmap_bh = ext4_read_block_bitmap(sb, i);

		if (bitmap_bh == NULL)

			continue;



		x = ext4_count_free(bitmap_bh, sb->s_blocksize);

		printk(KERN_DEBUG "group %lu: stored = %d, counted = %u\n",

			i, le16_to_cpu(gdp->bg_free_blocks_count), x);

		printk(KERN_DEBUG "group %u: stored = %d, counted = %u\n",

			i, ext4_free_blks_count(sb, gdp), x);

		bitmap_count += x;

	}

	brelse(bitmap_bh);

fs/ext4/ext4.h

+5 −2
Original line number Diff line number Diff line
@@ -1206,8 +1206,11 @@ static inline void ext4_r_blocks_count_set(struct ext4_super_block *es, 


static inline loff_t ext4_isize(struct ext4_inode *raw_inode)

{

	if (S_ISREG(le16_to_cpu(raw_inode->i_mode)))

		return ((loff_t)le32_to_cpu(raw_inode->i_size_high) << 32) |

			le32_to_cpu(raw_inode->i_size_lo);

	else

		return (loff_t) le32_to_cpu(raw_inode->i_size_lo);

}



static inline void ext4_isize_set(struct ext4_inode *raw_inode, loff_t i_size)

fs/ext4/extents.c

+1 −1
Original line number Diff line number Diff line
@@ -3048,7 +3048,7 @@ retry: 
			WARN_ON(ret <= 0);

			printk(KERN_ERR "%s: ext4_ext_get_blocks "

				    "returned error inode#%lu, block=%u, "

				    "max_blocks=%lu", __func__,

				    "max_blocks=%u", __func__,

				    inode->i_ino, block, max_blocks);

#endif

			ext4_mark_inode_dirty(handle, inode);

fs/ext4/inode.c

+3 −6
Original line number Diff line number Diff line
@@ -360,9 +360,9 @@ static int ext4_block_to_path(struct inode *inode, 
		final = ptrs;

	} else {

		ext4_warning(inode->i_sb, "ext4_block_to_path",

				"block %lu > max",

				"block %lu > max in inode %lu",

				i_block + direct_blocks +

				indirect_blocks + double_blocks);

				indirect_blocks + double_blocks, inode->i_ino);

	}

	if (boundary)

		*boundary = final - 1 - (i_block & (ptrs - 1));
@@ -2821,9 +2821,6 @@ static sector_t ext4_bmap(struct address_space *mapping, sector_t block) 
		filemap_write_and_wait(mapping);

	}



	BUG_ON(!EXT4_JOURNAL(inode) &&

	       EXT4_I(inode)->i_state & EXT4_STATE_JDATA);



	if (EXT4_JOURNAL(inode) && EXT4_I(inode)->i_state & EXT4_STATE_JDATA) {

		/*

		 * This is a REALLY heavyweight approach, but the use of
@@ -3622,7 +3619,7 @@ static void ext4_free_data(handle_t *handle, struct inode *inode, 
		 * block pointed to itself, it would have been detached when

		 * the block was cleared. Check for this instead of OOPSing.

		 */

		if (bh2jh(this_bh))

		if ((EXT4_JOURNAL(inode) == NULL) || bh2jh(this_bh))

			ext4_handle_dirty_metadata(handle, inode, this_bh);

		else

			ext4_error(inode->i_sb, __func__,

CRA Git | Maintained and supported by SUSTech CRA and CCSE