The patch titled
Subject: fsnotify: clean up spinlock assertions
has been removed from the -mm tree. Its filename was
fsnotify-cleanup-spinlock-assertions.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Jan Kara <jack@xxxxxxx>
Subject: 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@xxxxxxx
Signed-off-by: Jan Kara <jack@xxxxxxx>
Suggested-by: Heiner Kallweit <hkallweit1@xxxxxxxxx>
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/notify/fanotify/fanotify_user.c | 3 +--
fs/notify/notification.c | 9 +++------
2 files changed, 4 insertions(+), 8 deletions(-)
diff -puN fs/notify/fanotify/fanotify_user.c~fsnotify-cleanup-spinlock-assertions fs/notify/fanotify/fanotify_user.c
--- a/fs/notify/fanotify/fanotify_user.c~fsnotify-cleanup-spinlock-assertions
+++ a/fs/notify/fanotify/fanotify_user.c
@@ -54,8 +54,7 @@ struct kmem_cache *fanotify_perm_event_c
static struct fsnotify_event *get_one_event(struct fsnotify_group *group,
size_t count)
{
- BUG_ON(IS_ENABLED(CONFIG_SMP) &&
- !spin_is_locked(&group->notification_lock));
+ assert_spin_locked(&group->notification_lock);
pr_debug("%s: group=%p count=%zd\n", __func__, group, count);
diff -puN fs/notify/notification.c~fsnotify-cleanup-spinlock-assertions fs/notify/notification.c
--- a/fs/notify/notification.c~fsnotify-cleanup-spinlock-assertions
+++ a/fs/notify/notification.c
@@ -63,8 +63,7 @@ EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
/* return true if the notify queue is empty, false otherwise */
bool fsnotify_notify_queue_is_empty(struct fsnotify_group *group)
{
- BUG_ON(IS_ENABLED(CONFIG_SMP) &&
- !spin_is_locked(&group->notification_lock));
+ assert_spin_locked(&group->notification_lock);
return list_empty(&group->notification_list) ? true : false;
}
@@ -149,8 +148,7 @@ struct fsnotify_event *fsnotify_remove_f
{
struct fsnotify_event *event;
- BUG_ON(IS_ENABLED(CONFIG_SMP) &&
- !spin_is_locked(&group->notification_lock));
+ assert_spin_locked(&group->notification_lock);
pr_debug("%s: group=%p\n", __func__, group);
@@ -172,8 +170,7 @@ struct fsnotify_event *fsnotify_remove_f
*/
struct fsnotify_event *fsnotify_peek_first_event(struct fsnotify_group *group)
{
- BUG_ON(IS_ENABLED(CONFIG_SMP) &&
- !spin_is_locked(&group->notification_lock));
+ assert_spin_locked(&group->notification_lock);
return list_first_entry(&group->notification_list,
struct fsnotify_event, list);
_
Patches currently in -mm which might be from jack@xxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
