aboutsummaryrefslogtreecommitdiffstats
path: root/fs/notify/mark.c
diff options
context:
space:
mode:
authorLino Sanfilippo <LinoSanfilippo@gmx.de>2011-06-14 17:29:50 +0200
committerEric Paris <eparis@redhat.com>2012-12-11 13:29:46 -0500
commit986ab09807ca9454c3f54aae4db7e1bb00daeed3 (patch)
treed6b76b03624a2d95a73ba88d990cd5210ab9eb20 /fs/notify/mark.c
parent6dfbd149946c22c2e2886d6b560def78630c8387 (diff)
fsnotify: use a mutex instead of a spinlock to protect a groups mark list
Replaces the groups mark_lock spinlock with a mutex. Using a mutex instead of a spinlock results in more flexibility (i.e it allows to sleep while the lock is held). Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de> Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'fs/notify/mark.c')
-rw-r--r--fs/notify/mark.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/notify/mark.c b/fs/notify/mark.c
index 32447dc06c0..ab25b810b14 100644
--- a/fs/notify/mark.c
+++ b/fs/notify/mark.c
@@ -136,13 +136,13 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
group = mark->group;
spin_unlock(&mark->lock);
- spin_lock(&group->mark_lock);
+ mutex_lock(&group->mark_mutex);
spin_lock(&mark->lock);
/* something else already called this function on this mark */
if (!(mark->flags & FSNOTIFY_MARK_FLAG_ALIVE)) {
spin_unlock(&mark->lock);
- spin_unlock(&group->mark_lock);
+ mutex_unlock(&group->mark_mutex);
goto put_group;
}
@@ -159,7 +159,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
list_del_init(&mark->g_list);
spin_unlock(&mark->lock);
- spin_unlock(&group->mark_lock);
+ mutex_unlock(&group->mark_mutex);
spin_lock(&destroy_lock);
list_add(&mark->destroy_list, &destroy_list);
@@ -232,11 +232,11 @@ int fsnotify_add_mark(struct fsnotify_mark *mark,
/*
* LOCKING ORDER!!!!
- * group->mark_lock
+ * group->mark_mutex
* mark->lock
* inode->i_lock
*/
- spin_lock(&group->mark_lock);
+ mutex_lock(&group->mark_mutex);
spin_lock(&mark->lock);
mark->flags |= FSNOTIFY_MARK_FLAG_ALIVE;
@@ -263,7 +263,7 @@ int fsnotify_add_mark(struct fsnotify_mark *mark,
fsnotify_set_mark_mask_locked(mark, mark->mask);
spin_unlock(&mark->lock);
- spin_unlock(&group->mark_lock);
+ mutex_unlock(&group->mark_mutex);
if (inode)
__fsnotify_update_child_dentry_flags(inode);
@@ -277,7 +277,7 @@ err:
atomic_dec(&group->num_marks);
spin_unlock(&mark->lock);
- spin_unlock(&group->mark_lock);
+ mutex_unlock(&group->mark_mutex);
spin_lock(&destroy_lock);
list_add(&mark->destroy_list, &destroy_list);
@@ -296,7 +296,7 @@ void fsnotify_clear_marks_by_group_flags(struct fsnotify_group *group,
struct fsnotify_mark *lmark, *mark;
LIST_HEAD(free_list);
- spin_lock(&group->mark_lock);
+ mutex_lock(&group->mark_mutex);
list_for_each_entry_safe(mark, lmark, &group->marks_list, g_list) {
if (mark->flags & flags) {
list_add(&mark->free_g_list, &free_list);
@@ -304,7 +304,7 @@ void fsnotify_clear_marks_by_group_flags(struct fsnotify_group *group,
fsnotify_get_mark(mark);
}
}
- spin_unlock(&group->mark_lock);
+ mutex_unlock(&group->mark_mutex);
list_for_each_entry_safe(mark, lmark, &free_list, free_g_list) {
fsnotify_destroy_mark(mark);