[patch 89/99] btrfs: btrfs_wait_ordered_extents should return void

[Jeff Mahoney]

 btrfs_wait_ordered_extents has no error conditions and should return void.

Signed-off-by: Jeff Mahoney <je...@suse.com>
---
 fs/btrfs/ordered-data.c |    5 ++---
 fs/btrfs/ordered-data.h |    4 ++--
 fs/btrfs/transaction.c  |    3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -465,8 +465,8 @@ void btrfs_remove_ordered_extent(struct
  * wait for all the ordered extents in a root.  This is done when balancing
  * space between drives.
  */
-int btrfs_wait_ordered_extents(struct btrfs_root *root,
-                              int nocow_only, int delay_iput)
+void btrfs_wait_ordered_extents(struct btrfs_root *root,
+                               int nocow_only, int delay_iput)
 {
        struct list_head splice;
        struct list_head *cur;
@@ -514,7 +514,6 @@ int btrfs_wait_ordered_extents(struct bt
                spin_lock(&root->fs_info->ordered_extent_lock);
        }
        spin_unlock(&root->fs_info->ordered_extent_lock);
-       return 0;
 }
 
 /*
--- a/fs/btrfs/ordered-data.h
+++ b/fs/btrfs/ordered-data.h
@@ -174,6 +174,6 @@ int btrfs_run_ordered_operations(struct
 int btrfs_add_ordered_operation(struct btrfs_trans_handle *trans,
                                struct btrfs_root *root,
                                struct inode *inode);
-int btrfs_wait_ordered_extents(struct btrfs_root *root,
-                              int nocow_only, int delay_iput);
+void btrfs_wait_ordered_extents(struct btrfs_root *root,
+                               int nocow_only, int delay_iput);
 #endif
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1207,8 +1207,7 @@ int btrfs_commit_transaction(struct btrf
 
                if (flush_on_commit || snap_pending) {
                        btrfs_start_delalloc_inodes(root, 1);
-                       ret = btrfs_wait_ordered_extents(root, 0, 1);
-                       BUG_ON(ret);
+                       btrfs_wait_ordered_extents(root, 0, 1);
                }
 
                ret = btrfs_run_delayed_items(trans, root);


--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html