4 files changed, 10 insertions, 8 deletions

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index c5f40dc1f74f..e9c2f8895eab 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -1614,7 +1614,7 @@ struct btrfs_fs_info {
 
         spinlock_t delayed_iput_lock;
         struct list_head delayed_iputs;
-        struct rw_semaphore delayed_iput_sem;
+        struct mutex cleaner_delayed_iput_mutex;
 
         /* this protects tree_mod_seq_list */
         spinlock_t tree_mod_seq_lock;
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 64f02c3d0dd0..be03f93ca257 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1801,7 +1801,10 @@ static int cleaner_kthread(void *arg)
                         goto sleep;
                 }
 
+                mutex_lock(&root->fs_info->cleaner_delayed_iput_mutex);
                 btrfs_run_delayed_iputs(root);
+                mutex_unlock(&root->fs_info->cleaner_delayed_iput_mutex);
+
                 again = btrfs_clean_one_deleted_snapshot(root);
                 mutex_unlock(&root->fs_info->cleaner_mutex);
 
@@ -2571,8 +2574,8 @@ int open_ctree(struct super_block *sb,
         mutex_init(&fs_info->delete_unused_bgs_mutex);
         mutex_init(&fs_info->reloc_mutex);
         mutex_init(&fs_info->delalloc_root_mutex);
+        mutex_init(&fs_info->cleaner_delayed_iput_mutex);
         seqlock_init(&fs_info->profiles_lock);
-        init_rwsem(&fs_info->delayed_iput_sem);
 
         INIT_LIST_HEAD(&fs_info->dirty_cowonly_roots);
         INIT_LIST_HEAD(&fs_info->space_info);
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 92843ab772a5..abcffa4b8231 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4153,11 +4153,12 @@ commit_trans:
                                 if (ret)
                                         return ret;
                                 /*
-                                 * make sure that all running delayed iput are
-                                 * done
+                                 * The cleaner kthread might still be doing iput
+                                 * operations. Wait for it to finish so that
+                                 * more space is released.
                                  */
-                                down_write(&root->fs_info->delayed_iput_sem);
-                                up_write(&root->fs_info->delayed_iput_sem);
+                                mutex_lock(&root->fs_info->cleaner_delayed_iput_mutex);
+                                mutex_unlock(&root->fs_info->cleaner_delayed_iput_mutex);
                                 goto again;
                         } else {
                                 btrfs_end_transaction(trans, root);
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 85afe66955cf..8ad9e2200442 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3134,7 +3134,6 @@ void btrfs_run_delayed_iputs(struct btrfs_root *root)
 {
         struct btrfs_fs_info *fs_info = root->fs_info;
 
-        down_read(&fs_info->delayed_iput_sem);
         spin_lock(&fs_info->delayed_iput_lock);
         while (!list_empty(&fs_info->delayed_iputs)) {
                 struct btrfs_inode *inode;
@@ -3153,7 +3152,6 @@ void btrfs_run_delayed_iputs(struct btrfs_root *root)
                 spin_lock(&fs_info->delayed_iput_lock);
         }
         spin_unlock(&fs_info->delayed_iput_lock);
-        up_read(&root->fs_info->delayed_iput_sem);
 }
 
 /*