diff for duplicates of <20150915073801.GA480@swordfish> diff --git a/a/1.txt b/N1/1.txt index 7ed2399..926906f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -38,9 +38,9 @@ mutt, etc. > > > > > > Signed-off-by: Vitaly Wool <[2]vitalywool@gmail.com> > > > --- -> > > drivers/block/zram/zram_drv.c | 13 +++++++++++++ -> > > drivers/block/zram/zram_drv.h | 16 ---------------- -> > > 2 files changed, 13 insertions(+), 16 deletions(-) +> > > drivers/block/zram/zram_drv.c | 13 +++++++++++++ +> > > drivers/block/zram/zram_drv.h | 16 ---------------- +> > > 2 files changed, 13 insertions(+), 16 deletions(-) > > > > > > diff --git a/drivers/block/zram/zram_drv.c > b/drivers/block/zram/zram_drv.c @@ -49,38 +49,38 @@ mutt, etc. > > > +++ b/drivers/block/zram/zram_drv.c > > > @@ -42,6 +42,7 @@ static const char *default_compressor = "lzo"; > > > -> > > /* Module params (documentation at end) */ -> > > static unsigned int num_devices = 1; +> > > /* Module params (documentation at end) */ +> > > static unsigned int num_devices = 1; > > > +static size_t max_zpage_size = PAGE_SIZE / 4 * 3; > > > -> > > static inline void deprecated_attr_warn(const char *name) -> > > { +> > > static inline void deprecated_attr_warn(const char *name) +> > > { > > > @@ -1411,6 +1412,16 @@ static int __init zram_init(void) -> > > return ret; -> > > } +> > > return ret; +> > > } > > > -> > > + /* -> > > + * max_zpage_size must be less than or equal to: -> > > + * ZS_MAX_ALLOC_SIZE. Otherwise, zs_malloc() would -> > > + * always return failure. -> > > + */ -> > > + if (max_zpage_size > PAGE_SIZE) { -> > > + pr_err("Invalid max_zpage_size %ld\n", max_zpage_size); +> > > + /* +> > > + * max_zpage_size must be less than or equal to: +> > > + * ZS_MAX_ALLOC_SIZE. Otherwise, zs_malloc() would +> > > + * always return failure. +> > > + */ +> > > + if (max_zpage_size > PAGE_SIZE) { +> > > + pr_err("Invalid max_zpage_size %ld\n", max_zpage_size); > > > > and how do people find out ZS_MAX_ALLOC_SIZE? this error message does > not > > help. > > -> > > + return -EINVAL; -> > > + } +> > > + return -EINVAL; +> > > + } > > > + -> > > zram_major = register_blkdev(0, "zram"); -> > > if (zram_major <= 0) { -> > > pr_err("Unable to get major number\n"); +> > > zram_major = register_blkdev(0, "zram"); +> > > if (zram_major <= 0) { +> > > pr_err("Unable to get major number\n"); > > > @@ -1444,6 +1455,8 @@ module_exit(zram_exit); > > > -> > > module_param(num_devices, uint, 0); -> > > MODULE_PARM_DESC(num_devices, "Number of pre-created zram devices"); +> > > module_param(num_devices, uint, 0); +> > > MODULE_PARM_DESC(num_devices, "Number of pre-created zram devices"); > > > +module_param(max_zpage_size, ulong, 0); > > > +MODULE_PARM_DESC(max_zpage_size, "Threshold for storing compressed > pages"); @@ -89,8 +89,8 @@ mutt, etc. > > > > > > > -> > > MODULE_LICENSE("Dual BSD/GPL"); -> > > MODULE_AUTHOR("Nitin Gupta <[3]ngupta@vflare.org>"); +> > > MODULE_LICENSE("Dual BSD/GPL"); +> > > MODULE_AUTHOR("Nitin Gupta <[3]ngupta@vflare.org>"); > > > diff --git a/drivers/block/zram/zram_drv.h > b/drivers/block/zram/zram_drv.h > > > index 8e92339..3a29c33 100644 @@ -98,7 +98,7 @@ mutt, etc. > > > +++ b/drivers/block/zram/zram_drv.h > > > @@ -20,22 +20,6 @@ > > > -> > > #include "zcomp.h" +> > > #include "zcomp.h" > > > > > > -/*-- Configurable parameters */ > > > - @@ -110,21 +110,21 @@ mutt, etc. > > > - > > > -/* > > > - * NOTE: max_zpage_size must be less than or equal to: -> > > - * ZS_MAX_ALLOC_SIZE. Otherwise, zs_malloc() would +> > > - * ZS_MAX_ALLOC_SIZE. Otherwise, zs_malloc() would > > > - * always return failure. > > > - */ > > > - > > > -/*-- End of configurable params */ > > > - -> > > #define SECTOR_SHIFT 9 -> > > #define SECTORS_PER_PAGE_SHIFT (PAGE_SHIFT - SECTOR_SHIFT) -> > > #define SECTORS_PER_PAGE (1 << SECTORS_PER_PAGE_SHIFT) +> > > #define SECTOR_SHIFT 9 +> > > #define SECTORS_PER_PAGE_SHIFT (PAGE_SHIFT - SECTOR_SHIFT) +> > > #define SECTORS_PER_PAGE (1 << SECTORS_PER_PAGE_SHIFT) > > > -- > > > 1.9.1 > > > > > > -- > > > To unsubscribe, send a message with 'unsubscribe linux-mm' in -> > > the body to [4]majordomo@kvack.org. For more info on Linux MM, +> > > the body to [4]majordomo@kvack.org. For more info on Linux MM, > > > see: [5]http://www.linux-mm.org/ . > > > Don't email: <a href=mailto:"[6]dont@kvack.org"> [7]email@kvack.org > </a> @@ -140,9 +140,3 @@ mutt, etc. > 5. http://www.linux-mm.org/ > 6. mailto:dont@kvack.org > 7. mailto:email@kvack.org - --- -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 cc13a3c..1cbbe68 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -54,9 +54,9 @@ "> > >\n" "> > > Signed-off-by: Vitaly Wool <[2]vitalywool@gmail.com>\n" "> > > ---\n" - "> > > drivers/block/zram/zram_drv.c | 13 +++++++++++++\n" - "> > > drivers/block/zram/zram_drv.h | 16 ----------------\n" - "> > > 2 files changed, 13 insertions(+), 16 deletions(-)\n" + "> > >\302\240 drivers/block/zram/zram_drv.c | 13 +++++++++++++\n" + "> > >\302\240 drivers/block/zram/zram_drv.h | 16 ----------------\n" + "> > >\302\240 2 files changed, 13 insertions(+), 16 deletions(-)\n" "> > >\n" "> > > diff --git a/drivers/block/zram/zram_drv.c\n" "> b/drivers/block/zram/zram_drv.c\n" @@ -65,38 +65,38 @@ "> > > +++ b/drivers/block/zram/zram_drv.c\n" "> > > @@ -42,6 +42,7 @@ static const char *default_compressor = \"lzo\";\n" "> > >\n" - "> > > /* Module params (documentation at end) */\n" - "> > > static unsigned int num_devices = 1;\n" + "> > >\302\240 /* Module params (documentation at end) */\n" + "> > >\302\240 static unsigned int num_devices = 1;\n" "> > > +static size_t max_zpage_size = PAGE_SIZE / 4 * 3;\n" "> > >\n" - "> > > static inline void deprecated_attr_warn(const char *name)\n" - "> > > {\n" + "> > >\302\240 static inline void deprecated_attr_warn(const char *name)\n" + "> > >\302\240 {\n" "> > > @@ -1411,6 +1412,16 @@ static int __init zram_init(void)\n" - "> > > return ret;\n" - "> > > }\n" + "> > >\302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240return ret;\n" + "> > >\302\240 \302\240 \302\240 \302\240}\n" "> > >\n" - "> > > + /*\n" - "> > > + * max_zpage_size must be less than or equal to:\n" - "> > > + * ZS_MAX_ALLOC_SIZE. Otherwise, zs_malloc() would\n" - "> > > + * always return failure.\n" - "> > > + */\n" - "> > > + if (max_zpage_size > PAGE_SIZE) {\n" - "> > > + pr_err(\"Invalid max_zpage_size %ld\\n\", max_zpage_size);\n" + "> > > +\302\240 \302\240 \302\240/*\n" + "> > > +\302\240 \302\240 \302\240 * max_zpage_size must be less than or equal to:\n" + "> > > +\302\240 \302\240 \302\240 * ZS_MAX_ALLOC_SIZE. Otherwise, zs_malloc() would\n" + "> > > +\302\240 \302\240 \302\240 * always return failure.\n" + "> > > +\302\240 \302\240 \302\240 */\n" + "> > > +\302\240 \302\240 \302\240if (max_zpage_size > PAGE_SIZE) {\n" + "> > > +\302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240pr_err(\"Invalid max_zpage_size %ld\\n\", max_zpage_size);\n" "> >\n" "> > and how do people find out ZS_MAX_ALLOC_SIZE? this error message does\n" "> not\n" "> > help.\n" "> >\n" - "> > > + return -EINVAL;\n" - "> > > + }\n" + "> > > +\302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240return -EINVAL;\n" + "> > > +\302\240 \302\240 \302\240}\n" "> > > +\n" - "> > > zram_major = register_blkdev(0, \"zram\");\n" - "> > > if (zram_major <= 0) {\n" - "> > > pr_err(\"Unable to get major number\\n\");\n" + "> > >\302\240 \302\240 \302\240 \302\240zram_major = register_blkdev(0, \"zram\");\n" + "> > >\302\240 \302\240 \302\240 \302\240if (zram_major <= 0) {\n" + "> > >\302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240pr_err(\"Unable to get major number\\n\");\n" "> > > @@ -1444,6 +1455,8 @@ module_exit(zram_exit);\n" "> > >\n" - "> > > module_param(num_devices, uint, 0);\n" - "> > > MODULE_PARM_DESC(num_devices, \"Number of pre-created zram devices\");\n" + "> > >\302\240 module_param(num_devices, uint, 0);\n" + "> > >\302\240 MODULE_PARM_DESC(num_devices, \"Number of pre-created zram devices\");\n" "> > > +module_param(max_zpage_size, ulong, 0);\n" "> > > +MODULE_PARM_DESC(max_zpage_size, \"Threshold for storing compressed\n" "> pages\");\n" @@ -105,8 +105,8 @@ "> >\n" "> >\n" "> > >\n" - "> > > MODULE_LICENSE(\"Dual BSD/GPL\");\n" - "> > > MODULE_AUTHOR(\"Nitin Gupta <[3]ngupta@vflare.org>\");\n" + "> > >\302\240 MODULE_LICENSE(\"Dual BSD/GPL\");\n" + "> > >\302\240 MODULE_AUTHOR(\"Nitin Gupta <[3]ngupta@vflare.org>\");\n" "> > > diff --git a/drivers/block/zram/zram_drv.h\n" "> b/drivers/block/zram/zram_drv.h\n" "> > > index 8e92339..3a29c33 100644\n" @@ -114,7 +114,7 @@ "> > > +++ b/drivers/block/zram/zram_drv.h\n" "> > > @@ -20,22 +20,6 @@\n" "> > >\n" - "> > > #include \"zcomp.h\"\n" + "> > >\302\240 #include \"zcomp.h\"\n" "> > >\n" "> > > -/*-- Configurable parameters */\n" "> > > -\n" @@ -126,21 +126,21 @@ "> > > -\n" "> > > -/*\n" "> > > - * NOTE: max_zpage_size must be less than or equal to:\n" - "> > > - * ZS_MAX_ALLOC_SIZE. Otherwise, zs_malloc() would\n" + "> > > - *\302\240 \302\240ZS_MAX_ALLOC_SIZE. Otherwise, zs_malloc() would\n" "> > > - * always return failure.\n" "> > > - */\n" "> > > -\n" "> > > -/*-- End of configurable params */\n" "> > > -\n" - "> > > #define SECTOR_SHIFT 9\n" - "> > > #define SECTORS_PER_PAGE_SHIFT (PAGE_SHIFT - SECTOR_SHIFT)\n" - "> > > #define SECTORS_PER_PAGE (1 << SECTORS_PER_PAGE_SHIFT)\n" + "> > >\302\240 #define SECTOR_SHIFT\302\240 \302\240 \302\240 \302\240 \302\2409\n" + "> > >\302\240 #define SECTORS_PER_PAGE_SHIFT\302\240 \302\240 \302\240 \302\240(PAGE_SHIFT - SECTOR_SHIFT)\n" + "> > >\302\240 #define SECTORS_PER_PAGE\302\240 \302\240 \302\240(1 << SECTORS_PER_PAGE_SHIFT)\n" "> > > --\n" "> > > 1.9.1\n" "> > >\n" "> > > --\n" "> > > To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "> > > the body to [4]majordomo@kvack.org. For more info on Linux MM,\n" + "> > > the body to [4]majordomo@kvack.org.\302\240 For more info on Linux MM,\n" "> > > see: [5]http://www.linux-mm.org/ .\n" "> > > Don't email: <a href=mailto:\"[6]dont@kvack.org\"> [7]email@kvack.org\n" "> </a>\n" @@ -155,12 +155,6 @@ "> 4. mailto:majordomo@kvack.org\n" "> 5. http://www.linux-mm.org/\n" "> 6. mailto:dont@kvack.org\n" - "> 7. mailto:email@kvack.org\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>" + > 7. mailto:email@kvack.org -9bca0ace0521ba136556ea43b28103248de9d0e07ed3324f3aedc6ba2c2950d5 +b3115f0436203c1b6368e8ba46cce22075a4f36299ecb33951e41e7fe5491876
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.