exportfs: use pr_debug for unreachable debug statements

expfs.c has a bunch of dprintk statements which are unusable due to:
 #define dprintk(fmt, args...) do{}while(0)
Use pr_debug so that they can be enabled dynamically.
Also make some minor changes to the debug statements to fix some
incorrect types, and remove __func__ which can be handled by dynamic
debug separately.

Signed-off-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: NeilBrown <neilb@suse.de>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c
index c648a493faf23865780924ece6dceda506d75152..3204bd33e4e8a45f4fef150e651834d5e15cf607 100644 (file)
--- a/fs/exportfs/expfs.c
+++ b/fs/exportfs/expfs.c
@@ -18,7 +18,7 @@
 #include <linux/sched.h>
 #include <linux/cred.h>
 
-#define dprintk(fmt, args...) do{}while(0)
+#define dprintk(fmt, args...) pr_debug(fmt, ##args)
 
 
 static int get_name(const struct path *path, char *name, struct dentry *child);
@@ -132,8 +132,8 @@ static struct dentry *reconnect_one(struct vfsmount *mnt,
        inode_unlock(dentry->d_inode);
 
        if (IS_ERR(parent)) {
-               dprintk("%s: get_parent of %ld failed, err %d\n",
-                       __func__, dentry->d_inode->i_ino, PTR_ERR(parent));
+               dprintk("get_parent of %lu failed, err %ld\n",
+                       dentry->d_inode->i_ino, PTR_ERR(parent));
                return parent;
        }
 
@@ -147,7 +147,7 @@ static struct dentry *reconnect_one(struct vfsmount *mnt,
        dprintk("%s: found name: %s\n", __func__, nbuf);
        tmp = lookup_one_unlocked(mnt_user_ns(mnt), nbuf, parent, strlen(nbuf));
        if (IS_ERR(tmp)) {
-               dprintk("%s: lookup failed: %d\n", __func__, PTR_ERR(tmp));
+               dprintk("lookup failed: %ld\n", PTR_ERR(tmp));
                err = PTR_ERR(tmp);
                goto out_err;
        }