Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[karo-tx-linux.git] / fs / 9p / xattr.c

diff --git a/fs/9p/xattr.c b/fs/9p/xattr.c
index d288773871b3aa9c1816096cdd59bc43520d64eb..29653b70a9c345b3d8b0ac8162ade170550c4083 100644 (file)
--- a/fs/9p/xattr.c
+++ b/fs/9p/xattr.c
@@ -32,8 +32,8 @@ ssize_t v9fs_fid_xattr_get(struct p9_fid *fid, const char *name,
        attr_fid = p9_client_xattrwalk(fid, name, &attr_size);
        if (IS_ERR(attr_fid)) {
                retval = PTR_ERR(attr_fid);
-               P9_DPRINTK(P9_DEBUG_VFS,
-                       "p9_client_attrwalk failed %zd\n", retval);
+               p9_debug(P9_DEBUG_VFS, "p9_client_attrwalk failed %zd\n",
+                        retval);
                attr_fid = NULL;
                goto error;
        }
@@ -87,8 +87,8 @@ ssize_t v9fs_xattr_get(struct dentry *dentry, const char *name,
 {
        struct p9_fid *fid;
 
-       P9_DPRINTK(P9_DEBUG_VFS, "%s: name = %s value_len = %zu\n",
-               __func__, name, buffer_size);
+       p9_debug(P9_DEBUG_VFS, "name = %s value_len = %zu\n",
+                name, buffer_size);
        fid = v9fs_fid_lookup(dentry);
        if (IS_ERR(fid))
                return PTR_ERR(fid);
@@ -115,8 +115,8 @@ int v9fs_xattr_set(struct dentry *dentry, const char *name,
        int retval, msize, write_count;
        struct p9_fid *fid = NULL;
 
-       P9_DPRINTK(P9_DEBUG_VFS, "%s: name = %s value_len = %zu flags = %d\n",
-               __func__, name, value_len, flags);
+       p9_debug(P9_DEBUG_VFS, "name = %s value_len = %zu flags = %d\n",
+                name, value_len, flags);
 
        fid = v9fs_fid_clone(dentry);
        if (IS_ERR(fid)) {
@@ -129,8 +129,8 @@ int v9fs_xattr_set(struct dentry *dentry, const char *name,
         */
        retval = p9_client_xattrcreate(fid, name, value_len, flags);
        if (retval < 0) {
-               P9_DPRINTK(P9_DEBUG_VFS,
-                       "p9_client_xattrcreate failed %d\n", retval);
+               p9_debug(P9_DEBUG_VFS, "p9_client_xattrcreate failed %d\n",
+                        retval);
                goto error;
        }
        msize = fid->clnt->msize;