diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-01-11 19:53:53 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-01-11 19:53:53 +0100 |
| commit | ac9a19745196388ae5d828c0be7a1d6e472101f3 (patch) | |
| tree | 49c47e1a07241653deb4a4b4e7a91626f586ad05 /include/linux/blkdev.h | |
| parent | 422765c2638924da10ff363b5eed77924911bdc7 (diff) | |
| parent | 43114018cb0b253fd03c4ff4d42bcdc43389ac1c (diff) | |
Merge branch 'blkcg-cfq-hierarchy' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup into for-3.9/core
Tejun writes:
Hello, Jens.
Please consider pulling from the following branch to receive cfq blkcg
hierarchy support. The branch is based on top of v3.8-rc2.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git blkcg-cfq-hierarchy
The patchset was reviewd in the following thread.
http://thread.gmane.org/gmane.linux.kernel.cgroups/5571
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index dbe74279f3d6..78feda9bbae2 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -19,6 +19,7 @@ #include <linux/gfp.h> #include <linux/bsg.h> #include <linux/smp.h> +#include <linux/rcupdate.h> #include <asm/scatterlist.h> @@ -437,6 +438,7 @@ struct request_queue { /* Throttle data */ struct throtl_data *td; #endif + struct rcu_head rcu_head; }; #define QUEUE_FLAG_QUEUED 1 /* uses generic tag queueing */ |