Merge tag 'for-linux-3.3-merge-window' of git://linux-c6x.org/git/projects/linux...

[mv-sheeva.git] / fs / 9p / vfs_super.c

diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index f68ff65a32a526cbb5bae7f7b31feec512560bc0..7b0cd87b07c20772b79395bb03afdb2bc5ebf414 100644 (file)
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
@@ -121,7 +121,7 @@ static struct dentry *v9fs_mount(struct file_system_type *fs_type, int flags,
        struct p9_fid *fid;
        int retval = 0;
 
-       P9_DPRINTK(P9_DEBUG_VFS, " \n");
+       p9_debug(P9_DEBUG_VFS, "\n");
 
        v9ses = kzalloc(sizeof(struct v9fs_session_info), GFP_KERNEL);
        if (!v9ses)
@@ -191,7 +191,7 @@ static struct dentry *v9fs_mount(struct file_system_type *fs_type, int flags,
                goto release_sb;
        v9fs_fid_add(root, fid);
 
-       P9_DPRINTK(P9_DEBUG_VFS, " simple set mount, return 0\n");
+       p9_debug(P9_DEBUG_VFS, " simple set mount, return 0\n");
        return dget(sb->s_root);
 
 clunk_fid:
@@ -223,7 +223,7 @@ static void v9fs_kill_super(struct super_block *s)
 {
        struct v9fs_session_info *v9ses = s->s_fs_info;
 
-       P9_DPRINTK(P9_DEBUG_VFS, " %p\n", s);
+       p9_debug(P9_DEBUG_VFS, " %p\n", s);
 
        kill_anon_super(s);
 
@@ -231,7 +231,7 @@ static void v9fs_kill_super(struct super_block *s)
        v9fs_session_close(v9ses);
        kfree(v9ses);
        s->s_fs_info = NULL;
-       P9_DPRINTK(P9_DEBUG_VFS, "exiting kill_super\n");
+       p9_debug(P9_DEBUG_VFS, "exiting kill_super\n");
 }
 
 static void
@@ -303,7 +303,7 @@ static int v9fs_write_inode(struct inode *inode,
         * send an fsync request to server irrespective of
         * wbc->sync_mode.
         */
-       P9_DPRINTK(P9_DEBUG_VFS, "%s: inode %p\n", __func__, inode);
+       p9_debug(P9_DEBUG_VFS, "%s: inode %p\n", __func__, inode);
        v9inode = V9FS_I(inode);
        if (!v9inode->writeback_fid)
                return 0;
@@ -326,7 +326,7 @@ static int v9fs_write_inode_dotl(struct inode *inode,
         * send an fsync request to server irrespective of
         * wbc->sync_mode.
         */
-       P9_DPRINTK(P9_DEBUG_VFS, "%s: inode %p\n", __func__, inode);
+       p9_debug(P9_DEBUG_VFS, "%s: inode %p\n", __func__, inode);
        v9inode = V9FS_I(inode);
        if (!v9inode->writeback_fid)
                return 0;