diff options
author | David Sterba <dsterba@suse.cz> | 2014-07-30 18:51:36 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2014-10-02 11:30:32 -0400 |
commit | a50924e3a4d7fccb0ecfbd42a4c7ed6e56ee1765 (patch) | |
tree | 00b37163c433ba8851df27120ef2a79859bc9008 /fs | |
parent | 2755a0de64693501741fb3603cd8ca928b0b7e81 (diff) |
btrfs: drop constant param from btrfs_release_extent_buffer_page
All callers use the same value, simplify the function.
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/extent_io.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 78229007f99e..638e1a5b00e2 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c | |||
@@ -4450,19 +4450,16 @@ int extent_buffer_under_io(struct extent_buffer *eb) | |||
4450 | /* | 4450 | /* |
4451 | * Helper for releasing extent buffer page. | 4451 | * Helper for releasing extent buffer page. |
4452 | */ | 4452 | */ |
4453 | static void btrfs_release_extent_buffer_page(struct extent_buffer *eb, | 4453 | static void btrfs_release_extent_buffer_page(struct extent_buffer *eb) |
4454 | unsigned long start_idx) | ||
4455 | { | 4454 | { |
4456 | unsigned long index; | 4455 | unsigned long index; |
4457 | unsigned long num_pages; | ||
4458 | struct page *page; | 4456 | struct page *page; |
4459 | int mapped = !test_bit(EXTENT_BUFFER_DUMMY, &eb->bflags); | 4457 | int mapped = !test_bit(EXTENT_BUFFER_DUMMY, &eb->bflags); |
4460 | 4458 | ||
4461 | BUG_ON(extent_buffer_under_io(eb)); | 4459 | BUG_ON(extent_buffer_under_io(eb)); |
4462 | 4460 | ||
4463 | num_pages = num_extent_pages(eb->start, eb->len); | 4461 | index = num_extent_pages(eb->start, eb->len); |
4464 | index = start_idx + num_pages; | 4462 | if (index == 0) |
4465 | if (start_idx >= index) | ||
4466 | return; | 4463 | return; |
4467 | 4464 | ||
4468 | do { | 4465 | do { |
@@ -4498,7 +4495,7 @@ static void btrfs_release_extent_buffer_page(struct extent_buffer *eb, | |||
4498 | /* One for when we alloced the page */ | 4495 | /* One for when we alloced the page */ |
4499 | page_cache_release(page); | 4496 | page_cache_release(page); |
4500 | } | 4497 | } |
4501 | } while (index != start_idx); | 4498 | } while (index != 0); |
4502 | } | 4499 | } |
4503 | 4500 | ||
4504 | /* | 4501 | /* |
@@ -4506,7 +4503,7 @@ static void btrfs_release_extent_buffer_page(struct extent_buffer *eb, | |||
4506 | */ | 4503 | */ |
4507 | static inline void btrfs_release_extent_buffer(struct extent_buffer *eb) | 4504 | static inline void btrfs_release_extent_buffer(struct extent_buffer *eb) |
4508 | { | 4505 | { |
4509 | btrfs_release_extent_buffer_page(eb, 0); | 4506 | btrfs_release_extent_buffer_page(eb); |
4510 | __free_extent_buffer(eb); | 4507 | __free_extent_buffer(eb); |
4511 | } | 4508 | } |
4512 | 4509 | ||
@@ -4863,7 +4860,7 @@ static int release_extent_buffer(struct extent_buffer *eb) | |||
4863 | } | 4860 | } |
4864 | 4861 | ||
4865 | /* Should be safe to release our pages at this point */ | 4862 | /* Should be safe to release our pages at this point */ |
4866 | btrfs_release_extent_buffer_page(eb, 0); | 4863 | btrfs_release_extent_buffer_page(eb); |
4867 | call_rcu(&eb->rcu_head, btrfs_release_extent_buffer_rcu); | 4864 | call_rcu(&eb->rcu_head, btrfs_release_extent_buffer_rcu); |
4868 | return 1; | 4865 | return 1; |
4869 | } | 4866 | } |