Merge commit 'v2.6.30-rc1' into core/urgent

Merge reason: need latest upstream to queue up dependent fix

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 0 deletions

diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index 8ad9545b8db9..917ab9525568 100644
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -385,6 +385,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)
         mutex_lock(&inode->inotify_mutex);
         if (inotify_clone_watch(&old->watch, &chunk->watch) < 0) {
                 mutex_unlock(&inode->inotify_mutex);
+                put_inotify_watch(&old->watch);
                 free_chunk(chunk);
                 return -ENOSPC;
         }
@@ -394,6 +395,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)
                 chunk->dead = 1;
                 inotify_evict_watch(&chunk->watch);
                 mutex_unlock(&inode->inotify_mutex);
+                put_inotify_watch(&old->watch);
                 put_inotify_watch(&chunk->watch);
                 return 0;
         }