From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 30 Oct 2012 02:23:40 +0000 (+1100)
Subject: Merge remote-tracking branch 'fsnotify/for-next'
X-Git-Tag: next-20121030~41
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=18ae76d3e315333b785a66a4cfcc395aeca2ea5d;p=karo-tx-linux.git

Merge remote-tracking branch 'fsnotify/for-next'

Conflicts:
	kernel/audit_tree.c
---

18ae76d3e315333b785a66a4cfcc395aeca2ea5d
diff --cc kernel/audit_tree.c
index ed206fd88cca,9cedf310e23b..e81175ef25f8
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@@ -249,7 -249,8 +249,7 @@@ static void untag_chunk(struct node *p
  		list_del_rcu(&chunk->hash);
  		spin_unlock(&hash_lock);
  		spin_unlock(&entry->lock);
- 		fsnotify_destroy_mark(entry);
+ 		fsnotify_destroy_mark(entry, audit_tree_group);
 -		fsnotify_put_mark(entry);
  		goto out;
  	}
  
@@@ -291,8 -292,8 +291,8 @@@
  		owner->root = new;
  	spin_unlock(&hash_lock);
  	spin_unlock(&entry->lock);
- 	fsnotify_destroy_mark(entry);
+ 	fsnotify_destroy_mark(entry, audit_tree_group);
 -	fsnotify_put_mark(entry);
 +	fsnotify_put_mark(&new->mark);	/* drop initial reference */
  	goto out;
  
  Fallback:
@@@ -443,9 -443,9 +443,9 @@@ static int tag_chunk(struct inode *inod
  	spin_unlock(&hash_lock);
  	spin_unlock(&chunk_entry->lock);
  	spin_unlock(&old_entry->lock);
- 	fsnotify_destroy_mark(old_entry);
+ 	fsnotify_destroy_mark(old_entry, audit_tree_group);
 +	fsnotify_put_mark(chunk_entry);	/* drop initial reference */
  	fsnotify_put_mark(old_entry); /* pair to fsnotify_find mark_entry */
 -	fsnotify_put_mark(old_entry); /* and kill it */
  	return 0;
  }