2014-06-12 11:28:11

by Andrey Skvortsov

[permalink] [raw]
Subject: [PATCH] staging: lustre: obdclass: linux-sysctl.c: fix pointer coding style issue


Signed-off-by: Andrey Skvortsov <[email protected]>
---
drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
index c1ef0c9..b87ca10 100644
--- a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
@@ -196,7 +196,7 @@ int LL_PROC_PROTO(proc_max_dirty_pages_in_mb)
}
if (write) {
rc = lprocfs_write_frac_helper(buffer, *lenp,
- (unsigned int*)table->data,
+ (unsigned int *)table->data,
1 << (20 - PAGE_CACHE_SHIFT));
/* Don't allow them to let dirty pages exceed 90% of system
* memory and set a hard minimum of 4MB. */
@@ -214,7 +214,7 @@ int LL_PROC_PROTO(proc_max_dirty_pages_in_mb)
int len;

len = lprocfs_read_frac_helper(buf, sizeof(buf),
- *(unsigned int*)table->data,
+ *(unsigned int *)table->data,
1 << (20 - PAGE_CACHE_SHIFT));
if (len > *lenp)
len = *lenp;
@@ -238,15 +238,14 @@ int LL_PROC_PROTO(proc_alloc_fail_rate)
}
if (write) {
rc = lprocfs_write_frac_helper(buffer, *lenp,
- (unsigned int*)table->data,
+ (unsigned int *)table->data,
OBD_ALLOC_FAIL_MULT);
} else {
char buf[21];
int len;

len = lprocfs_read_frac_helper(buf, 21,
- *(unsigned int*)table->data,
+ *(unsigned int *)table->data,
OBD_ALLOC_FAIL_MULT);
if (len > *lenp)
len = *lenp;
--
1.7.10.4


2014-06-18 22:31:36

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH] staging: lustre: obdclass: linux-sysctl.c: fix pointer coding style issue

On Thu, Jun 12, 2014 at 07:27:12PM +0400, Andrey Skvortsov wrote:
>
> Signed-off-by: Andrey Skvortsov <[email protected]>
> ---
> drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c | 8 ++++----

This patch does not apply to my tree for one chunk. Can you please
refresh it against the staging-next branch of the staging.git tree on
git.kernel.org?

thanks,

greg k-h

2014-06-19 07:24:17

by Andrey Skvortsov

[permalink] [raw]
Subject: [PATCHv2 1/3] staging: lustre: obdclass: linux-sysctl.c: fix pointer coding style issue

From: Andrey Skvortsov <[email protected]>


