kclient: fix symbol names without 'ceph_' prefix

diff --git a/src/TODO b/src/TODO
index 358afc76267a4177d3abea335d78519006170f9b..0156e57d8b0a0f275650a670d998649243fe6ec6 100644 (file)
--- a/src/TODO
+++ b/src/TODO
@@ -70,7 +70,6 @@ repair
 
 
 kernel client
-- fix symbol names for osdmap.h (possibly others?)
 - osd client needs to recalculate layout if osdmap changes (pg_num etc may change)
 - fix up mds selection, and ESTALE handling
 - make cap import/export efficient

diff --git a/src/kernel/debugfs.c b/src/kernel/debugfs.c
index e556855098178d313d58339cdc6f912e12d90668..ae2a6a25ca65a31934643a79e26a95ade44217a7 100644 (file)
--- a/src/kernel/debugfs.c
+++ b/src/kernel/debugfs.c
@@ -209,8 +209,7 @@ static int osdmap_show(struct seq_file *s, void *p)
                struct ceph_pg_pool_info *pool =
                        &client->osdc.osdmap->pg_pool[i];
                seq_printf(s, "pg_pool %d pg_num %d / %d, lpg_num %d / %d",
-                          i,
-                          pool->v.pg_num, pool->pg_num_mask,
+                          i, pool->v.pg_num, pool->pg_num_mask,
                           pool->v.lpg_num, pool->lpg_num_mask);
        }
        for (i = 0; i < client->osdc.osdmap->max_osd; i++) {

diff --git a/src/kernel/osd_client.c b/src/kernel/osd_client.c
index d49d57a3a92c4c4d0ce9aacd192b49a35705e03d..1fc0e0958dd813ab7fda3b1dbae236a5285a3b1a 100644 (file)
--- a/src/kernel/osd_client.c
+++ b/src/kernel/osd_client.c
@@ -38,8 +38,8 @@ static int calc_layout(struct ceph_osd_client *osdc,
        reqhead->oid.ino = cpu_to_le64(vino.ino);
        reqhead->oid.snap = cpu_to_le64(vino.snap);
 
-       calc_file_object_mapping(layout, off, plen, &reqhead->oid,
-                                &objoff, &objlen);
+       ceph_calc_file_object_mapping(layout, off, plen, &reqhead->oid,
+                                     &objoff, &objlen);
        if (*plen < orig_len)
                dout(10, " skipping last %llu, final file extent %llu~%llu\n",
                     orig_len - *plen, off, *plen);
@@ -48,8 +48,8 @@ static int calc_layout(struct ceph_osd_client *osdc,
        req->r_num_pages = calc_pages_for(off, *plen);
 
        /* pgid? */
-       err = calc_object_layout(&reqhead->layout, &reqhead->oid, layout,
-                                osdc->osdmap);
+       err = ceph_calc_object_layout(&reqhead->layout, &reqhead->oid, layout,
+                                     osdc->osdmap);
 
        dout(10, "calc_layout %llx.%08x %llu~%llu pgid %llx (%d pages)\n",
             le64_to_cpu(reqhead->oid.ino), le32_to_cpu(reqhead->oid.bno),
@@ -604,7 +604,7 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg)
                                goto bad;
                        }
                        if (newmap != osdc->osdmap) {
-                               osdmap_destroy(osdc->osdmap);
+                               ceph_osdmap_destroy(osdc->osdmap);
                                osdc->osdmap = newmap;
                        }
                } else {
@@ -642,7 +642,7 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg)
                        oldmap = osdc->osdmap;
                        osdc->osdmap = newmap;
                        if (oldmap)
-                               osdmap_destroy(oldmap);
+                               ceph_osdmap_destroy(oldmap);
                }
                p += maplen;
                nr_maps--;
@@ -849,7 +849,7 @@ void ceph_osdc_stop(struct ceph_osd_client *osdc)
 {
        cancel_delayed_work_sync(&osdc->timeout_work);
        if (osdc->osdmap) {
-               osdmap_destroy(osdc->osdmap);
+               ceph_osdmap_destroy(osdc->osdmap);
                osdc->osdmap = NULL;
        }
 }

