Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63244fa1 authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

libceph: introduce ceph_osd_request_target, calc_target() 



Introduce ceph_osd_request_target, containing all mapping-related
fields of ceph_osd_request and calc_target() for calculating mappings
and populating it.

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

fs/ceph/addr.c

+1 −1
Original line number Diff line number Diff line
@@ -1774,7 +1774,7 @@ static int __ceph_pool_perm_get(struct ceph_inode_info *ci, u32 pool) 
	wr_req->r_flags = CEPH_OSD_FLAG_WRITE |

			  CEPH_OSD_FLAG_ACK | CEPH_OSD_FLAG_ONDISK;

	osd_req_op_init(wr_req, 0, CEPH_OSD_OP_CREATE, CEPH_OSD_OP_FLAG_EXCL);

	wr_req->r_base_oloc.pool = pool;

	ceph_oloc_copy(&wr_req->r_base_oloc, &rd_req->r_base_oloc);

	ceph_oid_copy(&wr_req->r_base_oid, &rd_req->r_base_oid);



	err = ceph_osdc_alloc_messages(wr_req, GFP_NOFS);

fs/ceph/file.c

+1 −1
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ static void ceph_aio_retry_work(struct work_struct *work) 
	req->r_flags =	CEPH_OSD_FLAG_ORDERSNAP |

			CEPH_OSD_FLAG_ONDISK |

			CEPH_OSD_FLAG_WRITE;

	req->r_base_oloc = orig_req->r_base_oloc;

	ceph_oloc_copy(&req->r_base_oloc, &orig_req->r_base_oloc);

	ceph_oid_copy(&req->r_base_oid, &orig_req->r_base_oid);



	ret = ceph_osdc_alloc_messages(req, GFP_NOFS);

include/linux/ceph/osd_client.h

+23 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ typedef void (*ceph_osdc_callback_t)(struct ceph_osd_request *, 
				     struct ceph_msg *);

typedef void (*ceph_osdc_unsafe_callback_t)(struct ceph_osd_request *, bool);



#define CEPH_HOMELESS_OSD	-1



/* a given osd we're communicating with */

struct ceph_osd {

	atomic_t o_ref;
@@ -118,6 +120,27 @@ struct ceph_osd_req_op { 
	};

};



struct ceph_osd_request_target {

	struct ceph_object_id base_oid;

	struct ceph_object_locator base_oloc;

	struct ceph_object_id target_oid;

	struct ceph_object_locator target_oloc;



	struct ceph_pg pgid;

	u32 pg_num;

	u32 pg_num_mask;

	struct ceph_osds acting;

	struct ceph_osds up;

	int size;

	int min_size;

	bool sort_bitwise;



	unsigned int flags;                /* CEPH_OSD_FLAG_* */

	bool paused;



	int osd;

};



/* an in-flight request */

struct ceph_osd_request {

	u64             r_tid;              /* unique for this client */

include/linux/ceph/osdmap.h

+34 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ int ceph_pg_compare(const struct ceph_pg *lhs, const struct ceph_pg *rhs); 


#define CEPH_POOL_FLAG_HASHPSPOOL	(1ULL << 0) /* hash pg seed and pool id

						       together */

#define CEPH_POOL_FLAG_FULL		(1ULL << 1) /* pool is full */



struct ceph_pg_pool_info {

	struct rb_node node;
@@ -62,6 +63,22 @@ struct ceph_object_locator { 
	s64 pool;

};



static inline void ceph_oloc_init(struct ceph_object_locator *oloc)

{

	oloc->pool = -1;

}



static inline bool ceph_oloc_empty(const struct ceph_object_locator *oloc)

{

	return oloc->pool == -1;

}



static inline void ceph_oloc_copy(struct ceph_object_locator *dest,

				  const struct ceph_object_locator *src)

{

	dest->pool = src->pool;

}



/*

 * Maximum supported by kernel client object name length

 *
@@ -227,6 +244,23 @@ static inline void ceph_osds_init(struct ceph_osds *set) 


void ceph_osds_copy(struct ceph_osds *dest, const struct ceph_osds *src);



bool ceph_is_new_interval(const struct ceph_osds *old_acting,

			  const struct ceph_osds *new_acting,

			  const struct ceph_osds *old_up,

			  const struct ceph_osds *new_up,

			  int old_size,

			  int new_size,

			  int old_min_size,

			  int new_min_size,

			  u32 old_pg_num,

			  u32 new_pg_num,

			  bool old_sort_bitwise,

			  bool new_sort_bitwise,

			  const struct ceph_pg *pgid);

bool ceph_osds_changed(const struct ceph_osds *old_acting,

		       const struct ceph_osds *new_acting,

		       bool any_change);



/* calculate mapping of a file extent to an object */

extern int ceph_calc_file_object_mapping(struct ceph_file_layout *layout,

					 u64 off, u64 len,

include/linux/ceph/rados.h

+5 −0
Original line number Diff line number Diff line
@@ -153,6 +153,11 @@ extern const char *ceph_osd_state_name(int s); 
#define CEPH_OSDMAP_NOIN     (1<<8)  /* block osd auto mark-in */

#define CEPH_OSDMAP_NOBACKFILL (1<<9) /* block osd backfill */

#define CEPH_OSDMAP_NORECOVER (1<<10) /* block osd recovery and backfill */

#define CEPH_OSDMAP_NOSCRUB  (1<<11) /* block periodic scrub */

#define CEPH_OSDMAP_NODEEP_SCRUB (1<<12) /* block periodic deep-scrub */

#define CEPH_OSDMAP_NOTIERAGENT (1<<13) /* disable tiering agent */

#define CEPH_OSDMAP_NOREBALANCE (1<<14) /* block osd backfill unless pg is degraded */

#define CEPH_OSDMAP_SORTBITWISE (1<<15) /* use bitwise hobject_t sort */



/*

 * The error code to return when an OSD can't handle a write