fsnotify: Avoid double locking in fsnotify_detach_from_object()
We lock object list lock in fsnotify_detach_from_object() twice - once to detach mark and second time to recalculate mask. That is unnecessary and later it will become problematic as we will free the connector as soon as there is no mark in it. So move recalculation of fsnotify mask into the same critical section that is detaching mark. This also removes recalculation of child dentry flags from fsnotify_detach_from_object(). That is however fine. Those marks will get recalculated once some event happens on a child. Reviewed-by: Miklos Szeredi <mszeredi@redhat.com> Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
parent
8212a6097a
commit
73cd3c33ab
|
@ -158,9 +158,9 @@ static struct inode *fsnotify_detach_from_object(struct fsnotify_mark *mark)
|
|||
if (conn->flags & FSNOTIFY_OBJ_TYPE_INODE)
|
||||
inode = conn->inode;
|
||||
}
|
||||
__fsnotify_recalc_mask(conn);
|
||||
mark->connector = NULL;
|
||||
spin_unlock(lock);
|
||||
fsnotify_recalc_mask(conn);
|
||||
|
||||
return inode;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue