btrfs: remove inode argument from btrfs_start_ordered_extent

The passed in ordered_extent struct is always well-formed and contains
the inode making the explicit argument redundant.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 2969d71..038e0af 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1491,8 +1491,7 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages,
                                unlock_page(pages[i]);
                                put_page(pages[i]);
                        }
-                       btrfs_start_ordered_extent(&inode->vfs_inode,
-                                       ordered, 1);
+                       btrfs_start_ordered_extent(ordered, 1);
                        btrfs_put_ordered_extent(ordered);
                        return -EAGAIN;
                }

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 0280eb3..b848163 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2357,7 +2357,7 @@ again:
                unlock_extent_cached(&inode->io_tree, page_start, page_end,
                                     &cached_state);
                unlock_page(page);
-               btrfs_start_ordered_extent(&inode->vfs_inode, ordered, 1);
+               btrfs_start_ordered_extent(ordered, 1);
                btrfs_put_ordered_extent(ordered);
                goto again;
        }
@@ -4581,7 +4581,7 @@ again:
                                     &cached_state);
                unlock_page(page);
                put_page(page);
-               btrfs_start_ordered_extent(inode, ordered, 1);
+               btrfs_start_ordered_extent(ordered, 1);
                btrfs_put_ordered_extent(ordered);
                goto again;
        }
@@ -7149,7 +7149,7 @@ static int lock_extent_direct(struct inode *inode, u64 lockstart, u64 lockend,
                         */
                        if (writing ||
                            test_bit(BTRFS_ORDERED_DIRECT, &ordered->flags))
-                               btrfs_start_ordered_extent(inode, ordered, 1);
+                               btrfs_start_ordered_extent(ordered, 1);
                        else
                                ret = -ENOTBLK;
                        btrfs_put_ordered_extent(ordered);
@@ -8324,7 +8324,7 @@ again:
                unlock_extent_cached(io_tree, page_start, page_end,
                                     &cached_state);
                unlock_page(page);
-               btrfs_start_ordered_extent(inode, ordered, 1);
+               btrfs_start_ordered_extent(ordered, 1);
                btrfs_put_ordered_extent(ordered);
                goto again;
        }

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index de65cf6..ab408a2 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1319,7 +1319,7 @@ again:
                                break;
 
                        unlock_page(page);
-                       btrfs_start_ordered_extent(inode, ordered, 1);
+                       btrfs_start_ordered_extent(ordered, 1);
                        btrfs_put_ordered_extent(ordered);
                        lock_page(page);
                        /*

diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index c93b4f2..87bac9e 100644 (file)
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -543,7 +543,7 @@ static void btrfs_run_ordered_extent_work(struct btrfs_work *work)
        struct btrfs_ordered_extent *ordered;
 
        ordered = container_of(work, struct btrfs_ordered_extent, flush_work);
-       btrfs_start_ordered_extent(ordered->inode, ordered, 1);
+       btrfs_start_ordered_extent(ordered, 1);
        complete(&ordered->completion);
 }
 
@@ -649,14 +649,13 @@ void btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, u64 nr,
  * in the extent, and it waits on the io completion code to insert
  * metadata into the btree corresponding to the extent
  */
-void btrfs_start_ordered_extent(struct inode *inode,
-                                      struct btrfs_ordered_extent *entry,
-                                      int wait)
+void btrfs_start_ordered_extent(struct btrfs_ordered_extent *entry, int wait)
 {
        u64 start = entry->file_offset;
        u64 end = start + entry->num_bytes - 1;
+       struct btrfs_inode *inode = BTRFS_I(entry->inode);
 
-       trace_btrfs_ordered_extent_start(BTRFS_I(inode), entry);
+       trace_btrfs_ordered_extent_start(inode, entry);
 
        /*
         * pages in the range can be dirty, clean or writeback.  We
@@ -664,7 +663,7 @@ void btrfs_start_ordered_extent(struct inode *inode,
         * for the flusher thread to find them
         */
        if (!test_bit(BTRFS_ORDERED_DIRECT, &entry->flags))
-               filemap_fdatawrite_range(inode->i_mapping, start, end);
+               filemap_fdatawrite_range(inode->vfs_inode.i_mapping, start, end);
        if (wait) {
                wait_event(entry->wait, test_bit(BTRFS_ORDERED_COMPLETE,
                                                 &entry->flags));
@@ -719,7 +718,7 @@ int btrfs_wait_ordered_range(struct inode *inode, u64 start, u64 len)
                        btrfs_put_ordered_extent(ordered);
                        break;
                }
-               btrfs_start_ordered_extent(inode, ordered, 1);
+               btrfs_start_ordered_extent(ordered, 1);
                end = ordered->file_offset;
                /*
                 * If the ordered extent had an error save the error but don't
@@ -939,7 +938,7 @@ void btrfs_lock_and_flush_ordered_range(struct btrfs_inode *inode, u64 start,
                        break;
                }
                unlock_extent_cached(&inode->io_tree, start, end, cachedp);
-               btrfs_start_ordered_extent(&inode->vfs_inode, ordered, 1);
+               btrfs_start_ordered_extent(ordered, 1);
                btrfs_put_ordered_extent(ordered);
        }
 }

diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h
index 8fe720d..c3a2325 100644 (file)
--- a/fs/btrfs/ordered-data.h
+++ b/fs/btrfs/ordered-data.h
@@ -174,8 +174,7 @@ void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry,
                           struct btrfs_ordered_sum *sum);
 struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct btrfs_inode *inode,
                                                         u64 file_offset);
-void btrfs_start_ordered_extent(struct inode *inode,
-                               struct btrfs_ordered_extent *entry, int wait);
+void btrfs_start_ordered_extent(struct btrfs_ordered_extent *entry, int wait);
 int btrfs_wait_ordered_range(struct inode *inode, u64 start, u64 len);
 struct btrfs_ordered_extent *
 btrfs_lookup_first_ordered_extent(struct btrfs_inode *inode, u64 file_offset);