|
@@ -138,7 +138,7 @@ static struct btrfs_fs_devices *__alloc_fs_devices(void)
|
|
{
|
|
{
|
|
struct btrfs_fs_devices *fs_devs;
|
|
struct btrfs_fs_devices *fs_devs;
|
|
|
|
|
|
- fs_devs = kzalloc(sizeof(*fs_devs), GFP_NOFS);
|
|
|
|
|
|
+ fs_devs = kzalloc(sizeof(*fs_devs), GFP_KERNEL);
|
|
if (!fs_devs)
|
|
if (!fs_devs)
|
|
return ERR_PTR(-ENOMEM);
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
|
|
@@ -220,7 +220,7 @@ static struct btrfs_device *__alloc_device(void)
|
|
{
|
|
{
|
|
struct btrfs_device *dev;
|
|
struct btrfs_device *dev;
|
|
|
|
|
|
- dev = kzalloc(sizeof(*dev), GFP_NOFS);
|
|
|
|
|
|
+ dev = kzalloc(sizeof(*dev), GFP_KERNEL);
|
|
if (!dev)
|
|
if (!dev)
|
|
return ERR_PTR(-ENOMEM);
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
|
|
@@ -733,7 +733,8 @@ static struct btrfs_fs_devices *clone_fs_devices(struct btrfs_fs_devices *orig)
|
|
* uuid mutex so nothing we touch in here is going to disappear.
|
|
* uuid mutex so nothing we touch in here is going to disappear.
|
|
*/
|
|
*/
|
|
if (orig_dev->name) {
|
|
if (orig_dev->name) {
|
|
- name = rcu_string_strdup(orig_dev->name->str, GFP_NOFS);
|
|
|
|
|
|
+ name = rcu_string_strdup(orig_dev->name->str,
|
|
|
|
+ GFP_KERNEL);
|
|
if (!name) {
|
|
if (!name) {
|
|
kfree(device);
|
|
kfree(device);
|
|
goto error;
|
|
goto error;
|
|
@@ -2287,7 +2288,7 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
|
|
goto error;
|
|
goto error;
|
|
}
|
|
}
|
|
|
|
|
|
- name = rcu_string_strdup(device_path, GFP_NOFS);
|
|
|
|
|
|
+ name = rcu_string_strdup(device_path, GFP_KERNEL);
|
|
if (!name) {
|
|
if (!name) {
|
|
kfree(device);
|
|
kfree(device);
|
|
ret = -ENOMEM;
|
|
ret = -ENOMEM;
|