9p: Reduce object size with CONFIG_NET_9P_DEBUG

[cascardo/linux.git] / fs / 9p / cache.c

diff --git a/fs/9p/cache.c b/fs/9p/cache.c
index 945aa5f..a9ea73d 100644 (file)
--- a/fs/9p/cache.c
+++ b/fs/9p/cache.c
@@ -62,8 +62,8 @@ static uint16_t v9fs_cache_session_get_key(const void *cookie_netfs_data,
        uint16_t klen = 0;
 
        v9ses = (struct v9fs_session_info *)cookie_netfs_data;
-       P9_DPRINTK(P9_DEBUG_FSC, "session %p buf %p size %u", v9ses,
-                  buffer, bufmax);
+       p9_debug(P9_DEBUG_FSC, "session %p buf %p size %u\n",
+                v9ses, buffer, bufmax);
 
        if (v9ses->cachetag)
                klen = strlen(v9ses->cachetag);
@@ -72,7 +72,7 @@ static uint16_t v9fs_cache_session_get_key(const void *cookie_netfs_data,
                return 0;
 
        memcpy(buffer, v9ses->cachetag, klen);
-       P9_DPRINTK(P9_DEBUG_FSC, "cache session tag %s", v9ses->cachetag);
+       p9_debug(P9_DEBUG_FSC, "cache session tag %s\n", v9ses->cachetag);
        return klen;
 }
 
@@ -91,14 +91,14 @@ void v9fs_cache_session_get_cookie(struct v9fs_session_info *v9ses)
        v9ses->fscache = fscache_acquire_cookie(v9fs_cache_netfs.primary_index,
                                                &v9fs_cache_session_index_def,
                                                v9ses);
-       P9_DPRINTK(P9_DEBUG_FSC, "session %p get cookie %p", v9ses,
-                  v9ses->fscache);
+       p9_debug(P9_DEBUG_FSC, "session %p get cookie %p\n",
+                v9ses, v9ses->fscache);
 }
 
 void v9fs_cache_session_put_cookie(struct v9fs_session_info *v9ses)
 {
-       P9_DPRINTK(P9_DEBUG_FSC, "session %p put cookie %p", v9ses,
-                  v9ses->fscache);
+       p9_debug(P9_DEBUG_FSC, "session %p put cookie %p\n",
+                v9ses, v9ses->fscache);
        fscache_relinquish_cookie(v9ses->fscache, 0);
        v9ses->fscache = NULL;
 }
@@ -109,8 +109,8 @@ static uint16_t v9fs_cache_inode_get_key(const void *cookie_netfs_data,
 {
        const struct v9fs_inode *v9inode = cookie_netfs_data;
        memcpy(buffer, &v9inode->qid.path, sizeof(v9inode->qid.path));
-       P9_DPRINTK(P9_DEBUG_FSC, "inode %p get key %llu", &v9inode->vfs_inode,
-                  v9inode->qid.path);
+       p9_debug(P9_DEBUG_FSC, "inode %p get key %llu\n",
+                &v9inode->vfs_inode, v9inode->qid.path);
        return sizeof(v9inode->qid.path);
 }
 
@@ -120,8 +120,8 @@ static void v9fs_cache_inode_get_attr(const void *cookie_netfs_data,
        const struct v9fs_inode *v9inode = cookie_netfs_data;
        *size = i_size_read(&v9inode->vfs_inode);
 
-       P9_DPRINTK(P9_DEBUG_FSC, "inode %p get attr %llu", &v9inode->vfs_inode,
-                  *size);
+       p9_debug(P9_DEBUG_FSC, "inode %p get attr %llu\n",
+                &v9inode->vfs_inode, *size);
 }
 
 static uint16_t v9fs_cache_inode_get_aux(const void *cookie_netfs_data,
@@ -129,8 +129,8 @@ static uint16_t v9fs_cache_inode_get_aux(const void *cookie_netfs_data,
 {
        const struct v9fs_inode *v9inode = cookie_netfs_data;
        memcpy(buffer, &v9inode->qid.version, sizeof(v9inode->qid.version));
-       P9_DPRINTK(P9_DEBUG_FSC, "inode %p get aux %u", &v9inode->vfs_inode,
-                  v9inode->qid.version);
+       p9_debug(P9_DEBUG_FSC, "inode %p get aux %u\n",
+                &v9inode->vfs_inode, v9inode->qid.version);
        return sizeof(v9inode->qid.version);
 }
 
@@ -206,8 +206,8 @@ void v9fs_cache_inode_get_cookie(struct inode *inode)
                                                  &v9fs_cache_inode_index_def,
                                                  v9inode);
 
-       P9_DPRINTK(P9_DEBUG_FSC, "inode %p get cookie %p", inode,
-                  v9inode->fscache);
+       p9_debug(P9_DEBUG_FSC, "inode %p get cookie %p\n",
+                inode, v9inode->fscache);
 }
 
 void v9fs_cache_inode_put_cookie(struct inode *inode)
@@ -216,8 +216,8 @@ void v9fs_cache_inode_put_cookie(struct inode *inode)
 
        if (!v9inode->fscache)
                return;
-       P9_DPRINTK(P9_DEBUG_FSC, "inode %p put cookie %p", inode,
-                  v9inode->fscache);
+       p9_debug(P9_DEBUG_FSC, "inode %p put cookie %p\n",
+                inode, v9inode->fscache);
 
        fscache_relinquish_cookie(v9inode->fscache, 0);
        v9inode->fscache = NULL;
@@ -229,8 +229,8 @@ void v9fs_cache_inode_flush_cookie(struct inode *inode)
 
        if (!v9inode->fscache)
                return;
-       P9_DPRINTK(P9_DEBUG_FSC, "inode %p flush cookie %p", inode,
-                  v9inode->fscache);
+       p9_debug(P9_DEBUG_FSC, "inode %p flush cookie %p\n",
+                inode, v9inode->fscache);
 
        fscache_relinquish_cookie(v9inode->fscache, 1);
        v9inode->fscache = NULL;
@@ -272,8 +272,8 @@ void v9fs_cache_inode_reset_cookie(struct inode *inode)
        v9inode->fscache = fscache_acquire_cookie(v9ses->fscache,
                                                  &v9fs_cache_inode_index_def,
                                                  v9inode);
-       P9_DPRINTK(P9_DEBUG_FSC, "inode %p revalidating cookie old %p new %p",
-                  inode, old, v9inode->fscache);
+       p9_debug(P9_DEBUG_FSC, "inode %p revalidating cookie old %p new %p\n",
+                inode, old, v9inode->fscache);
 
        spin_unlock(&v9inode->fscache_lock);
 }
