diff options
| author | David Sterba | 2016-02-26 15:38:28 +0100 |
|---|---|---|
| committer | David Sterba | 2016-02-26 15:38:28 +0100 |
| commit | e22b3d1fbe596c7feba6782dab2e11c7b99f1d90 (patch) | |
| tree | 50cfe9b71c227c8661b785ab3a0a5cab33ad8e3f /fs/btrfs/ioctl.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 | kernel-qcow2-linux-e22b3d1fbe596c7feba6782dab2e11c7b99f1d90.tar.gz kernel-qcow2-linux-e22b3d1fbe596c7feba6782dab2e11c7b99f1d90.tar.xz kernel-qcow2-linux-e22b3d1fbe596c7feba6782dab2e11c7b99f1d90.zip | |
Merge branch 'dev/gfp-flags' into for-chris-4.6
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 93e7832d1d1b..9ba7b5be3fe5 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -2925,8 +2925,8 @@ static int btrfs_cmp_data_prepare(struct inode *src, u64 loff, * of the array is bounded by len, which is in turn bounded by * BTRFS_MAX_DEDUPE_LEN. */ - src_pgarr = kzalloc(num_pages * sizeof(struct page *), GFP_NOFS); - dst_pgarr = kzalloc(num_pages * sizeof(struct page *), GFP_NOFS); + src_pgarr = kcalloc(num_pages, sizeof(struct page *), GFP_KERNEL); + dst_pgarr = kcalloc(num_pages, sizeof(struct page *), GFP_KERNEL); if (!src_pgarr || !dst_pgarr) { kfree(src_pgarr); kfree(dst_pgarr); |