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

Commit 69c7c854 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre/libcfs: Move private tracefile structs out of header 



the struct page_collection, struct cfs_trace_page and
struct tracefiled_ctl are only used by tracefile.c, so move them
there.

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6918d1f6

drivers/staging/lustre/lustre/libcfs/tracefile.c

+45 −0
Original line number Diff line number Diff line
@@ -56,6 +56,51 @@ static int thread_running; 


static atomic_t cfs_tage_allocated = ATOMIC_INIT(0);



struct page_collection {

	struct list_head	pc_pages;

	/*

	 * if this flag is set, collect_pages() will spill both

	 * ->tcd_daemon_pages and ->tcd_pages to the ->pc_pages. Otherwise,

	 * only ->tcd_pages are spilled.

	 */

	int		pc_want_daemon_pages;

};



struct tracefiled_ctl {

	struct completion	tctl_start;

	struct completion	tctl_stop;

	wait_queue_head_t		tctl_waitq;

	pid_t			tctl_pid;

	atomic_t		tctl_shutdown;

};



/*

 * small data-structure for each page owned by tracefiled.

 */

struct cfs_trace_page {

	/*

	 * page itself

	 */

	struct page	  *page;

	/*

	 * linkage into one of the lists in trace_data_union or

	 * page_collection

	 */

	struct list_head	   linkage;

	/*

	 * number of bytes used within this page

	 */

	unsigned int	 used;

	/*

	 * cpu that owns this page

	 */

	unsigned short       cpu;

	/*

	 * type(context) of this page

	 */

	unsigned short       type;

};



static void put_pages_on_tcd_daemon_list(struct page_collection *pc,

					 struct cfs_trace_cpu_data *tcd);

drivers/staging/lustre/lustre/libcfs/tracefile.h

+0 −51
Original line number Diff line number Diff line
@@ -195,57 +195,6 @@ extern union cfs_trace_data_union (*cfs_trace_data[TCD_MAX_TYPES])[NR_CPUS]; 
	     (tcd = &(*cfs_trace_data[i])[cpu].tcd) &&			\

	     cfs_trace_lock_tcd(tcd, 1); cfs_trace_unlock_tcd(tcd, 1), i++)



/* XXX nikita: this declaration is internal to tracefile.c and should probably

 * be moved there */

struct page_collection {

	struct list_head	pc_pages;

	/*

	 * if this flag is set, collect_pages() will spill both

	 * ->tcd_daemon_pages and ->tcd_pages to the ->pc_pages. Otherwise,

	 * only ->tcd_pages are spilled.

	 */

	int		pc_want_daemon_pages;

};



/* XXX nikita: this declaration is internal to tracefile.c and should probably

 * be moved there */

struct tracefiled_ctl {

	struct completion	tctl_start;

	struct completion	tctl_stop;

	wait_queue_head_t		tctl_waitq;

	pid_t			tctl_pid;

	atomic_t		tctl_shutdown;

};



/*

 * small data-structure for each page owned by tracefiled.

 */

/* XXX nikita: this declaration is internal to tracefile.c and should probably

 * be moved there */

struct cfs_trace_page {

	/*

	 * page itself

	 */

	struct page	  *page;

	/*

	 * linkage into one of the lists in trace_data_union or

	 * page_collection

	 */

	struct list_head	   linkage;

	/*

	 * number of bytes used within this page

	 */

	unsigned int	 used;

	/*

	 * cpu that owns this page

	 */

	unsigned short       cpu;

	/*

	 * type(context) of this page

	 */

	unsigned short       type;

};



void cfs_set_ptldebug_header(struct ptldebug_header *header,

			     struct libcfs_debug_msg_data *m,

			     unsigned long stack);