diff --git a/src/kernel/osdmap.c b/src/kernel/osdmap.c
index 75c9c5e6e48bb99c49e02dd7814f38ab864e843e..7030ef80f17a44a544b839b96956ed22e78ce534 100644 (file)
--- a/src/kernel/osdmap.c
+++ b/src/kernel/osdmap.c
@@ -290,7 +290,7 @@ bad:
 /*
  * osd map
  */
-void osdmap_destroy(struct ceph_osdmap *map)
+void ceph_osdmap_destroy(struct ceph_osdmap *map)
 {
        dout(10, "osdmap_destroy %p\n", map);
        if (map->crush)
@@ -430,7 +430,7 @@ struct ceph_osdmap *osdmap_decode(void **p, void *end)
 
 bad:
        dout(30, "osdmap_decode fail\n");
-       osdmap_destroy(map);
+       ceph_osdmap_destroy(map);
        return ERR_PTR(err);
 }
 
@@ -596,10 +596,10 @@ bad:
  * for now, we write only a single su, until we can
  * pass a stride back to the caller.
  */
-void calc_file_object_mapping(struct ceph_file_layout *layout,
-                             u64 off, u64 *plen,
-                             struct ceph_object *oid,
-                             u64 *oxoff, u64 *oxlen)
+void ceph_calc_file_object_mapping(struct ceph_file_layout *layout,
+                                  u64 off, u64 *plen,
+                                  struct ceph_object *oid,
+                                  u64 *oxoff, u64 *oxlen)
 {
        u32 osize = le32_to_cpu(layout->fl_object_size);
        u32 su = le32_to_cpu(layout->fl_stripe_unit);
@@ -640,10 +640,10 @@ void calc_file_object_mapping(struct ceph_file_layout *layout,
  * calculate an object layout (i.e. pgid) from an oid,
  * file_layout, and osdmap
  */
-int calc_object_layout(struct ceph_object_layout *ol,
-                      struct ceph_object *oid,
-                      struct ceph_file_layout *fl,
-                      struct ceph_osdmap *osdmap)
+int ceph_calc_object_layout(struct ceph_object_layout *ol,
+                           struct ceph_object *oid,
+                           struct ceph_file_layout *fl,
+                           struct ceph_osdmap *osdmap)
 {
        unsigned num, num_mask;
        union ceph_pg pgid;

diff --git a/src/kernel/osdmap.h b/src/kernel/osdmap.h
index 3d7ec4bcc6d61af4e5dd32c2c50b221ba7919e8e..113fc20ff9b6bc6724281124c1f9e946b8853097 100644 (file)
--- a/src/kernel/osdmap.h
+++ b/src/kernel/osdmap.h
@@ -89,18 +89,18 @@ extern struct ceph_osdmap *osdmap_decode(void **p, void *end);
 extern struct ceph_osdmap *apply_incremental(void **p, void *end,
                                             struct ceph_osdmap *map,
                                             struct ceph_messenger *msgr);
-extern void osdmap_destroy(struct ceph_osdmap *map);
+extern void ceph_osdmap_destroy(struct ceph_osdmap *map);
 
 /* calculate mapping of a file extent to an object */
-extern void calc_file_object_mapping(struct ceph_file_layout *layout,
-                                    u64 off, u64 *plen,
-                                    struct ceph_object *oid,
-                                    u64 *oxoff, u64 *oxlen);
+extern void ceph_calc_file_object_mapping(struct ceph_file_layout *layout,
+                                         u64 off, u64 *plen,
+                                         struct ceph_object *oid,
+                                         u64 *oxoff, u64 *oxlen);
 
 /* calculate mapping of object to a placement group */
-extern int calc_object_layout(struct ceph_object_layout *ol,
-                             struct ceph_object *oid,
-                             struct ceph_file_layout *fl,
-                             struct ceph_osdmap *osdmap);
+extern int ceph_calc_object_layout(struct ceph_object_layout *ol,
+                                  struct ceph_object *oid,
+                                  struct ceph_file_layout *fl,
+                                  struct ceph_osdmap *osdmap);
 
 #endif