Btrfs: cleanup arguments to extent_clear_unlock_delalloc

This patch removes the io_tree argument for extent_clear_unlock_delalloc since
we always use &BTRFS_I(inode)->io_tree, and it separates out the extent tree
operations from the page operations.  This way we just pass in the extent bits
we want to clear and then pass in the operations we want done to the pages.
This is because I'm going to fix what extent bits we clear in some cases and
rather than add a bunch of new flags we'll just use the actual extent bits we
want to clear.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>

1 files changed, 11 insertions, 21 deletions

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index daf180dafe39..c137f98fbd24 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1678,31 +1678,21 @@ out_failed:
         return found;
 }
 
-int extent_clear_unlock_delalloc(struct inode *inode,
-                                struct extent_io_tree *tree,
-                                u64 start, u64 end, struct page *locked_page,
-                                unsigned long op)
+int extent_clear_unlock_delalloc(struct inode *inode, u64 start, u64 end,
+                                 struct page *locked_page,
+                                 unsigned long clear_bits,
+                                 unsigned long page_ops)
 {
+        struct extent_io_tree *tree = &BTRFS_I(inode)->io_tree;
         int ret;
         struct page *pages[16];
         unsigned long index = start >> PAGE_CACHE_SHIFT;
         unsigned long end_index = end >> PAGE_CACHE_SHIFT;
         unsigned long nr_pages = end_index - index + 1;
         int i;
-        unsigned long clear_bits = 0;
-
-        if (op & EXTENT_CLEAR_UNLOCK)
-                clear_bits |= EXTENT_LOCKED;
-        if (op & EXTENT_CLEAR_DIRTY)
-                clear_bits |= EXTENT_DIRTY;
-
-        if (op & EXTENT_CLEAR_DELALLOC)
-                clear_bits |= EXTENT_DELALLOC;
 
         clear_extent_bit(tree, start, end, clear_bits, 1, 0, NULL, GFP_NOFS);
-        if (!(op & (EXTENT_CLEAR_UNLOCK_PAGE | EXTENT_CLEAR_DIRTY |
-                    EXTENT_SET_WRITEBACK | EXTENT_END_WRITEBACK |
-                    EXTENT_SET_PRIVATE2)))
+        if (page_ops == 0)
                 return 0;
 
         while (nr_pages > 0) {
@@ -1711,20 +1701,20 @@ int extent_clear_unlock_delalloc(struct inode *inode,
                                      nr_pages, ARRAY_SIZE(pages)), pages);
                 for (i = 0; i < ret; i++) {
 
-                        if (op & EXTENT_SET_PRIVATE2)
+                        if (page_ops & PAGE_SET_PRIVATE2)
                                 SetPagePrivate2(pages[i]);
 
                         if (pages[i] == locked_page) {
                                 page_cache_release(pages[i]);
                                 continue;
                         }
-                        if (op & EXTENT_CLEAR_DIRTY)
+                        if (page_ops & PAGE_CLEAR_DIRTY)
                                 clear_page_dirty_for_io(pages[i]);
-                        if (op & EXTENT_SET_WRITEBACK)
+                        if (page_ops & PAGE_SET_WRITEBACK)
                                 set_page_writeback(pages[i]);
-                        if (op & EXTENT_END_WRITEBACK)
+                        if (page_ops & PAGE_END_WRITEBACK)
                                 end_page_writeback(pages[i]);
-                        if (op & EXTENT_CLEAR_UNLOCK_PAGE)
+                        if (page_ops & PAGE_UNLOCK)
                                 unlock_page(pages[i]);
                         page_cache_release(pages[i]);
                 }