Merge branch 'for-next' of git://git.infradead.org/users/eparis/notify

[deliverable/linux.git] / fs / notify / fdinfo.c

diff --git a/fs/notify/fdinfo.c b/fs/notify/fdinfo.c
index 514c4b81483d618adda933b5e63b93bb9e529324..238a5930cb3c7d16e1c76952e66c6bf24f5299ae 100644 (file)
--- a/fs/notify/fdinfo.c
+++ b/fs/notify/fdinfo.c
@@ -27,13 +27,13 @@ static int show_fdinfo(struct seq_file *m, struct file *f,
        struct fsnotify_mark *mark;
        int ret = 0;
 
-       spin_lock(&group->mark_lock);
+       mutex_lock(&group->mark_mutex);
        list_for_each_entry(mark, &group->marks_list, g_list) {
                ret = show(m, mark);
                if (ret)
                        break;
        }
-       spin_unlock(&group->mark_lock);
+       mutex_unlock(&group->mark_mutex);
        return ret;
 }