autofs4: change log print macros to not insert newline

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

diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index 4e0c8d62dc1fce5ddac84aa9c8832c4650ccb050..169ba871b86c1cb1fb1cb44a6f36060551117fa5 100644 (file)
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -31,7 +31,7 @@ void autofs4_catatonic_mode(struct autofs_sb_info *sbi)
                return;
        }
 
-       DPRINTK("entering catatonic mode");
+       DPRINTK("entering catatonic mode\n");
 
        sbi->catatonic = 1;
        wq = sbi->queues;
@@ -88,7 +88,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
 
        return (bytes > 0);
 }
-       
+
 static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
                                 struct autofs_wait_queue *wq,
                                 int type)
@@ -101,7 +101,7 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
        struct file *pipe = NULL;
        size_t pktsz;
 
-       DPRINTK("wait id = 0x%08lx, name = %.*s, type=%d",
+       DPRINTK("wait id = 0x%08lx, name = %.*s, type=%d\n",
                (unsigned long) wq->wait_queue_token,
                wq->name.len, wq->name.name, type);
 
@@ -164,7 +164,7 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
                break;
        }
        default:
-               printk("autofs4_notify_daemon: bad type %d!\n", type);
+               AUTOFS_WARN("bad type %d!\n", type);
                mutex_unlock(&sbi->wq_mutex);
                return;
        }
@@ -463,7 +463,7 @@ int autofs4_wait(struct autofs_sb_info *sbi,
                autofs4_notify_daemon(sbi, wq, type);
        } else {
                wq->wait_ctr++;
-               DPRINTK("existing wait id = 0x%08lx, name = %.*s, nfy=%d",
+               DPRINTK("existing wait id = 0x%08lx, name = %.*s, nfy=%d\n",
                        (unsigned long) wq->wait_queue_token, wq->name.len,
                        wq->name.name, notify);
                mutex_unlock(&sbi->wq_mutex);
@@ -476,12 +476,14 @@ int autofs4_wait(struct autofs_sb_info *sbi,
         */
        if (wq->name.name) {
                /* Block all but "shutdown" signals while waiting */
-               sigset_t oldset;
+               unsigned long shutdown_sigs_mask;
                unsigned long irqflags;
+               sigset_t oldset;
 
                spin_lock_irqsave(&current->sighand->siglock, irqflags);
                oldset = current->blocked;
-               siginitsetinv(&current->blocked, SHUTDOWN_SIGS & ~oldset.sig[0]);
+               shutdown_sigs_mask = SHUTDOWN_SIGS & ~oldset.sig[0];
+               siginitsetinv(&current->blocked, shutdown_sigs_mask);
                recalc_sigpending();
                spin_unlock_irqrestore(&current->sighand->siglock, irqflags);
 
@@ -492,7 +494,7 @@ int autofs4_wait(struct autofs_sb_info *sbi,
                recalc_sigpending();
                spin_unlock_irqrestore(&current->sighand->siglock, irqflags);
        } else {
-               DPRINTK("skipped sleeping");
+               DPRINTK("skipped sleeping\n");
        }
 
        status = wq->status;
@@ -567,4 +569,3 @@ int autofs4_wait_release(struct autofs_sb_info *sbi, autofs_wqt_t wait_queue_tok
 
        return 0;
 }
-