diff for duplicates of <20100713102228.2835.64815.sendpatchset@danny.redhat> diff --git a/a/1.txt b/N1/1.txt index b6cf59f..b140f20 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,9 +49,3 @@ index 5c8b918..30bb8ce 100644 } -- 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 526a0df..98bef21 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -66,12 +66,6 @@ " \t\tsk_adjust_memalloc(-1, -RPC_RESERVE_PAGES);\n" " \t}\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 -f48b536a1c0435ef1af205e57d5ed0ae9bf7b5f64d65c048a2f704e2957af97b +d5e5aa5f938b4e5c51877217290ac03a7d96166e96fff9571ad4e0df481dcd1c
diff --git a/a/1.txt b/N2/1.txt index b6cf59f..8b13789 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,57 +1 @@ ->From fd03848cadf5719228f617b72039cc8302d892ef Mon Sep 17 00:00:00 2001 -From: Xiaotian Feng <dfeng@redhat.com> -Date: Tue, 13 Jul 2010 14:00:02 +0800 -Subject: [PATCH 30/30] fix mess up on swap with multi files from same nfs server -xs_swapper() will set xprt->swapper when swapon nfs files, unset xprt->swapper -when swapoff nfs files. This will lead a bug if we swapon multi files from -the same nfs server, they had the same xprt, then the reserved memory could -not be disconnected when we swapoff all files. - -Signed-off-by: Xiaotian Feng <dfeng@redhat.com> ---- - include/linux/sunrpc/xprt.h | 4 ++-- - net/sunrpc/xprtsock.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h -index ba2330d..bc49091 100644 ---- a/include/linux/sunrpc/xprt.h -+++ b/include/linux/sunrpc/xprt.h -@@ -171,8 +171,8 @@ struct rpc_xprt { - unsigned int max_reqs; /* total slots */ - unsigned long state; /* transport state */ - unsigned char shutdown : 1, /* being shut down */ -- resvport : 1, /* use a reserved port */ -- swapper : 1; /* we're swapping over this -+ resvport : 1; /* use a reserved port */ -+ unsigned int swapper; /* we're swapping over this - transport */ - unsigned int bind_index; /* bind function index */ - -diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c -index 5c8b918..30bb8ce 100644 ---- a/net/sunrpc/xprtsock.c -+++ b/net/sunrpc/xprtsock.c -@@ -1662,11 +1662,11 @@ int xs_swapper(struct rpc_xprt *xprt, int enable) - */ - err = sk_adjust_memalloc(1, RPC_RESERVE_PAGES); - if (!err) { -- xprt->swapper = 1; -+ xprt->swapper++; - xs_set_memalloc(xprt); - } - } else if (xprt->swapper) { -- xprt->swapper = 0; -+ xprt->swapper--; - sk_clear_memalloc(transport->inet); - sk_adjust_memalloc(-1, -RPC_RESERVE_PAGES); - } --- -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 526a0df..a239fca 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -16,62 +16,5 @@ " davem@davemloft.net\0" "\00:1\0" "b\0" - ">From fd03848cadf5719228f617b72039cc8302d892ef Mon Sep 17 00:00:00 2001\n" - "From: Xiaotian Feng <dfeng@redhat.com>\n" - "Date: Tue, 13 Jul 2010 14:00:02 +0800\n" - "Subject: [PATCH 30/30] fix mess up on swap with multi files from same nfs server\n" - "\n" - "xs_swapper() will set xprt->swapper when swapon nfs files, unset xprt->swapper\n" - "when swapoff nfs files. This will lead a bug if we swapon multi files from\n" - "the same nfs server, they had the same xprt, then the reserved memory could\n" - "not be disconnected when we swapoff all files.\n" - "\n" - "Signed-off-by: Xiaotian Feng <dfeng@redhat.com>\n" - "---\n" - " include/linux/sunrpc/xprt.h | 4 ++--\n" - " net/sunrpc/xprtsock.c | 4 ++--\n" - " 2 files changed, 4 insertions(+), 4 deletions(-)\n" - "\n" - "diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h\n" - "index ba2330d..bc49091 100644\n" - "--- a/include/linux/sunrpc/xprt.h\n" - "+++ b/include/linux/sunrpc/xprt.h\n" - "@@ -171,8 +171,8 @@ struct rpc_xprt {\n" - " \tunsigned int\t\tmax_reqs;\t/* total slots */\n" - " \tunsigned long\t\tstate;\t\t/* transport state */\n" - " \tunsigned char\t\tshutdown : 1,\t/* being shut down */\n" - "-\t\t\t\tresvport : 1, /* use a reserved port */\n" - "-\t\t\t\tswapper : 1; /* we're swapping over this\n" - "+\t\t\t\tresvport : 1;\t/* use a reserved port */\n" - "+\tunsigned int\t\tswapper;\t/* we're swapping over this\n" - " \t\t\t\t\t\t transport */\n" - " \tunsigned int\t\tbind_index;\t/* bind function index */\n" - " \n" - "diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c\n" - "index 5c8b918..30bb8ce 100644\n" - "--- a/net/sunrpc/xprtsock.c\n" - "+++ b/net/sunrpc/xprtsock.c\n" - "@@ -1662,11 +1662,11 @@ int xs_swapper(struct rpc_xprt *xprt, int enable)\n" - " \t\t */\n" - " \t\terr = sk_adjust_memalloc(1, RPC_RESERVE_PAGES);\n" - " \t\tif (!err) {\n" - "-\t\t\txprt->swapper = 1;\n" - "+\t\t\txprt->swapper++;\n" - " \t\t\txs_set_memalloc(xprt);\n" - " \t\t}\n" - " \t} else if (xprt->swapper) {\n" - "-\t\txprt->swapper = 0;\n" - "+\t\txprt->swapper--;\n" - " \t\tsk_clear_memalloc(transport->inet);\n" - " \t\tsk_adjust_memalloc(-1, -RPC_RESERVE_PAGES);\n" - " \t}\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>" -f48b536a1c0435ef1af205e57d5ed0ae9bf7b5f64d65c048a2f704e2957af97b +0420e5f72eda85ac15519689b0d7c4a26450cf90433895d336d6e4650fd4e9bc
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.