Commit ce6eba3d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-wait-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull wait_var_event updates from Ingo Molnar:
 "This introduces the new wait_var_event() API, which is a more flexible
  waiting primitive than wait_on_atomic_t().

  All wait_on_atomic_t() users are migrated over to the new API and
  wait_on_atomic_t() is removed. The migration fixes one bug and should
  result in no functional changes for the other usecases"

* 'sched-wait-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/wait: Improve __var_waitqueue() code generation
  sched/wait: Remove the wait_on_atomic_t() API
  sched/wait, arch/mips: Fix and convert wait_on_atomic_t() usage to the new wait_var_event() API
  sched/wait, fs/ocfs2: Convert wait_on_atomic_t() usage to the new wait_var_event() API
  sched/wait, fs/nfs: Convert wait_on_atomic_t() usage to the new wait_var_event() API
  sched/wait, fs/fscache: Convert wait_on_atomic_t() usage to the new wait_var_event() API
  sched/wait, fs/btrfs: Convert wait_on_atomic_t() usage to the new wait_var_event() API
  sched/wait, fs/afs: Convert wait_on_atomic_t() usage to the new wait_var_event() API
  sched/wait, drivers/media: Convert wait_on_atomic_t() usage to the new wait_var_event() API
  sched/wait, drivers/drm: Convert wait_on_atomic_t() usage to the new wait_var_event() API
  sched/wait: Introduce wait_var_event()
