1 files changed, 2 insertions, 2 deletions

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 57a7f331eb3e..77d7fbc0fa47 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1649,8 +1649,8 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path)
         if (device->writeable) {
                 lock_chunks(root);
                 list_del_init(&device->dev_alloc_list);
+                device->fs_devices->rw_devices--;
                 unlock_chunks(root);
-                root->fs_info->fs_devices->rw_devices--;
                 clear_super = true;
         }
 
@@ -1795,8 +1795,8 @@ error_undo:
                 lock_chunks(root);
                 list_add(&device->dev_alloc_list,
                          &root->fs_info->fs_devices->alloc_list);
+                device->fs_devices->rw_devices++;
                 unlock_chunks(root);
-                root->fs_info->fs_devices->rw_devices++;
         }
         goto error_brelse;
 }