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

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/net/ceph/crypto.c b/net/ceph/crypto.c
index af14cb425164d068d8a6272e1d9da1491ccd5f74..6e7a236525b6ff92d9cd2e44770cb6f7334b0b02 100644 (file)
--- a/net/ceph/crypto.c
+++ b/net/ceph/crypto.c
@@ -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);

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 771d4c904469e805800e9ca823ea8dfadb65033a..ed9e237d967cda7ec162b8bcf28299883e0317f8 100644 (file)
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -223,7 +223,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);

diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
index 812eb3b46c1f94d188079274457108cad4c5b54f..aef5b1062beec7c0d9e45fbe4c77b6ec05b10d5a 100644 (file)
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
@@ -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);
 
 }