Merge branches 'pm-cpuidle', 'pm-cpufreq', 'pm-domains' and 'pm-sleep'

[linux-2.6-block.git] / kernel / audit.c

diff --git a/kernel/audit.c b/kernel/audit.c
index 60c9c5adc5be1c633951b47e6b80c297f7ea036b..3a3e5deeda8d3e5f16977c7fac2ceac4480f792b 100644 (file)
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -508,8 +508,7 @@ static void flush_hold_queue(void)
         * if auditd just disappeared but we
         * dequeued an skb we need to drop ref
         */
-       if (skb)
-               consume_skb(skb);
+       consume_skb(skb);
 }
 
 static int kauditd_thread(void *dummy)
@@ -523,7 +522,8 @@ static int kauditd_thread(void *dummy)
                skb = skb_dequeue(&audit_skb_queue);
 
                if (skb) {
-                       if (skb_queue_len(&audit_skb_queue) <= audit_backlog_limit)
+                       if (!audit_backlog_limit ||
+                           (skb_queue_len(&audit_skb_queue) <= audit_backlog_limit))
                                wake_up(&audit_backlog_wait);
                        if (audit_pid)
                                kauditd_send_skb(skb);
@@ -1231,9 +1231,7 @@ static void audit_buffer_free(struct audit_buffer *ab)
        if (!ab)
                return;
 
-       if (ab->skb)
-               kfree_skb(ab->skb);
-
+       kfree_skb(ab->skb);
        spin_lock_irqsave(&audit_freelist_lock, flags);
        if (audit_freelist_count > AUDIT_MAXFREE)
                kfree(ab);
@@ -1721,7 +1719,7 @@ static inline int audit_copy_fcaps(struct audit_names *name,
 
 /* Copy inode data into an audit_names. */
 void audit_copy_inode(struct audit_names *name, const struct dentry *dentry,
-                     const struct inode *inode)
+                     struct inode *inode)
 {
        name->ino   = inode->i_ino;
        name->dev   = inode->i_sb->s_dev;