autofs4: use pr_xxx() macros directly for logging

[linux-2.6-block.git] / fs / autofs4 / expire.c

diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
index 107a38f2a9ec7bf3a1d8050e11e1a94c7fc539c0..9510d8d2e9cd2fa4ac7919c7bd8bee48c30d6165 100644 (file)
--- a/fs/autofs4/expire.c
+++ b/fs/autofs4/expire.c
@@ -37,7 +37,7 @@ static int autofs4_mount_busy(struct vfsmount *mnt, struct dentry *dentry)
        struct path path = {.mnt = mnt, .dentry = dentry};
        int status = 1;
 
-       DPRINTK("dentry %p %pd\n", dentry, dentry);
+       pr_debug("dentry %p %pd\n", dentry, dentry);
 
        path_get(&path);
 
@@ -63,7 +63,7 @@ static int autofs4_mount_busy(struct vfsmount *mnt, struct dentry *dentry)
 
        status = 0;
 done:
-       DPRINTK("returning = %d\n", status);
+       pr_debug("returning = %d\n", status);
        path_put(&path);
        return status;
 }
@@ -189,7 +189,7 @@ static int autofs4_direct_busy(struct vfsmount *mnt,
                               unsigned long timeout,
                               int do_now)
 {
-       DPRINTK("top %p %pd\n", top, top);
+       pr_debug("top %p %pd\n", top, top);
 
        /* If it's busy update the expiry counters */
        if (!may_umount_tree(mnt)) {
@@ -220,7 +220,7 @@ static int autofs4_tree_busy(struct vfsmount *mnt,
        struct autofs_info *top_ino = autofs4_dentry_ino(top);
        struct dentry *p;
 
-       DPRINTK("top %p %pd\n", top, top);
+       pr_debug("top %p %pd\n", top, top);
 
        /* Negative dentry - give up */
        if (!simple_positive(top))
@@ -228,7 +228,7 @@ static int autofs4_tree_busy(struct vfsmount *mnt,
 
        p = NULL;
        while ((p = get_next_positive_dentry(p, top))) {
-               DPRINTK("dentry %p %pd\n", p, p);
+               pr_debug("dentry %p %pd\n", p, p);
 
                /*
                 * Is someone visiting anywhere in the subtree ?
@@ -274,11 +274,11 @@ static struct dentry *autofs4_check_leaves(struct vfsmount *mnt,
 {
        struct dentry *p;
 
-       DPRINTK("parent %p %pd\n", parent, parent);
+       pr_debug("parent %p %pd\n", parent, parent);
 
        p = NULL;
        while ((p = get_next_positive_dentry(p, parent))) {
-               DPRINTK("dentry %p %pd\n", p, p);
+               pr_debug("dentry %p %pd\n", p, p);
 
                if (d_mountpoint(p)) {
                        /* Can we umount this guy */
@@ -363,7 +363,7 @@ static struct dentry *should_expire(struct dentry *dentry,
         *         offset (autofs-5.0+).
         */
        if (d_mountpoint(dentry)) {
-               DPRINTK("checking mountpoint %p %pd\n", dentry, dentry);
+               pr_debug("checking mountpoint %p %pd\n", dentry, dentry);
 
                /* Can we umount this guy */
                if (autofs4_mount_busy(mnt, dentry))
@@ -376,7 +376,7 @@ static struct dentry *should_expire(struct dentry *dentry,
        }
 
        if (d_really_is_positive(dentry) && d_is_symlink(dentry)) {
-               DPRINTK("checking symlink %p %pd\n", dentry, dentry);
+               pr_debug("checking symlink %p %pd\n", dentry, dentry);
                /*
                 * A symlink can't be "busy" in the usual sense so
                 * just check last used for expire timeout.
@@ -473,7 +473,7 @@ struct dentry *autofs4_expire_indirect(struct super_block *sb,
        return NULL;
 
 found:
-       DPRINTK("returning %p %pd\n", expired, expired);
+       pr_debug("returning %p %pd\n", expired, expired);
        ino->flags |= AUTOFS_INF_EXPIRING;
        smp_mb();
        ino->flags &= ~AUTOFS_INF_NO_RCU;
@@ -505,12 +505,12 @@ int autofs4_expire_wait(struct dentry *dentry, int rcu_walk)
        if (ino->flags & AUTOFS_INF_EXPIRING) {
                spin_unlock(&sbi->fs_lock);
 
-               DPRINTK("waiting for expire %p name=%pd\n", dentry, dentry);
+               pr_debug("waiting for expire %p name=%pd\n", dentry, dentry);
 
                status = autofs4_wait(sbi, dentry, NFY_NONE);
                wait_for_completion(&ino->expire_complete);
 
-               DPRINTK("expire done status=%d\n", status);
+               pr_debug("expire done status=%d\n", status);
 
                if (d_unhashed(dentry))
                        return -EAGAIN;