diff options
| author | Chris Mason <clm@fb.com> | 2015-12-23 13:11:27 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-12-23 13:11:27 -0800 |
| commit | 13d5d15d6301f8e69a8fe8500f6ef732bfd44bd1 (patch) | |
| tree | 8915afc4b24489d3a184a962eb83a3447ee51fdd /fs/btrfs/async-thread.c | |
| parent | afa427cf9d6ef64e73df68882cbabde0e6a61639 (diff) | |
| parent | 39a27ec1004e886f1d949bdb8f2616896d02c5c2 (diff) | |
Merge branch 'dev/gfp-flags' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.5
Diffstat (limited to 'fs/btrfs/async-thread.c')
| -rw-r--r-- | fs/btrfs/async-thread.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c index 3e36e4adc4a3..88d9af3d4581 100644 --- a/fs/btrfs/async-thread.c +++ b/fs/btrfs/async-thread.c @@ -97,7 +97,7 @@ static struct __btrfs_workqueue * __btrfs_alloc_workqueue(const char *name, unsigned int flags, int limit_active, int thresh) { - struct __btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_NOFS); + struct __btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_KERNEL); if (!ret) return NULL; @@ -148,7 +148,7 @@ struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name, int limit_active, int thresh) { - struct btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_NOFS); + struct btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_KERNEL); if (!ret) return NULL; |