Skip to contentSkip to conversation

drivers/dlm/: make code static

PATCH In review Adrian Bunk 2 participants 2 messages Jun 14, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/dlm/: make code static

This patch makes needlessly global code static.

---

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(-)
drivers/dlm/lock.c renamed from drivers/dlm/lock.c.old +5 -5
@@ -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;
 
drivers/dlm/lockspace.c renamed from drivers/dlm/lockspace.c.old +3 -3
@@ -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);
 }
drivers/dlm/main.c renamed from drivers/dlm/main.c.old +2 -2
@@ -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();
drivers/dlm/member.c renamed from drivers/dlm/member.c.old +3 -3
@@ -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;
 
drivers/dlm/recover.c renamed from drivers/dlm/recover.c.old +1 -1
@@ -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;
 
drivers/dlm/recoverd.c renamed from drivers/dlm/recoverd.c.old +1 -1
@@ -658,7 +658,7 @@
 	}
 }
 
-int dlm_recoverd(void *arg)
+static int dlm_recoverd(void *arg)
 {
 	struct dlm_ls *ls;
 
#1 lore raw
Quoted 1 line · Adrian Bunk

This patch makes needlessly global code static.

Thanks, I already applied these changes; just haven't sent off a new batch of -mm patches yet.

Dave