Skip to contentSkip to conversation

libceph: eliminate sparse warnings

PATCH Superseded Alex Elder 1 participant 1 message Feb 20, 2013 Ceph common code (libceph)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Alex Elder

author
#0 lore raw

PATCH 1/1 libceph: eliminate sparse warnings

Eliminate most of the problems in the libceph code that cause sparse to issue warnings.
- Convert functions that are never referenced externally to have static scope.
- Pass NULL rather than 0 for a pointer argument in one spot in ceph_monc_delete_snapid()

This partially resolves:

    http://tracker.ceph.com/issues/4184
---
 net/ceph/crypto.c     |    7 ++++---
 net/ceph/messenger.c  |    2 +-
 net/ceph/mon_client.c |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
net/ceph/crypto.c +0 -0
index af14cb4..6e7a236 100644
@@ -423,7 +423,8 @@ int ceph_encrypt2(struct ceph_crypto_key *secret,

void *dst, size_t *dst_len,
}
}

-int ceph_key_instantiate(struct key *key, struct key_preparsed_payload *prep)
+static int ceph_key_instantiate(struct key *key,
+ struct key_preparsed_payload *prep)
{
struct ceph_crypto_key *ckey;
size_t datalen = prep->datalen;
@@ -458,12 +459,12 @@ err:
return ret;
}

-int ceph_key_match(const struct key *key, const void *description) +static int ceph_key_match(const struct key *key, const void *description)
{
return strcmp(key->description, description) == 0;
}

-void ceph_key_destroy(struct key *key) { +static void ceph_key_destroy(struct key *key) {
struct ceph_crypto_key *ckey = key->payload.data;

ceph_crypto_key_destroy(ckey);

net/ceph/messenger.c +1 -1
index 8a62a55..ab702cd 100644
@@ -172,7 +172,7 @@ static void encode_my_addr(struct ceph_messenger *msgr)
  */
 static struct workqueue_struct *ceph_msgr_wq;
 
-void _ceph_msgr_exit(void)
+static void _ceph_msgr_exit(void)
 {
 	if (ceph_msgr_wq) {
 		destroy_workqueue(ceph_msgr_wq);
net/ceph/mon_client.c +0 -0
index 812eb3b..aef5b10 100644
@@ -697,7 +697,7 @@ int ceph_monc_delete_snapid(struct ceph_mon_client

*monc,
u32 pool, u64 snapid)
{
return do_poolop(monc, POOL_OP_CREATE_UNMANAGED_SNAP,
- pool, snapid, 0, 0);
+ pool, snapid, NULL, 0);

}

Signature · 1 line
1.7.9.5