From: James Simmons <jsimmons@infradead.org> To: NeilBrown <neilb@suse.com> Cc: Oleg Drokin <oleg.drokin@intel.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Andreas Dilger <andreas.dilger@intel.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Lustre Development List <lustre-devel@lists.lustre.org> Subject: Re: [PATCH 13/17] staging: lustre: libcfs: remove cfs_timeout_cap() Date: Fri, 30 Mar 2018 20:03:02 +0100 (BST) [thread overview] Message-ID: <alpine.LFD.2.21.1803302002410.9681@casper.infradead.org> (raw) In-Reply-To: <152229760874.27689.12453214678546053828.stgit@noble> > This wrapper is only used once, so open-code it as max(). > > This allows us to remove the libcfs_time.h include file. Reviewed-by: James Simmons <jsimmons@infradead.org> > Signed-off-by: NeilBrown <neilb@suse.com> > --- > .../staging/lustre/include/linux/libcfs/libcfs.h | 1 > .../lustre/include/linux/libcfs/libcfs_time.h | 50 -------------------- > .../lustre/include/linux/libcfs/linux/linux-time.h | 2 - > drivers/staging/lustre/lustre/ptlrpc/import.c | 4 +- > 4 files changed, 3 insertions(+), 54 deletions(-) > delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_time.h > > diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/libcfs.h > index 3b751c436b3d..3d3fa52858e5 100644 > --- a/drivers/staging/lustre/include/linux/libcfs/libcfs.h > +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs.h > @@ -43,7 +43,6 @@ > #include <linux/libcfs/libcfs_private.h> > #include <linux/libcfs/libcfs_cpu.h> > #include <linux/libcfs/libcfs_prim.h> > -#include <linux/libcfs/libcfs_time.h> > #include <linux/libcfs/libcfs_string.h> > #include <linux/libcfs/libcfs_hash.h> > #include <linux/libcfs/libcfs_fail.h> > diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h > deleted file mode 100644 > index 172a8872e3f3..000000000000 > --- a/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h > +++ /dev/null > @@ -1,50 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0 > -/* > - * GPL HEADER START > - * > - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 only, > - * as published by the Free Software Foundation. > - * > - * This program is distributed in the hope that it will be useful, but > - * WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - * General Public License version 2 for more details (a copy is included > - * in the LICENSE file that accompanied this code). > - * > - * You should have received a copy of the GNU General Public License > - * version 2 along with this program; If not, see > - * http://www.gnu.org/licenses/gpl-2.0.html > - * > - * GPL HEADER END > - */ > -/* > - * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. > - * Use is subject to license terms. > - */ > -/* > - * This file is part of Lustre, http://www.lustre.org/ > - * Lustre is a trademark of Sun Microsystems, Inc. > - * > - * libcfs/include/libcfs/libcfs_time.h > - * > - * Time functions. > - * > - */ > - > -#ifndef __LIBCFS_TIME_H__ > -#define __LIBCFS_TIME_H__ > -/* > - * return valid time-out based on user supplied one. Currently we only check > - * that time-out is not shorted than allowed. > - */ > -static inline long cfs_timeout_cap(long timeout) > -{ > - if (timeout < CFS_TICK) > - timeout = CFS_TICK; > - return timeout; > -} > - > -#endif > diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h > index ff3aae2f1231..ecb2126a9e6f 100644 > --- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h > +++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h > @@ -78,7 +78,7 @@ static inline int cfs_time_beforeq_64(u64 t1, u64 t2) > /* > * One jiffy > */ > -#define CFS_TICK (1) > +#define CFS_TICK (1UL) > > #define CFS_DURATION_T "%ld" > > diff --git a/drivers/staging/lustre/lustre/ptlrpc/import.c b/drivers/staging/lustre/lustre/ptlrpc/import.c > index 4a9d1f189d01..dd4fd54128dd 100644 > --- a/drivers/staging/lustre/lustre/ptlrpc/import.c > +++ b/drivers/staging/lustre/lustre/ptlrpc/import.c > @@ -1486,7 +1486,7 @@ int ptlrpc_disconnect_import(struct obd_import *imp, int noclose) > } > > if (ptlrpc_import_in_recovery(imp)) { > - long timeout; > + unsigned long timeout; > > if (AT_OFF) { > if (imp->imp_server_timeout) > @@ -1501,7 +1501,7 @@ int ptlrpc_disconnect_import(struct obd_import *imp, int noclose) > > if (wait_event_idle_timeout(imp->imp_recovery_waitq, > !ptlrpc_import_in_recovery(imp), > - cfs_timeout_cap(timeout)) == 0) > + max(timeout, CFS_TICK)) == 0) > l_wait_event_abortable( > imp->imp_recovery_waitq, > !ptlrpc_import_in_recovery(imp)); > > >
WARNING: multiple messages have this Message-ID (diff)
From: James Simmons <jsimmons@infradead.org> To: NeilBrown <neilb@suse.com> Cc: Oleg Drokin <oleg.drokin@intel.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Andreas Dilger <andreas.dilger@intel.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Lustre Development List <lustre-devel@lists.lustre.org> Subject: [lustre-devel] [PATCH 13/17] staging: lustre: libcfs: remove cfs_timeout_cap() Date: Fri, 30 Mar 2018 20:03:02 +0100 (BST) [thread overview] Message-ID: <alpine.LFD.2.21.1803302002410.9681@casper.infradead.org> (raw) In-Reply-To: <152229760874.27689.12453214678546053828.stgit@noble> > This wrapper is only used once, so open-code it as max(). > > This allows us to remove the libcfs_time.h include file. Reviewed-by: James Simmons <jsimmons@infradead.org> > Signed-off-by: NeilBrown <neilb@suse.com> > --- > .../staging/lustre/include/linux/libcfs/libcfs.h | 1 > .../lustre/include/linux/libcfs/libcfs_time.h | 50 -------------------- > .../lustre/include/linux/libcfs/linux/linux-time.h | 2 - > drivers/staging/lustre/lustre/ptlrpc/import.c | 4 +- > 4 files changed, 3 insertions(+), 54 deletions(-) > delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_time.h > > diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/libcfs.h > index 3b751c436b3d..3d3fa52858e5 100644 > --- a/drivers/staging/lustre/include/linux/libcfs/libcfs.h > +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs.h > @@ -43,7 +43,6 @@ > #include <linux/libcfs/libcfs_private.h> > #include <linux/libcfs/libcfs_cpu.h> > #include <linux/libcfs/libcfs_prim.h> > -#include <linux/libcfs/libcfs_time.h> > #include <linux/libcfs/libcfs_string.h> > #include <linux/libcfs/libcfs_hash.h> > #include <linux/libcfs/libcfs_fail.h> > diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h > deleted file mode 100644 > index 172a8872e3f3..000000000000 > --- a/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h > +++ /dev/null > @@ -1,50 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0 > -/* > - * GPL HEADER START > - * > - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 only, > - * as published by the Free Software Foundation. > - * > - * This program is distributed in the hope that it will be useful, but > - * WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - * General Public License version 2 for more details (a copy is included > - * in the LICENSE file that accompanied this code). > - * > - * You should have received a copy of the GNU General Public License > - * version 2 along with this program; If not, see > - * http://www.gnu.org/licenses/gpl-2.0.html > - * > - * GPL HEADER END > - */ > -/* > - * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. > - * Use is subject to license terms. > - */ > -/* > - * This file is part of Lustre, http://www.lustre.org/ > - * Lustre is a trademark of Sun Microsystems, Inc. > - * > - * libcfs/include/libcfs/libcfs_time.h > - * > - * Time functions. > - * > - */ > - > -#ifndef __LIBCFS_TIME_H__ > -#define __LIBCFS_TIME_H__ > -/* > - * return valid time-out based on user supplied one. Currently we only check > - * that time-out is not shorted than allowed. > - */ > -static inline long cfs_timeout_cap(long timeout) > -{ > - if (timeout < CFS_TICK) > - timeout = CFS_TICK; > - return timeout; > -} > - > -#endif > diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h > index ff3aae2f1231..ecb2126a9e6f 100644 > --- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h > +++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h > @@ -78,7 +78,7 @@ static inline int cfs_time_beforeq_64(u64 t1, u64 t2) > /* > * One jiffy > */ > -#define CFS_TICK (1) > +#define CFS_TICK (1UL) > > #define CFS_DURATION_T "%ld" > > diff --git a/drivers/staging/lustre/lustre/ptlrpc/import.c b/drivers/staging/lustre/lustre/ptlrpc/import.c > index 4a9d1f189d01..dd4fd54128dd 100644 > --- a/drivers/staging/lustre/lustre/ptlrpc/import.c > +++ b/drivers/staging/lustre/lustre/ptlrpc/import.c > @@ -1486,7 +1486,7 @@ int ptlrpc_disconnect_import(struct obd_import *imp, int noclose) > } > > if (ptlrpc_import_in_recovery(imp)) { > - long timeout; > + unsigned long timeout; > > if (AT_OFF) { > if (imp->imp_server_timeout) > @@ -1501,7 +1501,7 @@ int ptlrpc_disconnect_import(struct obd_import *imp, int noclose) > > if (wait_event_idle_timeout(imp->imp_recovery_waitq, > !ptlrpc_import_in_recovery(imp), > - cfs_timeout_cap(timeout)) == 0) > + max(timeout, CFS_TICK)) == 0) > l_wait_event_abortable( > imp->imp_recovery_waitq, > !ptlrpc_import_in_recovery(imp)); > > >
next prev parent reply other threads:[~2018-03-30 19:03 UTC|newest] Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-03-29 4:26 [PATCH 00/17] staging: Assorted lustre cleanup NeilBrown 2018-03-29 4:26 ` [lustre-devel] " NeilBrown 2018-03-29 4:26 ` [PATCH 05/17] staging: lustre: remove unneeded include NeilBrown 2018-03-29 4:26 ` [lustre-devel] " NeilBrown 2018-03-30 18:57 ` James Simmons 2018-03-30 18:57 ` [lustre-devel] " James Simmons 2018-03-29 4:26 ` [PATCH 11/17] staging: lustre: libcfs: discard cfs_time_shift() NeilBrown 2018-03-29 4:26 ` [lustre-devel] " NeilBrown 2018-03-30 19:02 ` James Simmons 2018-03-30 19:02 ` [lustre-devel] " James Simmons 2018-04-02 19:34 ` Dilger, Andreas 2018-04-02 19:34 ` [lustre-devel] " Dilger, Andreas 2018-04-02 22:26 ` NeilBrown 2018-04-02 22:26 ` [lustre-devel] " NeilBrown 2018-04-04 8:10 ` Dilger, Andreas 2018-04-04 8:10 ` Dilger, Andreas 2018-04-04 22:00 ` NeilBrown 2018-04-04 22:00 ` NeilBrown 2018-03-29 4:26 ` [PATCH 17/17] staging: lustre: remove cruft from libcfs/linux/libcfs.h NeilBrown 2018-03-29 4:26 ` [lustre-devel] " NeilBrown 2018-03-30 19:07 ` James Simmons 2018-03-30 19:07 ` [lustre-devel] " James Simmons 2018-03-29 4:26 ` [PATCH 07/17] staging: lustre: ldlm: free resource when ldlm_lock_create() fails NeilBrown 2018-03-29 4:26 ` [lustre-devel] " NeilBrown 2018-03-30 18:58 ` James Simmons 2018-03-30 18:58 ` [lustre-devel] " James Simmons 2018-03-29 4:26 ` [PATCH 01/17] staging: lustre: remove invariant in cl_io_read_ahead() NeilBrown 2018-03-29 4:26 ` [lustre-devel] " NeilBrown 2018-03-30 18:56 ` James Simmons 2018-03-30 18:56 ` [lustre-devel] " James Simmons 2018-03-29 4:26 ` [PATCH 02/17] staging: lustre: remove unused ldlm_completion_ast_async() NeilBrown 2018-03-29 4:26 ` [lustre-devel] " NeilBrown 2018-03-30 18:57 ` James Simmons 2018-03-30 18:57 ` [lustre-devel] " James Simmons 2018-03-29 4:26 ` [PATCH 04/17] staging: lustre: remove unused hash tables NeilBrown 2018-03-29 4:26 ` [lustre-devel] " NeilBrown 2018-03-30 18:57 ` James Simmons 2018-03-30 18:57 ` [lustre-devel] " James Simmons 2018-03-29 4:26 ` [PATCH 03/17] staging: lustre: LNET excludes USERIO NeilBrown 2018-03-29 4:26 ` [lustre-devel] " NeilBrown 2018-03-30 19:09 ` James Simmons 2018-03-30 19:09 ` [lustre-devel] " James Simmons 2018-03-29 4:26 ` [PATCH 10/17] staging: lustre: libcfs: discard cfs_time_add/sub NeilBrown 2018-03-29 4:26 ` [lustre-devel] " NeilBrown 2018-03-30 19:00 ` James Simmons 2018-03-30 19:00 ` [lustre-devel] " James Simmons 2018-03-29 4:26 ` [PATCH 13/17] staging: lustre: libcfs: remove cfs_timeout_cap() NeilBrown 2018-03-29 4:26 ` [lustre-devel] " NeilBrown 2018-03-30 19:03 ` James Simmons [this message] 2018-03-30 19:03 ` James Simmons 2018-04-02 19:38 ` Dilger, Andreas 2018-04-02 19:38 ` [lustre-devel] " Dilger, Andreas 2018-04-02 22:34 ` NeilBrown 2018-04-02 22:34 ` [lustre-devel] " NeilBrown 2018-03-29 4:26 ` [PATCH 14/17] staging: lustre: discard cfs_duration_sec() NeilBrown 2018-03-29 4:26 ` [lustre-devel] " NeilBrown 2018-03-30 19:02 ` James Simmons 2018-03-30 19:02 ` [lustre-devel] " James Simmons 2018-03-29 4:26 ` [PATCH 08/17] staging: lustre: add container_of_safe() NeilBrown 2018-03-29 4:26 ` [lustre-devel] " NeilBrown 2018-03-30 18:59 ` James Simmons 2018-03-30 18:59 ` [lustre-devel] " James Simmons 2018-04-10 1:37 ` Cory Spitz 2018-04-11 21:19 ` NeilBrown 2018-04-23 13:16 ` Greg Kroah-Hartman 2018-04-23 13:16 ` [lustre-devel] " Greg Kroah-Hartman 2018-03-29 4:26 ` [PATCH 09/17] staging: lustre: cfs_time_current() -> jiffies NeilBrown 2018-03-29 4:26 ` [lustre-devel] " NeilBrown 2018-03-30 19:00 ` James Simmons 2018-03-30 19:00 ` [lustre-devel] " James Simmons 2018-03-29 4:26 ` [PATCH 16/17] staging: lustre: discard linux-time.h NeilBrown 2018-03-29 4:26 ` [lustre-devel] " NeilBrown 2018-03-30 19:03 ` James Simmons 2018-03-30 19:03 ` [lustre-devel] " James Simmons 2018-03-29 4:26 ` [PATCH 12/17] staging: lustre: libcfs: discard cfs_time_after() NeilBrown 2018-03-29 4:26 ` [lustre-devel] " NeilBrown 2018-03-30 19:01 ` James Simmons 2018-03-30 19:01 ` [lustre-devel] " James Simmons 2018-03-29 4:26 ` [PATCH 06/17] staging: lustre: tidy up ldlm_resource_putref() NeilBrown 2018-03-29 4:26 ` [lustre-devel] " NeilBrown 2018-03-30 18:58 ` James Simmons 2018-03-30 18:58 ` [lustre-devel] " James Simmons 2018-03-29 4:26 ` [PATCH 15/17] staging: lustre: discard cfs_time_before_64() NeilBrown 2018-03-29 4:26 ` [lustre-devel] " NeilBrown 2018-03-30 19:03 ` James Simmons 2018-03-30 19:03 ` [lustre-devel] " James Simmons
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=alpine.LFD.2.21.1803302002410.9681@casper.infradead.org \ --to=jsimmons@infradead.org \ --cc=andreas.dilger@intel.com \ --cc=gregkh@linuxfoundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=lustre-devel@lists.lustre.org \ --cc=neilb@suse.com \ --cc=oleg.drokin@intel.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.