diff options
| author | Yan, Zheng <zyan@redhat.com> | 2015-06-13 11:27:05 +0200 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2015-06-25 10:49:31 +0200 |
| commit | 687265e5a885d6308f5d73e738efe3c2674fa218 (patch) | |
| tree | 65f9c44df4ed4c391b7f7f67d5f7643b703e8d47 /fs/ceph/addr.c | |
| parent | ceph: pre-allocate data structure that tracks caps flushing (diff) | |
| download | linux-687265e5a885d6308f5d73e738efe3c2674fa218.tar.xz linux-687265e5a885d6308f5d73e738efe3c2674fa218.zip | |
ceph: switch some GFP_NOFS memory allocation to GFP_KERNEL
GFP_NOFS memory allocation is required for page writeback path.
But there is no need to use GFP_NOFS in syscall path and readpage
path
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Diffstat (limited to 'fs/ceph/addr.c')
| -rw-r--r-- | fs/ceph/addr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 7edf3c49e661..97102038fe03 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -350,7 +350,7 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max) /* build page vector */ nr_pages = calc_pages_for(0, len); - pages = kmalloc(sizeof(*pages) * nr_pages, GFP_NOFS); + pages = kmalloc(sizeof(*pages) * nr_pages, GFP_KERNEL); ret = -ENOMEM; if (!pages) goto out; @@ -362,7 +362,7 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max) dout("start_read %p adding %p idx %lu\n", inode, page, page->index); if (add_to_page_cache_lru(page, &inode->i_data, page->index, - GFP_NOFS)) { + GFP_KERNEL)) { ceph_fscache_uncache_page(inode, page); page_cache_release(page); dout("start_read %p add_to_page_cache failed %p\n", |