diff options
| author | Alex Gartrell <agartrell@fb.com> | 2014-05-20 13:07:56 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-06-09 17:20:57 -0700 |
| commit | fc4adbff823f76577ece26dcb88bf6f8392dbd43 (patch) | |
| tree | d3708c9b2f6e3023a7da4452d90f65e99a007213 /fs/btrfs/file.c | |
| parent | 0e378df15cd87f540f1ba9503e4aa039e1c72741 (diff) | |
| download | linux-fc4adbff823f76577ece26dcb88bf6f8392dbd43.tar.gz linux-fc4adbff823f76577ece26dcb88bf6f8392dbd43.tar.bz2 linux-fc4adbff823f76577ece26dcb88bf6f8392dbd43.zip | |
btrfs: Drop EXTENT_UPTODATE check in hole punching and direct locking
In these instances, we are trying to determine if a page has been accessed
since we began the operation for the sake of retry. This is easily
accomplished by doing a gang lookup in the page mapping radix tree, and it
saves us the dependency on the flag (so that we might eventually delete
it).
btrfs_page_exists_in_range borrows heavily from find_get_page, replacing
the radix tree look up with a gang lookup of 1, so that we can find the
next highest page >= index and see if it falls into our lock range.
Signed-off-by: Chris Mason <clm@fb.com>
Signed-off-by: Alex Gartrell <agartrell@fb.com>
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 8accf94ef220..e46bfaf6cde2 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -2266,9 +2266,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) if ((!ordered || (ordered->file_offset + ordered->len <= lockstart || ordered->file_offset > lockend)) && - !test_range_bit(&BTRFS_I(inode)->io_tree, lockstart, - lockend, EXTENT_UPTODATE, 0, - cached_state)) { + !btrfs_page_exists_in_range(inode, lockstart, lockend)) { if (ordered) btrfs_put_ordered_extent(ordered); break; |