public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: green@linuxhacker.ru
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	devel@driverdev.osuosl.org,
	Andreas Dilger <andreas.dilger@intel.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Lustre Development List <lustre-devel@lists.lustre.org>,
	Oleg Drokin <green@linuxhacker.ru>
Subject: [PATCH 06/25] staging/lustre: Convert ptlrpc_at_check_timed to void
Date: Fri, 26 Feb 2016 01:49:54 -0500	[thread overview]
Message-ID: <1456469413-931943-7-git-send-email-green@linuxhacker.ru> (raw)
In-Reply-To: <1456469413-931943-1-git-send-email-green@linuxhacker.ru>

From: Oleg Drokin <green@linuxhacker.ru>

The only caller was not looking at the return value,
and liblustre, that cared about it is not part of the kernel client.

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
---
 drivers/staging/lustre/lustre/ptlrpc/service.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/lustre/lustre/ptlrpc/service.c b/drivers/staging/lustre/lustre/ptlrpc/service.c
index 6f71ecc..89039bf 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/service.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/service.c
@@ -1137,7 +1137,7 @@ out_free:
 /* Send early replies to everybody expiring within at_early_margin
  * asking for at_extra time
  */
-static int ptlrpc_at_check_timed(struct ptlrpc_service_part *svcpt)
+static void ptlrpc_at_check_timed(struct ptlrpc_service_part *svcpt)
 {
 	struct ptlrpc_at_array *array = &svcpt->scp_at_array;
 	struct ptlrpc_request *rq, *n;
@@ -1151,14 +1151,14 @@ static int ptlrpc_at_check_timed(struct ptlrpc_service_part *svcpt)
 	spin_lock(&svcpt->scp_at_lock);
 	if (svcpt->scp_at_check == 0) {
 		spin_unlock(&svcpt->scp_at_lock);
-		return 0;
+		return;
 	}
 	delay = cfs_time_sub(cfs_time_current(), svcpt->scp_at_checktime);
 	svcpt->scp_at_check = 0;
 
 	if (array->paa_count == 0) {
 		spin_unlock(&svcpt->scp_at_lock);
-		return 0;
+		return;
 	}
 
 	/* The timer went off, but maybe the nearest rpc already completed. */
@@ -1167,7 +1167,7 @@ static int ptlrpc_at_check_timed(struct ptlrpc_service_part *svcpt)
 		/* We've still got plenty of time.  Reset the timer. */
 		ptlrpc_at_set_timer(svcpt);
 		spin_unlock(&svcpt->scp_at_lock);
-		return 0;
+		return;
 	}
 
 	/* We're close to a timeout, and we don't know how much longer the
@@ -1237,8 +1237,6 @@ static int ptlrpc_at_check_timed(struct ptlrpc_service_part *svcpt)
 
 		ptlrpc_server_drop_request(rq);
 	}
-
-	return 1; /* return "did_something" for liblustre */
 }
 
 /**
-- 
2.1.0

  parent reply	other threads:[~2016-02-26  6:50 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-26  6:49 [PATCH 00/25] Lustre cleanups continued green
2016-02-26  6:49 ` [PATCH 01/25] staging/lustre/llite: Fix style vs open parenthesis alignment green
2016-02-26  6:49 ` [PATCH 02/25] staging/lustre/include: Fix style of function declarations green
2016-02-26  6:49 ` [PATCH 03/25] staging/lustre/fld: Fix style vs open parenthesis alignment green
2016-02-26  6:49 ` [PATCH 04/25] staging/lustre: Remove unused liblustre_check_services prototype green
2016-02-26  6:49 ` [PATCH 05/25] staging/lustre: Remove unused lustre_build_lock_params() green
2016-02-26  6:49 ` green [this message]
2016-02-26  6:49 ` [PATCH 07/25] staging/lustre: Remove misleading liblustre comments green
2016-02-26  6:49 ` [PATCH 08/25] staging/lustre: Remove liblustre references from explanations green
2016-02-26  6:49 ` [PATCH 09/25] staging/lustre/lmv: Remove commented out MDS selection policies green
2016-02-26  6:49 ` [PATCH 10/25] staging/lustre: F_SETLKW64 F_SETLK64 F_GETLK64 are always defined green
2016-02-26  6:49 ` [PATCH 11/25] staging/lustre: MS_POSIXACL is always defined, don't check for it green
2016-02-26  6:50 ` [PATCH 12/25] staging/lustre: Remove RELEASEPAGE_ARG_TYPE compat macro green
2016-02-26  6:50 ` [PATCH 13/25] staging/lustre: NEED_QUOTA_DEFS is never defined, drop it green
2016-02-26  6:50 ` [PATCH 14/25] staging/lustre/ptlrpc: Fix style vs open parenthesis alignment green
2016-02-26  6:50 ` [PATCH 15/25] staging/lustre/osc: " green
2016-02-26  6:50 ` [PATCH 16/25] staging/lustre/obdclass: " green
2016-02-26  6:50 ` [PATCH 17/25] staging/lustre/lov: " green
2016-02-26  6:50 ` [PATCH 18/25] staging/lustre/mdc: " green
2016-02-26  6:50 ` [PATCH 19/25] staging/lustre/mgc: " green
2016-02-26  6:50 ` [PATCH 20/25] staging/lustre/obdecho: " green
2016-02-26  6:50 ` [PATCH 21/25] staging/lustre/lmv: " green
2016-02-26  6:50 ` [PATCH 22/25] staging/lustre: Fix lines that start with spaces green
2016-02-26  6:50 ` [PATCH 23/25] staging/lustre: Rework MAX_DIO_SIZE macro green
2016-02-26  6:50 ` [PATCH 24/25] staging/lustre: Remove unneeded {} in lprocfs_stats_unlock() green
2016-02-26  6:50 ` [PATCH 25/25] staging/lustre/ptlrpc: Fix ENABLE_PINGER ifdef green

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1456469413-931943-7-git-send-email-green@linuxhacker.ru \
    --to=green@linuxhacker.ru \
    --cc=andreas.dilger@intel.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lustre-devel@lists.lustre.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox