p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ktime: Get rid of ktime_equal() 

No point in going through loops and hoops instead of just comparing the
values.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
This commit is contained in:
Thomas Gleixner 2016-12-25 12:43:07 +01:00
parent 8b0e195314
commit 1f3a8e49d8
4 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/dlm/lock.c
View File

@ -1395,7 +1395,6 @@ static int nodeid_warned(int nodeid, int num_nodes, int *warned)
void dlm_scan_waiters(struct dlm_ls *ls) void dlm_scan_waiters(struct dlm_ls *ls)
{ {
struct dlm_lkb *lkb; struct dlm_lkb *lkb;
ktime_t zero = 0;
s64 us; s64 us;
s64 debug_maxus = 0; s64 debug_maxus = 0;
u32 debug_scanned = 0; u32 debug_scanned = 0;
@ -1409,7 +1408,7 @@ void dlm_scan_waiters(struct dlm_ls *ls)
mutex_lock(&ls->ls_waiters_mutex); mutex_lock(&ls->ls_waiters_mutex);
list_for_each_entry(lkb, &ls->ls_waiters, lkb_wait_reply) { list_for_each_entry(lkb, &ls->ls_waiters, lkb_wait_reply) {
if (ktime_equal(lkb->lkb_wait_time, zero)) if (!lkb->lkb_wait_time)
continue; continue;
debug_scanned++; debug_scanned++;
@ -1419,7 +1418,7 @@ void dlm_scan_waiters(struct dlm_ls *ls)
if (us < dlm_config.ci_waitwarn_us) if (us < dlm_config.ci_waitwarn_us)
continue; continue;
lkb->lkb_wait_time = zero; lkb->lkb_wait_time = 0;
debug_expired++; debug_expired++;
if (us > debug_maxus) if (us > debug_maxus)

2
fs/nfs/flexfilelayout/flexfilelayout.c
View File

@ -623,7 +623,7 @@ nfs4_ff_layoutstat_start_io(struct nfs4_ff_layout_mirror *mirror,
struct nfs4_flexfile_layout *ffl = FF_LAYOUT_FROM_HDR(mirror->layout); struct nfs4_flexfile_layout *ffl = FF_LAYOUT_FROM_HDR(mirror->layout);
nfs4_ff_start_busy_timer(&layoutstat->busy_timer, now); nfs4_ff_start_busy_timer(&layoutstat->busy_timer, now);
if (ktime_equal(mirror->start_time, 0)) if (!mirror->start_time)
mirror->start_time = now; mirror->start_time = now;
if (mirror->report_interval != 0) if (mirror->report_interval != 0)
report_interval = (s64)mirror->report_interval * 1000LL; report_interval = (s64)mirror->report_interval * 1000LL;

15
include/linux/ktime.h
View File

@ -96,21 +96,6 @@ static inline ktime_t timeval_to_ktime(struct timeval tv)
/* Convert ktime_t to nanoseconds - NOP in the scalar storage format: */ /* Convert ktime_t to nanoseconds - NOP in the scalar storage format: */
#define ktime_to_ns(kt) (kt) #define ktime_to_ns(kt) (kt)
/**
* ktime_equal - Compares two ktime_t variables to see if they are equal
* @cmp1: comparable1
* @cmp2: comparable2
*
* Compare two ktime_t variables.
*
* Return: 1 if equal.
*/
static inline int ktime_equal(const ktime_t cmp1, const ktime_t cmp2)
{
return cmp1 == cmp2;
}
/** /**
* ktime_compare - Compares two ktime_t variables for less, greater or equal * ktime_compare - Compares two ktime_t variables for less, greater or equal
* @cmp1: comparable1 * @cmp1: comparable1

2
net/ipv6/mip6.c
View File

@ -191,7 +191,7 @@ static inline int mip6_report_rl_allow(ktime_t stamp,
int allow = 0; int allow = 0;
spin_lock_bh(&mip6_report_rl.lock); spin_lock_bh(&mip6_report_rl.lock);
if (!ktime_equal(mip6_report_rl.stamp, stamp) || if (mip6_report_rl.stamp != stamp ||
mip6_report_rl.iif != iif || mip6_report_rl.iif != iif ||
!ipv6_addr_equal(&mip6_report_rl.src, src) || !ipv6_addr_equal(&mip6_report_rl.src, src) ||
!ipv6_addr_equal(&mip6_report_rl.dst, dst)) { !ipv6_addr_equal(&mip6_report_rl.dst, dst)) {