Commit 86d52921 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: make btrfs_delalloc_release_space take btrfs_inode 



It needs btrfs_inode so take it as a parameter directly.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 25ce28ca

fs/btrfs/delalloc-space.c

+3 −3
Original line number Diff line number Diff line
@@ -579,10 +579,10 @@ int btrfs_delalloc_reserve_space(struct inode *inode, 
 * list if there are no delalloc bytes left.

 * Also it will handle the qgroup reserved space.

 */

void btrfs_delalloc_release_space(struct inode *inode,

void btrfs_delalloc_release_space(struct btrfs_inode *inode,

				  struct extent_changeset *reserved,

				  u64 start, u64 len, bool qgroup_free)

{

	btrfs_delalloc_release_metadata(BTRFS_I(inode), len, qgroup_free);

	btrfs_free_reserved_data_space(BTRFS_I(inode), reserved, start, len);

	btrfs_delalloc_release_metadata(inode, len, qgroup_free);

	btrfs_free_reserved_data_space(inode, reserved, start, len);

}

fs/btrfs/delalloc-space.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ int btrfs_check_data_free_space(struct inode *inode, 
			struct extent_changeset **reserved, u64 start, u64 len);

void btrfs_free_reserved_data_space(struct btrfs_inode *inode,

			struct extent_changeset *reserved, u64 start, u64 len);

void btrfs_delalloc_release_space(struct inode *inode,

void btrfs_delalloc_release_space(struct btrfs_inode *inode,

				  struct extent_changeset *reserved,

				  u64 start, u64 len, bool qgroup_free);

void btrfs_free_reserved_data_space_noquota(struct btrfs_fs_info *fs_info,

fs/btrfs/file.c

+3 −2
Original line number Diff line number Diff line
@@ -1784,7 +1784,7 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb, 
				__pos = round_down(pos,

						   fs_info->sectorsize) +

					(dirty_pages << PAGE_SHIFT);

				btrfs_delalloc_release_space(inode,

				btrfs_delalloc_release_space(BTRFS_I(inode),

						data_reserved, __pos,

						release_bytes, true);

			}
@@ -1850,7 +1850,8 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb, 
			btrfs_delalloc_release_metadata(BTRFS_I(inode),

					release_bytes, true);

		} else {

			btrfs_delalloc_release_space(inode, data_reserved,

			btrfs_delalloc_release_space(BTRFS_I(inode),

					data_reserved,

					round_down(pos, fs_info->sectorsize),

					release_bytes, true);

		}

fs/btrfs/inode.c

+14 −12
Original line number Diff line number Diff line
@@ -2328,7 +2328,8 @@ static void btrfs_writepage_fixup_worker(struct btrfs_work *work) 
		if (!ret) {

			btrfs_delalloc_release_extents(BTRFS_I(inode),

						       PAGE_SIZE);

			btrfs_delalloc_release_space(inode, data_reserved,

			btrfs_delalloc_release_space(BTRFS_I(inode),

						     data_reserved,

						     page_start, PAGE_SIZE,

						     true);

		}
@@ -2378,8 +2379,8 @@ static void btrfs_writepage_fixup_worker(struct btrfs_work *work) 
out_reserved:

	btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE);

	if (free_delalloc_space)

		btrfs_delalloc_release_space(inode, data_reserved, page_start,

					     PAGE_SIZE, true);

		btrfs_delalloc_release_space(BTRFS_I(inode), data_reserved,

					     page_start, PAGE_SIZE, true);

	unlock_extent_cached(&BTRFS_I(inode)->io_tree, page_start, page_end,

			     &cached_state);

out_page:
@@ -4539,7 +4540,7 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, 
again:

	page = find_or_create_page(mapping, index, mask);

	if (!page) {

		btrfs_delalloc_release_space(inode, data_reserved,

		btrfs_delalloc_release_space(BTRFS_I(inode), data_reserved,

					     block_start, blocksize, true);

		btrfs_delalloc_release_extents(BTRFS_I(inode), blocksize);

		ret = -ENOMEM;
@@ -4615,7 +4616,7 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, 
			btrfs_delalloc_release_metadata(BTRFS_I(inode),

					blocksize, true);

		else

			btrfs_delalloc_release_space(inode, data_reserved,

			btrfs_delalloc_release_space(BTRFS_I(inode), data_reserved,

					block_start, blocksize, true);

	}

	btrfs_delalloc_release_extents(BTRFS_I(inode), blocksize);
@@ -7947,8 +7948,9 @@ static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter) 
		current->journal_info = NULL;

		if (ret < 0 && ret != -EIOCBQUEUED) {

			if (dio_data.reserve)

				btrfs_delalloc_release_space(inode, data_reserved,

					offset, dio_data.reserve, true);

				btrfs_delalloc_release_space(BTRFS_I(inode),

					data_reserved, offset, dio_data.reserve,

					true);

			/*

			 * On error we might have left some ordered extents

			 * without submitting corresponding bios for them, so
@@ -7963,7 +7965,7 @@ static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter) 
					dio_data.unsubmitted_oe_range_start,

					false);

		} else if (ret >= 0 && (size_t)ret < count)

			btrfs_delalloc_release_space(inode, data_reserved,

			btrfs_delalloc_release_space(BTRFS_I(inode), data_reserved,

					offset, count - (size_t)ret, true);

		btrfs_delalloc_release_extents(BTRFS_I(inode), count);

	}
@@ -8277,9 +8279,9 @@ vm_fault_t btrfs_page_mkwrite(struct vm_fault *vmf) 
					  fs_info->sectorsize);

		if (reserved_space < PAGE_SIZE) {

			end = page_start + reserved_space - 1;

			btrfs_delalloc_release_space(inode, data_reserved,

					page_start, PAGE_SIZE - reserved_space,

					true);

			btrfs_delalloc_release_space(BTRFS_I(inode),

					data_reserved, page_start,

					PAGE_SIZE - reserved_space, true);

		}

	}
@@ -8334,7 +8336,7 @@ vm_fault_t btrfs_page_mkwrite(struct vm_fault *vmf) 
	unlock_page(page);

out:

	btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE);

	btrfs_delalloc_release_space(inode, data_reserved, page_start,

	btrfs_delalloc_release_space(BTRFS_I(inode), data_reserved, page_start,

				     reserved_space, (ret != 0));

out_noreserve:

	sb_end_pagefault(inode->i_sb);

fs/btrfs/ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -1333,7 +1333,7 @@ static int cluster_pages_for_defrag(struct inode *inode, 
		spin_lock(&BTRFS_I(inode)->lock);

		btrfs_mod_outstanding_extents(BTRFS_I(inode), 1);

		spin_unlock(&BTRFS_I(inode)->lock);

		btrfs_delalloc_release_space(inode, data_reserved,

		btrfs_delalloc_release_space(BTRFS_I(inode), data_reserved,

				start_index << PAGE_SHIFT,

				(page_cnt - i_done) << PAGE_SHIFT, true);

	}
@@ -1361,7 +1361,7 @@ static int cluster_pages_for_defrag(struct inode *inode, 
		unlock_page(pages[i]);

		put_page(pages[i]);

	}

	btrfs_delalloc_release_space(inode, data_reserved,

	btrfs_delalloc_release_space(BTRFS_I(inode), data_reserved,

			start_index << PAGE_SHIFT,

			page_cnt << PAGE_SHIFT, true);

	btrfs_delalloc_release_extents(BTRFS_I(inode), page_cnt << PAGE_SHIFT);