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/inode.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.xz linux-e22b3d1fbe596c7feba6782dab2e11c7b99f1d90.zip | |
Merge branch 'dev/gfp-flags' into for-chris-4.6
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 3e0d41511517..f8be74037f34 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -5793,7 +5793,7 @@ static int btrfs_real_readdir(struct file *file, struct dir_context *ctx) if (name_len <= sizeof(tmp_name)) { name_ptr = tmp_name; } else { - name_ptr = kmalloc(name_len, GFP_NOFS); + name_ptr = kmalloc(name_len, GFP_KERNEL); if (!name_ptr) { ret = -ENOMEM; goto err; |