Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb1b3dc4 authored by Sowmini Varadhan's avatar Sowmini Varadhan Committed by David S. Miller
Browse files

RDS: Add rds_conn_path_error() 



rds_conn_path_error() is the MP-aware analog of rds_conn_error,
to be used by multipath-capable callers.

Signed-off-by: default avatarSowmini Varadhan <sowmini.varadhan@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 992c9ec5

net/rds/connection.c

+12 −0
Original line number Diff line number Diff line
@@ -655,3 +655,15 @@ __rds_conn_error(struct rds_connection *conn, const char *fmt, ...) 


	rds_conn_drop(conn);

}



void

__rds_conn_path_error(struct rds_conn_path *cp, const char *fmt, ...)

{

	va_list ap;



	va_start(ap, fmt);

	vprintk(fmt, ap);

	va_end(ap);



	rds_conn_path_drop(cp);

}

net/rds/rds.h

+4 −0
Original line number Diff line number Diff line
@@ -669,6 +669,10 @@ void __rds_conn_error(struct rds_connection *conn, const char *, ...); 
#define rds_conn_error(conn, fmt...) \

	__rds_conn_error(conn, KERN_WARNING "RDS: " fmt)



void __rds_conn_path_error(struct rds_conn_path *cp, const char *, ...);

#define rds_conn_path_error(cp, fmt...) \

	__rds_conn_path_error(cp, KERN_WARNING "RDS: " fmt)



static inline int

rds_conn_path_transition(struct rds_conn_path *cp, int old, int new)

{

net/rds/threads.c

+2 −1
Original line number Diff line number Diff line
@@ -163,7 +163,8 @@ void rds_connect_worker(struct work_struct *work) 
						     RDS_CONN_DOWN))

				rds_queue_reconnect(cp);

			else

				rds_conn_error(conn, "RDS: connect failed\n");

				rds_conn_path_error(cp,

						    "RDS: connect failed\n");

		}

	}

}