AF_UNIX: Fix deadlock on connecting to shutdown socket

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / rds / stats.c

diff --git a/net/rds/stats.c b/net/rds/stats.c
index 637146893cf3e24286404e43c1400492c5437cb3..7598eb07cfb149264355695d4582f28e7b9b0962 100644 (file)
--- a/net/rds/stats.c
+++ b/net/rds/stats.c
@@ -37,10 +37,11 @@
 #include "rds.h"
 
 DEFINE_PER_CPU_SHARED_ALIGNED(struct rds_statistics, rds_stats);
+EXPORT_PER_CPU_SYMBOL_GPL(rds_stats);
 
 /* :.,$s/unsigned long\>.*\<s_\(.*\);/"\1",/g */
 
-static char *rds_stat_names[] = {
+static const char *const rds_stat_names[] = {
        "conn_reset",
        "recv_drop_bad_checksum",
        "recv_drop_old_seq",
@@ -77,7 +78,7 @@ static char *rds_stat_names[] = {
 };
 
 void rds_stats_info_copy(struct rds_info_iterator *iter,
-                        uint64_t *values, char **names, size_t nr)
+                        uint64_t *values, const char *const *names, size_t nr)
 {
        struct rds_info_counter ctr;
        size_t i;
@@ -90,6 +91,7 @@ void rds_stats_info_copy(struct rds_info_iterator *iter,
                rds_info_copy(iter, &ctr, sizeof(ctr));
        }
 }
+EXPORT_SYMBOL_GPL(rds_stats_info_copy);
 
 /*
  * This gives global counters across all the transports.  The strings