diff options
| author | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:28 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:28 +0100 |
| commit | e22b3d1fbe596c7feba6782dab2e11c7b99f1d90 (patch) | |
| tree | 50cfe9b71c227c8661b785ab3a0a5cab33ad8e3f /fs/btrfs/dev-replace.c | |
| parent | Merge branch 'chandan/prep-subpage-blocksize' into for-chris-4.6 (diff) | |
| parent | btrfs: switch to kcalloc in btrfs_cmp_data_prepare (diff) | |
| download | linux-e22b3d1fbe596c7feba6782dab2e11c7b99f1d90.tar.gz linux-e22b3d1fbe596c7feba6782dab2e11c7b99f1d90.zip | |
Merge branch 'dev/gfp-flags' into for-chris-4.6
Diffstat (limited to 'fs/btrfs/dev-replace.c')
| -rw-r--r-- | fs/btrfs/dev-replace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index cbb7dbfb3fff..01ce5fcecc5c 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -802,7 +802,7 @@ static int btrfs_dev_replace_kthread(void *data) struct btrfs_ioctl_dev_replace_args *status_args; u64 progress; - status_args = kzalloc(sizeof(*status_args), GFP_NOFS); + status_args = kzalloc(sizeof(*status_args), GFP_KERNEL); if (status_args) { btrfs_dev_replace_status(fs_info, status_args); progress = status_args->status.progress_1000; |