Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e24e960c authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

sched/wait, fs/ocfs2: Convert wait_on_atomic_t() usage to the new wait_var_event() API 



The old wait_on_atomic_t() is going to get removed, use the more
flexible wait_var_event() API instead.

No change in functionality.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 723c921e

fs/ocfs2/filecheck.c

+5 −4
Original line number Diff line number Diff line
@@ -134,9 +134,10 @@ ocfs2_filecheck_sysfs_free(struct ocfs2_filecheck_sysfs_entry *entry) 
{

	struct ocfs2_filecheck_entry *p;



	if (!atomic_dec_and_test(&entry->fs_count))

		wait_on_atomic_t(&entry->fs_count, atomic_t_wait,

				 TASK_UNINTERRUPTIBLE);

	if (!atomic_dec_and_test(&entry->fs_count)) {

		wait_var_event(&entry->fs_count,

			       !atomic_read(&entry->fs_count));

	}



	spin_lock(&entry->fs_fcheck->fc_lock);

	while (!list_empty(&entry->fs_fcheck->fc_head)) {
@@ -183,7 +184,7 @@ static void 
ocfs2_filecheck_sysfs_put(struct ocfs2_filecheck_sysfs_entry *entry)

{

	if (atomic_dec_and_test(&entry->fs_count))

		wake_up_atomic_t(&entry->fs_count);

		wake_up_var(&entry->fs_count);

}



static struct ocfs2_filecheck_sysfs_entry *