diff for duplicates of <20100713102155.2835.71936.sendpatchset@danny.redhat> diff --git a/a/1.txt b/N1/1.txt index 1cfdc74..ff30421 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -64,9 +64,3 @@ index 5852b20..dfa08cb 100644 p = NULL; -- 1.7.1.1 - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N1/content_digest index f927d27..5051e55 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -81,12 +81,6 @@ " \t\t\t\tmempool_free(p, nfs_wdata_mempool);\n" " \t\t\t\tp = NULL;\n" "-- \n" - "1.7.1.1\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + 1.7.1.1 -5a41430993890c951958bde8eb87b58c17904c92dd002ecd2b56eaadcf6403f5 +2760b3023dd41920ac7661dd4e0f973598ff95d20b929590e9e382d3cea23f6c
diff --git a/a/1.txt b/N2/1.txt index 1cfdc74..8b13789 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,72 +1 @@ ->From df0106f58d7ac2337f74efb1d8caaf27f635e050 Mon Sep 17 00:00:00 2001 -From: Xiaotian Feng <dfeng@redhat.com> -Date: Tue, 13 Jul 2010 13:11:32 +0800 -Subject: [PATCH 27/30] nfs: fix various memory recursions possible with swap over NFS. -GFP_NOFS is _more_ permissive than GFP_NOIO in that it will initiate IO, -just not of any filesystem data. - -The problem is that previuosly NOFS was correct because that avoids -recursion into the NFS code, it now is not, because also IO (swap) can -lead to this recursion. - -Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> -Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> -Signed-off-by: Xiaotian Feng <dfeng@redhat.com> ---- - fs/nfs/pagelist.c | 2 +- - fs/nfs/write.c | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c -index 2be94bb..c0247e9 100644 ---- a/fs/nfs/pagelist.c -+++ b/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); -diff --git a/fs/nfs/write.c b/fs/nfs/write.c -index 5852b20..dfa08cb 100644 ---- a/fs/nfs/write.c -+++ b/fs/nfs/write.c -@@ -50,7 +50,7 @@ static mempool_t *nfs_commit_mempool; - - struct nfs_write_data *nfs_commitdata_alloc(void) - { -- struct nfs_write_data *p = mempool_alloc(nfs_commit_mempool, GFP_NOFS); -+ struct nfs_write_data *p = mempool_alloc(nfs_commit_mempool, GFP_NOIO); - - if (p) { - memset(p, 0, sizeof(*p)); -@@ -69,7 +69,7 @@ void nfs_commit_free(struct nfs_write_data *p) - - struct nfs_write_data *nfs_writedata_alloc(unsigned int pagecount) - { -- struct nfs_write_data *p = mempool_alloc(nfs_wdata_mempool, GFP_NOFS); -+ struct nfs_write_data *p = mempool_alloc(nfs_wdata_mempool, GFP_NOIO); - - if (p) { - memset(p, 0, sizeof(*p)); -@@ -79,7 +79,7 @@ struct nfs_write_data *nfs_writedata_alloc(unsigned int pagecount) - 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) { - mempool_free(p, nfs_wdata_mempool); - p = NULL; --- -1.7.1.1 - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N2/content_digest index f927d27..284eb01 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -16,77 +16,5 @@ " davem@davemloft.net\0" "\00:1\0" "b\0" - ">From df0106f58d7ac2337f74efb1d8caaf27f635e050 Mon Sep 17 00:00:00 2001\n" - "From: Xiaotian Feng <dfeng@redhat.com>\n" - "Date: Tue, 13 Jul 2010 13:11:32 +0800\n" - "Subject: [PATCH 27/30] nfs: fix various memory recursions possible with swap over NFS.\n" - "\n" - "GFP_NOFS is _more_ permissive than GFP_NOIO in that it will initiate IO,\n" - "just not of any filesystem data.\n" - "\n" - "The problem is that previuosly NOFS was correct because that avoids\n" - "recursion into the NFS code, it now is not, because also IO (swap) can\n" - "lead to this recursion.\n" - "\n" - "Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>\n" - "Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de>\n" - "Signed-off-by: Xiaotian Feng <dfeng@redhat.com>\n" - "---\n" - " fs/nfs/pagelist.c | 2 +-\n" - " fs/nfs/write.c | 6 +++---\n" - " 2 files changed, 4 insertions(+), 4 deletions(-)\n" - "\n" - "diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c\n" - "index 2be94bb..c0247e9 100644\n" - "--- a/fs/nfs/pagelist.c\n" - "+++ b/fs/nfs/pagelist.c\n" - "@@ -27,7 +27,7 @@ static inline struct nfs_page *\n" - " nfs_page_alloc(void)\n" - " {\n" - " \tstruct nfs_page\t*p;\n" - "-\tp = kmem_cache_alloc(nfs_page_cachep, GFP_KERNEL);\n" - "+\tp = kmem_cache_alloc(nfs_page_cachep, GFP_NOIO);\n" - " \tif (p) {\n" - " \t\tmemset(p, 0, sizeof(*p));\n" - " \t\tINIT_LIST_HEAD(&p->wb_list);\n" - "diff --git a/fs/nfs/write.c b/fs/nfs/write.c\n" - "index 5852b20..dfa08cb 100644\n" - "--- a/fs/nfs/write.c\n" - "+++ b/fs/nfs/write.c\n" - "@@ -50,7 +50,7 @@ static mempool_t *nfs_commit_mempool;\n" - " \n" - " struct nfs_write_data *nfs_commitdata_alloc(void)\n" - " {\n" - "-\tstruct nfs_write_data *p = mempool_alloc(nfs_commit_mempool, GFP_NOFS);\n" - "+\tstruct nfs_write_data *p = mempool_alloc(nfs_commit_mempool, GFP_NOIO);\n" - " \n" - " \tif (p) {\n" - " \t\tmemset(p, 0, sizeof(*p));\n" - "@@ -69,7 +69,7 @@ void nfs_commit_free(struct nfs_write_data *p)\n" - " \n" - " struct nfs_write_data *nfs_writedata_alloc(unsigned int pagecount)\n" - " {\n" - "-\tstruct nfs_write_data *p = mempool_alloc(nfs_wdata_mempool, GFP_NOFS);\n" - "+\tstruct nfs_write_data *p = mempool_alloc(nfs_wdata_mempool, GFP_NOIO);\n" - " \n" - " \tif (p) {\n" - " \t\tmemset(p, 0, sizeof(*p));\n" - "@@ -79,7 +79,7 @@ struct nfs_write_data *nfs_writedata_alloc(unsigned int pagecount)\n" - " \t\tif (pagecount <= ARRAY_SIZE(p->page_array))\n" - " \t\t\tp->pagevec = p->page_array;\n" - " \t\telse {\n" - "-\t\t\tp->pagevec = kcalloc(pagecount, sizeof(struct page *), GFP_NOFS);\n" - "+\t\t\tp->pagevec = kcalloc(pagecount, sizeof(struct page *), GFP_NOIO);\n" - " \t\t\tif (!p->pagevec) {\n" - " \t\t\t\tmempool_free(p, nfs_wdata_mempool);\n" - " \t\t\t\tp = NULL;\n" - "-- \n" - "1.7.1.1\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -5a41430993890c951958bde8eb87b58c17904c92dd002ecd2b56eaadcf6403f5 +ca21aed33a1626b71514035e76fae69deffdcb91227bf1957e4a5a86cc51dcce
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.