Commit 12979354 authored by Sage Weil's avatar Sage Weil
Browse files

libceph: rename ceph_pg -> ceph_pg_v1 



Rename the old version this type to distinguish it from the new version.

Signed-off-by: default avatarSage Weil <sage@inktank.com>
Reviewed-by: default avatarAlex Elder <elder@inktank.com>
parent c47f9371

fs/ceph/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg) 
	u64 len = 1, olen;

	u64 tmp;

	struct ceph_object_layout ol;

	struct ceph_pg pgid;

	struct ceph_pg_v1 pgid;

	int r;



	/* copy and validate */

include/linux/ceph/osd_client.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct ceph_osd_request { 
	struct list_head r_linger_item;

	struct list_head r_linger_osd;

	struct ceph_osd *r_osd;

	struct ceph_pg   r_pgid;

	struct ceph_pg_v1 r_pgid;

	int              r_pg_osds[CEPH_PG_MAX_SIZE];

	int              r_num_pg_osds;

include/linux/ceph/osdmap.h

+4 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ struct ceph_pg_pool_info { 


struct ceph_pg_mapping {

	struct rb_node node;

	struct ceph_pg pgid;

	struct ceph_pg_v1 pgid;

	int len;

	int osds[];

};
@@ -118,10 +118,11 @@ extern int ceph_calc_object_layout(struct ceph_object_layout *ol, 
				   const char *oid,

				   struct ceph_file_layout *fl,

				   struct ceph_osdmap *osdmap);

extern int ceph_calc_pg_acting(struct ceph_osdmap *osdmap, struct ceph_pg pgid,

extern int ceph_calc_pg_acting(struct ceph_osdmap *osdmap,

			       struct ceph_pg_v1 pgid,

			       int *acting);

extern int ceph_calc_pg_primary(struct ceph_osdmap *osdmap,

				struct ceph_pg pgid);

				struct ceph_pg_v1 pgid);



extern const char *ceph_pg_pool_name_by_id(struct ceph_osdmap *map, u64 id);

extern int ceph_pg_poolid_by_name(struct ceph_osdmap *map, const char *name);

include/linux/ceph/rados.h

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ struct ceph_timespec { 
 * placement group.

 * we encode this into one __le64.

 */

struct ceph_pg {

struct ceph_pg_v1 {

	__le16 preferred; /* preferred primary osd */

	__le16 ps;        /* placement seed */

	__le32 pool;      /* object pool */
@@ -128,7 +128,7 @@ static inline int ceph_stable_mod(int x, int b, int bmask) 
 * object layout - how a given object should be stored.

 */

struct ceph_object_layout {

	struct ceph_pg ol_pgid;   /* raw pg, with _full_ ps precision. */

	struct ceph_pg_v1 ol_pgid;   /* raw pg, with _full_ ps precision. */

	__le32 ol_stripe_unit;    /* for per-object parity, if any */

} __attribute__ ((packed));

net/ceph/osd_client.c

+1 −1
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ static int __map_request(struct ceph_osd_client *osdc, 
			 struct ceph_osd_request *req, int force_resend)

{

	struct ceph_osd_request_head *reqhead = req->r_request->front.iov_base;

	struct ceph_pg pgid;

	struct ceph_pg_v1 pgid;

	int acting[CEPH_PG_MAX_SIZE];

	int o = -1, num = 0;

	int err;