Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   NeilBrown <neilb@suse.com>
To:     "Dilger\, Andreas" <andreas.dilger@intel.com>
Date:   Tue, 03 Apr 2018 08:34:00 +1000
Cc:     "Drokin\, Oleg" <oleg.drokin@intel.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        James Simmons <jsimmons@infradead.org>,
        "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()
In-Reply-To: <346B8E2C-5842-4771-86D8-CBB5CEF2DC35@intel.com>
References: <152229732768.27689.4800156943561963977.stgit@noble> <152229760874.27689.12453214678546053828.stgit@noble> <346B8E2C-5842-4771-86D8-CBB5CEF2DC35@intel.com>
Message-ID: <87k1tp1bmv.fsf@notabene.neil.brown.name>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
        micalg=pgp-sha256; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

On Mon, Apr 02 2018, Dilger, Andreas wrote:

> On Mar 28, 2018, at 22:26, NeilBrown <neilb@suse.com> wrote:

>> diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-tim=
e.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)
>
> It seems like CFS_TICK is mostly useless as well and could just be droppe=
d?

Possibly, but I don't know what its purpose is so I didn't want to just
drop it in the middle of a patch that is performing an idempotent
transformation.

Do you know why the one place that uses CFS_TICK wants to protect about
a timeout of zero?  Maybe because the old l_wait_event() treated a
timeout of zero as meaning no timeout?
In that case this really is irrelevant now and that
wait_event_idle_timeout() should just use "timeout" directly.

Thanks,
NeilBrown


>
>> #define CFS_DURATION_T	  "%ld"
>>=20
>> diff --git a/drivers/staging/lustre/lustre/ptlrpc/import.c b/drivers/sta=
ging/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 *im=
p, int noclose)
>> 	}
>>=20
>> 	if (ptlrpc_import_in_recovery(imp)) {
>> -		long timeout;
>> +		unsigned long timeout;
>>=20
>> 		if (AT_OFF) {
>> 			if (imp->imp_server_timeout)
>> @@ -1501,7 +1501,7 @@ int ptlrpc_disconnect_import(struct obd_import *im=
p, int noclose)
>>=20
>> 		if (wait_event_idle_timeout(imp->imp_recovery_waitq,
>> 					    !ptlrpc_import_in_recovery(imp),
>> -					    cfs_timeout_cap(timeout)) =3D=3D 0)
>> +					    max(timeout, CFS_TICK)) =3D=3D 0)
>> 			l_wait_event_abortable(
>> 				imp->imp_recovery_waitq,
>> 				!ptlrpc_import_in_recovery(imp));
>>=20
>>=20
>
> Cheers, Andreas
> --
> Andreas Dilger
> Lustre Principal Architect
> Intel Corporation

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEG8Yp69OQ2HB7X0l6Oeye3VZigbkFAlrCr9kACgkQOeye3VZi
gbnnfhAAv1ip0QJR0qLJ8SXIOFocVwJfPS+J9pw51MC+2bkZkQ1x8ZO6gq0ZlVoR
Hmc/65qENJAyJtXee6RxC1fO5fF2pLkHbUkzPg5cohu8sjBznaZA2OFShLwnRXyd
/hFp+az2v1UG7rcoY63yXVgtkPzoQRTSdnE+A9sOqYdUdOAQ6Ap+BBlvvwjob6YB
UY4o1Qd0pT9Fnk28YvS53dERbKTuUdvI8Gdqlh3+8kLkwp4ZofooIyv2IUlhiE1v
TCpTARl5ETY0YSZ4poXYjMLPPESd20PRzC0c425Zg786h2Lwv36cE0daypQaeZx/
xl/aF+aSKJ2L+1M2/ZYLN33j8bfelzV0ox53bUqC055Xnwh1mVv8g3dZX4pncRPH
D2TWwqT33eB1ybvXsff48N745XZMaMKYTEZGOsq8DlV01x4sCmKOuKFmlwMro6PS
FKlvJE66O8W3nf/CTgTuRgu3zo/x1RfTdkOe3UI/y/kiuqJrUkFf83Uucf4WrERm
GZWF8uzEAKqI6+slMEp3+a1WMv2YDvuzloQSSAjJzrmA1p1d1XtqsPd6Aw4Z4Yfw
wSHARh5CrwhghVmVz2ADwtWONUWrp6VZsau/ZNhRyBYiRkpL8wfA8euBePTdX6Bw
TDZNC2FbSozAg98Vhm/eFiSVYNj0RN6r5TwcJ9BUiBaS7whGggo=
=Bb07
-----END PGP SIGNATURE-----
--=-=-=--