imported patch CA-14400-reduce-printk-levels

diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 8e317e115532cccc63e946c4034e6dd44e25fc3a..8d1df373406334620118f97218bbd8d2c513107e 100644 (file)
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -287,7 +287,7 @@ static ssize_t bonding_store_slaves(struct class_device *cd, const char *buffer,
                read_lock_bh(&bond->lock);
                bond_for_each_slave(bond, slave, i)
                        if (strnicmp(slave->dev->name, ifname, IFNAMSIZ) == 0) {
-                               printk(KERN_ERR DRV_NAME
+                               printk(KERN_INFO DRV_NAME
                                       ": %s: Interface %s is already enslaved!\n",
                                       bond->dev->name, ifname);
                                ret = -EPERM;

diff --git a/drivers/xen/blkfront/blkfront.c b/drivers/xen/blkfront/blkfront.c
index 2464f80252068709f48a1960e2cb86b81e64be3d..c6aaa5952b096f8200b023c8f88d8f14b30dab56 100644 (file)
--- a/drivers/xen/blkfront/blkfront.c
+++ b/drivers/xen/blkfront/blkfront.c
@@ -294,7 +294,7 @@ static void backend_changed(struct xenbus_device *dev,
                mutex_lock(&bd->bd_mutex);
 #endif
                if (info->users > 0)
-                       xenbus_dev_error(dev, -EBUSY,
+                       xenbus_dev_error_loglevel(dev, -EBUSY, KERN_DEBUG, 
                                         "Device in use; refusing to close");
                else
                        blkfront_closing(dev);

diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
index 220e1be6de07e2071abc0563ec4cc6eba78a3ad8..07088cdfe57e3d7b9eb9ae74187b0c026bb68e0e 100644 (file)
--- a/drivers/xen/xenbus/xenbus_client.c
+++ b/drivers/xen/xenbus/xenbus_client.c
@@ -159,7 +159,7 @@ static char *error_path(struct xenbus_device *dev)
 }
 
 
-void _dev_error(struct xenbus_device *dev, int err, const char *fmt,
+static void _dev_error(struct xenbus_device *dev, int err, const char *loglevel, const char *fmt,
                va_list ap)
 {
        int ret;
@@ -176,18 +176,19 @@ void _dev_error(struct xenbus_device *dev, int err, const char *fmt,
 
        BUG_ON(len + ret > PRINTF_BUFFER_SIZE-1);
 
-       dev_err(&dev->dev, "%s\n", printf_buffer);
+       printk("%sxenbus dev %s error %s\n", loglevel, dev->nodename,
+              printf_buffer);
 
        path_buffer = error_path(dev);
 
        if (path_buffer == NULL) {
-               printk("xenbus: failed to write error node for %s (%s)\n",
+               printk(KERN_ERR "xenbus: failed to write error node for %s (%s)\n",
                       dev->nodename, printf_buffer);
                goto fail;
        }
 
        if (xenbus_write(XBT_NIL, path_buffer, "error", printf_buffer) != 0) {
-               printk("xenbus: failed to write error node for %s (%s)\n",
+               printk(KERN_ERR "xenbus: failed to write error node for %s (%s)\n",
                       dev->nodename, printf_buffer);
                goto fail;
        }
@@ -199,18 +200,27 @@ fail:
                kfree(path_buffer);
 }
 
-
 void xenbus_dev_error(struct xenbus_device *dev, int err, const char *fmt,
                      ...)
 {
        va_list ap;
 
        va_start(ap, fmt);
-       _dev_error(dev, err, fmt, ap);
+       _dev_error(dev, err, KERN_WARNING, fmt, ap);
        va_end(ap);
 }
 EXPORT_SYMBOL_GPL(xenbus_dev_error);
 
+void xenbus_dev_error_loglevel(struct xenbus_device *dev, int err, const char *loglevel, const char *fmt,
+                     ...)
+{
+       va_list ap;
+
+       va_start(ap, fmt);
+       _dev_error(dev, err, loglevel, fmt, ap);
+       va_end(ap);
+}
+EXPORT_SYMBOL_GPL(xenbus_dev_error_loglevel);
 
 void xenbus_dev_fatal(struct xenbus_device *dev, int err, const char *fmt,
                      ...)
@@ -218,7 +228,7 @@ void xenbus_dev_fatal(struct xenbus_device *dev, int err, const char *fmt,
        va_list ap;
 
        va_start(ap, fmt);
-       _dev_error(dev, err, fmt, ap);
+       _dev_error(dev, err, KERN_ALERT, fmt, ap);
        va_end(ap);
 
        xenbus_switch_state(dev, XenbusStateClosing);

diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h
index c5bd548fd70b5d0bdb269b7eba08af992ada6155..1bdbc9e70e252dfedf665b853df34c754fe0ae2f 100644 (file)
--- a/include/xen/xenbus.h
+++ b/include/xen/xenbus.h
@@ -287,6 +287,13 @@ enum xenbus_state xenbus_read_driver_state(const char *path);
 void xenbus_dev_error(struct xenbus_device *dev, int err, const char *fmt,
                      ...);
 
+/***
+ * The same as xenbus_dev_error, but using loglevel for printks to console.
+ * xenbus_dev_error(dev, err, fmt, args) is equivalent to 
+ * xenbus_dev_error_loglevel(dev, err, KERN_WARNING, fmt, args).
+ */
+void xenbus_dev_error_loglevel(struct xenbus_device *dev, int err, const char *loglevel, const char *fmt,
+                     ...);
 
 /***
  * Equivalent to xenbus_dev_error(dev, err, fmt, args), followed by