From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx48z+OEOUAeP1essi2Y3LjHQYRGTkTD1ST2RZUKFga3qXn7P2pPHdvgxztJxKTqNJIcLm2DM ARC-Seal: i=1; a=rsa-sha256; t=1522297737; cv=none; d=google.com; s=arc-20160816; b=K/rL118Ph4HAvdyATmL2KThjgKUxNe8sIRmYjW4/g2lubk0gT7gAHHps7Ed3u8CCvU 8EoVlZWus4UU2zW0kVEUpHtqK1JB6N1dYHSOJ9X4Ku2kiWHc2NSojBpXRNbii3u8Ph+I S4uG7qr5n3wGBLhh4jLiYAE6l8+TdQH+Xylm2p7ouiPWzP63l5KXU3sCIOPRJN4eUOrb oSpngnKeELuNC+4XmKsxCLKEh3E8KPphrWuOSPI3yHlTaEgRczI8Bbc1AWkXzwU2+FQt +LoPFbvsAXokMH3aFeQvxCqQxDDEYHhAgCuLibxr5he5YqpO20KfB6pSt3xNVv8D5vp4 hFrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:cc:subject:date:to:from :arc-authentication-results; bh=tDY+knztfAjWtFvDYOSVwIWo1v1sU+JXVEh5Zh5nTOo=; b=edirK5EeN+2ZS/5Bd/q8hpuwzOByivVh5ynO0rZZwDyT0iQIl40gwpoSKBBcgexuKG +OQ+I6Vsp2VYXNFDy4DGGY3UV60t5jV4DZKBFGuWKs2Q6jH/E41fDDX9dwrhY920CVbB MOT1cPc+aeyMMWtiIYkfSQjefhCOaGFdFwGCMZDN8OdoghixlvfLaVEWv79LpyLcnuRQ DyrudZgFHNAJ6g5Tliakq7a118BHylUJwgcIcPLyDnrdlm0gNOW55lWQaY406MNBTNZA swmCWru/wgVVlhSS8IJcqsGhVf9hEWCaXQCyz5rBBuYOFqM7ZNJ82/qp7so0ZtJ4Juix cdyA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of neilb@suse.com designates 195.135.220.15 as permitted sender) smtp.mailfrom=neilb@suse.com Authentication-Results: mx.google.com; spf=pass (google.com: domain of neilb@suse.com designates 195.135.220.15 as permitted sender) smtp.mailfrom=neilb@suse.com From: NeilBrown To: Oleg Drokin , Greg Kroah-Hartman , James Simmons , Andreas Dilger Date: Thu, 29 Mar 2018 15:26:48 +1100 Subject: [PATCH 15/17] staging: lustre: discard cfs_time_before_64() Cc: Linux Kernel Mailing List , Lustre Development List Message-ID: <152229760881.27689.10658125792259115083.stgit@noble> In-Reply-To: <152229732768.27689.4800156943561963977.stgit@noble> References: <152229732768.27689.4800156943561963977.stgit@noble> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1596244872321523554?= X-GMAIL-MSGID: =?utf-8?q?1596244872321523554?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: cfs_time_before_64 is the same as time_before64() similarly cfs_time_beforeq_64() matsches time_before_eq64() So just use the standard interfaces. Signed-off-by: NeilBrown Reviewed-by: James Simmons --- .../lustre/include/linux/libcfs/linux/linux-time.h | 14 -------------- drivers/staging/lustre/lustre/include/obd_class.h | 4 ++-- drivers/staging/lustre/lustre/ptlrpc/import.c | 4 ++-- 3 files changed, 4 insertions(+), 18 deletions(-) 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 9a353c6cb85a..ecdebccf2b44 100644 --- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h +++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h @@ -56,20 +56,6 @@ #include -/* - * Generic kernel stuff - */ - -static inline int cfs_time_before_64(u64 t1, u64 t2) -{ - return (__s64)t2 - (__s64)t1 > 0; -} - -static inline int cfs_time_beforeq_64(u64 t1, u64 t2) -{ - return (__s64)t2 - (__s64)t1 >= 0; -} - /* * One jiffy */ diff --git a/drivers/staging/lustre/lustre/include/obd_class.h b/drivers/staging/lustre/lustre/include/obd_class.h index 7cfc3c8d100c..176b63e2c9a7 100644 --- a/drivers/staging/lustre/lustre/include/obd_class.h +++ b/drivers/staging/lustre/lustre/include/obd_class.h @@ -932,7 +932,7 @@ static inline int obd_statfs_async(struct obd_export *exp, CDEBUG(D_SUPER, "%s: osfs %p age %llu, max_age %llu\n", obd->obd_name, &obd->obd_osfs, obd->obd_osfs_age, max_age); - if (cfs_time_before_64(obd->obd_osfs_age, max_age)) { + if (time_before64(obd->obd_osfs_age, max_age)) { rc = OBP(obd, statfs_async)(exp, oinfo, max_age, rqset); } else { CDEBUG(D_SUPER, @@ -992,7 +992,7 @@ static inline int obd_statfs(const struct lu_env *env, struct obd_export *exp, CDEBUG(D_SUPER, "osfs %llu, max_age %llu\n", obd->obd_osfs_age, max_age); - if (cfs_time_before_64(obd->obd_osfs_age, max_age)) { + if (time_before64(obd->obd_osfs_age, max_age)) { rc = OBP(obd, statfs)(env, exp, osfs, max_age, flags); if (rc == 0) { spin_lock(&obd->obd_osfs_lock); diff --git a/drivers/staging/lustre/lustre/ptlrpc/import.c b/drivers/staging/lustre/lustre/ptlrpc/import.c index dd4fd54128dd..537a9e2ed467 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/import.c +++ b/drivers/staging/lustre/lustre/ptlrpc/import.c @@ -463,7 +463,7 @@ static int import_select_connection(struct obd_import *imp) * the last successful attempt, go with this one */ if ((conn->oic_last_attempt == 0) || - cfs_time_beforeq_64(conn->oic_last_attempt, + time_before_eq64(conn->oic_last_attempt, imp->imp_last_success_conn)) { imp_conn = conn; tried_all = 0; @@ -476,7 +476,7 @@ static int import_select_connection(struct obd_import *imp) */ if (!imp_conn) imp_conn = conn; - else if (cfs_time_before_64(conn->oic_last_attempt, + else if (time_before64(conn->oic_last_attempt, imp_conn->oic_last_attempt)) imp_conn = conn; }