X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fbrc_procfs.c;h=6bcb51c2412bf44e348eabc1ab080512e58625fc;hb=2dd26837037ee6b9ff3d8fbdb1eb64b203ad7b02;hp=ae4a4f50f87c4cc97878dc58198e4e2a2178119f;hpb=a14bc59fb8f27db193d74662dc9c5cb8237177ef;p=openvswitch

diff --git a/datapath/brc_procfs.c b/datapath/brc_procfs.c
index ae4a4f50..6bcb51c2 100644
--- a/datapath/brc_procfs.c
+++ b/datapath/brc_procfs.c
@@ -1,17 +1,20 @@
 /*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011 Nicira Networks.
  * Distributed under the terms of the GNU GPL version 2.
  *
  * Significant portions of this file may be copied from parts of the Linux
  * kernel, by Linus Torvalds and others.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <net/genetlink.h>
+#include "brc_procfs.h"
 #include "openvswitch/brcompat-netlink.h"
 
 /* This code implements a Generic Netlink command BRC_GENL_C_SET_PROC that can
@@ -49,7 +52,7 @@ static struct file_operations brc_fops = {
 static struct proc_dir_entry *proc_vlan_dir;
 static struct proc_dir_entry *proc_bonding_dir;
 
-struct proc_dir_entry *brc_lookup_entry(struct proc_dir_entry *de, const char *name)
+static struct proc_dir_entry *brc_lookup_entry(struct proc_dir_entry *de, const char *name)
 {
 	int namelen = strlen(name);
 	for (de = de->subdir; de; de = de->next) {
@@ -68,9 +71,9 @@ static struct proc_dir_entry *brc_open_dir(const char *dir_name,
 	if (!*dirp) {
 		struct proc_dir_entry *dir;
 		if (brc_lookup_entry(parent, dir_name)) {
-			printk(KERN_WARNING "%s proc directory exists, can't "
-			       "simulate--probably its real module is "
-			       "loaded\n", dir_name);
+			pr_warn("%s proc directory exists, can't simulate--"
+				"probably its real module is loaded\n",
+				dir_name);
 			return NULL;
 		}
 		dir = *dirp = proc_mkdir(dir_name, parent);
@@ -168,7 +171,7 @@ static void kill_proc_dir(const char *dir_name,
 		if (!e)
 			break;
 
-		if (e->namelen >= sizeof name) {
+		if (e->namelen >= sizeof(name)) {
 			/* Can't happen: we prevent adding names this long by
 			 * limiting the BRC_GENL_A_PROC_NAME string to
 			 * BRC_NAME_LEN_MAX bytes.  */