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

Commit e64855c6 authored by Jan Kara's avatar Jan Kara Committed by Jens Axboe
Browse files

fs: Add helper to clean bdev aliases under a bh and use it 



Add a helper function that clears buffer heads from a block device
aliasing passed bh. Use this helper function from filesystems instead of
the original unmap_underlying_metadata() to save some boiler plate code
and also have a better name for the functionalily since it is not
unmapping anything for a *long* time.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 69a9bea1

fs/buffer.c

+3 −5
Original line number Diff line number Diff line
@@ -1821,8 +1821,7 @@ int __block_write_full_page(struct inode *inode, struct page *page, 
			if (buffer_new(bh)) {

				/* blockdev mappings never come here */

				clear_buffer_new(bh);

				unmap_underlying_metadata(bh->b_bdev,

							bh->b_blocknr);

				clean_bdev_bh_alias(bh);

			}

		}

		bh = bh->b_this_page;
@@ -2068,8 +2067,7 @@ int __block_write_begin_int(struct page *page, loff_t pos, unsigned len, 
			}



			if (buffer_new(bh)) {

				unmap_underlying_metadata(bh->b_bdev,

							bh->b_blocknr);

				clean_bdev_bh_alias(bh);

				if (PageUptodate(page)) {

					clear_buffer_new(bh);

					set_buffer_uptodate(bh);
@@ -2709,7 +2707,7 @@ int nobh_write_begin(struct address_space *mapping, 
		if (!buffer_mapped(bh))

			is_mapped_to_disk = 0;

		if (buffer_new(bh))

			unmap_underlying_metadata(bh->b_bdev, bh->b_blocknr);

			clean_bdev_bh_alias(bh);

		if (PageUptodate(page)) {

			set_buffer_uptodate(bh);

			continue;

fs/ext4/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -1123,8 +1123,7 @@ static int ext4_block_write_begin(struct page *page, loff_t pos, unsigned len, 
			if (err)

				break;

			if (buffer_new(bh)) {

				unmap_underlying_metadata(bh->b_bdev,

							  bh->b_blocknr);

				clean_bdev_bh_alias(bh);

				if (PageUptodate(page)) {

					clear_buffer_new(bh);

					set_buffer_uptodate(bh);

fs/ext4/page-io.c

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ int ext4_bio_write_page(struct ext4_io_submit *io, 
		}

		if (buffer_new(bh)) {

			clear_buffer_new(bh);

			unmap_underlying_metadata(bh->b_bdev, bh->b_blocknr);

			clean_bdev_bh_alias(bh);

		}

		set_buffer_async_write(bh);

		nr_to_submit++;

fs/mpage.c

+1 −2
Original line number Diff line number Diff line
@@ -555,8 +555,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc, 
		if (mpd->get_block(inode, block_in_file, &map_bh, 1))

			goto confused;

		if (buffer_new(&map_bh))

			unmap_underlying_metadata(map_bh.b_bdev,

						map_bh.b_blocknr);

			clean_bdev_bh_alias(&map_bh);

		if (buffer_boundary(&map_bh)) {

			boundary_block = map_bh.b_blocknr;

			boundary_bdev = map_bh.b_bdev;

fs/ntfs/aops.c

+1 −1
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ static int ntfs_write_block(struct page *page, struct writeback_control *wbc) 
			}

			// TODO: Instantiate the hole.

			// clear_buffer_new(bh);

			// unmap_underlying_metadata(bh->b_bdev, bh->b_blocknr);

			// clean_bdev_bh_alias(bh);

			ntfs_error(vol->sb, "Writing into sparse regions is "

					"not supported yet. Sorry.");

			err = -EOPNOTSUPP;