btrfs: Fix a lockdep warning when running xfstest.

[deliverable/linux.git] / fs / btrfs / volumes.c

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index d47289c715c814f47c7842349afc942640310238..01920515f90d4cfc4fa5c13b9dcca0a5e8a6a6b4 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1800,8 +1800,8 @@ error_undo:
        goto error_brelse;
 }
 
-void btrfs_rm_dev_replace_srcdev(struct btrfs_fs_info *fs_info,
-                                struct btrfs_device *srcdev)
+void btrfs_rm_dev_replace_remove_srcdev(struct btrfs_fs_info *fs_info,
+                                       struct btrfs_device *srcdev)
 {
        struct btrfs_fs_devices *fs_devices;
 
@@ -1829,6 +1829,12 @@ void btrfs_rm_dev_replace_srcdev(struct btrfs_fs_info *fs_info,
 
        if (srcdev->bdev)
                fs_devices->open_devices--;
+}
+
+void btrfs_rm_dev_replace_free_srcdev(struct btrfs_fs_info *fs_info,
+                                     struct btrfs_device *srcdev)
+{
+       struct btrfs_fs_devices *fs_devices = srcdev->fs_devices;
 
        call_rcu(&srcdev->rcu, free_device);