diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-18 23:29:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-18 23:29:41 -0400 |
| commit | 4da0bd736552e6377b407b3c3d3ae518ebbdd269 (patch) | |
| tree | f0da9f843b8033565c3ca4103fccb17a60688326 /include/linux/iocontext.h | |
| parent | 81a430ac1b88b0702c57d2513e247317e810e04d (diff) | |
| parent | c16fa4f2ad19908a47c63d8fa436a1178438c7e7 (diff) | |
| download | op-kernel-dev-4da0bd736552e6377b407b3c3d3ae518ebbdd269.zip op-kernel-dev-4da0bd736552e6377b407b3c3d3ae518ebbdd269.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'include/linux/iocontext.h')
| -rw-r--r-- | include/linux/iocontext.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h index 119773e..1a30180 100644 --- a/include/linux/iocontext.h +++ b/include/linux/iocontext.h @@ -6,8 +6,11 @@ #include <linux/workqueue.h> enum { - ICQ_IOPRIO_CHANGED, - ICQ_CGROUP_CHANGED, + ICQ_IOPRIO_CHANGED = 1 << 0, + ICQ_CGROUP_CHANGED = 1 << 1, + ICQ_EXITED = 1 << 2, + + ICQ_CHANGED_MASK = ICQ_IOPRIO_CHANGED | ICQ_CGROUP_CHANGED, }; /* @@ -88,7 +91,7 @@ struct io_cq { struct rcu_head __rcu_head; }; - unsigned long changed; + unsigned int flags; }; /* @@ -139,6 +142,7 @@ struct io_context *get_task_io_context(struct task_struct *task, gfp_t gfp_flags, int node); void ioc_ioprio_changed(struct io_context *ioc, int ioprio); void ioc_cgroup_changed(struct io_context *ioc); +unsigned int icq_get_changed(struct io_cq *icq); #else struct io_context; static inline void put_io_context(struct io_context *ioc) { } |
