On Wed, May 18, 2016 at 5:00 AM, Namhyung Kim <[email protected]> wrote: > The code is duplicate between compression is enabled or not. > > Signed-off-by: Namhyung Kim <[email protected]> > --- > fs/pstore/platform.c | 32 +++++++++++++------------------- > 1 file changed, 13 insertions(+), 19 deletions(-) > > diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c > index 04a0164a2066..277730f6c462 100644 > --- a/fs/pstore/platform.c > +++ b/fs/pstore/platform.c > @@ -304,19 +304,25 @@ static void pstore_dump(struct kmsg_dumper *dumper, > int hsize; > int zipped_len = -1; > size_t len; > - bool compressed; > + bool compressed = false; > size_t total_len; > > if (big_oops_buf && is_locked) { > dst = big_oops_buf; > - hsize = sprintf(dst, "%s#%d Part%u\n", why, > - oopscount, part); > - size = big_oops_buf_sz - hsize; > + size = big_oops_buf_sz; > + } else { > + dst = psinfo->buf; > + size = psinfo->bufsize; > + } > > - if (!kmsg_dump_get_buffer(dumper, true, dst + hsize, > - size, &len)) > - break; > + hsize = sprintf(dst, "%s#%d Part%u\n", why, oopscount, part); > + size -= hsize; > + > + if (!kmsg_dump_get_buffer(dumper, true, dst + hsize, > + size, &len)) > + break; > > + if (big_oops_buf && is_locked) { > zipped_len = pstore_compress(dst, psinfo->buf, > hsize + len, psinfo->bufsize); > > @@ -324,21 +330,9 @@ static void pstore_dump(struct kmsg_dumper *dumper, > compressed = true; > total_len = zipped_len; > } else { > - compressed = false; > total_len = copy_kmsg_to_buffer(hsize, len); > } > } else { > - dst = psinfo->buf; > - hsize = sprintf(dst, "%s#%d Part%u\n", why, oopscount, > - part); > - size = psinfo->bufsize - hsize; > - dst += hsize; > - > - if (!kmsg_dump_get_buffer(dumper, true, dst, > - size, &len)) > - break; > - > - compressed = false; > total_len = hsize + len; > } > > -- > 2.8.0 >
Nice cleanup, thanks! Applied. -Kees -- Kees Cook Chrome OS & Brillo Security
