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

Commit 2b8bf345 authored by NeilBrown's avatar NeilBrown
Browse files

md: remove typedefs: mdk_thread_t -> struct md_thread 



Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent fd01b88c

drivers/md/md.c

+7 −7
Original line number Diff line number Diff line
@@ -6362,7 +6362,7 @@ static const struct block_device_operations md_fops = 


static int md_thread(void * arg)

{

	mdk_thread_t *thread = arg;

	struct md_thread *thread = arg;



	/*

	 * md_thread is a 'system-thread', it's priority should be very
@@ -6401,7 +6401,7 @@ static int md_thread(void * arg) 
	return 0;

}



void md_wakeup_thread(mdk_thread_t *thread)

void md_wakeup_thread(struct md_thread *thread)

{

	if (thread) {

		pr_debug("md: waking up MD thread %s.\n", thread->tsk->comm);
@@ -6410,12 +6410,12 @@ void md_wakeup_thread(mdk_thread_t *thread) 
	}

}



mdk_thread_t *md_register_thread(void (*run) (struct mddev *), struct mddev *mddev,

struct md_thread *md_register_thread(void (*run) (struct mddev *), struct mddev *mddev,

				 const char *name)

{

	mdk_thread_t *thread;

	struct md_thread *thread;



	thread = kzalloc(sizeof(mdk_thread_t), GFP_KERNEL);

	thread = kzalloc(sizeof(struct md_thread), GFP_KERNEL);

	if (!thread)

		return NULL;
@@ -6435,9 +6435,9 @@ mdk_thread_t *md_register_thread(void (*run) (struct mddev *), struct mddev *mdd 
	return thread;

}



void md_unregister_thread(mdk_thread_t **threadp)

void md_unregister_thread(struct md_thread **threadp)

{

	mdk_thread_t *thread = *threadp;

	struct md_thread *thread = *threadp;

	if (!thread)

		return;

	pr_debug("interrupting MD-thread pid %d\n", task_pid_nr(thread->tsk));

drivers/md/md.h

+10 −8
Original line number Diff line number Diff line
@@ -251,8 +251,8 @@ struct mddev { 
	atomic_t			plug_cnt;	/* If device is expecting

							 * more bios soon.

							 */

	struct mdk_thread_s		*thread;	/* management thread */

	struct mdk_thread_s		*sync_thread;	/* doing resync or reconstruct */

	struct md_thread		*thread;	/* management thread */

	struct md_thread		*sync_thread;	/* doing resync or reconstruct */

	sector_t			curr_resync;	/* last block scheduled */

	/* As resync requests can complete out of order, we cannot easily track

	 * how much resync has been completed.  So we occasionally pause until
@@ -509,14 +509,14 @@ static inline void sysfs_unlink_rdev(struct mddev *mddev, struct md_rdev *rdev) 
#define rdev_for_each_rcu(rdev, mddev)				\

	list_for_each_entry_rcu(rdev, &((mddev)->disks), same_set)



typedef struct mdk_thread_s {

struct md_thread {

	void			(*run) (struct mddev *mddev);

	struct mddev		*mddev;

	wait_queue_head_t	wqueue;

	unsigned long           flags;

	struct task_struct	*tsk;

	unsigned long		timeout;

} mdk_thread_t;

};



#define THREAD_WAKEUP  0
@@ -553,10 +553,12 @@ static inline void safe_put_page(struct page *p) 


extern int register_md_personality(struct mdk_personality *p);

extern int unregister_md_personality(struct mdk_personality *p);

extern mdk_thread_t * md_register_thread(void (*run) (struct mddev *mddev),

				struct mddev *mddev, const char *name);

extern void md_unregister_thread(mdk_thread_t **threadp);

extern void md_wakeup_thread(mdk_thread_t *thread);

extern struct md_thread *md_register_thread(

	void (*run)(struct mddev *mddev),

	struct mddev *mddev,

	const char *name);

extern void md_unregister_thread(struct md_thread **threadp);

extern void md_wakeup_thread(struct md_thread *thread);

extern void md_check_recovery(struct mddev *mddev);

extern void md_write_start(struct mddev *mddev, struct bio *bi);

extern void md_write_end(struct mddev *mddev);

drivers/md/raid1.h

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ struct r1_private_data_s { 
	/* When taking over an array from a different personality, we store

	 * the new thread here until we fully activate the array.

	 */

	struct mdk_thread_s	*thread;

	struct md_thread	*thread;

};



typedef struct r1_private_data_s conf_t;

drivers/md/raid10.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ struct r10_private_data_s { 
	/* When taking over an array from a different personality, we store

	 * the new thread here until we fully activate the array.

	 */

	struct mdk_thread_s	*thread;

	struct md_thread	*thread;

};



typedef struct r10_private_data_s conf_t;

drivers/md/raid5.h

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ struct raid5_private_data { 
	/* When taking over an array from a different personality, we store

	 * the new thread here until we fully activate the array.

	 */

	struct mdk_thread_s	*thread;

	struct md_thread	*thread;

};



typedef struct raid5_private_data raid5_conf_t;