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

Commit 24a85e88 authored by Shivani Bhardwaj's avatar Shivani Bhardwaj Committed by Greg Kroah-Hartman
Browse files

Staging: lustre: statahead: Remove agl_list_empty wrapper 



Remove the function agl_list_empty() and replace its calls with the
function it wrapped.

Signed-off-by: default avatarShivani Bhardwaj <shivanib134@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 615f9a68

drivers/staging/lustre/lustre/llite/statahead.c

+8 −8
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ static void ll_agl_add(struct ll_statahead_info *sai, 


		igrab(inode);

		spin_lock(&parent->lli_agl_lock);

		if (agl_list_empty(sai))

		if (list_empty(&sai->sai_entries_agl))

			added = 1;

		list_add_tail(&child->lli_agl_list, &sai->sai_entries_agl);

		spin_unlock(&parent->lli_agl_lock);
@@ -522,7 +522,7 @@ static void ll_sai_put(struct ll_statahead_info *sai) 
		LASSERT(list_empty(&sai->sai_entries_stated));



		LASSERT(atomic_read(&sai->sai_cache_count) == 0);

		LASSERT(agl_list_empty(sai));

		LASSERT(list_empty(&sai->sai_entries_agl));



		iput(inode);

		kfree(sai);
@@ -955,7 +955,7 @@ static int ll_agl_thread(void *arg) 


	while (1) {

		l_wait_event(thread->t_ctl_waitq,

			     !agl_list_empty(sai) ||

			     !list_empty(&sai->sai_entries_agl) ||

			     !thread_is_running(thread),

			     &lwi);
@@ -965,7 +965,7 @@ static int ll_agl_thread(void *arg) 
		spin_lock(&plli->lli_agl_lock);

		/* The statahead thread maybe help to process AGL entries,

		 * so check whether list empty again. */

		if (!agl_list_empty(sai)) {

		if (!list_empty(&sai->sai_entries_agl)) {

			clli = list_entry(sai->sai_entries_agl.next,

					  struct ll_inode_info, lli_agl_list);

			list_del_init(&clli->lli_agl_list);
@@ -978,7 +978,7 @@ static int ll_agl_thread(void *arg) 


	spin_lock(&plli->lli_agl_lock);

	sai->sai_agl_valid = 0;

	while (!agl_list_empty(sai)) {

	while (!list_empty(&sai->sai_entries_agl)) {

		clli = list_entry(sai->sai_entries_agl.next,

				  struct ll_inode_info, lli_agl_list);

		list_del_init(&clli->lli_agl_list);
@@ -1121,7 +1121,7 @@ static int ll_statahead_thread(void *arg) 
			l_wait_event(thread->t_ctl_waitq,

				     !sa_sent_full(sai) ||

				     !list_empty(&sai->sai_entries_received) ||

				     !agl_list_empty(sai) ||

				     !list_empty(&sai->sai_entries_agl) ||

				     !thread_is_running(thread),

				     &lwi);
@@ -1140,7 +1140,7 @@ static int ll_statahead_thread(void *arg) 
			 * to process the AGL entries. */

			if (sa_sent_full(sai)) {

				spin_lock(&plli->lli_agl_lock);

				while (!agl_list_empty(sai)) {

				while (!list_empty(&sai->sai_entries_agl)) {

					clli = list_entry(sai->sai_entries_agl.next,

							  struct ll_inode_info, lli_agl_list);

					list_del_init(&clli->lli_agl_list);
@@ -1198,7 +1198,7 @@ static int ll_statahead_thread(void *arg) 
			}



			spin_lock(&plli->lli_agl_lock);

			while (!agl_list_empty(sai) &&

			while (!list_empty(&sai->sai_entries_agl) &&

			       thread_is_running(thread)) {

				clli = list_entry(sai->sai_entries_agl.next,

						  struct ll_inode_info, lli_agl_list);