diff for duplicates of <1468989000.1900.94.camel@perches.com> diff --git a/a/1.txt b/N1/1.txt index 38af217..5ae91b9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,9 +2,9 @@ On Wed, 2016-07-20 at 00:20 -0400, Nicolas Pitre wrote: > diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c [] > @@ -15,6 +15,8 @@ -> � * JAN/99 -- coded full program relocation (gerg@snapgear.com) -> � */ -> � +> * JAN/99 -- coded full program relocation (gerg@snapgear.com) +> */ +> > +#define pr_fmt(fmt) "BINFMT_FLAT: : " fmt Why the double colon? @@ -12,38 +12,38 @@ Much more common would be #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > @@ -106,8 +98,8 @@ static struct linux_binfmt flat_format = { -> � -> �static int flat_core_dump(struct coredump_params *cprm) -> �{ +> +> static int flat_core_dump(struct coredump_params *cprm) +> { > - printk("Process %s:%d received signr %d and should have core dumped\n", > - current->comm, current->pid, cprm->siginfo->si_signo); > + pr_warning("Process %s:%d received signr %d and should have core dumped\n", -> + ���current->comm, current->pid, cprm->siginfo->si_signo); +> + current->comm, current->pid, cprm->siginfo->si_signo); Prefer pr_warn -> � return(1); -> �} -> � +> return(1); +> } +> > @@ -190,17 +182,17 @@ static int decompress_exec( -> � loff_t fpos; -> � int ret, retval; -> � +> loff_t fpos; +> int ret, retval; +> > - DBG_FLT("decompress_exec(offset=%lx,buf=%p,len=%lx)\n",offset, dst, len); > + pr_debug("decompress_exec(offset=%lx,buf=%p,len=%lx)\n",offset, dst, len); Generally unnecessary as the function tracer works well -> � -> � memset(&strm, 0, sizeof(strm)); -> � strm.workspace = kmalloc(zlib_inflate_workspacesize(), GFP_KERNEL); -> � if (strm.workspace == NULL) { +> +> memset(&strm, 0, sizeof(strm)); +> strm.workspace = kmalloc(zlib_inflate_workspacesize(), GFP_KERNEL); +> if (strm.workspace == NULL) { > - DBG_FLT("binfmt_flat: no memory for decompress workspace\n"); > + pr_debug("no memory for decompress workspace\n"); -> � return -ENOMEM; -> � } -> � buf = kmalloc(LBUFSIZE, GFP_KERNEL); -> � if (buf == NULL) { +> return -ENOMEM; +> } +> buf = kmalloc(LBUFSIZE, GFP_KERNEL); +> if (buf == NULL) { > - DBG_FLT("binfmt_flat: no memory for read buffer\n"); > + pr_debug("no memory for read buffer\n"); diff --git a/a/content_digest b/N1/content_digest index 224a8ea..feb3892 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -15,9 +15,9 @@ "> diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c\n" "[]\n" "> @@ -15,6 +15,8 @@\n" - "> \303\257\302\277\302\275 *\tJAN/99 -- coded full program relocation (gerg@snapgear.com)\n" - "> \303\257\302\277\302\275 */\n" - "> \303\257\302\277\302\275\n" + "> \302\240 *\tJAN/99 -- coded full program relocation (gerg@snapgear.com)\n" + "> \302\240 */\n" + "> \302\240\n" "> +#define pr_fmt(fmt)\t\"BINFMT_FLAT: : \" fmt\n" "\n" "Why the double colon?\n" @@ -25,41 +25,41 @@ "#define pr_fmt(fmt) KBUILD_MODNAME \": \" fmt\n" "\n" "> @@ -106,8 +98,8 @@ static struct linux_binfmt flat_format = {\n" - "> \303\257\302\277\302\275\n" - "> \303\257\302\277\302\275static int flat_core_dump(struct coredump_params *cprm)\n" - "> \303\257\302\277\302\275{\n" + "> \302\240\n" + "> \302\240static int flat_core_dump(struct coredump_params *cprm)\n" + "> \302\240{\n" "> -\tprintk(\"Process %s:%d received signr %d and should have core dumped\\n\",\n" "> -\t\t\tcurrent->comm, current->pid, cprm->siginfo->si_signo);\n" "> +\tpr_warning(\"Process %s:%d received signr %d and should have core dumped\\n\",\n" - "> +\t\t\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275current->comm, current->pid, cprm->siginfo->si_signo);\n" + "> +\t\t\302\240\302\240\302\240current->comm, current->pid, cprm->siginfo->si_signo);\n" "\n" "Prefer pr_warn\n" "\n" - "> \303\257\302\277\302\275\treturn(1);\n" - "> \303\257\302\277\302\275}\n" - "> \303\257\302\277\302\275\n" + "> \302\240\treturn(1);\n" + "> \302\240}\n" + "> \302\240\n" "> @@ -190,17 +182,17 @@ static int decompress_exec(\n" - "> \303\257\302\277\302\275\tloff_t fpos;\n" - "> \303\257\302\277\302\275\tint ret, retval;\n" - "> \303\257\302\277\302\275\n" + "> \302\240\tloff_t fpos;\n" + "> \302\240\tint ret, retval;\n" + "> \302\240\n" "> -\tDBG_FLT(\"decompress_exec(offset=%lx,buf=%p,len=%lx)\\n\",offset, dst, len);\n" "> +\tpr_debug(\"decompress_exec(offset=%lx,buf=%p,len=%lx)\\n\",offset, dst, len);\n" "\n" "Generally unnecessary as the function tracer works well\n" "\n" - "> \303\257\302\277\302\275\n" - "> \303\257\302\277\302\275\tmemset(&strm, 0, sizeof(strm));\n" - "> \303\257\302\277\302\275\tstrm.workspace = kmalloc(zlib_inflate_workspacesize(), GFP_KERNEL);\n" - "> \303\257\302\277\302\275\tif (strm.workspace == NULL) {\n" + "> \302\240\n" + "> \302\240\tmemset(&strm, 0, sizeof(strm));\n" + "> \302\240\tstrm.workspace = kmalloc(zlib_inflate_workspacesize(), GFP_KERNEL);\n" + "> \302\240\tif (strm.workspace == NULL) {\n" "> -\t\tDBG_FLT(\"binfmt_flat: no memory for decompress workspace\\n\");\n" "> +\t\tpr_debug(\"no memory for decompress workspace\\n\");\n" - "> \303\257\302\277\302\275\t\treturn -ENOMEM;\n" - "> \303\257\302\277\302\275\t}\n" - "> \303\257\302\277\302\275\tbuf = kmalloc(LBUFSIZE, GFP_KERNEL);\n" - "> \303\257\302\277\302\275\tif (buf == NULL) {\n" + "> \302\240\t\treturn -ENOMEM;\n" + "> \302\240\t}\n" + "> \302\240\tbuf = kmalloc(LBUFSIZE, GFP_KERNEL);\n" + "> \302\240\tif (buf == NULL) {\n" "> -\t\tDBG_FLT(\"binfmt_flat: no memory for read buffer\\n\");\n" "> +\t\tpr_debug(\"no memory for read buffer\\n\");\n" "\n" Unnecessary OOM messages as allocs do a stack dump -ec367f7c42ccf9fe93ae4011019f81fa88d103eb1450aefb8bcb9216f6211157 +e190dcb637b1f0a111a5a894193e764730c8aa7fa4f2b6d507830da7dd72eb66
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.