summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/ceph/Kconfig1
-rw-r--r--net/ceph/Makefile1
-rw-r--r--net/ceph/auth_none.c1
-rw-r--r--net/ceph/auth_none.h1
-rw-r--r--net/ceph/auth_x.c2
-rw-r--r--net/ceph/auth_x.h1
-rw-r--r--net/ceph/mon_client.c2
-rw-r--r--net/ceph/pagevec.c1
8 files changed, 1 insertions, 9 deletions
diff --git a/net/ceph/Kconfig b/net/ceph/Kconfig
index f8cceb99e732..cd2d5b9301a1 100644
--- a/net/ceph/Kconfig
+++ b/net/ceph/Kconfig
@@ -41,4 +41,3 @@ config CEPH_LIB_USE_DNS_RESOLVER
41 Documentation/networking/dns_resolver.txt 41 Documentation/networking/dns_resolver.txt
42 42
43 If unsure, say N. 43 If unsure, say N.
44
diff --git a/net/ceph/Makefile b/net/ceph/Makefile
index 12bf49772d24..db09defe27d0 100644
--- a/net/ceph/Makefile
+++ b/net/ceph/Makefile
@@ -15,4 +15,3 @@ libceph-y := ceph_common.o messenger.o msgpool.o buffer.o pagelist.o \
15 auth_x.o \ 15 auth_x.o \
16 ceph_fs.o ceph_strings.o ceph_hash.o \ 16 ceph_fs.o ceph_strings.o ceph_hash.o \
17 pagevec.o snapshot.o string_table.o 17 pagevec.o snapshot.o string_table.o
18
diff --git a/net/ceph/auth_none.c b/net/ceph/auth_none.c
index 41d2a0c72236..edb7042479ed 100644
--- a/net/ceph/auth_none.c
+++ b/net/ceph/auth_none.c
@@ -142,4 +142,3 @@ int ceph_auth_none_init(struct ceph_auth_client *ac)
142 ac->ops = &ceph_auth_none_ops; 142 ac->ops = &ceph_auth_none_ops;
143 return 0; 143 return 0;
144} 144}
145
diff --git a/net/ceph/auth_none.h b/net/ceph/auth_none.h
index 860ed9875791..4158f064302e 100644
--- a/net/ceph/auth_none.h
+++ b/net/ceph/auth_none.h
@@ -26,4 +26,3 @@ struct ceph_auth_none_info {
26int ceph_auth_none_init(struct ceph_auth_client *ac); 26int ceph_auth_none_init(struct ceph_auth_client *ac);
27 27
28#endif 28#endif
29
diff --git a/net/ceph/auth_x.c b/net/ceph/auth_x.c
index b05c3a540a5a..6caac27fca85 100644
--- a/net/ceph/auth_x.c
+++ b/net/ceph/auth_x.c
@@ -823,5 +823,3 @@ out_nomem:
823out: 823out:
824 return ret; 824 return ret;
825} 825}
826
827
diff --git a/net/ceph/auth_x.h b/net/ceph/auth_x.h
index 57ba99f7736f..c03735f96df9 100644
--- a/net/ceph/auth_x.h
+++ b/net/ceph/auth_x.h
@@ -52,4 +52,3 @@ struct ceph_x_info {
52int ceph_x_init(struct ceph_auth_client *ac); 52int ceph_x_init(struct ceph_auth_client *ac);
53 53
54#endif 54#endif
55
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
index d7a7a2330ef7..18deb3d889c4 100644
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
@@ -1249,7 +1249,7 @@ static void dispatch(struct ceph_connection *con, struct ceph_msg *msg)
1249 if (monc->client->extra_mon_dispatch && 1249 if (monc->client->extra_mon_dispatch &&
1250 monc->client->extra_mon_dispatch(monc->client, msg) == 0) 1250 monc->client->extra_mon_dispatch(monc->client, msg) == 0)
1251 break; 1251 break;
1252 1252
1253 pr_err("received unknown message type %d %s\n", type, 1253 pr_err("received unknown message type %d %s\n", type,
1254 ceph_msg_type_name(type)); 1254 ceph_msg_type_name(type));
1255 } 1255 }
diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c
index e560d3975f41..d3736f5bffec 100644
--- a/net/ceph/pagevec.c
+++ b/net/ceph/pagevec.c
@@ -197,4 +197,3 @@ void ceph_zero_page_vector_range(int off, int len, struct page **pages)
197 } 197 }
198} 198}
199EXPORT_SYMBOL(ceph_zero_page_vector_range); 199EXPORT_SYMBOL(ceph_zero_page_vector_range);
200