Commit 965bd8b9 authored Dec 16, 2014 by Chris Rorvick Committed by Greg Kroah-Hartman Jan 17, 2015

drivers: staging: lustre: Use mult if units not specified



Units can be passed to lprocfs_write_frac_u64_helper() via a suffix
(e.g., "...K", "...M", etc.) tacked onto the value.  A comment states
that "specified units override the multiplier," though the multiplier is
overridden regardless.  Update the conditional logic so that it only
applies when units are specified.

Signed-off-by: Chris Rorvick <chris@rorvick.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 054cd837

drivers/staging/lustre/lustre/obdclass/lprocfs_status.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1908,7 +1908,7 @@ int lprocfs_write_frac_u64_helper(const char *buffer, unsigned long count,
		units <<= 10;
		}
		/* Specified units override the multiplier */
		if (units)
		if (units > 1)
		mult = mult < 0 ? -units : units;

		frac *= mult;