aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/xen
diff options
context:
space:
mode:
authorChen Gang <gang.chen.5i5j@gmail.com>2014-09-26 11:36:03 -0400
committerDavid Vrabel <david.vrabel@citrix.com>2014-10-06 05:27:56 -0400
commit305559f16538708b603ceeb317ebaed9c4da9ce9 (patch)
tree6b9e6ab3e351f865b817c296a25a9e19b56c69e4 /drivers/xen
parentc7440a2f225e3b37abbe27f069465cd31ba94b3c (diff)
xen/xenbus: Remove BUG_ON() when error string trucated
xenbus_va_dev_error() is for printing error, so when error string is too long to be truncated, need not BUG_ON(), still return truncation string is OK. Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/xenbus/xenbus_client.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
index aa9b2fcdaeb2..ca744102b666 100644
--- a/drivers/xen/xenbus/xenbus_client.c
+++ b/drivers/xen/xenbus/xenbus_client.c
@@ -259,7 +259,6 @@ static char *error_path(struct xenbus_device *dev)
259static void xenbus_va_dev_error(struct xenbus_device *dev, int err, 259static void xenbus_va_dev_error(struct xenbus_device *dev, int err,
260 const char *fmt, va_list ap) 260 const char *fmt, va_list ap)
261{ 261{
262 int ret;
263 unsigned int len; 262 unsigned int len;
264 char *printf_buffer = NULL; 263 char *printf_buffer = NULL;
265 char *path_buffer = NULL; 264 char *path_buffer = NULL;
@@ -270,9 +269,7 @@ static void xenbus_va_dev_error(struct xenbus_device *dev, int err,
270 goto fail; 269 goto fail;
271 270
272 len = sprintf(printf_buffer, "%i ", -err); 271 len = sprintf(printf_buffer, "%i ", -err);
273 ret = vsnprintf(printf_buffer+len, PRINTF_BUFFER_SIZE-len, fmt, ap); 272 vsnprintf(printf_buffer+len, PRINTF_BUFFER_SIZE-len, fmt, ap);
274
275 BUG_ON(len + ret > PRINTF_BUFFER_SIZE-1);
276 273
277 dev_err(&dev->dev, "%s\n", printf_buffer); 274 dev_err(&dev->dev, "%s\n", printf_buffer);
278 275