md/raid5: typedef removal: raid5_conf_t -> struct r5conf (d1688a6d) · Commits · e / devices / android_kernel_teracube_2e

drivers/md/dm-raid.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1097,7 +1097,7 @@ static int raid_status(struct dm_target *ti, status_type_t type,
		rs->md.bitmap_info.max_write_behind);

		if (rs->print_flags & DMPF_STRIPE_CACHE) {
		raid5_conf_t *conf = rs->md.private;
		struct r5conf *conf = rs->md.private;

		/* convert from kiB to sectors */
		DMEMIT(" stripe_cache %d",
		@@ -1146,7 +1146,7 @@ static void raid_io_hints(struct dm_target ti, struct queue_limits limits)
		{
		struct raid_set *rs = ti->private;
		unsigned chunk_size = rs->md.chunk_sectors << 9;
		raid5_conf_t *conf = rs->md.private;
		struct r5conf *conf = rs->md.private;

		blk_limits_io_min(limits, chunk_size);
		blk_limits_io_opt(limits, chunk_size * (conf->raid_disks - conf->max_degraded));

+79 −79

File changed.

Preview size limit exceeded, changes collapsed.

+3 −5

Original line number	Diff line number	Diff line
		@@ -197,7 +197,7 @@ enum reconstruct_states {
		struct stripe_head {
		struct hlist_node hash;
		struct list_head lru; /* inactive_list or handle_list */
		struct raid5_private_data *raid_conf;
		struct r5conf *raid_conf;
		short generation; /* increments with every
		* reshape */
		sector_t sector; /* sector of this row */
		@@ -347,7 +347,7 @@ struct disk_info {
		struct md_rdev *rdev;
		};

		struct raid5_private_data {
		struct r5conf {
		struct hlist_head *stripe_hashtbl;
		struct mddev *mddev;
		struct disk_info *spare;
		@@ -439,8 +439,6 @@ struct raid5_private_data {
		struct md_thread *thread;
		};

		typedef struct raid5_private_data raid5_conf_t;

		/*
		* Our supported algorithms
		*/
		@@ -504,6 +502,6 @@ static inline int algorithm_is_DDF(int layout)
		}

		extern int md_raid5_congested(struct mddev *mddev, int bits);
		extern void md_raid5_kick_device(raid5_conf_t *conf);
		extern void md_raid5_kick_device(struct r5conf *conf);
		extern int raid5_set_cache_size(struct mddev *mddev, int size);
		#endif