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

Commit 54319351 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: lustre: remove timer_list_t typedef 



Use struct timer_list instead.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8db0fc89

drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h

+7 −7
Original line number Diff line number Diff line
@@ -56,13 +56,13 @@ int64_t waitq_timedwait(wait_queue_t *, cfs_task_state_t, int64_t); 
void waitq_wait(wait_queue_t *, cfs_task_state_t);

void add_wait_queue_exclusive_head(wait_queue_head_t *, wait_queue_t *);



void cfs_init_timer(timer_list_t *t);

void cfs_timer_init(timer_list_t *t, cfs_timer_func_t *func, void *arg);

void cfs_timer_done(timer_list_t *t);

void cfs_timer_arm(timer_list_t *t, cfs_time_t deadline);

void cfs_timer_disarm(timer_list_t *t);

int  cfs_timer_is_armed(timer_list_t *t);

cfs_time_t cfs_timer_deadline(timer_list_t *t);

void cfs_init_timer(struct timer_list *t);

void cfs_timer_init(struct timer_list *t, cfs_timer_func_t *func, void *arg);

void cfs_timer_done(struct timer_list *t);

void cfs_timer_arm(struct timer_list *t, cfs_time_t deadline);

void cfs_timer_disarm(struct timer_list *t);

int  cfs_timer_is_armed(struct timer_list *t);

cfs_time_t cfs_timer_deadline(struct timer_list *t);



/*

 * Memory

drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h

+0 −5
Original line number Diff line number Diff line
@@ -107,9 +107,4 @@ typedef struct task_struct task_t; 
	current->journal_info = journal_info;   \

	} while(0)



/*

 * Timer

 */

typedef struct timer_list timer_list_t;



#endif

drivers/staging/lustre/lustre/include/lustre_net.h

+1 −1
Original line number Diff line number Diff line
@@ -2636,7 +2636,7 @@ struct ptlrpc_service_part { 
	/** reqs waiting for replies */

	struct ptlrpc_at_array		scp_at_array;

	/** early reply timer */

	timer_list_t			scp_at_timer;

	struct timer_list		scp_at_timer;

	/** debug */

	cfs_time_t			scp_at_checktime;

	/** check early replies */

drivers/staging/lustre/lustre/include/obd.h

+1 −1
Original line number Diff line number Diff line
@@ -900,7 +900,7 @@ struct obd_device { 
	int			      obd_requests_queued_for_recovery;

	wait_queue_head_t		      obd_next_transno_waitq;

	/* protected by obd_recovery_task_lock */

	timer_list_t		      obd_recovery_timer;

	struct timer_list	      obd_recovery_timer;

	time_t			   obd_recovery_start; /* seconds */

	time_t			   obd_recovery_end; /* seconds, for lprocfs_status */

	int			      obd_recovery_time_hard;

drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c

+7 −7
Original line number Diff line number Diff line
@@ -112,13 +112,13 @@ cfs_pause(cfs_duration_t ticks) 
}

EXPORT_SYMBOL(cfs_pause);



void cfs_init_timer(timer_list_t *t)

void cfs_init_timer(struct timer_list *t)

{

	init_timer(t);

}

EXPORT_SYMBOL(cfs_init_timer);



void cfs_timer_init(timer_list_t *t, cfs_timer_func_t *func, void *arg)

void cfs_timer_init(struct timer_list *t, cfs_timer_func_t *func, void *arg)

{

	init_timer(t);

	t->function = func;
@@ -126,31 +126,31 @@ void cfs_timer_init(timer_list_t *t, cfs_timer_func_t *func, void *arg) 
}

EXPORT_SYMBOL(cfs_timer_init);



void cfs_timer_done(timer_list_t *t)

void cfs_timer_done(struct timer_list *t)

{

	return;

}

EXPORT_SYMBOL(cfs_timer_done);



void cfs_timer_arm(timer_list_t *t, cfs_time_t deadline)

void cfs_timer_arm(struct timer_list *t, cfs_time_t deadline)

{

	mod_timer(t, deadline);

}

EXPORT_SYMBOL(cfs_timer_arm);



void cfs_timer_disarm(timer_list_t *t)

void cfs_timer_disarm(struct timer_list *t)

{

	del_timer(t);

}

EXPORT_SYMBOL(cfs_timer_disarm);



int  cfs_timer_is_armed(timer_list_t *t)

int  cfs_timer_is_armed(struct timer_list *t)

{

	return timer_pending(t);

}

EXPORT_SYMBOL(cfs_timer_is_armed);



cfs_time_t cfs_timer_deadline(timer_list_t *t)

cfs_time_t cfs_timer_deadline(struct timer_list *t)

{

	return t->expires;

}