Commit a9bda311 authored by Shraddha Barke's avatar Shraddha Barke Committed by Greg Kroah-Hartman
Browse files

Staging: lustre: obdclass: cl_io: Declare as static 



Declare cl_page_list_assume, cl_io_cancel, cl_io_rw_advance,
cl_page_list_del, cl_page_list_discard, cl_page_list_fini as
static since they are used only in this particular file.
Also remove them from corresponding header files

Signed-off-by: default avatarShraddha Barke <shraddha.6596@gmail.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 91a3a501

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

+0 −5
Original line number Diff line number Diff line
@@ -3125,13 +3125,8 @@ void cl_page_list_move (struct cl_page_list *dst, struct cl_page_list *src, 
			  struct cl_page *page);

void cl_page_list_splice (struct cl_page_list *list,

			  struct cl_page_list *head);

void cl_page_list_del    (const struct lu_env *env,

			  struct cl_page_list *plist, struct cl_page *page);

void cl_page_list_disown (const struct lu_env *env,

			  struct cl_io *io, struct cl_page_list *plist);

void cl_page_list_discard(const struct lu_env *env,

			  struct cl_io *io, struct cl_page_list *plist);

void cl_page_list_fini   (const struct lu_env *env, struct cl_page_list *plist);



void cl_2queue_init     (struct cl_2queue *queue);

void cl_2queue_add      (struct cl_2queue *queue, struct cl_page *page);

drivers/staging/lustre/lustre/obdclass/cl_io.c

+12 −16
Original line number Diff line number Diff line
@@ -570,7 +570,8 @@ EXPORT_SYMBOL(cl_io_iter_fini); 
/**

 * Records that read or write io progressed \a nob bytes forward.

 */

void cl_io_rw_advance(const struct lu_env *env, struct cl_io *io, size_t nob)

static void cl_io_rw_advance(const struct lu_env *env, struct cl_io *io,

			     size_t nob)

{

	const struct cl_io_slice *scan;
@@ -589,7 +590,6 @@ void cl_io_rw_advance(const struct lu_env *env, struct cl_io *io, size_t nob) 
								   nob);

	}

}

EXPORT_SYMBOL(cl_io_rw_advance);



/**

 * Adds a lock to a lockset.
@@ -936,7 +936,7 @@ EXPORT_SYMBOL(cl_io_submit_sync); 
/**

 * Cancel an IO which has been submitted by cl_io_submit_rw.

 */

int cl_io_cancel(const struct lu_env *env, struct cl_io *io,

static int cl_io_cancel(const struct lu_env *env, struct cl_io *io,

			struct cl_page_list *queue)

{

	struct cl_page *page;
@@ -952,7 +952,6 @@ int cl_io_cancel(const struct lu_env *env, struct cl_io *io, 
	}

	return result;

}

EXPORT_SYMBOL(cl_io_cancel);



/**

 * Main io loop.
@@ -1076,7 +1075,7 @@ EXPORT_SYMBOL(cl_page_list_add); 
/**

 * Removes a page from a page list.

 */

void cl_page_list_del(const struct lu_env *env,

static void cl_page_list_del(const struct lu_env *env,

			     struct cl_page_list *plist, struct cl_page *page)

{

	LASSERT(plist->pl_nr > 0);
@@ -1090,7 +1089,6 @@ void cl_page_list_del(const struct lu_env *env, 
	lu_ref_del_at(&page->cp_reference, &page->cp_queue_ref, "queue", plist);

	cl_page_put(env, page);

}

EXPORT_SYMBOL(cl_page_list_del);



/**

 * Moves a page from one page list to another.
@@ -1167,7 +1165,8 @@ EXPORT_SYMBOL(cl_page_list_disown); 
/**

 * Releases pages from queue.

 */

void cl_page_list_fini(const struct lu_env *env, struct cl_page_list *plist)

static void cl_page_list_fini(const struct lu_env *env,

			      struct cl_page_list *plist)

{

	struct cl_page *page;

	struct cl_page *temp;
@@ -1178,12 +1177,11 @@ void cl_page_list_fini(const struct lu_env *env, struct cl_page_list *plist) 
		cl_page_list_del(env, plist, page);

	LASSERT(plist->pl_nr == 0);

}

EXPORT_SYMBOL(cl_page_list_fini);



/**

 * Assumes all pages in a queue.

 */

void cl_page_list_assume(const struct lu_env *env,

static void cl_page_list_assume(const struct lu_env *env,

				struct cl_io *io, struct cl_page_list *plist)

{

	struct cl_page *page;
@@ -1193,12 +1191,11 @@ void cl_page_list_assume(const struct lu_env *env, 
	cl_page_list_for_each(page, plist)

		cl_page_assume(env, io, page);

}

EXPORT_SYMBOL(cl_page_list_assume);



/**

 * Discards all pages in a queue.

 */

void cl_page_list_discard(const struct lu_env *env, struct cl_io *io,

static void cl_page_list_discard(const struct lu_env *env, struct cl_io *io,

				 struct cl_page_list *plist)

{

	struct cl_page *page;
@@ -1207,7 +1204,6 @@ void cl_page_list_discard(const struct lu_env *env, struct cl_io *io, 
	cl_page_list_for_each(page, plist)

		cl_page_discard(env, io, page);

}

EXPORT_SYMBOL(cl_page_list_discard);



/**

 * Initialize dual page queue.