Commit 16e08b14 authored by zhangyi (F)'s avatar zhangyi (F) Committed by Theodore Ts'o
Browse files

ext4: cleanup clean_bdev_aliases() calls 



Now, we have already handle all cases of forgetting buffer in
jbd2_journal_forget(), the buffer should not be mapped to blockdevice
when reallocating it. So this patch remove all clean_bdev_aliases() and
clean_bdev_bh_alias() calls which were invoked by ext4 explicitly.

Suggested-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
parent 59759926

fs/ext4/extents.c

+1 −11
Original line number Diff line number Diff line
@@ -4048,18 +4048,8 @@ out: 
	} else

		allocated = ret;

	map->m_flags |= EXT4_MAP_NEW;

	/*

	 * if we allocated more blocks than requested

	 * we need to make sure we unmap the extra block

	 * allocated. The actual needed block will get

	 * unmapped later when we find the buffer_head marked

	 * new.

	 */

	if (allocated > map->m_len) {

		clean_bdev_aliases(inode->i_sb->s_bdev, newblock + map->m_len,

				   allocated - map->m_len);

	if (allocated > map->m_len)

		allocated = map->m_len;

	}

	map->m_len = allocated;



map_out:

fs/ext4/inode.c

+0 −7
Original line number Diff line number Diff line
@@ -678,8 +678,6 @@ found: 
		if (flags & EXT4_GET_BLOCKS_ZERO &&

		    map->m_flags & EXT4_MAP_MAPPED &&

		    map->m_flags & EXT4_MAP_NEW) {

			clean_bdev_aliases(inode->i_sb->s_bdev, map->m_pblk,

					   map->m_len);

			ret = ext4_issue_zeroout(inode, map->m_lblk,

						 map->m_pblk, map->m_len);

			if (ret) {
@@ -1194,7 +1192,6 @@ static int ext4_block_write_begin(struct page *page, loff_t pos, unsigned len, 
			if (err)

				break;

			if (buffer_new(bh)) {

				clean_bdev_bh_alias(bh);

				if (PageUptodate(page)) {

					clear_buffer_new(bh);

					set_buffer_uptodate(bh);
@@ -2490,10 +2487,6 @@ static int mpage_map_one_extent(handle_t *handle, struct mpage_da_data *mpd) 
	}



	BUG_ON(map->m_len == 0);

	if (map->m_flags & EXT4_MAP_NEW) {

		clean_bdev_aliases(inode->i_sb->s_bdev, map->m_pblk,

				   map->m_len);

	}

	return 0;

}

fs/ext4/page-io.c

+1 −3
Original line number Diff line number Diff line
@@ -467,10 +467,8 @@ int ext4_bio_write_page(struct ext4_io_submit *io, 
				ext4_io_submit(io);

			continue;

		}

		if (buffer_new(bh)) {

		if (buffer_new(bh))

			clear_buffer_new(bh);

			clean_bdev_bh_alias(bh);

		}

		set_buffer_async_write(bh);

		nr_to_submit++;

	} while ((bh = bh->b_this_page) != head);

CRA Git | Maintained and supported by SUSTech CRA and CCSE