9p: Reduce object size with CONFIG_NET_9P_DEBUG

[deliverable/linux.git] / fs / 9p / v9fs.c

diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c
index 2b78014a124a2522007d11e97eda94b3d82ab8af..1964f98e74bedf861d12950dda7f9382ec3f8093 100644 (file)
--- a/fs/9p/v9fs.c
+++ b/fs/9p/v9fs.c
@@ -23,6 +23,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
@@ -85,15 +87,15 @@ static int get_cache_mode(char *s)
 
        if (!strcmp(s, "loose")) {
                version = CACHE_LOOSE;
-               P9_DPRINTK(P9_DEBUG_9P, "Cache mode: loose\n");
+               p9_debug(P9_DEBUG_9P, "Cache mode: loose\n");
        } else if (!strcmp(s, "fscache")) {
                version = CACHE_FSCACHE;
-               P9_DPRINTK(P9_DEBUG_9P, "Cache mode: fscache\n");
+               p9_debug(P9_DEBUG_9P, "Cache mode: fscache\n");
        } else if (!strcmp(s, "none")) {
                version = CACHE_NONE;
-               P9_DPRINTK(P9_DEBUG_9P, "Cache mode: none\n");
+               p9_debug(P9_DEBUG_9P, "Cache mode: none\n");
        } else
-               printk(KERN_INFO "9p: Unknown Cache mode %s.\n", s);
+               pr_info("Unknown Cache mode %s\n", s);
        return version;
 }
 
@@ -140,8 +142,8 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
                case Opt_debug:
                        r = match_int(&args[0], &option);
                        if (r < 0) {
-                               P9_DPRINTK(P9_DEBUG_ERROR,
-                                          "integer field, but no integer?\n");
+                               p9_debug(P9_DEBUG_ERROR,
+                                        "integer field, but no integer?\n");
                                ret = r;
                                continue;
                        }
@@ -154,8 +156,8 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
                case Opt_dfltuid:
                        r = match_int(&args[0], &option);
                        if (r < 0) {
-                               P9_DPRINTK(P9_DEBUG_ERROR,
-                                          "integer field, but no integer?\n");
+                               p9_debug(P9_DEBUG_ERROR,
+                                        "integer field, but no integer?\n");
                                ret = r;
                                continue;
                        }
@@ -164,8 +166,8 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
                case Opt_dfltgid:
                        r = match_int(&args[0], &option);
                        if (r < 0) {
-                               P9_DPRINTK(P9_DEBUG_ERROR,
-                                          "integer field, but no integer?\n");
+                               p9_debug(P9_DEBUG_ERROR,
+                                        "integer field, but no integer?\n");
                                ret = r;
                                continue;
                        }
@@ -174,8 +176,8 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
                case Opt_afid:
                        r = match_int(&args[0], &option);
                        if (r < 0) {
-                               P9_DPRINTK(P9_DEBUG_ERROR,
-                                          "integer field, but no integer?\n");
+                               p9_debug(P9_DEBUG_ERROR,
+                                        "integer field, but no integer?\n");
                                ret = r;
                                continue;
                        }
@@ -205,8 +207,8 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
                        s = match_strdup(&args[0]);
                        if (!s) {
                                ret = -ENOMEM;
-                               P9_DPRINTK(P9_DEBUG_ERROR,
-                                 "problem allocating copy of cache arg\n");
+                               p9_debug(P9_DEBUG_ERROR,
+                                        "problem allocating copy of cache arg\n");
                                goto free_and_return;
                        }
                        ret = get_cache_mode(s);
@@ -223,8 +225,8 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
                        s = match_strdup(&args[0]);
                        if (!s) {
                                ret = -ENOMEM;
-                               P9_DPRINTK(P9_DEBUG_ERROR,
-                                 "problem allocating copy of access arg\n");
+                               p9_debug(P9_DEBUG_ERROR,
+                                        "problem allocating copy of access arg\n");
                                goto free_and_return;
                        }
 
@@ -240,8 +242,8 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
                                v9ses->uid = simple_strtoul(s, &e, 10);
                                if (*e != '\0') {
                                        ret = -EINVAL;
-                                       printk(KERN_INFO "9p: Unknown access "
-                                                       "argument %s.\n", s);
+                                       pr_info("Unknown access argument %s\n",
+                                               s);
                                        kfree(s);
                                        goto free_and_return;
                                }
@@ -254,9 +256,8 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
 #ifdef CONFIG_9P_FS_POSIX_ACL
                        v9ses->flags |= V9FS_POSIX_ACL;
 #else
-                       P9_DPRINTK(P9_DEBUG_ERROR,
-                                       "Not defined CONFIG_9P_FS_POSIX_ACL. "
-                                       "Ignoring posixacl option\n");
+                       p9_debug(P9_DEBUG_ERROR,
+                                "Not defined CONFIG_9P_FS_POSIX_ACL. Ignoring posixacl option\n");
 #endif
                        break;
 
@@ -318,7 +319,7 @@ struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses,
        if (IS_ERR(v9ses->clnt)) {
                retval = PTR_ERR(v9ses->clnt);
                v9ses->clnt = NULL;
-               P9_DPRINTK(P9_DEBUG_ERROR, "problem initializing 9p client\n");
+               p9_debug(P9_DEBUG_ERROR, "problem initializing 9p client\n");
                goto error;
        }
 
@@ -371,7 +372,7 @@ struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses,
        if (IS_ERR(fid)) {
                retval = PTR_ERR(fid);
                fid = NULL;
-               P9_DPRINTK(P9_DEBUG_ERROR, "cannot attach\n");
+               p9_debug(P9_DEBUG_ERROR, "cannot attach\n");
                goto error;
        }
 
@@ -429,7 +430,7 @@ void v9fs_session_close(struct v9fs_session_info *v9ses)
  */
 
 void v9fs_session_cancel(struct v9fs_session_info *v9ses) {
-       P9_DPRINTK(P9_DEBUG_ERROR, "cancel session %p\n", v9ses);
+       p9_debug(P9_DEBUG_ERROR, "cancel session %p\n", v9ses);
        p9_client_disconnect(v9ses->clnt);
 }
 
@@ -442,7 +443,7 @@ void v9fs_session_cancel(struct v9fs_session_info *v9ses) {
 
 void v9fs_session_begin_cancel(struct v9fs_session_info *v9ses)
 {
-       P9_DPRINTK(P9_DEBUG_ERROR, "begin cancel session %p\n", v9ses);
+       p9_debug(P9_DEBUG_ERROR, "begin cancel session %p\n", v9ses);
        p9_client_begin_disconnect(v9ses->clnt);
 }
 
@@ -591,23 +592,23 @@ static void v9fs_cache_unregister(void)
 static int __init init_v9fs(void)
 {
        int err;
-       printk(KERN_INFO "Installing v9fs 9p2000 file system support\n");
+       pr_info("Installing v9fs 9p2000 file system support\n");
        /* TODO: Setup list of registered trasnport modules */
        err = register_filesystem(&v9fs_fs_type);
        if (err < 0) {
-               printk(KERN_ERR "Failed to register filesystem\n");
+               pr_err("Failed to register filesystem\n");
                return err;
        }
 
        err = v9fs_cache_register();
        if (err < 0) {
-               printk(KERN_ERR "Failed to register v9fs for caching\n");
+               pr_err("Failed to register v9fs for caching\n");
                goto out_fs_unreg;
        }
 
        err = v9fs_sysfs_init();
        if (err < 0) {
-               printk(KERN_ERR "Failed to register with sysfs\n");
+               pr_err("Failed to register with sysfs\n");
                goto out_sysfs_cleanup;
        }