Btrfs: fix block group remaining RO forever after error during device replace

When doing a device replace, while at scrub.c:scrub_enumerate_chunks(), we
set the block group to RO mode and then wait for any ongoing writes into
extents of the block group to complete. While doing that wait we overwrite
the value of the variable 'ret' and can break out of the loop if an error
happens without turning the block group back into RW mode. So what happens
is the following:

1) btrfs_inc_block_group_ro() returns 0, meaning it set the block group
   to RO mode (its ->ro field set to 1 or incremented to some value > 1);

2) Then btrfs_wait_ordered_roots() returns a value > 0;

3) Then if either joining or committing the transaction fails, we break
   out of the loop wihtout calling btrfs_dec_block_group_ro(), leaving
   the block group in RO mode forever.

To fix this, just remove the code that waits for ongoing writes to extents
of the block group, since it's not needed because in the initial setup
phase of a device replace operation, before starting to find all chunks
and their extents, we set the target device for replace while holding
fs_info->dev_replace->rwsem, which ensures that after releasing that
semaphore, any writes into the source device are made to the target device
as well (__btrfs_map_block() guarantees that). So while at
scrub_enumerate_chunks() we only need to worry about finding and copying
extents (from the source device to the target device) that were written
before we started the device replace operation.

Fixes: f0e9b7d6401959 ("Btrfs: fix race setting block group readonly during device replace")
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index 6240a5a1f2c06e43ab2ce7f37848497a0e651228..fb09bc2f8e4d5a752e47115796b6903204426909 100644 (file)
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -572,12 +572,11 @@ u64 btrfs_wait_ordered_extents(struct btrfs_root *root, u64 nr,
        return count;
 }
 
-u64 btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, u64 nr,
+void btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, u64 nr,
                             const u64 range_start, const u64 range_len)
 {
        struct btrfs_root *root;
        struct list_head splice;
-       u64 total_done = 0;
        u64 done;
 
        INIT_LIST_HEAD(&splice);
@@ -597,7 +596,6 @@ u64 btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, u64 nr,
                done = btrfs_wait_ordered_extents(root, nr,
                                                  range_start, range_len);
                btrfs_put_fs_root(root);
-               total_done += done;
 
                spin_lock(&fs_info->ordered_root_lock);
                if (nr != U64_MAX) {
@@ -607,8 +605,6 @@ u64 btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, u64 nr,
        list_splice_tail(&splice, &fs_info->ordered_roots);
        spin_unlock(&fs_info->ordered_root_lock);
        mutex_unlock(&fs_info->ordered_operations_mutex);
-
-       return total_done;
 }
 
 /*

diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h
index 5204171ea9622f8d73ff4ac649e5d8a828ead439..4eb0319a86d7a8cff5efad442f7728fc034eef6c 100644 (file)
--- a/fs/btrfs/ordered-data.h
+++ b/fs/btrfs/ordered-data.h
@@ -186,7 +186,7 @@ int btrfs_find_ordered_sum(struct inode *inode, u64 offset, u64 disk_bytenr,
                           u8 *sum, int len);
 u64 btrfs_wait_ordered_extents(struct btrfs_root *root, u64 nr,
                               const u64 range_start, const u64 range_len);
-u64 btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, u64 nr,
+void btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, u64 nr,
                              const u64 range_start, const u64 range_len);
 void btrfs_lock_and_flush_ordered_range(struct extent_io_tree *tree,
                                        struct btrfs_inode *inode, u64 start,

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index bd3f2266c5f49ed96d685e4be05fb12670daf159..21de630b073024c343d75835c3a61ba0922aac7b 100644 (file)
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -3579,45 +3579,6 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx,
                 * of btrfs_super_block::sys_chunk_array
                 */
                ret = btrfs_inc_block_group_ro(cache, false);
-               if (!ret && sctx->is_dev_replace) {
-                       /*
-                        * If we are doing a device replace wait for any tasks
-                        * that started delalloc right before we set the block
-                        * group to RO mode, as they might have just allocated
-                        * an extent from it or decided they could do a nocow
-                        * write. And if any such tasks did that, wait for their
-                        * ordered extents to complete and then commit the
-                        * current transaction, so that we can later see the new
-                        * extent items in the extent tree - the ordered extents
-                        * create delayed data references (for cow writes) when
-                        * they complete, which will be run and insert the
-                        * corresponding extent items into the extent tree when
-                        * we commit the transaction they used when running
-                        * inode.c:btrfs_finish_ordered_io(). We later use
-                        * the commit root of the extent tree to find extents
-                        * to copy from the srcdev into the tgtdev, and we don't
-                        * want to miss any new extents.
-                        */
-                       btrfs_wait_block_group_reservations(cache);
-                       btrfs_wait_nocow_writers(cache);
-                       ret = btrfs_wait_ordered_roots(fs_info, U64_MAX,
-                                                      cache->start,
-                                                      cache->length);
-                       if (ret > 0) {
-                               struct btrfs_trans_handle *trans;
-
-                               trans = btrfs_join_transaction(root);
-                               if (IS_ERR(trans))
-                                       ret = PTR_ERR(trans);
-                               else
-                                       ret = btrfs_commit_transaction(trans);
-                               if (ret) {
-                                       scrub_pause_off(fs_info);
-                                       btrfs_put_block_group(cache);
-                                       break;
-                               }
-                       }
-               }
                scrub_pause_off(fs_info);
 
                if (ret == 0) {