Commit c63716ab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-4.13-rc4' of git://github.com/ceph/ceph-client 

Pull ceph fixes from Ilya Dryomov:
 "A bunch of fixes and follow-ups for -rc1 Luminous patches: issues with
  ->reencode_message() and last minute RADOS semantic changes in
  v12.1.2"

* tag 'ceph-for-4.13-rc4' of git://github.com/ceph/ceph-client:
  libceph: make RECOVERY_DELETES feature create a new interval
  libceph: upmap semantic changes
  crush: assume weight_set != null imples weight_set_size > 0
  libceph: fallback for when there isn't a pool-specific choose_arg
  libceph: don't call ->reencode_message() more than once per message
  libceph: make encode_request_*() work with r_mempool requests
parents a64c40e7 ae78dd81

include/linux/ceph/osd_client.h

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ struct ceph_osd_request_target { 
	int size;

	int min_size;

	bool sort_bitwise;

	bool recovery_deletes;



	unsigned int flags;                /* CEPH_OSD_FLAG_* */

	bool paused;

include/linux/ceph/osdmap.h

+2 −0
Original line number Diff line number Diff line
@@ -272,6 +272,8 @@ bool ceph_is_new_interval(const struct ceph_osds *old_acting, 
			  u32 new_pg_num,

			  bool old_sort_bitwise,

			  bool new_sort_bitwise,

			  bool old_recovery_deletes,

			  bool new_recovery_deletes,

			  const struct ceph_pg *pgid);

bool ceph_osds_changed(const struct ceph_osds *old_acting,

		       const struct ceph_osds *new_acting,

include/linux/ceph/rados.h

+4 −0
Original line number Diff line number Diff line
@@ -158,6 +158,10 @@ extern const char *ceph_osd_state_name(int s); 
#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 */

#define CEPH_OSDMAP_REQUIRE_JEWEL    (1<<16) /* require jewel for booting osds */

#define CEPH_OSDMAP_REQUIRE_KRAKEN   (1<<17) /* require kraken for booting osds */

#define CEPH_OSDMAP_REQUIRE_LUMINOUS (1<<18) /* require l for booting osds */

#define CEPH_OSDMAP_RECOVERY_DELETES (1<<19) /* deletes performed during recovery instead of peering */



/*

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

include/linux/crush/crush.h

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ struct crush_choose_arg { 
struct crush_choose_arg_map {

#ifdef __KERNEL__

	struct rb_node node;

	u64 choose_args_index;

	s64 choose_args_index;

#endif

	struct crush_choose_arg *args; /*!< replacement for each bucket

                                            in the crushmap */

net/ceph/crush/mapper.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ static __u32 *get_choose_arg_weights(const struct crush_bucket_straw2 *bucket, 
				     const struct crush_choose_arg *arg,

				     int position)

{

	if (!arg || !arg->weight_set || arg->weight_set_size == 0)

	if (!arg || !arg->weight_set)

		return bucket->item_weights;



	if (position >= arg->weight_set_size)

CRA Git | Maintained and supported by SUSTech CRA and CCSE