[RFC PATCH 1/5] SQUASH rbd/locking: remove rbd_warn() carriage returns

[David Disseldorp <ddiss@xxxxxxx>]

rbd_warn() already appends '\n'.

Signed-off-by: David Disseldorp <ddiss@xxxxxxx>
---
 drivers/block/rbd_main.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/block/rbd_main.c b/drivers/block/rbd_main.c
index 774a03a..57e76ed 100644
--- a/drivers/block/rbd_main.c
+++ b/drivers/block/rbd_main.c
@@ -4369,13 +4369,13 @@ static int rbd_dev_print_lock_info(struct rbd_device *rbd_dev, char *name,
 	switch (addr->in_addr.ss_family) {
 	case AF_INET:
 		sin = (struct sockaddr_in *)&addr->in_addr;
-		rbd_warn(rbd_dev, "%s %s %s.%llu %s %pI4\n",
+		rbd_warn(rbd_dev, "%s %s %s.%llu %s %pI4",
 			 name, cookie, ceph_entity_type_name(type), num, desc,
 			 &sin->sin_addr.s_addr);
 		break;
 	case AF_INET6:
 		sin6 = (struct sockaddr_in6 *)&addr->in_addr;
-		rbd_warn(rbd_dev, "%s %s %s.%llu %s %pI6\n",
+		rbd_warn(rbd_dev, "%s %s %s.%llu %s %pI6",
 			 name, cookie, ceph_entity_type_name(type), num, desc,
 			 &sin6->sin6_addr);
 		break;
@@ -4423,7 +4423,7 @@ static size_t rbd_dev_print_locks(struct rbd_device *rbd_dev)
 						   GFP_KERNEL);
 		if (IS_ERR(lock)) {
 			rbd_warn(rbd_dev,
-				 "Could not print info for all locks\n");
+				 "Could not print info for all locks");
 			ret = PTR_ERR(lock);
 			goto free_list_locks_pg;
 		}
@@ -4580,10 +4580,10 @@ static ssize_t rbd_lock_set(struct device *dev, struct device_attribute *attr,
 
 	ret = sscanf(buf, "%15s %15s %15s\n", name, cookie, desc);
 	if (ret != 3) {
-		rbd_warn(rbd_dev, "Invalid number of params. Got %d\n", ret);
+		rbd_warn(rbd_dev, "Invalid number of params. Got %d", ret);
 		return -EINVAL;
 	} else if (!strlen(name) || !strlen(cookie) || !strlen(desc)) {
-		rbd_warn(rbd_dev, "missing param\n");
+		rbd_warn(rbd_dev, "missing param");
 		return -EINVAL;
 	}
 
@@ -4604,10 +4604,10 @@ static ssize_t rbd_unlock_set(struct device *dev, struct device_attribute *attr,
 
 	ret = sscanf(buf, "%15s %15s\n", name, cookie);
 	if (ret != 2) {
-		rbd_warn(rbd_dev, "Invalid number of params. Got %d\n", ret);
+		rbd_warn(rbd_dev, "Invalid number of params. Got %d", ret);
 		return -EINVAL;
 	} else if (!strlen(name) || !strlen(cookie)) {
-		rbd_warn(rbd_dev, "missing param\n");
+		rbd_warn(rbd_dev, "missing param");
 		return -EINVAL;
 	}
 
@@ -4628,10 +4628,10 @@ static ssize_t rbd_break_locks_set(struct device *dev,
 
 	ret = sscanf(buf, "%15s\n", name);
 	if (ret != 1) {
-		rbd_warn(rbd_dev, "Invalid number of params. Got %d\n", ret);
+		rbd_warn(rbd_dev, "Invalid number of params. Got %d", ret);
 		return -EINVAL;
 	} else if (!strlen(name)) {
-		rbd_warn(rbd_dev, "missing param\n");
+		rbd_warn(rbd_dev, "missing param");
 		return -EINVAL;
 	}
 
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html