parents a5532439 b3fc5c9b
...@@ -781,6 +781,8 @@ int mips_set_process_fp_mode(struct task_struct *task, unsigned int value) ...@@ -781,6 +781,8 @@ int mips_set_process_fp_mode(struct task_struct *task, unsigned int value)
atomic_set(&task->mm->context.fp_mode_switching, 0); atomic_set(&task->mm->context.fp_mode_switching, 0);
preempt_enable(); preempt_enable();
wake_up_var(&task->mm->context.fp_mode_switching);
return 0; return 0;
} }
......
...@@ -1248,8 +1248,8 @@ static int enable_restore_fp_context(int msa) ...@@ -1248,8 +1248,8 @@ static int enable_restore_fp_context(int msa)
* If an FP mode switch is currently underway, wait for it to * If an FP mode switch is currently underway, wait for it to
* complete before proceeding. * complete before proceeding.
*/ */
wait_on_atomic_t(&current->mm->context.fp_mode_switching, wait_var_event(&current->mm->context.fp_mode_switching,
atomic_t_wait, TASK_KILLABLE); !atomic_read(&current->mm->context.fp_mode_switching));
if (!used_math()) { if (!used_math()) {
/* First time FP context user. */ /* First time FP context user. */
......
...@@ -177,8 +177,9 @@ static ssize_t auxdev_read_iter(struct kiocb *iocb, struct iov_iter *to) ...@@ -177,8 +177,9 @@ static ssize_t auxdev_read_iter(struct kiocb *iocb, struct iov_iter *to)
res = pos - iocb->ki_pos; res = pos - iocb->ki_pos;
iocb->ki_pos = pos; iocb->ki_pos = pos;
atomic_dec(&aux_dev->usecount); if (atomic_dec_and_test(&aux_dev->usecount))
wake_up_atomic_t(&aux_dev->usecount); wake_up_var(&aux_dev->usecount);
return res; return res;
} }
...@@ -218,8 +219,9 @@ static ssize_t auxdev_write_iter(struct kiocb *iocb, struct iov_iter *from) ...@@ -218,8 +219,9 @@ static ssize_t auxdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
res = pos - iocb->ki_pos; res = pos - iocb->ki_pos;
iocb->ki_pos = pos; iocb->ki_pos = pos;
atomic_dec(&aux_dev->usecount); if (atomic_dec_and_test(&aux_dev->usecount))
wake_up_atomic_t(&aux_dev->usecount); wake_up_var(&aux_dev->usecount);
return res; return res;
} }
...@@ -277,8 +279,7 @@ void drm_dp_aux_unregister_devnode(struct drm_dp_aux *aux) ...@@ -277,8 +279,7 @@ void drm_dp_aux_unregister_devnode(struct drm_dp_aux *aux)
mutex_unlock(&aux_idr_mutex); mutex_unlock(&aux_idr_mutex);
atomic_dec(&aux_dev->usecount); atomic_dec(&aux_dev->usecount);
wait_on_atomic_t(&aux_dev->usecount, atomic_t_wait, wait_var_event(&aux_dev->usecount, !atomic_read(&aux_dev->usecount));
TASK_UNINTERRUPTIBLE);
minor = aux_dev->index; minor = aux_dev->index;
if (aux_dev->dev) if (aux_dev->dev)
......
...@@ -271,18 +271,13 @@ struct igt_wakeup { ...@@ -271,18 +271,13 @@ struct igt_wakeup {
u32 seqno; u32 seqno;
}; };
static int wait_atomic_timeout(atomic_t *p, unsigned int mode)
{
return schedule_timeout(10 * HZ) ? 0 : -ETIMEDOUT;
}
static bool wait_for_ready(struct igt_wakeup *w) static bool wait_for_ready(struct igt_wakeup *w)
{ {
DEFINE_WAIT(ready); DEFINE_WAIT(ready);
set_bit(IDLE, &w->flags); set_bit(IDLE, &w->flags);
if (atomic_dec_and_test(w->done)) if (atomic_dec_and_test(w->done))
wake_up_atomic_t(w->done); wake_up_var(w->done);
if (test_bit(STOP, &w->flags)) if (test_bit(STOP, &w->flags))
goto out; goto out;
...@@ -299,7 +294,7 @@ static bool wait_for_ready(struct igt_wakeup *w) ...@@ -299,7 +294,7 @@ static bool wait_for_ready(struct igt_wakeup *w)
out: out:
clear_bit(IDLE, &w->flags); clear_bit(IDLE, &w->flags);
if (atomic_dec_and_test(w->set)) if (atomic_dec_and_test(w->set))
wake_up_atomic_t(w->set); wake_up_var(w->set);
return !test_bit(STOP, &w->flags); return !test_bit(STOP, &w->flags);
} }
...@@ -342,7 +337,7 @@ static void igt_wake_all_sync(atomic_t *ready, ...@@ -342,7 +337,7 @@ static void igt_wake_all_sync(atomic_t *ready,
atomic_set(ready, 0); atomic_set(ready, 0);
wake_up_all(wq); wake_up_all(wq);
wait_on_atomic_t(set, atomic_t_wait, TASK_UNINTERRUPTIBLE); wait_var_event(set, !atomic_read(set));
atomic_set(ready, count); atomic_set(ready, count);
atomic_set(done, count); atomic_set(done, count);
} }
...@@ -350,7 +345,6 @@ static void igt_wake_all_sync(atomic_t *ready, ...@@ -350,7 +345,6 @@ static void igt_wake_all_sync(atomic_t *ready,
static int igt_wakeup(void *arg) static int igt_wakeup(void *arg)
{ {
I915_RND_STATE(prng); I915_RND_STATE(prng);
const int state = TASK_UNINTERRUPTIBLE;
struct intel_engine_cs *engine = arg; struct intel_engine_cs *engine = arg;
struct igt_wakeup *waiters; struct igt_wakeup *waiters;
DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq); DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
...@@ -418,7 +412,7 @@ static int igt_wakeup(void *arg) ...@@ -418,7 +412,7 @@ static int igt_wakeup(void *arg)
* that they are ready for the next test. We wait until all * that they are ready for the next test. We wait until all
* threads are complete and waiting for us (i.e. not a seqno). * threads are complete and waiting for us (i.e. not a seqno).
*/ */
err = wait_on_atomic_t(&done, wait_atomic_timeout, state); err = wait_var_event_timeout(&done, !atomic_read(&done), 10 * HZ);
if (err) { if (err) {
pr_err("Timed out waiting for %d remaining waiters\n", pr_err("Timed out waiting for %d remaining waiters\n",
atomic_read(&done)); atomic_read(&done));
......
...@@ -106,8 +106,8 @@ int hfi_core_deinit(struct venus_core *core, bool blocking) ...@@ -106,8 +106,8 @@ int hfi_core_deinit(struct venus_core *core, bool blocking)
if (!empty) { if (!empty) {
mutex_unlock(&core->lock); mutex_unlock(&core->lock);
wait_on_atomic_t(&core->insts_count, atomic_t_wait, wait_var_event(&core->insts_count,
TASK_UNINTERRUPTIBLE); !atomic_read(&core->insts_count));
mutex_lock(&core->lock); mutex_lock(&core->lock);
} }
...@@ -229,8 +229,8 @@ void hfi_session_destroy(struct venus_inst *inst) ...@@ -229,8 +229,8 @@ void hfi_session_destroy(struct venus_inst *inst)
mutex_lock(&core->lock); mutex_lock(&core->lock);
list_del_init(&inst->list); list_del_init(&inst->list);
atomic_dec(&core->insts_count); if (atomic_dec_and_test(&core->insts_count))
wake_up_atomic_t(&core->insts_count); wake_up_var(&core->insts_count);
mutex_unlock(&core->lock); mutex_unlock(&core->lock);
} }
EXPORT_SYMBOL_GPL(hfi_session_destroy); EXPORT_SYMBOL_GPL(hfi_session_destroy);
......
...@@ -25,7 +25,7 @@ static void afs_manage_cell(struct work_struct *); ...@@ -25,7 +25,7 @@ static void afs_manage_cell(struct work_struct *);
static void afs_dec_cells_outstanding(struct afs_net *net) static void afs_dec_cells_outstanding(struct afs_net *net)
{ {
if (atomic_dec_and_test(&net->cells_outstanding)) if (atomic_dec_and_test(&net->cells_outstanding))
wake_up_atomic_t(&net->cells_outstanding); wake_up_var(&net->cells_outstanding);
} }
/* /*
...@@ -764,7 +764,7 @@ void afs_cell_purge(struct afs_net *net) ...@@ -764,7 +764,7 @@ void afs_cell_purge(struct afs_net *net)
afs_queue_cell_manager(net); afs_queue_cell_manager(net);
_debug("wait"); _debug("wait");
wait_on_atomic_t(&net->cells_outstanding, atomic_t_wait, wait_var_event(&net->cells_outstanding,
TASK_UNINTERRUPTIBLE); !atomic_read(&net->cells_outstanding));
_leave(""); _leave("");
} }
...@@ -103,8 +103,8 @@ void afs_close_socket(struct afs_net *net) ...@@ -103,8 +103,8 @@ void afs_close_socket(struct afs_net *net)
} }
_debug("outstanding %u", atomic_read(&net->nr_outstanding_calls)); _debug("outstanding %u", atomic_read(&net->nr_outstanding_calls));
wait_on_atomic_t(&net->nr_outstanding_calls, atomic_t_wait, wait_var_event(&net->nr_outstanding_calls,
TASK_UNINTERRUPTIBLE); !atomic_read(&net->nr_outstanding_calls));
_debug("no outstanding calls"); _debug("no outstanding calls");
kernel_sock_shutdown(net->socket, SHUT_RDWR); kernel_sock_shutdown(net->socket, SHUT_RDWR);
...@@ -175,7 +175,7 @@ void afs_put_call(struct afs_call *call) ...@@ -175,7 +175,7 @@ void afs_put_call(struct afs_call *call)
trace_afs_call(call, afs_call_trace_free, 0, o, trace_afs_call(call, afs_call_trace_free, 0, o,
__builtin_return_address(0)); __builtin_return_address(0));
if (o == 0) if (o == 0)
wake_up_atomic_t(&net->nr_outstanding_calls); wake_up_var(&net->nr_outstanding_calls);
} }
} }
......
...@@ -25,7 +25,7 @@ static void afs_inc_servers_outstanding(struct afs_net *net) ...@@ -25,7 +25,7 @@ static void afs_inc_servers_outstanding(struct afs_net *net)
static void afs_dec_servers_outstanding(struct afs_net *net) static void afs_dec_servers_outstanding(struct afs_net *net)
{ {
if (atomic_dec_and_test(&net->servers_outstanding)) if (atomic_dec_and_test(&net->servers_outstanding))
wake_up_atomic_t(&net->servers_outstanding); wake_up_var(&net->servers_outstanding);
} }
/* /*
...@@ -521,8 +521,8 @@ void afs_purge_servers(struct afs_net *net) ...@@ -521,8 +521,8 @@ void afs_purge_servers(struct afs_net *net)
afs_queue_server_manager(net); afs_queue_server_manager(net);
_debug("wait"); _debug("wait");
wait_on_atomic_t(&net->servers_outstanding, atomic_t_wait, wait_var_event(&net->servers_outstanding,
TASK_UNINTERRUPTIBLE); !atomic_read(&net->servers_outstanding));
_leave(""); _leave("");
} }
......
...@@ -3990,7 +3990,7 @@ void btrfs_dec_nocow_writers(struct btrfs_fs_info *fs_info, u64 bytenr) ...@@ -3990,7 +3990,7 @@ void btrfs_dec_nocow_writers(struct btrfs_fs_info *fs_info, u64 bytenr)
bg = btrfs_lookup_block_group(fs_info, bytenr); bg = btrfs_lookup_block_group(fs_info, bytenr);
ASSERT(bg); ASSERT(bg);
if (atomic_dec_and_test(&bg->nocow_writers)) if (atomic_dec_and_test(&bg->nocow_writers))
wake_up_atomic_t(&bg->nocow_writers); wake_up_var(&bg->nocow_writers);
/* /*
* Once for our lookup and once for the lookup done by a previous call * Once for our lookup and once for the lookup done by a previous call
* to btrfs_inc_nocow_writers() * to btrfs_inc_nocow_writers()
...@@ -4001,8 +4001,7 @@ void btrfs_dec_nocow_writers(struct btrfs_fs_info *fs_info, u64 bytenr) ...@@ -4001,8 +4001,7 @@ void btrfs_dec_nocow_writers(struct btrfs_fs_info *fs_info, u64 bytenr)
void btrfs_wait_nocow_writers(struct btrfs_block_group_cache *bg) void btrfs_wait_nocow_writers(struct btrfs_block_group_cache *bg)
{ {
wait_on_atomic_t(&bg->nocow_writers, atomic_t_wait, wait_var_event(&bg->nocow_writers, !atomic_read(&bg->nocow_writers));
TASK_UNINTERRUPTIBLE);
} }
static const char *alloc_name(u64 flags) static const char *alloc_name(u64 flags)
...@@ -6526,7 +6525,7 @@ void btrfs_dec_block_group_reservations(struct btrfs_fs_info *fs_info, ...@@ -6526,7 +6525,7 @@ void btrfs_dec_block_group_reservations(struct btrfs_fs_info *fs_info,
bg = btrfs_lookup_block_group(fs_info, start); bg = btrfs_lookup_block_group(fs_info, start);
ASSERT(bg); ASSERT(bg);
if (atomic_dec_and_test(&bg->reservations)) if (atomic_dec_and_test(&bg->reservations))
wake_up_atomic_t(&bg->reservations); wake_up_var(&bg->reservations);
btrfs_put_block_group(bg); btrfs_put_block_group(bg);
} }
...@@ -6552,8 +6551,7 @@ void btrfs_wait_block_group_reservations(struct btrfs_block_group_cache *bg) ...@@ -6552,8 +6551,7 @@ void btrfs_wait_block_group_reservations(struct btrfs_block_group_cache *bg)
down_write(&space_info->groups_sem); down_write(&space_info->groups_sem);
up_write(&space_info->groups_sem); up_write(&space_info->groups_sem);
wait_on_atomic_t(&bg->reservations, atomic_t_wait, wait_var_event(&bg->reservations, !atomic_read(&bg->reservations));
TASK_UNINTERRUPTIBLE);
} }
/** /**
...@@ -11061,7 +11059,7 @@ void btrfs_wait_for_snapshot_creation(struct btrfs_root *root) ...@@ -11061,7 +11059,7 @@ void btrfs_wait_for_snapshot_creation(struct btrfs_root *root)
ret = btrfs_start_write_no_snapshotting(root); ret = btrfs_start_write_no_snapshotting(root);
if (ret) if (ret)
break; break;
wait_on_atomic_t(&root->will_be_snapshotted, atomic_t_wait, wait_var_event(&root->will_be_snapshotted,
TASK_UNINTERRUPTIBLE); !atomic_read(&root->will_be_snapshotted));
} }
} }
...@@ -723,7 +723,7 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir, ...@@ -723,7 +723,7 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,
btrfs_subvolume_release_metadata(fs_info, &pending_snapshot->block_rsv); btrfs_subvolume_release_metadata(fs_info, &pending_snapshot->block_rsv);
dec_and_free: dec_and_free:
if (atomic_dec_and_test(&root->will_be_snapshotted)) if (atomic_dec_and_test(&root->will_be_snapshotted))
wake_up_atomic_t(&root->will_be_snapshotted); wake_up_var(&root->will_be_snapshotted);
free_pending: free_pending:
kfree(pending_snapshot->root_item); kfree(pending_snapshot->root_item);
btrfs_free_path(pending_snapshot->path); btrfs_free_path(pending_snapshot->path);
......
...@@ -557,9 +557,10 @@ void __fscache_disable_cookie(struct fscache_cookie *cookie, bool invalidate) ...@@ -557,9 +557,10 @@ void __fscache_disable_cookie(struct fscache_cookie *cookie, bool invalidate)
* n_active reaches 0). This makes sure outstanding reads and writes * n_active reaches 0). This makes sure outstanding reads and writes
* have completed. * have completed.
*/ */
if (!atomic_dec_and_test(&cookie->n_active)) if (!atomic_dec_and_test(&cookie->n_active)) {
wait_on_atomic_t(&cookie->n_active, atomic_t_wait, wait_var_event(&cookie->n_active,
TASK_UNINTERRUPTIBLE); !atomic_read(&cookie->n_active));
}
/* Make sure any pending writes are cancelled. */ /* Make sure any pending writes are cancelled. */
if (cookie->def->type != FSCACHE_COOKIE_TYPE_INDEX) if (cookie->def->type != FSCACHE_COOKIE_TYPE_INDEX)
......
...@@ -85,11 +85,6 @@ int nfs_wait_bit_killable(struct wait_bit_key *key, int mode) ...@@ -85,11 +85,6 @@ int nfs_wait_bit_killable(struct wait_bit_key *key, int mode)
} }
EXPORT_SYMBOL_GPL(nfs_wait_bit_killable); EXPORT_SYMBOL_GPL(nfs_wait_bit_killable);
int nfs_wait_atomic_killable(atomic_t *p, unsigned int mode)
{
return nfs_wait_killable(mode);
}
/** /**
* nfs_compat_user_ino64 - returns the user-visible inode number * nfs_compat_user_ino64 - returns the user-visible inode number
* @fileid: 64-bit fileid * @fileid: 64-bit fileid
......
...@@ -98,8 +98,8 @@ nfs_page_free(struct nfs_page *p) ...@@ -98,8 +98,8 @@ nfs_page_free(struct nfs_page *p)
int int
nfs_iocounter_wait(struct nfs_lock_context *l_ctx) nfs_iocounter_wait(struct nfs_lock_context *l_ctx)
{ {
return wait_on_atomic_t(&l_ctx->io_count, nfs_wait_atomic_killable, return wait_var_event_killable(&l_ctx->io_count,
TASK_KILLABLE); !atomic_read(&l_ctx->io_count));
} }
/** /**
...@@ -395,7 +395,7 @@ static void nfs_clear_request(struct nfs_page *req) ...@@ -395,7 +395,7 @@ static void nfs_clear_request(struct nfs_page *req)
} }
if (l_ctx != NULL) { if (l_ctx != NULL) {
if (atomic_dec_and_test(&l_ctx->io_count)) { if (atomic_dec_and_test(&l_ctx->io_count)) {
wake_up_atomic_t(&l_ctx->io_count); wake_up_var(&l_ctx->io_count);
if (test_bit(NFS_CONTEXT_UNLOCK, &ctx->flags)) if (test_bit(NFS_CONTEXT_UNLOCK, &ctx->flags))
rpc_wake_up(&NFS_SERVER(d_inode(ctx->dentry))->uoc_rpcwaitq); rpc_wake_up(&NFS_SERVER(d_inode(ctx->dentry))->uoc_rpcwaitq);
} }
......
...@@ -245,7 +245,7 @@ pnfs_generic_commit_cancel_empty_pagelist(struct list_head *pages, ...@@ -245,7 +245,7 @@ pnfs_generic_commit_cancel_empty_pagelist(struct list_head *pages,
{ {
if (list_empty(pages)) { if (list_empty(pages)) {
if (atomic_dec_and_test(&cinfo->mds->rpcs_out)) if (atomic_dec_and_test(&cinfo->mds->rpcs_out))
wake_up_atomic_t(&cinfo->mds->rpcs_out); wake_up_var(&cinfo->mds->rpcs_out);
/* don't call nfs_commitdata_release - it tries to put /* don't call nfs_commitdata_release - it tries to put
* the open_context which is not acquired until nfs_init_commit * the open_context which is not acquired until nfs_init_commit
* which has not been called on @data */ * which has not been called on @data */
......
...@@ -1620,8 +1620,8 @@ static void nfs_writeback_result(struct rpc_task *task, ...@@ -1620,8 +1620,8 @@ static void nfs_writeback_result(struct rpc_task *task,
static int wait_on_commit(struct nfs_mds_commit_info *cinfo) static int wait_on_commit(struct nfs_mds_commit_info *cinfo)
{ {
return wait_on_atomic_t(&cinfo->rpcs_out, return wait_var_event_killable(&cinfo->rpcs_out,
nfs_wait_atomic_killable, TASK_KILLABLE); !atomic_read(&cinfo->rpcs_out));
} }
static void nfs_commit_begin(struct nfs_mds_commit_info *cinfo) static void nfs_commit_begin(struct nfs_mds_commit_info *cinfo)
...@@ -1632,7 +1632,7 @@ static void nfs_commit_begin(struct nfs_mds_commit_info *cinfo) ...@@ -1632,7 +1632,7 @@ static void nfs_commit_begin(struct nfs_mds_commit_info *cinfo)
static void nfs_commit_end(struct nfs_mds_commit_info *cinfo) static void nfs_commit_end(struct nfs_mds_commit_info *cinfo)
{ {
if (atomic_dec_and_test(&cinfo->rpcs_out)) if (atomic_dec_and_test(&cinfo->rpcs_out))
wake_up_atomic_t(&cinfo->rpcs_out); wake_up_var(&cinfo->rpcs_out);
} }
void nfs_commitdata_release(struct nfs_commit_data *data) void nfs_commitdata_release(struct nfs_commit_data *data)
......
...@@ -134,9 +134,10 @@ ocfs2_filecheck_sysfs_free(struct ocfs2_filecheck_sysfs_entry *entry) ...@@ -134,9 +134,10 @@ ocfs2_filecheck_sysfs_free(struct ocfs2_filecheck_sysfs_entry *entry)
{ {
struct ocfs2_filecheck_entry *p; struct ocfs2_filecheck_entry *p;
if (!atomic_dec_and_test(&entry->fs_count)) if (!atomic_dec_and_test(&entry->fs_count)) {
wait_on_atomic_t(&entry->fs_count, atomic_t_wait, wait_var_event(&entry->fs_count,
TASK_UNINTERRUPTIBLE); !atomic_read(&entry->fs_count));
}
spin_lock(&entry->fs_fcheck->fc_lock); spin_lock(&entry->fs_fcheck->fc_lock);
while (!list_empty(&entry->fs_fcheck->fc_head)) { while (!list_empty(&entry->fs_fcheck->fc_head)) {
...@@ -183,7 +184,7 @@ static void ...@@ -183,7 +184,7 @@ static void
ocfs2_filecheck_sysfs_put(struct ocfs2_filecheck_sysfs_entry *entry) ocfs2_filecheck_sysfs_put(struct ocfs2_filecheck_sysfs_entry *entry)
{ {
if (atomic_dec_and_test(&entry->fs_count)) 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 * static struct ocfs2_filecheck_sysfs_entry *
......
...@@ -496,7 +496,7 @@ static inline bool __fscache_unuse_cookie(struct fscache_cookie *cookie) ...@@ -496,7 +496,7 @@ static inline bool __fscache_unuse_cookie(struct fscache_cookie *cookie)
static inline void __fscache_wake_unused_cookie(struct fscache_cookie *cookie) static inline void __fscache_wake_unused_cookie(struct fscache_cookie *cookie)
{ {
wake_up_atomic_t(&cookie->n_active); wake_up_var(&cookie->n_active);
} }
/** /**
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
struct wait_bit_key { struct wait_bit_key {
void *flags; void *flags;
int bit_nr; int bit_nr;
#define WAIT_ATOMIC_T_BIT_NR -1
unsigned long timeout; unsigned long timeout;
}; };
...@@ -22,21 +21,15 @@ struct wait_bit_queue_entry { ...@@ -22,21 +21,15 @@ struct wait_bit_queue_entry {
#define __WAIT_BIT_KEY_INITIALIZER(word, bit) \ #define __WAIT_BIT_KEY_INITIALIZER(word, bit) \
{ .flags = word, .bit_nr = bit, } { .flags = word, .bit_nr = bit, }
#define __WAIT_ATOMIC_T_KEY_INITIALIZER(p) \
{ .flags = p, .bit_nr = WAIT_ATOMIC_T_BIT_NR, }
typedef int wait_bit_action_f(struct wait_bit_key *key, int mode); typedef int wait_bit_action_f(struct wait_bit_key *key, int mode);
typedef int wait_atomic_t_action_f(atomic_t *counter, unsigned int mode);
void __wake_up_bit(struct wait_queue_head *wq_head, void *word, int bit); void __wake_up_bit(struct wait_queue_head *wq_head, void *word, int bit);
int __wait_on_bit(struct wait_queue_head *wq_head, struct wait_bit_queue_entry *wbq_entry, wait_bit_action_f *action, unsigned int mode); int __wait_on_bit(struct wait_queue_head *wq_head, struct wait_bit_queue_entry *wbq_entry, wait_bit_action_f *action, unsigned int mode);
int __wait_on_bit_lock(struct wait_queue_head *wq_head, struct wait_bit_queue_entry *wbq_entry, wait_bit_action_f *action, unsigned int mode); int __wait_on_bit_lock(struct wait_queue_head *wq_head, struct wait_bit_queue_entry *wbq_entry, wait_bit_action_f *action, unsigned int mode);
void wake_up_bit(void *word, int bit); void wake_up_bit(void *word, int bit);
void wake_up_atomic_t(atomic_t *p);
int out_of_line_wait_on_bit(void *word, int, wait_bit_action_f *action, unsigned int mode); int out_of_line_wait_on_bit(void *word, int, wait_bit_action_f *action, unsigned int mode);
int out_of_line_wait_on_bit_timeout(void *word, int, wait_bit_action_f *action, unsigned int mode, unsigned long timeout); int out_of_line_wait_on_bit_timeout(void *word, int, wait_bit_action_f *action, unsigned int mode, unsigned long timeout);
int out_of_line_wait_on_bit_lock(void *word, int, wait_bit_action_f *action, unsigned int mode); int out_of_line_wait_on_bit_lock(void *word, int, wait_bit_action_f *action, unsigned int mode);
int out_of_line_wait_on_atomic_t(atomic_t *p, wait_atomic_t_action_f action, unsigned int mode);
struct wait_queue_head *bit_waitqueue(void *word, int bit); struct wait_queue_head *bit_waitqueue(void *word, int bit);
extern void __init wait_bit_init(void); extern void __init wait_bit_init(void);
...@@ -57,7 +50,6 @@ extern int bit_wait(struct wait_bit_key *key, int mode); ...@@ -57,7 +50,6 @@ extern int bit_wait(struct wait_bit_key *key, int mode);
extern int bit_wait_io(struct wait_bit_key *key, int mode); extern int bit_wait_io(struct wait_bit_key *key, int mode);
extern int bit_wait_timeout(struct wait_bit_key *key, int mode); extern int bit_wait_timeout(struct wait_bit_key *key, int mode);
extern int bit_wait_io_timeout(struct wait_bit_key *key, int mode); extern int bit_wait_io_timeout(struct wait_bit_key *key, int mode);
extern int atomic_t_wait(atomic_t *counter, unsigned int mode);
/** /**
* wait_on_bit - wait for a bit to be cleared * wait_on_bit - wait for a bit to be cleared
...@@ -243,23 +235,74 @@ wait_on_bit_lock_action(unsigned long *word, int bit, wait_bit_action_f *action, ...@@ -243,23 +235,74 @@ wait_on_bit_lock_action(unsigned long *word, int bit, wait_bit_action_f *action,
return out_of_line_wait_on_bit_lock(word, bit, action, mode); return out_of_line_wait_on_bit_lock(word, bit, action, mode);
} }
/** extern void init_wait_var_entry(struct wait_bit_queue_entry *wbq_entry, void *var, int flags);
* wait_on_atomic_t - Wait for an atomic_t to become 0 extern void wake_up_var(void *var);
* @val: The atomic value being waited on, a kernel virtual address extern wait_queue_head_t *__var_waitqueue(void *p);
* @action: the function used to sleep, which may take special actions
* @mode: the task state to sleep in #define ___wait_var_event(var, condition, state, exclusive, ret, cmd) \
* ({ \
* Wait for an atomic_t to become 0. We abuse the bit-wait waitqueue table for __label__ __out; \
* the purpose of getting a waitqueue, but we set the key to a bit number struct wait_queue_head *__wq_head = __var_waitqueue(var); \
* outside of the target 'word'. struct wait_bit_queue_entry __wbq_entry; \