diff options
| author | Len Brown <len.brown@intel.com> | 2012-04-07 05:48:59 +0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-04-07 05:48:59 +0400 |
| commit | eeaab2d8af2cf1d36d7086f22e9de42d6dd2995c (patch) | |
| tree | 369b9c91a6d808944f07d2290fec6f9fe2731904 /drivers/target/target_core_iblock.h | |
| parent | ee01e663373343c63e0e3d364d09f6155378dbcc (diff) | |
| parent | aaef292acf3a78d9c0bb6fb72226077d286b45d7 (diff) | |
| download | linux-eeaab2d8af2cf1d36d7086f22e9de42d6dd2995c.tar.xz | |
Merge branches 'idle-fix' and 'misc' into release
Diffstat (limited to 'drivers/target/target_core_iblock.h')
| -rw-r--r-- | drivers/target/target_core_iblock.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/target/target_core_iblock.h b/drivers/target/target_core_iblock.h index 5cf1860c10d0..e929370b6fd3 100644 --- a/drivers/target/target_core_iblock.h +++ b/drivers/target/target_core_iblock.h @@ -8,7 +8,7 @@ struct iblock_req { struct se_task ib_task; - atomic_t ib_bio_cnt; + atomic_t pending; atomic_t ib_bio_err_cnt; } ____cacheline_aligned; @@ -19,11 +19,6 @@ struct iblock_dev { u32 ibd_flags; struct bio_set *ibd_bio_set; struct block_device *ibd_bd; - struct iblock_hba *ibd_host; -} ____cacheline_aligned; - -struct iblock_hba { - int iblock_host_id; } ____cacheline_aligned; #endif /* TARGET_CORE_IBLOCK_H */ |