Merge tag 'for-4.15-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

[thirdparty/kernel/stable.git] / fs / btrfs / extent-tree.c

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 16e46ee3cd16a923d53338675cae7c4d93d5d7c9..2f4328511ac84e11b8148952b09b25f3b4bb4e9d 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3992,16 +3992,9 @@ void btrfs_dec_nocow_writers(struct btrfs_fs_info *fs_info, u64 bytenr)
        btrfs_put_block_group(bg);
 }
 
-static int btrfs_wait_nocow_writers_atomic_t(atomic_t *a)
-{
-       schedule();
-       return 0;
-}
-
 void btrfs_wait_nocow_writers(struct btrfs_block_group_cache *bg)
 {
-       wait_on_atomic_t(&bg->nocow_writers,
-                        btrfs_wait_nocow_writers_atomic_t,
+       wait_on_atomic_t(&bg->nocow_writers, atomic_t_wait,
                         TASK_UNINTERRUPTIBLE);
 }
 
@@ -6530,12 +6523,6 @@ void btrfs_dec_block_group_reservations(struct btrfs_fs_info *fs_info,
        btrfs_put_block_group(bg);
 }
 
-static int btrfs_wait_bg_reservations_atomic_t(atomic_t *a)
-{
-       schedule();
-       return 0;
-}
-
 void btrfs_wait_block_group_reservations(struct btrfs_block_group_cache *bg)
 {
        struct btrfs_space_info *space_info = bg->space_info;
@@ -6558,8 +6545,7 @@ void btrfs_wait_block_group_reservations(struct btrfs_block_group_cache *bg)
        down_write(&space_info->groups_sem);
        up_write(&space_info->groups_sem);
 
-       wait_on_atomic_t(&bg->reservations,
-                        btrfs_wait_bg_reservations_atomic_t,
+       wait_on_atomic_t(&bg->reservations, atomic_t_wait,
                         TASK_UNINTERRUPTIBLE);
 }
 
@@ -11060,12 +11046,6 @@ int btrfs_start_write_no_snapshotting(struct btrfs_root *root)
        return 1;
 }
 
-static int wait_snapshotting_atomic_t(atomic_t *a)
-{
-       schedule();
-       return 0;
-}
-
 void btrfs_wait_for_snapshot_creation(struct btrfs_root *root)
 {
        while (true) {
@@ -11074,8 +11054,7 @@ void btrfs_wait_for_snapshot_creation(struct btrfs_root *root)
                ret = btrfs_start_write_no_snapshotting(root);
                if (ret)
                        break;
-               wait_on_atomic_t(&root->will_be_snapshotted,
-                                wait_snapshotting_atomic_t,
+               wait_on_atomic_t(&root->will_be_snapshotted, atomic_t_wait,
                                 TASK_UNINTERRUPTIBLE);
        }
 }