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

Commit e182163d authored by Omar Sandoval's avatar Omar Sandoval Committed by David Sterba
Browse files

btrfs: stop clearing EXTENT_DIRTY in inode I/O tree 



Since commit fee187d9 ("Btrfs: do not set EXTENT_DIRTY along with
EXTENT_DELALLOC"), we never set EXTENT_DIRTY in inode->io_tree, so we
can simplify and stop trying to clear it.

Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarOmar Sandoval <osandov@fb.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent f50cb7af

fs/btrfs/extent_io.c

+2 −4
Original line number Diff line number Diff line
@@ -4322,10 +4322,8 @@ int extent_invalidatepage(struct extent_io_tree *tree, 


	lock_extent_bits(tree, start, end, &cached_state);

	wait_on_page_writeback(page);

	clear_extent_bit(tree, start, end,

			 EXTENT_LOCKED | EXTENT_DIRTY | EXTENT_DELALLOC |

			 EXTENT_DO_ACCOUNTING,

			 1, 1, &cached_state);

	clear_extent_bit(tree, start, end, EXTENT_LOCKED | EXTENT_DELALLOC |

			 EXTENT_DO_ACCOUNTING, 1, 1, &cached_state);

	return 0;

}

fs/btrfs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -537,8 +537,8 @@ int btrfs_dirty_pages(struct inode *inode, struct page **pages, 
	 * we can set things up properly

	 */

	clear_extent_bit(&BTRFS_I(inode)->io_tree, start_pos, end_of_last_block,

			 EXTENT_DIRTY | EXTENT_DELALLOC |

			 EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG, 0, 0, cached);

			 EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,

			 0, 0, cached);



	if (!btrfs_is_free_space_inode(BTRFS_I(inode))) {

		if (start_pos >= isize &&

fs/btrfs/free-space-cache.c

+4 −5
Original line number Diff line number Diff line
@@ -1006,7 +1006,7 @@ update_cache_item(struct btrfs_trans_handle *trans, 
	ret = btrfs_search_slot(trans, root, &key, path, 0, 1);

	if (ret < 0) {

		clear_extent_bit(&BTRFS_I(inode)->io_tree, 0, inode->i_size - 1,

				 EXTENT_DIRTY | EXTENT_DELALLOC, 0, 0, NULL);

				 EXTENT_DELALLOC, 0, 0, NULL);

		goto fail;

	}

	leaf = path->nodes[0];
@@ -1018,9 +1018,8 @@ update_cache_item(struct btrfs_trans_handle *trans, 
		if (found_key.objectid != BTRFS_FREE_SPACE_OBJECTID ||

		    found_key.offset != offset) {

			clear_extent_bit(&BTRFS_I(inode)->io_tree, 0,

					 inode->i_size - 1,

					 EXTENT_DIRTY | EXTENT_DELALLOC, 0, 0,

					 NULL);

					 inode->i_size - 1, EXTENT_DELALLOC, 0,

					 0, NULL);

			btrfs_release_path(path);

			goto fail;

		}
@@ -1116,7 +1115,7 @@ static int flush_dirty_cache(struct inode *inode) 
	ret = btrfs_wait_ordered_range(inode, 0, (u64)-1);

	if (ret)

		clear_extent_bit(&BTRFS_I(inode)->io_tree, 0, inode->i_size - 1,

				 EXTENT_DIRTY | EXTENT_DELALLOC, 0, 0, NULL);

				 EXTENT_DELALLOC, 0, 0, NULL);



	return ret;

}

fs/btrfs/inode.c

+16 −25
Original line number Diff line number Diff line
@@ -4986,8 +4986,7 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, 
	}



	clear_extent_bit(&BTRFS_I(inode)->io_tree, block_start, block_end,

			  EXTENT_DIRTY | EXTENT_DELALLOC |

			  EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,

			 EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,

			 0, 0, &cached_state);



	ret = btrfs_set_extent_delalloc(inode, block_start, block_end, 0,
@@ -5372,9 +5371,9 @@ static void evict_inode_truncate_pages(struct inode *inode) 
			btrfs_qgroup_free_data(inode, NULL, start, end - start + 1);



		clear_extent_bit(io_tree, start, end,

				 EXTENT_LOCKED | EXTENT_DIRTY |

				 EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING |

				 EXTENT_DEFRAG, 1, 1, &cached_state);

				 EXTENT_LOCKED | EXTENT_DELALLOC |

				 EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG, 1, 1,

				 &cached_state);



		cond_resched();

		spin_lock(&io_tree->lock);
