btrfs: make writepage_delalloc take btrfs_inode

[sfrench/cifs-2.6.git] / fs / btrfs / extent_io.c

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index cb9969ffafbd7dc586022eb124bf13a3b9290982..abd36d92c077d9643686f336712203a17ea7139f 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -3419,7 +3419,7 @@ static void update_nr_written(struct writeback_control *wbc,
  * This returns 0 if all went well (page still locked)
  * This returns < 0 if there were errors (page still locked)
  */
-static noinline_for_stack int writepage_delalloc(struct inode *inode,
+static noinline_for_stack int writepage_delalloc(struct btrfs_inode *inode,
                struct page *page, struct writeback_control *wbc,
                u64 delalloc_start, unsigned long *nr_written)
 {
@@ -3432,14 +3432,14 @@ static noinline_for_stack int writepage_delalloc(struct inode *inode,
 
 
        while (delalloc_end < page_end) {
-               found = find_lock_delalloc_range(inode, page,
+               found = find_lock_delalloc_range(&inode->vfs_inode, page,
                                               &delalloc_start,
                                               &delalloc_end);
                if (!found) {
                        delalloc_start = delalloc_end + 1;
                        continue;
                }
-               ret = btrfs_run_delalloc_range(BTRFS_I(inode), page, delalloc_start,
+               ret = btrfs_run_delalloc_range(inode, page, delalloc_start,
                                delalloc_end, &page_started, nr_written, wbc);
                if (ret) {
                        SetPageError(page);
@@ -3657,7 +3657,8 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,
        set_page_extent_mapped(page);
 
        if (!epd->extent_locked) {
-               ret = writepage_delalloc(inode, page, wbc, start, &nr_written);
+               ret = writepage_delalloc(BTRFS_I(inode), page, wbc, start,
+                                        &nr_written);
                if (ret == 1)
                        return 0;
                if (ret)