Btrfs: do not strdup non existent strings
When we close devices we add back empty devices for some reason that escapes me. In the case of a missing dev we don't allocate an rcu_string for it's name, so check to see if the device has a name and if it doesn't don't bother strdup()'ing it. Thanks, Signed-off-by: Josef Bacik <jbacik@fusionio.com>
This commit is contained in:
parent
aa9ddcd4b5
commit
99f5944b84
|
@ -569,9 +569,11 @@ static int __btrfs_close_devices(struct btrfs_fs_devices *fs_devices)
|
||||||
memcpy(new_device, device, sizeof(*new_device));
|
memcpy(new_device, device, sizeof(*new_device));
|
||||||
|
|
||||||
/* Safe because we are under uuid_mutex */
|
/* Safe because we are under uuid_mutex */
|
||||||
name = rcu_string_strdup(device->name->str, GFP_NOFS);
|
if (device->name) {
|
||||||
BUG_ON(device->name && !name); /* -ENOMEM */
|
name = rcu_string_strdup(device->name->str, GFP_NOFS);
|
||||||
rcu_assign_pointer(new_device->name, name);
|
BUG_ON(device->name && !name); /* -ENOMEM */
|
||||||
|
rcu_assign_pointer(new_device->name, name);
|
||||||
|
}
|
||||||
new_device->bdev = NULL;
|
new_device->bdev = NULL;
|
||||||
new_device->writeable = 0;
|
new_device->writeable = 0;
|
||||||
new_device->in_fs_metadata = 0;
|
new_device->in_fs_metadata = 0;
|
||||||
|
|
Loading…
Reference in a new issue