@@ -7732,12 +7731,9 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock, 
	u64 start = iblock << inode->i_blkbits;

	u64 lockstart, lockend;

	u64 len = bh_result->b_size;

	int unlock_bits = EXTENT_LOCKED;

	int ret = 0;



	if (create)

		unlock_bits |= EXTENT_DIRTY;

	else

	if (!create)

		len = min_t(u64, len, fs_info->sectorsize);



	lockstart = start;
@@ -7796,9 +7792,8 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock, 
		if (ret < 0)

			goto unlock_err;



		/* clear and unlock the entire range */

		clear_extent_bit(&BTRFS_I(inode)->io_tree, lockstart, lockend,

				 unlock_bits, 1, 0, &cached_state);

		unlock_extent_cached(&BTRFS_I(inode)->io_tree, lockstart,

				     lockend, &cached_state);

	} else {

		ret = btrfs_get_blocks_direct_read(em, bh_result, inode,

						   start, len);
@@ -7814,9 +7809,8 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock, 
		 */

		lockstart = start + bh_result->b_size;

		if (lockstart < lockend) {

			clear_extent_bit(&BTRFS_I(inode)->io_tree, lockstart,

					 lockend, unlock_bits, 1, 0,

					 &cached_state);

			unlock_extent_cached(&BTRFS_I(inode)->io_tree,

					     lockstart, lockend, &cached_state);

		} else {

			free_extent_state(cached_state);

		}
@@ -7827,8 +7821,8 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock, 
	return 0;



unlock_err:

	clear_extent_bit(&BTRFS_I(inode)->io_tree, lockstart, lockend,

			 unlock_bits, 1, 0, &cached_state);

	unlock_extent_cached(&BTRFS_I(inode)->io_tree, lockstart, lockend,

			     &cached_state);

err:

	if (dio_data)

		current->journal_info = dio_data;
@@ -8843,8 +8837,7 @@ static void btrfs_invalidatepage(struct page *page, unsigned int offset, 
		 */

		if (!inode_evicting)

			clear_extent_bit(tree, start, end,

					 EXTENT_DIRTY | EXTENT_DELALLOC |

					 EXTENT_DELALLOC_NEW |

					 EXTENT_DELALLOC | EXTENT_DELALLOC_NEW |

					 EXTENT_LOCKED | EXTENT_DO_ACCOUNTING |

					 EXTENT_DEFRAG, 1, 0, &cached_state);

		/*
@@ -8899,8 +8892,7 @@ static void btrfs_invalidatepage(struct page *page, unsigned int offset, 
	if (PageDirty(page))

		btrfs_qgroup_free_data(inode, NULL, page_start, PAGE_SIZE);

	if (!inode_evicting) {

		clear_extent_bit(tree, page_start, page_end,

				 EXTENT_LOCKED | EXTENT_DIRTY |

		clear_extent_bit(tree, page_start, page_end, EXTENT_LOCKED |

				 EXTENT_DELALLOC | EXTENT_DELALLOC_NEW |

				 EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG, 1, 1,

				 &cached_state);
@@ -9028,9 +9020,8 @@ vm_fault_t btrfs_page_mkwrite(struct vm_fault *vmf) 
	 * reserve data&meta space before lock_page() (see above comments).

	 */

	clear_extent_bit(&BTRFS_I(inode)->io_tree, page_start, end,

			  EXTENT_DIRTY | EXTENT_DELALLOC |

			  EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,

			  0, 0, &cached_state);

			  EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING |

			  EXTENT_DEFRAG, 0, 0, &cached_state);



	ret2 = btrfs_set_extent_delalloc(inode, page_start, end, 0,

					&cached_state);

fs/btrfs/ioctl.c

+2 −3
Original line number Diff line number Diff line
@@ -1333,9 +1333,8 @@ static int cluster_pages_for_defrag(struct inode *inode, 
	lock_extent_bits(&BTRFS_I(inode)->io_tree,

			 page_start, page_end - 1, &cached_state);

	clear_extent_bit(&BTRFS_I(inode)->io_tree, page_start,

			  page_end - 1, EXTENT_DIRTY | EXTENT_DELALLOC |

			  EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG, 0, 0,

			  &cached_state);

			  page_end - 1, EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING |

			  EXTENT_DEFRAG, 0, 0, &cached_state);



	if (i_done != page_cnt) {

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