mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-24 05:04:00 +08:00
staging/lustre: Always clamp cdls_delay between min and max
In libcfs_debug_vmsg2, cdls_delay is only clamped between the minimum and the maximum when it is increased by multiplying by the backoff factor. It is not clamped when it is decreased by dividing by the backoff factor. This allows it to achieve values less than the minimum, which allows a console message to be printed that should have been skipped. This patch moves the clamping outside of the else statement, ensuring that cdls_delay is always between the min and the max after the first time through libcfs_debug_vmsg2. Signed-off-by: Ryan Haasken <haasken@cray.com> Reviewed-on: http://review.whamcloud.com/9503 Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4711 Reviewed-by: Chris Horn <hornc@cray.com> Reviewed-by: Ann Koehler <amk@cray.com> Reviewed-by: Andreas Dilger <andreas.dilger@intel.com> Signed-off-by: Oleg Drokin <oleg.drokin@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
beaa264726
commit
b7d0254ce8
@ -416,13 +416,13 @@ console:
|
||||
cdls->cdls_delay /= libcfs_console_backoff * 4;
|
||||
} else {
|
||||
cdls->cdls_delay *= libcfs_console_backoff;
|
||||
|
||||
if (cdls->cdls_delay < libcfs_console_min_delay)
|
||||
cdls->cdls_delay = libcfs_console_min_delay;
|
||||
else if (cdls->cdls_delay > libcfs_console_max_delay)
|
||||
cdls->cdls_delay = libcfs_console_max_delay;
|
||||
}
|
||||
|
||||
if (cdls->cdls_delay < libcfs_console_min_delay)
|
||||
cdls->cdls_delay = libcfs_console_min_delay;
|
||||
else if (cdls->cdls_delay > libcfs_console_max_delay)
|
||||
cdls->cdls_delay = libcfs_console_max_delay;
|
||||
|
||||
/* ensure cdls_next is never zero after it's been seen */
|
||||
cdls->cdls_next = (cfs_time_current() + cdls->cdls_delay) | 1;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user