2014-12-17 22:02:17

by Rickard Strandqvist

Subject: [PATCH] staging: lustre: lustre: obdclass: lprocfs_status.c: Removed an unnecessary NULL check

Removed an unnecessary NULL check. And clarified a switch statement.

Signed-off-by: Rickard Strandqvist <[email protected]>
---
drivers/staging/lustre/lustre/obdclass/lprocfs_status.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
index 61e04af..bf3353f 100644
--- a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
+++ b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
@@ -45,6 +45,7 @@
#include "../include/lprocfs_status.h"
#include "../include/lustre/lustre_idl.h"
#include <linux/seq_file.h>
+#include <linux/ctype.h>

static const char * const obd_connect_names[] = {
"read_only",
@@ -1882,7 +1883,7 @@ int lprocfs_write_frac_u64_helper(const char *buffer, unsigned long count,
if (pbuf == end)
return -EINVAL;

- if (end != NULL && *end == '.') {
+ if (*end == '.') {
int i;
pbuf = end + 1;

@@ -1897,16 +1898,16 @@ int lprocfs_write_frac_u64_helper(const char *buffer, unsigned long count,
}

units = 1;
- switch (*end) {
- case 'p': case 'P':
+ switch (tolower(*end)) {
+ case 'p':
units <<= 10;
- case 't': case 'T':
+ case 't':
units <<= 10;
- case 'g': case 'G':
+ case 'g':
units <<= 10;
- case 'm': case 'M':
+ case 'm':
units <<= 10;
- case 'k': case 'K':
+ case 'k':
units <<= 10;
}
/* Specified units override the multiplier */
--
1.7.10.4

2014-12-18 00:11:25

by Greg Kroah-Hartman

Subject: Re: [PATCH] staging: lustre: lustre: obdclass: lprocfs_status.c: Removed an unnecessary NULL check

On Wed, Dec 17, 2014 at 11:05:00PM +0100, Rickard Strandqvist wrote:
> Removed an unnecessary NULL check. And clarified a switch statement.

That's two different things, please only do one thing in a patch, so
this would be 2 different patches.

please fix up and resend as a series of patches.

thanks,

greg k-h

2014-12-21 18:07:34

by Rickard Strandqvist

Subject: Re: [PATCH] staging: lustre: lustre: obdclass: lprocfs_status.c: Removed an unnecessary NULL check

2014-12-18 1:11 GMT+01:00 Greg Kroah-Hartman <[email protected]>:
> On Wed, Dec 17, 2014 at 11:05:00PM +0100, Rickard Strandqvist wrote:
>> Removed an unnecessary NULL check. And clarified a switch statement.
>
> That's two different things, please only do one thing in a patch, so
> this would be 2 different patches.
>
> please fix up and resend as a series of patches.
>
> thanks,
>
> greg k-h



Ok, sorry new path on the way!

Kind regards
Rickard Strandqvist