GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-24 15:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fsnotify: Move object pointer to fsnotify_mark_connector

Browse source 
Move pointer to inode / vfsmount from mark itself to the
fsnotify_mark_connector structure. This is another step on the path
towards decoupling inode / vfsmount lifetime from notification mark
lifetime.

Reviewed-by: Miklos Szeredi <mszeredi@redhat.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Jan Kara 2017-03-14 14:29:35 +01:00
parent 9dd813c15b
commit 86ffe245c4
8 changed files with 74 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

25
kernel/audit_tree.c
View file

@ -172,10 +172,25 @@ static unsigned long inode_to_key(const struct inode *inode)
/*
* Function to return search key in our hash from chunk. Key 0 is special and
* should never be present in the hash.
*
* Must be called with chunk->mark.lock held to protect from connector
* becoming NULL.
*/
static unsigned long __chunk_to_key(struct audit_chunk *chunk)
{
if (!chunk->mark.connector)
return 0;
return (unsigned long)chunk->mark.connector->inode;
}
static unsigned long chunk_to_key(struct audit_chunk *chunk)
{
return (unsigned long)chunk->mark.inode;
unsigned long key;
spin_lock(&chunk->mark.lock);
key = __chunk_to_key(chunk);
spin_unlock(&chunk->mark.lock);
return key;
}
static inline struct list_head *chunk_hash(unsigned long key)
@ -187,7 +202,7 @@ static inline struct list_head *chunk_hash(unsigned long key)
/* hash_lock & entry->lock is held by caller */
static void insert_hash(struct audit_chunk *chunk)
{
unsigned long key = chunk_to_key(chunk);
unsigned long key = __chunk_to_key(chunk);
struct list_head *list;
if (!(chunk->mark.flags & FSNOTIFY_MARK_FLAG_ATTACHED))
@ -276,8 +291,8 @@ static void untag_chunk(struct node *p)
if (!new)
goto Fallback;
if (fsnotify_add_mark_locked(&new->mark, entry->group, entry->inode,
NULL, 1)) {
if (fsnotify_add_mark_locked(&new->mark, entry->group,
entry->connector->inode, NULL, 1)) {
fsnotify_put_mark(&new->mark);
goto Fallback;
}
@ -418,7 +433,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)
}
if (fsnotify_add_mark_locked(chunk_entry, old_entry->group,
old_entry->inode, NULL, 1)) {
old_entry->connector->inode, NULL, 1)) {
spin_unlock(&old_entry->lock);
mutex_unlock(&old_entry->group->mark_mutex);
fsnotify_put_mark(chunk_entry);