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

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

staging: lustre: remove task_t typedef 



Use struct task_struct instead.

Also remove the unused libcfs_current() function, while I noticed it
doing this conversion.

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 e7e73793

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

+0 −4
Original line number Diff line number Diff line
@@ -85,10 +85,6 @@ LL_PROC_PROTO(name) \ 
 */

typedef struct proc_dir_entry	   proc_dir_entry_t;



/*

 * Task struct

 */

typedef struct task_struct	      task_t;

#define DECL_JOURNAL_DATA	   void *journal_info

#define PUSH_JOURNAL		do {    \

	journal_info = current->journal_info;   \

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c

+1 −1
Original line number Diff line number Diff line
@@ -1802,7 +1802,7 @@ kiblnd_recv (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed, 
int

kiblnd_thread_start(int (*fn)(void *arg), void *arg, char *name)

{

	task_t *task = kthread_run(fn, arg, name);

	struct task_struct *task = kthread_run(fn, arg, name);



	if (IS_ERR(task))

		return PTR_ERR(task);

drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c

+1 −1
Original line number Diff line number Diff line
@@ -1005,7 +1005,7 @@ ksocknal_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg) 
int

ksocknal_thread_start(int (*fn)(void *arg), void *arg, char *name)

{

	task_t *task = kthread_run(fn, arg, name);

	struct task_struct *task = kthread_run(fn, arg, name);



	if (IS_ERR(task))

		return PTR_ERR(task);

drivers/staging/lustre/lnet/selftest/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ stt_timer_main (void *arg) 
int

stt_start_timer_thread (void)

{

	task_t *task;

	struct task_struct *task;



	LASSERT(!stt_data.stt_shuttingdown);

drivers/staging/lustre/lustre/include/cl_object.h

+4 −4
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ struct cl_page { 
	/**

	 * Debug information, the task is owning the page.

	 */

	task_t	      *cp_task;

	struct task_struct	*cp_task;

	/**

	 * Owning IO request in cl_page_state::CPS_PAGEOUT and

	 * cl_page_state::CPS_PAGEIN states. This field is maintained only in
@@ -1576,13 +1576,13 @@ struct cl_lock { 
	 * \see osc_lock_enqueue_wait(), lov_lock_cancel(), lov_sublock_wait().

	 */

	struct mutex		cll_guard;

	task_t	   *cll_guarder;

	struct task_struct	*cll_guarder;

	int		   cll_depth;



	/**

	 * the owner for INTRANSIT state

	 */

	task_t	   *cll_intransit_owner;

	struct task_struct	*cll_intransit_owner;

	int		   cll_error;

	/**

	 * Number of holds on a lock. A hold prevents a lock from being
@@ -1869,7 +1869,7 @@ do { \ 
struct cl_page_list {

	unsigned	     pl_nr;

	struct list_head	   pl_pages;

	task_t	  *pl_owner;

	struct task_struct	*pl_owner;

};



/**