NFS: Don't loop forever in nfs_do_recoalesce()

[linux-2.6-microblaze.git] / fs / nfs / pagelist.c

diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index ad7f83d..9157dd1 100644 (file)
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -90,10 +90,10 @@ void nfs_set_pgio_error(struct nfs_pgio_header *hdr, int error, loff_t pos)
        }
 }
 
-static inline struct nfs_page *
-nfs_page_alloc(void)
+static inline struct nfs_page *nfs_page_alloc(void)
 {
-       struct nfs_page *p = kmem_cache_zalloc(nfs_page_cachep, GFP_KERNEL);
+       struct nfs_page *p =
+               kmem_cache_zalloc(nfs_page_cachep, nfs_io_gfp_mask());
        if (p)
                INIT_LIST_HEAD(&p->wb_list);
        return p;
@@ -892,7 +892,7 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *desc,
        struct nfs_commit_info cinfo;
        struct nfs_page_array *pg_array = &hdr->page_array;
        unsigned int pagecount, pageused;
-       gfp_t gfp_flags = GFP_KERNEL;
+       gfp_t gfp_flags = nfs_io_gfp_mask();
 
        pagecount = nfs_page_array_len(mirror->pg_base, mirror->pg_count);
        pg_array->npages = pagecount;
@@ -979,7 +979,7 @@ nfs_pageio_alloc_mirrors(struct nfs_pageio_descriptor *desc,
        desc->pg_mirrors_dynamic = NULL;
        if (mirror_count == 1)
                return desc->pg_mirrors_static;
-       ret = kmalloc_array(mirror_count, sizeof(*ret), GFP_KERNEL);
+       ret = kmalloc_array(mirror_count, sizeof(*ret), nfs_io_gfp_mask());
        if (ret != NULL) {
                for (i = 0; i < mirror_count; i++)
                        nfs_pageio_mirror_init(&ret[i], desc->pg_bsize);
@@ -1218,6 +1218,7 @@ static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc)
 
        do {
                list_splice_init(&mirror->pg_list, &head);
+               mirror->pg_recoalesce = 0;
 
                while (!list_empty(&head)) {
                        struct nfs_page *req;