btrfs: remove the wait argument to btrfs_start_ordered_extent

Given that wait is always set to 1, so remove the argument.
Last use of wait with 0 was in 0c304304feab ("Btrfs: remove
csum_bytes_left").

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/defrag.c b/fs/btrfs/defrag.c
index 2737af7e278069320ca9ca2f0d8144a958458b22..8065341d831a1705e198616dce9771e4b34dc1dd 100644 (file)
--- a/fs/btrfs/defrag.c
+++ b/fs/btrfs/defrag.c
@@ -765,7 +765,7 @@ again:
                        break;
 
                unlock_page(page);
-               btrfs_start_ordered_extent(ordered, 1);
+               btrfs_start_ordered_extent(ordered);
                btrfs_put_ordered_extent(ordered);
                lock_page(page);
                /*

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index af046d22300e2ccdcbce0984383a4e5e0a7feef4..5cc5a1faaef5b571e81322b7b3699bf2017a591b 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1017,7 +1017,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(ordered, 1);
+                       btrfs_start_ordered_extent(ordered);
                        btrfs_put_ordered_extent(ordered);
                        return -EAGAIN;
                }

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 49a2e118f561f64cb72f5cce7791c216e8350eb0..3c49742f0d4556f229e19db5e81a0952ccceece7 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2969,7 +2969,7 @@ again:
                unlock_extent(&inode->io_tree, page_start, page_end,
                              &cached_state);
                unlock_page(page);
-               btrfs_start_ordered_extent(ordered, 1);
+               btrfs_start_ordered_extent(ordered);
                btrfs_put_ordered_extent(ordered);
                goto again;
        }
@@ -4987,7 +4987,7 @@ again:
                unlock_extent(io_tree, block_start, block_end, &cached_state);
                unlock_page(page);
                put_page(page);
-               btrfs_start_ordered_extent(ordered, 1);
+               btrfs_start_ordered_extent(ordered);
                btrfs_put_ordered_extent(ordered);
                goto again;
        }
@@ -7392,7 +7392,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(ordered, 1);
+                               btrfs_start_ordered_extent(ordered);
                        else
                                ret = nowait ? -EAGAIN : -ENOTBLK;
                        btrfs_put_ordered_extent(ordered);
@@ -8552,7 +8552,7 @@ again:
                unlock_extent(io_tree, page_start, page_end, &cached_state);
                unlock_page(page);
                up_read(&BTRFS_I(inode)->i_mmap_lock);
-               btrfs_start_ordered_extent(ordered, 1);
+               btrfs_start_ordered_extent(ordered);
                btrfs_put_ordered_extent(ordered);
                goto again;
        }

diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index 57d8c72737e1ad4ef52251cd0dfbb879bfae6570..6c24b69e2d0a372c0990093652a7272773341cfa 100644 (file)
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -616,7 +616,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, 1);
+       btrfs_start_ordered_extent(ordered);
        complete(&ordered->completion);
 }
 
@@ -716,13 +716,12 @@ void btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, u64 nr,
 }
 
 /*
- * Used to start IO or wait for a given ordered extent to finish.
+ * Start IO and wait for a given ordered extent to finish.
  *
- * If wait is one, this effectively waits on page writeback for all the pages
- * in the extent, and it waits on the io completion code to insert
- * metadata into the btree corresponding to the extent
+ * Wait on page writeback for all the pages in the extent and the IO completion
+ * code to insert metadata into the btree corresponding to the extent.
  */
-void btrfs_start_ordered_extent(struct btrfs_ordered_extent *entry, int wait)
+void btrfs_start_ordered_extent(struct btrfs_ordered_extent *entry)
 {
        u64 start = entry->file_offset;
        u64 end = start + entry->num_bytes - 1;
@@ -744,12 +743,10 @@ void btrfs_start_ordered_extent(struct btrfs_ordered_extent *entry, int wait)
         */
        if (!test_bit(BTRFS_ORDERED_DIRECT, &entry->flags))
                filemap_fdatawrite_range(inode->vfs_inode.i_mapping, start, end);
-       if (wait) {
-               if (!freespace_inode)
-                       btrfs_might_wait_for_event(inode->root->fs_info, btrfs_ordered_extent);
-               wait_event(entry->wait, test_bit(BTRFS_ORDERED_COMPLETE,
-                                                &entry->flags));
-       }
+
+       if (!freespace_inode)
+               btrfs_might_wait_for_event(inode->root->fs_info, btrfs_ordered_extent);
+       wait_event(entry->wait, test_bit(BTRFS_ORDERED_COMPLETE, &entry->flags));
 }
 
 /*
@@ -800,7 +797,7 @@ int btrfs_wait_ordered_range(struct inode *inode, u64 start, u64 len)
                        btrfs_put_ordered_extent(ordered);
                        break;
                }
-               btrfs_start_ordered_extent(ordered, 1);
+               btrfs_start_ordered_extent(ordered);
                end = ordered->file_offset;
                /*
                 * If the ordered extent had an error save the error but don't
@@ -1061,7 +1058,7 @@ void btrfs_lock_and_flush_ordered_range(struct btrfs_inode *inode, u64 start,
                        break;
                }
                unlock_extent(&inode->io_tree, start, end, cachedp);
-               btrfs_start_ordered_extent(ordered, 1);
+               btrfs_start_ordered_extent(ordered);
                btrfs_put_ordered_extent(ordered);
        }
 }

diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h
index 89f82b78f590f3322c645746133474abf52b06b0..ae3ed748acaf665a73c57f15f0021a994be28fbf 100644 (file)
--- a/fs/btrfs/ordered-data.h
+++ b/fs/btrfs/ordered-data.h
@@ -187,7 +187,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 btrfs_ordered_extent *entry, int wait);
+void btrfs_start_ordered_extent(struct btrfs_ordered_extent *entry);
 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);