Commit f81f1633 authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

libceph: rename ceph_calc_pg_primary() 



Rename ceph_calc_pg_primary() to ceph_pg_to_acting_primary() to
emphasise that it returns acting primary.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 6f3bfd45

fs/ceph/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg) 
		return r;

	}



	dl.osd = ceph_calc_pg_primary(osdc->osdmap, pgid);

	dl.osd = ceph_pg_to_acting_primary(osdc->osdmap, &pgid);

	if (dl.osd >= 0) {

		struct ceph_entity_addr *a =

			ceph_osd_addr(osdc->osdmap, dl.osd);

include/linux/ceph/osdmap.h

+2 −2
Original line number Diff line number Diff line
@@ -236,8 +236,8 @@ void ceph_pg_to_up_acting_osds(struct ceph_osdmap *osdmap, 
			       const struct ceph_pg *raw_pgid,

			       struct ceph_osds *up,

			       struct ceph_osds *acting);

extern int ceph_calc_pg_primary(struct ceph_osdmap *osdmap,

				struct ceph_pg pgid);

int ceph_pg_to_acting_primary(struct ceph_osdmap *osdmap,

			      const struct ceph_pg *raw_pgid);



extern struct ceph_pg_pool_info *ceph_pg_pool_by_id(struct ceph_osdmap *map,

						    u64 id);

net/ceph/osdmap.c

+5 −4
Original line number Diff line number Diff line
@@ -1896,13 +1896,14 @@ void ceph_pg_to_up_acting_osds(struct ceph_osdmap *osdmap, 
}



/*

 * Return primary osd for given pgid, or -1 if none.

 * Return acting primary for given PG, or -1 if none.

 */

int ceph_calc_pg_primary(struct ceph_osdmap *osdmap, struct ceph_pg pgid)

int ceph_pg_to_acting_primary(struct ceph_osdmap *osdmap,

			      const struct ceph_pg *raw_pgid)

{

	struct ceph_osds up, acting;



	ceph_pg_to_up_acting_osds(osdmap, &pgid, &up, &acting);

	ceph_pg_to_up_acting_osds(osdmap, raw_pgid, &up, &acting);

	return acting.primary;

}

EXPORT_SYMBOL(ceph_calc_pg_primary);
 
EXPORT_SYMBOL(ceph_pg_to_acting_primary);