Signed-off-by: Andrey Skvortsov <[email protected]>
---
drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
index c1ef0c9..b87ca10 100644
--- a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
@@ -196,7 +196,7 @@ int LL_PROC_PROTO(proc_max_dirty_pages_in_mb)
}
if (write) {
rc = lprocfs_write_frac_helper(buffer, *lenp,
- (unsigned int*)table->data,
+ (unsigned int *)table->data,
1 << (20 - PAGE_CACHE_SHIFT));
/* Don't allow them to let dirty pages exceed 90% of system
* memory and set a hard minimum of 4MB. */
@@ -214,7 +214,7 @@ int LL_PROC_PROTO(proc_max_dirty_pages_in_mb)
int len;

len = lprocfs_read_frac_helper(buf, sizeof(buf),
- *(unsigned int*)table->data,
+ *(unsigned int *)table->data,
1 << (20 - PAGE_CACHE_SHIFT));
if (len > *lenp)
len = *lenp;
@@ -238,14 +238,14 @@ int LL_PROC_PROTO(proc_alloc_fail_rate)
}
if (write) {
rc = lprocfs_write_frac_helper(buffer, *lenp,
- (unsigned int*)table->data,
+ (unsigned int *)table->data,
OBD_ALLOC_FAIL_MULT);
} else {
char buf[21];
int len;

len = lprocfs_read_frac_helper(buf, 21,
- *(unsigned int*)table->data,
+ *(unsigned int *)table->data,
OBD_ALLOC_FAIL_MULT);
if (len > *lenp)
len = *lenp;
--
1.7.10.4

2014-06-19 07:24:25

by Andrey Skvortsov

[permalink] [raw]
Subject: [PATCHv2 3/3] staging: lustre: obdclass: linux-sysctl.c: fix unnecessary spaces coding style issue

From: Andrey Skvortsov <[email protected]>


Signed-off-by: Andrey Skvortsov <[email protected]>
---
drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
index 4dcdfc2..140b570 100644
--- a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
@@ -408,18 +408,18 @@ static ctl_table_t parent_table[] = {
};
#endif

-void obd_sysctl_init (void)
+void obd_sysctl_init(void)
{
#ifdef CONFIG_SYSCTL
- if ( !obd_table_header )
+ if (!obd_table_header)
obd_table_header = register_sysctl_table(parent_table);
#endif
}

-void obd_sysctl_clean (void)
+void obd_sysctl_clean(void)
{
#ifdef CONFIG_SYSCTL
- if ( obd_table_header )
+ if (obd_table_header)
unregister_sysctl_table(obd_table_header);
obd_table_header = NULL;
#endif
--
1.7.10.4

2014-06-19 07:24:43

by Andrey Skvortsov

[permalink] [raw]
Subject: [PATCHv2 2/3] staging: lustre: obdclass: linux-sysctl.c: fix checkpatch warnings about included headers

From: Andrey Skvortsov <[email protected]>


Signed-off-by: Andrey Skvortsov <[email protected]>
---
drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
index b87ca10..4dcdfc2 100644
--- a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
@@ -42,8 +42,8 @@
#include <linux/slab.h>
#include <linux/stat.h>
#include <linux/ctype.h>
-#include <asm/bitops.h>
-#include <asm/uaccess.h>
+#include <linux/bitops.h>
+#include <linux/uaccess.h>
#include <linux/utsname.h>

#define DEBUG_SUBSYSTEM S_CLASS
--
1.7.10.4

2014-06-19 07:24:15

by Andrey Skvortsov

[permalink] [raw]
Subject: [PATCHv2 1/3] staging: lustre: obdclass: linux-sysctl.c: fix pointer coding style issue

From: Andrey Skvortsov <[email protected]>


Signed-off-by: Andrey Skvortsov <[email protected]>
---
Changes since PATCHv1:

I refreshed patch against the staging-next branch of the staging.git tree
and added some other coding style fixes as separate patches.


drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
index c1ef0c9..b87ca10 100644
--- a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
@@ -196,7 +196,7 @@ int LL_PROC_PROTO(proc_max_dirty_pages_in_mb)
}
if (write) {
rc = lprocfs_write_frac_helper(buffer, *lenp,
- (unsigned int*)table->data,
+ (unsigned int *)table->data,
1 << (20 - PAGE_CACHE_SHIFT));
/* Don't allow them to let dirty pages exceed 90% of system
* memory and set a hard minimum of 4MB. */
@@ -214,7 +214,7 @@ int LL_PROC_PROTO(proc_max_dirty_pages_in_mb)
int len;

len = lprocfs_read_frac_helper(buf, sizeof(buf),
- *(unsigned int*)table->data,
+ *(unsigned int *)table->data,
1 << (20 - PAGE_CACHE_SHIFT));
if (len > *lenp)
len = *lenp;
@@ -238,14 +238,14 @@ int LL_PROC_PROTO(proc_alloc_fail_rate)
}
if (write) {
rc = lprocfs_write_frac_helper(buffer, *lenp,
- (unsigned int*)table->data,
+ (unsigned int *)table->data,
OBD_ALLOC_FAIL_MULT);
} else {
char buf[21];
int len;

len = lprocfs_read_frac_helper(buf, 21,
- *(unsigned int*)table->data,
+ *(unsigned int *)table->data,
OBD_ALLOC_FAIL_MULT);
if (len > *lenp)
len = *lenp;
--
1.7.10.4

2014-06-19 07:24:13

by Andrey Skvortsov

[permalink] [raw]
Subject: [PATCHv2 0/3] staging: lustre: obdclass: fixing coding style issues

Changes since PATCHv1:

I refreshed patch against the staging-next branch of the staging.git tree
and added some other coding style fixes as separate patches.


Andrey Skvortsov (3):
staging: lustre: obdclass: linux-sysctl.c: fix pointer coding style
issue
staging: lustre: obdclass: linux-sysctl.c: fix checkpatch warnings
about included headers
staging: lustre: obdclass: linux-sysctl.c: fix unnecessary spaces
coding style issue

.../lustre/lustre/obdclass/linux/linux-sysctl.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)

--
1.7.10.4