@@ -323,7 +323,7 @@ int __v9fs_readpage_from_fscache(struct inode *inode, struct page *page)
        int ret;
        const struct v9fs_inode *v9inode = V9FS_I(inode);
 
-       P9_DPRINTK(P9_DEBUG_FSC, "inode %p page %p", inode, page);
+       p9_debug(P9_DEBUG_FSC, "inode %p page %p\n", inode, page);
        if (!v9inode->fscache)
                return -ENOBUFS;
 
@@ -335,13 +335,13 @@ int __v9fs_readpage_from_fscache(struct inode *inode, struct page *page)
        switch (ret) {
        case -ENOBUFS:
        case -ENODATA:
-               P9_DPRINTK(P9_DEBUG_FSC, "page/inode not in cache %d", ret);
+               p9_debug(P9_DEBUG_FSC, "page/inode not in cache %d\n", ret);
                return 1;
        case 0:
-               P9_DPRINTK(P9_DEBUG_FSC, "BIO submitted");
+               p9_debug(P9_DEBUG_FSC, "BIO submitted\n");
                return ret;
        default:
-               P9_DPRINTK(P9_DEBUG_FSC, "ret %d", ret);
+               p9_debug(P9_DEBUG_FSC, "ret %d\n", ret);
                return ret;
        }
 }
@@ -361,7 +361,7 @@ int __v9fs_readpages_from_fscache(struct inode *inode,
        int ret;
        const struct v9fs_inode *v9inode = V9FS_I(inode);
 
-       P9_DPRINTK(P9_DEBUG_FSC, "inode %p pages %u", inode, *nr_pages);
+       p9_debug(P9_DEBUG_FSC, "inode %p pages %u\n", inode, *nr_pages);
        if (!v9inode->fscache)
                return -ENOBUFS;
 
@@ -373,15 +373,15 @@ int __v9fs_readpages_from_fscache(struct inode *inode,
        switch (ret) {
        case -ENOBUFS:
        case -ENODATA:
-               P9_DPRINTK(P9_DEBUG_FSC, "pages/inodes not in cache %d", ret);
+               p9_debug(P9_DEBUG_FSC, "pages/inodes not in cache %d\n", ret);
                return 1;
        case 0:
                BUG_ON(!list_empty(pages));
                BUG_ON(*nr_pages != 0);
-               P9_DPRINTK(P9_DEBUG_FSC, "BIO submitted");
+               p9_debug(P9_DEBUG_FSC, "BIO submitted\n");
                return ret;
        default:
-               P9_DPRINTK(P9_DEBUG_FSC, "ret %d", ret);
+               p9_debug(P9_DEBUG_FSC, "ret %d\n", ret);
                return ret;
        }
 }
@@ -396,9 +396,9 @@ void __v9fs_readpage_to_fscache(struct inode *inode, struct page *page)
        int ret;
        const struct v9fs_inode *v9inode = V9FS_I(inode);
 
-       P9_DPRINTK(P9_DEBUG_FSC, "inode %p page %p", inode, page);
+       p9_debug(P9_DEBUG_FSC, "inode %p page %p\n", inode, page);
        ret = fscache_write_page(v9inode->fscache, page, GFP_KERNEL);
-       P9_DPRINTK(P9_DEBUG_FSC, "ret =  %d", ret);
+       p9_debug(P9_DEBUG_FSC, "ret =  %d\n", ret);
        if (ret != 0)
                v9fs_uncache_page(inode, page);
 }
@@ -409,7 +409,7 @@ void __v9fs_readpage_to_fscache(struct inode *inode, struct page *page)
 void __v9fs_fscache_wait_on_page_write(struct inode *inode, struct page *page)
 {
        const struct v9fs_inode *v9inode = V9FS_I(inode);
-       P9_DPRINTK(P9_DEBUG_FSC, "inode %p page %p", inode, page);
+       p9_debug(P9_DEBUG_FSC, "inode %p page %p\n", inode, page);
        if (PageFsCache(page))
                fscache_wait_on_page_write(v9inode->fscache, page);
 }