---

yaml --- r: 321394 b: refs/heads/master c: 34eaada h: refs/heads/master v: v3
git-mirror · Aug 4, 2012 · bfb47b2 · bfb47b2
1 parent c54017b
commit bfb47b2
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6463b0da6937e288b115d641ccd46c70fb3a4a8
+refs/heads/master: 34eaadaf22b0dd453288c6b115e0c823a0fb74d5
diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c
@@ -100,10 +100,6 @@ static void __save_error_info(struct btrfs_fs_info *fs_info)
 	fs_info->fs_state = BTRFS_SUPER_FLAG_ERROR;
 }
 
-/* NOTE:
- *	We move write_super stuff at umount in order to avoid deadlock
- *	for umount hold all lock.
- */
 static void save_error_info(struct btrfs_fs_info *fs_info)
 {
 	__save_error_info(fs_info);

diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c
@@ -1744,10 +1744,6 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
 
 	device->fs_devices = root->fs_info->fs_devices;
 
-	/*
-	 * we don't want write_supers to jump in here with our device
-	 * half setup
-	 */
 	mutex_lock(&root->fs_info->fs_devices->device_list_mutex);
 	list_add_rcu(&device->dev_list, &root->fs_info->fs_devices->devices);
 	list_add(&device->dev_alloc_list,