* [-mm patch] drivers/dlm/: make code static
@ 2005-06-14 1:43 Adrian Bunk
2005-06-14 2:19 ` David Teigland
0 siblings, 1 reply; 3+ messages in thread
From: Adrian Bunk @ 2005-06-14 1:43 UTC (permalink / raw)
To: Andrew Morton; +Cc: David Teigland, Patrick Caulfield, linux-kernel
This patch makes needlessly global code static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
This patch was already sent on:
- 2 Jun 2005
drivers/dlm/lock.c | 10 +++++-----
drivers/dlm/lockspace.c | 6 +++---
drivers/dlm/main.c | 4 ++--
drivers/dlm/member.c | 6 +++---
drivers/dlm/recover.c | 2 +-
drivers/dlm/recoverd.c | 2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
--- linux-2.6.12-rc5-mm2-full/drivers/dlm/lock.c.old 2005-06-02 22:09:02.000000000 +0200
+++ linux-2.6.12-rc5-mm2-full/drivers/dlm/lock.c 2005-06-02 22:10:22.000000000 +0200
@@ -94,7 +94,7 @@
* Usage: matrix[grmode+1][rqmode+1] (although m[rq+1][gr+1] is the same)
*/
-const int __dlm_compat_matrix[8][8] = {
+static const int __dlm_compat_matrix[8][8] = {
/* UN NL CR CW PR PW EX PD */
{1, 1, 1, 1, 1, 1, 1, 0}, /* UN */
{1, 1, 1, 1, 1, 1, 1, 0}, /* NL */
@@ -141,7 +141,7 @@
* Usage: matrix[grmode+1][rqmode+1]
*/
-const int __quecvt_compat_matrix[8][8] = {
+static const int __quecvt_compat_matrix[8][8] = {
/* UN NL CR CW PR PW EX PD */
{0, 0, 0, 0, 0, 0, 0, 0}, /* UN */
{0, 0, 1, 1, 1, 1, 1, 0}, /* NL */
@@ -1632,8 +1632,8 @@
return 0;
}
-int validate_lock_args(struct dlm_ls *ls, struct dlm_lkb *lkb,
- struct dlm_args *args)
+static int validate_lock_args(struct dlm_ls *ls, struct dlm_lkb *lkb,
+ struct dlm_args *args)
{
int rv = -EINVAL;
@@ -1687,7 +1687,7 @@
return rv;
}
-int validate_unlock_args(struct dlm_lkb *lkb, struct dlm_args *args)
+static int validate_unlock_args(struct dlm_lkb *lkb, struct dlm_args *args)
{
int rv = -EINVAL;
--- linux-2.6.12-rc5-mm2-full/drivers/dlm/lockspace.c.old 2005-06-02 22:10:40.000000000 +0200
+++ linux-2.6.12-rc5-mm2-full/drivers/dlm/lockspace.c 2005-06-02 22:10:54.000000000 +0200
@@ -39,7 +39,7 @@
return 0;
}
-int dlm_scand(void *data)
+static int dlm_scand(void *data)
{
struct dlm_ls *ls;
@@ -52,7 +52,7 @@
return 0;
}
-int dlm_scand_start(void)
+static int dlm_scand_start(void)
{
struct task_struct *p;
int error = 0;
@@ -65,7 +65,7 @@
return error;
}
-void dlm_scand_stop(void)
+static void dlm_scand_stop(void)
{
kthread_stop(scand_task);
}
--- linux-2.6.12-rc5-mm2-full/drivers/dlm/main.c.old 2005-06-02 22:11:11.000000000 +0200
+++ linux-2.6.12-rc5-mm2-full/drivers/dlm/main.c 2005-06-02 22:11:36.000000000 +0200
@@ -36,7 +36,7 @@
int dlm_node_ioctl_init(void);
void dlm_node_ioctl_exit(void);
-int __init init_dlm(void)
+static int __init init_dlm(void)
{
int error;
@@ -80,7 +80,7 @@
return error;
}
-void __exit exit_dlm(void)
+static void __exit exit_dlm(void)
{
dlm_lowcomms_exit();
dlm_member_sysfs_exit();
--- linux-2.6.12-rc5-mm2-full/drivers/dlm/member.c.old 2005-06-02 22:11:53.000000000 +0200
+++ linux-2.6.12-rc5-mm2-full/drivers/dlm/member.c 2005-06-02 22:12:20.000000000 +0200
@@ -47,7 +47,7 @@
}
}
-int dlm_add_member(struct dlm_ls *ls, int nodeid)
+static int dlm_add_member(struct dlm_ls *ls, int nodeid)
{
struct dlm_member *memb;
@@ -61,13 +61,13 @@
return 0;
}
-void dlm_remove_member(struct dlm_ls *ls, struct dlm_member *memb)
+static void dlm_remove_member(struct dlm_ls *ls, struct dlm_member *memb)
{
list_move(&memb->list, &ls->ls_nodes_gone);
ls->ls_num_nodes--;
}
-int dlm_is_member(struct dlm_ls *ls, int nodeid)
+static int dlm_is_member(struct dlm_ls *ls, int nodeid)
{
struct dlm_member *memb;
--- linux-2.6.12-rc5-mm2-full/drivers/dlm/recover.c.old 2005-06-02 22:12:34.000000000 +0200
+++ linux-2.6.12-rc5-mm2-full/drivers/dlm/recover.c 2005-06-02 22:13:18.000000000 +0200
@@ -237,7 +237,7 @@
return r;
}
-void recover_list_clear(struct dlm_ls *ls)
+static void recover_list_clear(struct dlm_ls *ls)
{
struct dlm_rsb *r, *s;
--- linux-2.6.12-rc5-mm2-full/drivers/dlm/recoverd.c.old 2005-06-02 22:13:28.000000000 +0200
+++ linux-2.6.12-rc5-mm2-full/drivers/dlm/recoverd.c 2005-06-02 22:13:36.000000000 +0200
@@ -658,7 +658,7 @@
}
}
-int dlm_recoverd(void *arg)
+static int dlm_recoverd(void *arg)
{
struct dlm_ls *ls;
^ permalink raw reply [flat|nested] 3+ messages in thread* [-mm patch] drivers/dlm/: make code static
@ 2005-06-02 20:17 Adrian Bunk
0 siblings, 0 replies; 3+ messages in thread
From: Adrian Bunk @ 2005-06-02 20:17 UTC (permalink / raw)
To: David Teigland, Patrick Caulfield; +Cc: linux-kernel
This patch makes needlessly global code static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
drivers/dlm/lock.c | 10 +++++-----
drivers/dlm/lockspace.c | 6 +++---
drivers/dlm/main.c | 4 ++--
drivers/dlm/member.c | 6 +++---
drivers/dlm/recover.c | 2 +-
drivers/dlm/recoverd.c | 2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
--- linux-2.6.12-rc5-mm2-full/drivers/dlm/lock.c.old 2005-06-02 22:09:02.000000000 +0200
+++ linux-2.6.12-rc5-mm2-full/drivers/dlm/lock.c 2005-06-02 22:10:22.000000000 +0200
@@ -94,7 +94,7 @@
* Usage: matrix[grmode+1][rqmode+1] (although m[rq+1][gr+1] is the same)
*/
-const int __dlm_compat_matrix[8][8] = {
+static const int __dlm_compat_matrix[8][8] = {
/* UN NL CR CW PR PW EX PD */
{1, 1, 1, 1, 1, 1, 1, 0}, /* UN */
{1, 1, 1, 1, 1, 1, 1, 0}, /* NL */
@@ -141,7 +141,7 @@
* Usage: matrix[grmode+1][rqmode+1]
*/
-const int __quecvt_compat_matrix[8][8] = {
+static const int __quecvt_compat_matrix[8][8] = {
/* UN NL CR CW PR PW EX PD */
{0, 0, 0, 0, 0, 0, 0, 0}, /* UN */
{0, 0, 1, 1, 1, 1, 1, 0}, /* NL */
@@ -1632,8 +1632,8 @@
return 0;
}
-int validate_lock_args(struct dlm_ls *ls, struct dlm_lkb *lkb,
- struct dlm_args *args)
+static int validate_lock_args(struct dlm_ls *ls, struct dlm_lkb *lkb,
+ struct dlm_args *args)
{
int rv = -EINVAL;
@@ -1687,7 +1687,7 @@
return rv;
}
-int validate_unlock_args(struct dlm_lkb *lkb, struct dlm_args *args)
+static int validate_unlock_args(struct dlm_lkb *lkb, struct dlm_args *args)
{
int rv = -EINVAL;
--- linux-2.6.12-rc5-mm2-full/drivers/dlm/lockspace.c.old 2005-06-02 22:10:40.000000000 +0200
+++ linux-2.6.12-rc5-mm2-full/drivers/dlm/lockspace.c 2005-06-02 22:10:54.000000000 +0200
@@ -39,7 +39,7 @@
return 0;
}
-int dlm_scand(void *data)
+static int dlm_scand(void *data)
{
struct dlm_ls *ls;
@@ -52,7 +52,7 @@
return 0;
}
-int dlm_scand_start(void)
+static int dlm_scand_start(void)
{
struct task_struct *p;
int error = 0;
@@ -65,7 +65,7 @@
return error;
}
-void dlm_scand_stop(void)
+static void dlm_scand_stop(void)
{
kthread_stop(scand_task);
}
--- linux-2.6.12-rc5-mm2-full/drivers/dlm/main.c.old 2005-06-02 22:11:11.000000000 +0200
+++ linux-2.6.12-rc5-mm2-full/drivers/dlm/main.c 2005-06-02 22:11:36.000000000 +0200
@@ -36,7 +36,7 @@
int dlm_node_ioctl_init(void);
void dlm_node_ioctl_exit(void);
-int __init init_dlm(void)
+static int __init init_dlm(void)
{
int error;
@@ -80,7 +80,7 @@
return error;
}
-void __exit exit_dlm(void)
+static void __exit exit_dlm(void)
{
dlm_lowcomms_exit();
dlm_member_sysfs_exit();
--- linux-2.6.12-rc5-mm2-full/drivers/dlm/member.c.old 2005-06-02 22:11:53.000000000 +0200
+++ linux-2.6.12-rc5-mm2-full/drivers/dlm/member.c 2005-06-02 22:12:20.000000000 +0200
@@ -47,7 +47,7 @@
}
}
-int dlm_add_member(struct dlm_ls *ls, int nodeid)
+static int dlm_add_member(struct dlm_ls *ls, int nodeid)
{
struct dlm_member *memb;
@@ -61,13 +61,13 @@
return 0;
}
-void dlm_remove_member(struct dlm_ls *ls, struct dlm_member *memb)
+static void dlm_remove_member(struct dlm_ls *ls, struct dlm_member *memb)
{
list_move(&memb->list, &ls->ls_nodes_gone);
ls->ls_num_nodes--;
}
-int dlm_is_member(struct dlm_ls *ls, int nodeid)
+static int dlm_is_member(struct dlm_ls *ls, int nodeid)
{
struct dlm_member *memb;
--- linux-2.6.12-rc5-mm2-full/drivers/dlm/recover.c.old 2005-06-02 22:12:34.000000000 +0200
+++ linux-2.6.12-rc5-mm2-full/drivers/dlm/recover.c 2005-06-02 22:13:18.000000000 +0200
@@ -237,7 +237,7 @@
return r;
}
-void recover_list_clear(struct dlm_ls *ls)
+static void recover_list_clear(struct dlm_ls *ls)
{
struct dlm_rsb *r, *s;
--- linux-2.6.12-rc5-mm2-full/drivers/dlm/recoverd.c.old 2005-06-02 22:13:28.000000000 +0200
+++ linux-2.6.12-rc5-mm2-full/drivers/dlm/recoverd.c 2005-06-02 22:13:36.000000000 +0200
@@ -658,7 +658,7 @@
}
}
-int dlm_recoverd(void *arg)
+static int dlm_recoverd(void *arg)
{
struct dlm_ls *ls;
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2005-06-14 2:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-06-14 1:43 [-mm patch] drivers/dlm/: make code static Adrian Bunk
2005-06-14 2:19 ` David Teigland
-- strict thread matches above, loose matches on Subject: below --
2005-06-02 20:17 Adrian Bunk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox