autofs4: make autofs log prints consistent

[cascardo/linux.git] / fs / autofs4 / waitq.c

diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index 4e0c8d6..314230d 100644 (file)
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -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)
@@ -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!", type);
                mutex_unlock(&sbi->wq_mutex);
                return;
        }
@@ -453,7 +453,7 @@ int autofs4_wait(struct autofs_sb_info *sbi,
                                        autofs_ptype_expire_indirect;
                }
 
-               DPRINTK("new wait id = 0x%08lx, name = %.*s, nfy=%d\n",
+               DPRINTK("new wait id = 0x%08lx, name = %.*s, nfy=%d",
                        (unsigned long) wq->wait_queue_token, wq->name.len,
                        wq->name.name, notify);
 
@@ -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);
 
@@ -567,4 +569,3 @@ int autofs4_wait_release(struct autofs_sb_info *sbi, autofs_wqt_t wait_queue_tok
 
        return 0;
 }
-