lkml.org 
[lkml]   [2008]   [Feb]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 28/28] nfs: fix various memory recursions possible with swap over NFS.
    GFP_NOFS is not enough, since swap traffic is IO, hence fall back to GFP_NOIO.

    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    ---
    fs/nfs/pagelist.c | 2 +-
    fs/nfs/write.c | 6 +++---
    2 files changed, 4 insertions(+), 4 deletions(-)

    Index: linux-2.6/fs/nfs/write.c
    ===================================================================
    --- linux-2.6.orig/fs/nfs/write.c
    +++ linux-2.6/fs/nfs/write.c
    @@ -44,7 +44,7 @@ static struct kmem_cache *nfs_wdata_cach

    struct nfs_write_data *nfs_commit_alloc(void)
    {
    - struct nfs_write_data *p = kmem_cache_alloc(nfs_wdata_cachep, GFP_NOFS);
    + struct nfs_write_data *p = kmem_cache_alloc(nfs_wdata_cachep, GFP_NOIO);

    if (p) {
    memset(p, 0, sizeof(*p));
    @@ -68,7 +68,7 @@ void nfs_commit_free(struct nfs_write_da

    struct nfs_write_data *nfs_writedata_alloc(unsigned int pagecount)
    {
    - struct nfs_write_data *p = kmem_cache_alloc(nfs_wdata_cachep, GFP_NOFS);
    + struct nfs_write_data *p = kmem_cache_alloc(nfs_wdata_cachep, GFP_NOIO);

    if (p) {
    memset(p, 0, sizeof(*p));
    @@ -77,7 +77,7 @@ struct nfs_write_data *nfs_writedata_all
    if (pagecount <= ARRAY_SIZE(p->page_array))
    p->pagevec = p->page_array;
    else {
    - p->pagevec = kcalloc(pagecount, sizeof(struct page *), GFP_NOFS);
    + p->pagevec = kcalloc(pagecount, sizeof(struct page *), GFP_NOIO);
    if (!p->pagevec) {
    kmem_cache_free(nfs_wdata_cachep, p);
    p = NULL;
    Index: linux-2.6/fs/nfs/pagelist.c
    ===================================================================
    --- linux-2.6.orig/fs/nfs/pagelist.c
    +++ linux-2.6/fs/nfs/pagelist.c
    @@ -27,7 +27,7 @@ static inline struct nfs_page *
    nfs_page_alloc(void)
    {
    struct nfs_page *p;
    - p = kmem_cache_alloc(nfs_page_cachep, GFP_KERNEL);
    + p = kmem_cache_alloc(nfs_page_cachep, GFP_NOIO);
    if (p) {
    memset(p, 0, sizeof(*p));
    INIT_LIST_HEAD(&p->wb_list);
    --



    \
     
     \ /
      Last update: 2008-02-20 16:39    [W:0.028 / U:30.436 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site