Messages in this thread | | | Date | Wed, 22 Aug 2012 14:02:17 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the fsnotify tree with Linus' tree |
| |
Hi Eric,
Today's linux-next merge of the fsnotify tree got a conflict in kernel/audit_tree.c between commits a2140fc0cb03 ("audit: fix refcounting in audit-tree") and b3e8692b4dde ("audit: clean up refcounting in audit-tree") from Linus' tree and commit 3c183c233284 ("fsnotify: pass group to fsnotify_destroy_mark()") from the fsnotify tree.
Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc kernel/audit_tree.c index ed206fd,9cedf31..0000000 --- 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; } [unhandled content-type:application/pgp-signature] | |