| Message ID | 1527793665-39150-1-git-send-email-yang.shi@linux.alibaba.com |
|---|---|
| State | Superseded |
| Delegated to: | Petr Vorel |
| Headers | show |
| Series | [Resend] zram03: drop obsolete sysfs interfaces | expand |
On Fri, Jun 1, 2018 at 3:07 AM, Yang Shi <yang.shi@linux.alibaba.com> wrote: > Due to upstream linux commit c87d1655c29500b459fb135258a93f8309ada9c7 > ("zram: remove obsolete sysfs attrs"), some sysfs interfaces are not > available anymore. Remove dumping them to avoid test case failure. > > Signed-off-by: Yang Shi <yang.shi@linux.alibaba.com> > Since the commit is merged from kernel-v4.10, how about changing like this: --- a/testcases/kernel/device-drivers/zram/zram03.c +++ b/testcases/kernel/device-drivers/zram/zram03.c @@ -184,12 +184,17 @@ static void print(char *string) static void dump_info(void) { - print("initstate"); - print("compr_data_size"); - print("orig_data_size"); - print("disksize"); - print("mem_used_total"); - print("num_reads"); - print("num_writes"); - print("zero_pages"); + if ((tst_kvercmp(4, 10, 0)) >= 0) { + print("initstate"); + print("disksize"); + } else { + print("initstate"); + print("compr_data_size"); + print("orig_data_size"); + print("disksize"); + print("mem_used_total"); + print("num_reads"); + print("num_writes"); + print("zero_pages"); + } } > --- > Subscribed LTP mailing list to resend the patch, so that all subscribers > can see it and get reviewed. > > testcases/kernel/device-drivers/zram/zram03.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/testcases/kernel/device-drivers/zram/zram03.c > b/testcases/kernel/device-drivers/zram/zram03.c > index 3f7ab4e..f2c166c 100644 > --- a/testcases/kernel/device-drivers/zram/zram03.c > +++ b/testcases/kernel/device-drivers/zram/zram03.c > @@ -185,11 +185,5 @@ static void print(char *string) > static void dump_info(void) > { > print("initstate"); > - print("compr_data_size"); > - print("orig_data_size"); > print("disksize"); > - print("mem_used_total"); > - print("num_reads"); > - print("num_writes"); > - print("zero_pages"); > } > -- > 1.8.3.1 > > > -- > Mailing list info: https://lists.linux.it/listinfo/ltp >
On 6/4/18 8:55 PM, Li Wang wrote: > > > On Fri, Jun 1, 2018 at 3:07 AM, Yang Shi <yang.shi@linux.alibaba.com > <mailto:yang.shi@linux.alibaba.com>> wrote: > > Due to upstream linux commit c87d1655c29500b459fb135258a93f8309ada9c7 > ("zram: remove obsolete sysfs attrs"), some sysfs interfaces are not > available anymore. Remove dumping them to avoid test case failure. > > Signed-off-by: Yang Shi <yang.shi@linux.alibaba.com > <mailto:yang.shi@linux.alibaba.com>> > > > Since the commit is merged from kernel-v4.10, how about changing like > this: > > --- a/testcases/kernel/device-drivers/zram/zram03.c > +++ b/testcases/kernel/device-drivers/zram/zram03.c > @@ -184,12 +184,17 @@ static void print(char *string) > > static void dump_info(void) > { > - print("initstate"); > - print("compr_data_size"); > - print("orig_data_size"); > - print("disksize"); > - print("mem_used_total"); > - print("num_reads"); > - print("num_writes"); > - print("zero_pages"); > + if ((tst_kvercmp(4, 10, 0)) >= 0) { > + print("initstate"); > + print("disksize"); > + } else { > + print("initstate"); > + print("compr_data_size"); > + print("orig_data_size"); > + print("disksize"); > + print("mem_used_total"); > + print("num_reads"); > + print("num_writes"); > + print("zero_pages"); > + } Yes, sure. Will fix in v2. Thanks for your suggestion. Yang > } > > > --- > Subscribed LTP mailing list to resend the patch, so that all > subscribers > can see it and get reviewed. > > testcases/kernel/device-drivers/zram/zram03.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/testcases/kernel/device-drivers/zram/zram03.c > b/testcases/kernel/device-drivers/zram/zram03.c > index 3f7ab4e..f2c166c 100644 > --- a/testcases/kernel/device-drivers/zram/zram03.c > +++ b/testcases/kernel/device-drivers/zram/zram03.c > @@ -185,11 +185,5 @@ static void print(char *string) > static void dump_info(void) > { > print("initstate"); > - print("compr_data_size"); > - print("orig_data_size"); > print("disksize"); > - print("mem_used_total"); > - print("num_reads"); > - print("num_writes"); > - print("zero_pages"); > } > -- > 1.8.3.1 > > > -- > Mailing list info: https://lists.linux.it/listinfo/ltp > <https://lists.linux.it/listinfo/ltp> > > > > > -- > Regards, > Li Wang <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body text="#000000" bgcolor="#FFFFFF"> <p><br> </p> <br> <div class="moz-cite-prefix">On 6/4/18 8:55 PM, Li Wang wrote:<br> </div> <blockquote type="cite" cite="mid:CAEemH2cYODCdBR7uz_8X33CW3x5kEBfmT9QGn=Kw1OipvOORYA@mail.gmail.com"> <div dir="ltr"> <div style="font-size:small" class="gmail_default"><br> </div> <div class="gmail_extra"><br> <div class="gmail_quote">On Fri, Jun 1, 2018 at 3:07 AM, Yang Shi <span dir="ltr"><<a target="_blank" href="mailto:yang.shi@linux.alibaba.com" moz-do-not-send="true">yang.shi@linux.alibaba.com</a>></span> wrote:<br> <blockquote style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex" class="gmail_quote">Due to upstream linux commit c87d1655c29500b459fb135258a93f<wbr>8309ada9c7<br> ("zram: remove obsolete sysfs attrs"), some sysfs interfaces are not<br> available anymore. Remove dumping them to avoid test case failure.<br> <br> Signed-off-by: Yang Shi <<a href="mailto:yang.shi@linux.alibaba.com" moz-do-not-send="true">yang.shi@linux.alibaba.com</a>><br> </blockquote> <div><br> <div style="font-size:small" class="gmail_default">Since the commit is merged from kernel-v4.10, how about changing like this:<br> <br> --- a/testcases/kernel/device-drivers/zram/zram03.c<br> +++ b/testcases/kernel/device-drivers/zram/zram03.c<br> @@ -184,12 +184,17 @@ static void print(char *string)<br> <br> static void dump_info(void)<br> {<br> - print("initstate");<br> - print("compr_data_size");<br> - print("orig_data_size");<br> - print("disksize");<br> - print("mem_used_total");<br> - print("num_reads");<br> - print("num_writes");<br> - print("zero_pages");<br> + if ((tst_kvercmp(4, 10, 0)) >= 0) {<br> + print("initstate");<br> + print("disksize");<br> + } else {<br> + print("initstate");<br> + print("compr_data_size");<br> + print("orig_data_size");<br> + print("disksize");<br> + print("mem_used_total");<br> + print("num_reads");<br> + print("num_writes");<br> + print("zero_pages");<br> + }<br> </div> </div> </div> </div> </div> </blockquote> <br> Yes, sure. Will fix in v2. Thanks for your suggestion.<br> <br> Yang<br> <br> <blockquote type="cite" cite="mid:CAEemH2cYODCdBR7uz_8X33CW3x5kEBfmT9QGn=Kw1OipvOORYA@mail.gmail.com"> <div dir="ltr"> <div class="gmail_extra"> <div class="gmail_quote"> <div> <div style="font-size:small" class="gmail_default"> }<br> </div> <br> </div> <blockquote style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex" class="gmail_quote"> ---<br> Subscribed LTP mailing list to resend the patch, so that all subscribers<br> can see it and get reviewed.<br> <br> testcases/kernel/device-<wbr>drivers/zram/zram03.c | 6 ------<br> 1 file changed, 6 deletions(-)<br> <br> diff --git a/testcases/kernel/device-<wbr>drivers/zram/zram03.c b/testcases/kernel/device-<wbr>drivers/zram/zram03.c<br> index 3f7ab4e..f2c166c 100644<br> --- a/testcases/kernel/device-<wbr>drivers/zram/zram03.c<br> +++ b/testcases/kernel/device-<wbr>drivers/zram/zram03.c<br> @@ -185,11 +185,5 @@ static void print(char *string)<br> static void dump_info(void)<br> {<br> print("initstate");<br> - print("compr_data_size");<br> - print("orig_data_size");<br> print("disksize");<br> - print("mem_used_total");<br> - print("num_reads");<br> - print("num_writes");<br> - print("zero_pages");<br> }<br> <span class="gmail-HOEnZb"><font color="#888888">-- <br> 1.8.3.1<br> <br> <br> -- <br> Mailing list info: <a target="_blank" rel="noreferrer" href="https://lists.linux.it/listinfo/ltp" moz-do-not-send="true">https://lists.linux.it/<wbr>listinfo/ltp</a><br> </font></span></blockquote> </div> <br> <br clear="all"> <br> -- <br> <div class="gmail_signature"> <div dir="ltr"> <div>Regards,<br> </div> <div>Li Wang<br> </div> </div> </div> </div> </div> </blockquote> <br> </body> </html>
diff --git a/testcases/kernel/device-drivers/zram/zram03.c b/testcases/kernel/device-drivers/zram/zram03.c index 3f7ab4e..f2c166c 100644 --- a/testcases/kernel/device-drivers/zram/zram03.c +++ b/testcases/kernel/device-drivers/zram/zram03.c @@ -185,11 +185,5 @@ static void print(char *string) static void dump_info(void) { print("initstate"); - print("compr_data_size"); - print("orig_data_size"); print("disksize"); - print("mem_used_total"); - print("num_reads"); - print("num_writes"); - print("zero_pages"); }
Due to upstream linux commit c87d1655c29500b459fb135258a93f8309ada9c7 ("zram: remove obsolete sysfs attrs"), some sysfs interfaces are not available anymore. Remove dumping them to avoid test case failure. Signed-off-by: Yang Shi <yang.shi@linux.alibaba.com> --- Subscribed LTP mailing list to resend the patch, so that all subscribers can see it and get reviewed. testcases/kernel/device-drivers/zram/zram03.c | 6 ------ 1 file changed, 6 deletions(-)