From 9383ddbc6e7cc4160f8e98127b574754f2ccad0a Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Wed, 15 Aug 2012 12:55:22 +0200 Subject: [PATCH] --- yaml --- r: 321959 b: refs/heads/master c: a2140fc0cb0325bb6384e788edd27b9a568714e2 h: refs/heads/master i: 321957: bcf1369f5fb5f379b0bc268fc70844915e6af7f0 321955: 0a3f13176f314328858067d7e3876186d9f3d9f6 321951: ae654c143923eb0bc2a16b632e32f2d3880a0f67 v: v3 --- [refs] | 2 +- trunk/kernel/audit_tree.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 20aac7799327..56a6b9ad24f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0fe33aae0e94b4097dd433c9399e16e17d638cd8 +refs/heads/master: a2140fc0cb0325bb6384e788edd27b9a568714e2 diff --git a/trunk/kernel/audit_tree.c b/trunk/kernel/audit_tree.c index 69a58515f43f..2b2ffff9eca2 100644 --- a/trunk/kernel/audit_tree.c +++ b/trunk/kernel/audit_tree.c @@ -250,7 +250,6 @@ static void untag_chunk(struct node *p) spin_unlock(&hash_lock); spin_unlock(&entry->lock); fsnotify_destroy_mark(entry); - fsnotify_put_mark(entry); goto out; } @@ -293,7 +292,6 @@ static void untag_chunk(struct node *p) spin_unlock(&hash_lock); spin_unlock(&entry->lock); fsnotify_destroy_mark(entry); - fsnotify_put_mark(entry); goto out; Fallback: @@ -332,6 +330,7 @@ static int create_chunk(struct inode *inode, struct audit_tree *tree) spin_unlock(&hash_lock); chunk->dead = 1; spin_unlock(&entry->lock); + fsnotify_get_mark(entry); fsnotify_destroy_mark(entry); fsnotify_put_mark(entry); return 0; @@ -412,6 +411,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree) spin_unlock(&chunk_entry->lock); spin_unlock(&old_entry->lock); + fsnotify_get_mark(chunk_entry); fsnotify_destroy_mark(chunk_entry); fsnotify_put_mark(chunk_entry); @@ -445,7 +445,6 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree) spin_unlock(&old_entry->lock); fsnotify_destroy_mark(old_entry); fsnotify_put_mark(old_entry); /* pair to fsnotify_find mark_entry */ - fsnotify_put_mark(old_entry); /* and kill it */ return 0; }