Commit ed272640 authored by Jan Kara's avatar Jan Kara Committed by Linus Torvalds

fsnotify: clean up spinlock assertions

Use assert_spin_locked() macro instead of hand-made BUG_ON statements.

Link: http://lkml.kernel.org/r/1474537439-18919-1-git-send-email-jack@suse.czSigned-off-by: default avatarJan Kara <jack@suse.cz>
Suggested-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0b1b8652
...@@ -54,8 +54,7 @@ struct kmem_cache *fanotify_perm_event_cachep __read_mostly; ...@@ -54,8 +54,7 @@ struct kmem_cache *fanotify_perm_event_cachep __read_mostly;
static struct fsnotify_event *get_one_event(struct fsnotify_group *group, static struct fsnotify_event *get_one_event(struct fsnotify_group *group,
size_t count) size_t count)
{ {
BUG_ON(IS_ENABLED(CONFIG_SMP) && assert_spin_locked(&group->notification_lock);
!spin_is_locked(&group->notification_lock));
pr_debug("%s: group=%p count=%zd\n", __func__, group, count); pr_debug("%s: group=%p count=%zd\n", __func__, group, count);
......
...@@ -63,8 +63,7 @@ EXPORT_SYMBOL_GPL(fsnotify_get_cookie); ...@@ -63,8 +63,7 @@ EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
/* return true if the notify queue is empty, false otherwise */ /* return true if the notify queue is empty, false otherwise */
bool fsnotify_notify_queue_is_empty(struct fsnotify_group *group) bool fsnotify_notify_queue_is_empty(struct fsnotify_group *group)
{ {
BUG_ON(IS_ENABLED(CONFIG_SMP) && assert_spin_locked(&group->notification_lock);
!spin_is_locked(&group->notification_lock));
return list_empty(&group->notification_list) ? true : false; return list_empty(&group->notification_list) ? true : false;
} }
...@@ -149,8 +148,7 @@ struct fsnotify_event *fsnotify_remove_first_event(struct fsnotify_group *group) ...@@ -149,8 +148,7 @@ struct fsnotify_event *fsnotify_remove_first_event(struct fsnotify_group *group)
{ {
struct fsnotify_event *event; struct fsnotify_event *event;
BUG_ON(IS_ENABLED(CONFIG_SMP) && assert_spin_locked(&group->notification_lock);
!spin_is_locked(&group->notification_lock));
pr_debug("%s: group=%p\n", __func__, group); pr_debug("%s: group=%p\n", __func__, group);
...@@ -172,8 +170,7 @@ struct fsnotify_event *fsnotify_remove_first_event(struct fsnotify_group *group) ...@@ -172,8 +170,7 @@ struct fsnotify_event *fsnotify_remove_first_event(struct fsnotify_group *group)
*/ */
struct fsnotify_event *fsnotify_peek_first_event(struct fsnotify_group *group) struct fsnotify_event *fsnotify_peek_first_event(struct fsnotify_group *group)
{ {
BUG_ON(IS_ENABLED(CONFIG_SMP) && assert_spin_locked(&group->notification_lock);
!spin_is_locked(&group->notification_lock));
return list_first_entry(&group->notification_list, return list_first_entry(&group->notification_list,
struct fsnotify_event, list); struct fsnotify_event, list);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment