diff options
| author | Lino Sanfilippo <LinoSanfilippo@gmx.de> | 2011-06-14 17:29:51 +0200 | 
|---|---|---|
| committer | Eric Paris <eparis@redhat.com> | 2012-12-11 13:44:36 -0500 | 
| commit | e2a29943e9a2ee2aa737a77f550f46ba72269db4 (patch) | |
| tree | cf0275eeed130433df241f115cbd2f9ebea96e7f /kernel/audit_tree.c | |
| parent | 986ab09807ca9454c3f54aae4db7e1bb00daeed3 (diff) | |
| download | olio-linux-3.10-e2a29943e9a2ee2aa737a77f550f46ba72269db4.tar.xz olio-linux-3.10-e2a29943e9a2ee2aa737a77f550f46ba72269db4.zip  | |
fsnotify: pass group to fsnotify_destroy_mark()
In fsnotify_destroy_mark() dont get the group from the passed mark anymore,
but pass the group itself as an additional parameter to the function.
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'kernel/audit_tree.c')
| -rw-r--r-- | kernel/audit_tree.c | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index ed206fd88cc..e81175ef25f 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c @@ -249,7 +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);  		goto out;  	} @@ -291,7 +291,7 @@ static void untag_chunk(struct node *p)  		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(&new->mark);	/* drop initial reference */  	goto out; @@ -331,7 +331,7 @@ static int create_chunk(struct inode *inode, struct audit_tree *tree)  		spin_unlock(&hash_lock);  		chunk->dead = 1;  		spin_unlock(&entry->lock); -		fsnotify_destroy_mark(entry); +		fsnotify_destroy_mark(entry, audit_tree_group);  		fsnotify_put_mark(entry);  		return 0;  	} @@ -412,7 +412,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)  		spin_unlock(&chunk_entry->lock);  		spin_unlock(&old_entry->lock); -		fsnotify_destroy_mark(chunk_entry); +		fsnotify_destroy_mark(chunk_entry, audit_tree_group);  		fsnotify_put_mark(chunk_entry);  		fsnotify_put_mark(old_entry); @@ -443,7 +443,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)  	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 */  	return 0;  |