| Message ID | 577E29A902000078000FBF28@prv-mh.provo.novell.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jul 07, 2016 at 02:06:33AM -0600, Jan Beulich wrote: > ... as being the simpler variant. > > Signed-off-by: Jan Beulich <jbeulich@suse.com> > --- > drivers/block/xen-blkfront.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > --- 4.7-rc6-prefer-xenbus_write.orig/drivers/block/xen-blkfront.c > +++ 4.7-rc6-prefer-xenbus_write/drivers/block/xen-blkfront.c > @@ -1825,14 +1825,13 @@ again: > } > kfree(path); > } > - err = xenbus_printf(xbt, dev->nodename, "protocol", "%s", > - XEN_IO_PROTO_ABI_NATIVE); > + err = xenbus_write(xbt, dev->nodename, "protocol", > + XEN_IO_PROTO_ABI_NATIVE); > if (err) { > message = "writing protocol"; > goto abort_transaction; > } > - err = xenbus_printf(xbt, dev->nodename, > - "feature-persistent", "%u", 1); > + err = xenbus_printf(xbt, dev->nodename, "feature-persistent", "1"); AFAICT you forgot to replace xenbus_printf with xenbus_write here. Roger.
>>> On 07.07.16 at 11:44, <roger.pau@citrix.com> wrote: > On Thu, Jul 07, 2016 at 02:06:33AM -0600, Jan Beulich wrote: >> ... as being the simpler variant. >> >> Signed-off-by: Jan Beulich <jbeulich@suse.com> >> --- >> drivers/block/xen-blkfront.c | 7 +++---- >> 1 file changed, 3 insertions(+), 4 deletions(-) >> >> --- 4.7-rc6-prefer-xenbus_write.orig/drivers/block/xen-blkfront.c >> +++ 4.7-rc6-prefer-xenbus_write/drivers/block/xen-blkfront.c >> @@ -1825,14 +1825,13 @@ again: >> } >> kfree(path); >> } >> - err = xenbus_printf(xbt, dev->nodename, "protocol", "%s", >> - XEN_IO_PROTO_ABI_NATIVE); >> + err = xenbus_write(xbt, dev->nodename, "protocol", >> + XEN_IO_PROTO_ABI_NATIVE); >> if (err) { >> message = "writing protocol"; >> goto abort_transaction; >> } >> - err = xenbus_printf(xbt, dev->nodename, >> - "feature-persistent", "%u", 1); >> + err = xenbus_printf(xbt, dev->nodename, "feature-persistent", "1"); > > AFAICT you forgot to replace xenbus_printf with xenbus_write here. Oops, indeed - thanks for noticing. Jan
--- 4.7-rc6-prefer-xenbus_write.orig/drivers/block/xen-blkfront.c +++ 4.7-rc6-prefer-xenbus_write/drivers/block/xen-blkfront.c @@ -1825,14 +1825,13 @@ again: } kfree(path); } - err = xenbus_printf(xbt, dev->nodename, "protocol", "%s", - XEN_IO_PROTO_ABI_NATIVE); + err = xenbus_write(xbt, dev->nodename, "protocol", + XEN_IO_PROTO_ABI_NATIVE); if (err) { message = "writing protocol"; goto abort_transaction; } - err = xenbus_printf(xbt, dev->nodename, - "feature-persistent", "%u", 1); + err = xenbus_printf(xbt, dev->nodename, "feature-persistent", "1"); if (err) dev_warn(&dev->dev, "writing persistent grants feature to xenbus");
... as being the simpler variant. Signed-off-by: Jan Beulich <jbeulich@suse.com> --- drivers/block/xen-blkfront.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)