diff options
Diffstat (limited to 'fs/btrfs/tests/btrfs-tests.c')
-rw-r--r-- | fs/btrfs/tests/btrfs-tests.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/tests/btrfs-tests.c b/fs/btrfs/tests/btrfs-tests.c index b1d920b30070..0e1e61a7ec23 100644 --- a/fs/btrfs/tests/btrfs-tests.c +++ b/fs/btrfs/tests/btrfs-tests.c | |||
@@ -82,18 +82,18 @@ void btrfs_destroy_test_fs(void) | |||
82 | struct btrfs_fs_info *btrfs_alloc_dummy_fs_info(void) | 82 | struct btrfs_fs_info *btrfs_alloc_dummy_fs_info(void) |
83 | { | 83 | { |
84 | struct btrfs_fs_info *fs_info = kzalloc(sizeof(struct btrfs_fs_info), | 84 | struct btrfs_fs_info *fs_info = kzalloc(sizeof(struct btrfs_fs_info), |
85 | GFP_NOFS); | 85 | GFP_KERNEL); |
86 | 86 | ||
87 | if (!fs_info) | 87 | if (!fs_info) |
88 | return fs_info; | 88 | return fs_info; |
89 | fs_info->fs_devices = kzalloc(sizeof(struct btrfs_fs_devices), | 89 | fs_info->fs_devices = kzalloc(sizeof(struct btrfs_fs_devices), |
90 | GFP_NOFS); | 90 | GFP_KERNEL); |
91 | if (!fs_info->fs_devices) { | 91 | if (!fs_info->fs_devices) { |
92 | kfree(fs_info); | 92 | kfree(fs_info); |
93 | return NULL; | 93 | return NULL; |
94 | } | 94 | } |
95 | fs_info->super_copy = kzalloc(sizeof(struct btrfs_super_block), | 95 | fs_info->super_copy = kzalloc(sizeof(struct btrfs_super_block), |
96 | GFP_NOFS); | 96 | GFP_KERNEL); |
97 | if (!fs_info->super_copy) { | 97 | if (!fs_info->super_copy) { |
98 | kfree(fs_info->fs_devices); | 98 | kfree(fs_info->fs_devices); |
99 | kfree(fs_info); | 99 | kfree(fs_info); |
@@ -180,11 +180,11 @@ btrfs_alloc_dummy_block_group(unsigned long length) | |||
180 | { | 180 | { |
181 | struct btrfs_block_group_cache *cache; | 181 | struct btrfs_block_group_cache *cache; |
182 | 182 | ||
183 | cache = kzalloc(sizeof(*cache), GFP_NOFS); | 183 | cache = kzalloc(sizeof(*cache), GFP_KERNEL); |
184 | if (!cache) | 184 | if (!cache) |
185 | return NULL; | 185 | return NULL; |
186 | cache->free_space_ctl = kzalloc(sizeof(*cache->free_space_ctl), | 186 | cache->free_space_ctl = kzalloc(sizeof(*cache->free_space_ctl), |
187 | GFP_NOFS); | 187 | GFP_KERNEL); |
188 | if (!cache->free_space_ctl) { | 188 | if (!cache->free_space_ctl) { |
189 | kfree(cache); | 189 | kfree(cache); |
190 | return NULL; | 190 | return NULL; |