rds: logging neatening

Joe Perches (2):
rds: Remove unused rds_conn_error
rds: Remove duplicate prefix from rds_conn_path_error use

 net/rds/connection.c | 15 ---------------
 net/rds/rds.h        |  4 ----
 net/rds/threads.c    |  3 +--
 3 files changed, 1 insertion(+), 21 deletions(-)

2.10.0.rc2.1.g053435c

This macro's last use was removed in commit d769ef81d5b59 ("RDS: Update rds_conn_shutdown to work with rds_conn_path") so make the macro and the __rds_conn_error function definition and declaration disappear.

---
 net/rds/connection.c | 15 ---------------
 net/rds/rds.h        |  4 ----
 2 files changed, 19 deletions(-)

index f5058559bb08..13f459dad4ef 100644
@@ -689,21 +689,6 @@ void rds_conn_connect_if_down(struct rds_connection *conn)
 }
 EXPORT_SYMBOL_GPL(rds_conn_connect_if_down);
 
-/*
- * An error occurred on the connection
- */
-void
-__rds_conn_error(struct rds_connection *conn, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	vprintk(fmt, ap);
-	va_end(ap);
-
-	rds_conn_drop(conn);
-}
-
 void
 __rds_conn_path_error(struct rds_conn_path *cp, const char *fmt, ...)
 {

index fd0bccb2f9f9..25532a46602f 100644
@@ -683,10 +683,6 @@ void rds_for_each_conn_info(struct socket *sock, unsigned int len,
 			  struct rds_info_lengths *lens,
 			  int (*visitor)(struct rds_connection *, void *),
 			  size_t item_len);
-__printf(2, 3)
-void __rds_conn_error(struct rds_connection *conn, const char *, ...);
-#define rds_conn_error(conn, fmt...) \
-	__rds_conn_error(conn, KERN_WARNING "RDS: " fmt)
 
 __printf(2, 3)
 void __rds_conn_path_error(struct rds_conn_path *cp, const char *, ...);

2.10.0.rc2.1.g053435c

Had same patch along with few more in the queue but didn't find time of late to get it on the list. Thanks for both patches.

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

From: Joe Perches <[email protected]>
Date: Sat, 15 Oct 2016 11:53:21 -0700

Applied.

rds_conn_path_error already prefixes "RDS:" to the output.

---
 net/rds/threads.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

index e42df11bf30a..e36e333a0aa0 100644
@@ -171,8 +171,7 @@ void rds_connect_worker(struct work_struct *work)
 						     RDS_CONN_DOWN))
 				rds_queue_reconnect(cp);
 			else
-				rds_conn_path_error(cp,
-						    "RDS: connect failed\n");
+				rds_conn_path_error(cp, "connect failed\n");
 		}
 	}
 }

2.10.0.rc2.1.g053435c

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

From: Joe Perches <[email protected]>
Date: Sat, 15 Oct 2016 11:53:22 -0700

Applied.