diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-10-13 12:29:45 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-13 12:29:45 +0200 |
| commit | c30f33437c3f85ec48353a1ef811e148217a2aaf (patch) | |
| tree | d5a0ca1e8d091a30fece2e9aeed285225c026049 /include/linux | |
| parent | 132cc538cd90f60a0b5df6a512dfd4bc5fe2039a (diff) | |
| parent | 2ec24ff1d1875defa742c76c9c7d74dca06b7e1f (diff) | |
| download | kernel_samsung_aries-c30f33437c3f85ec48353a1ef811e148217a2aaf.zip kernel_samsung_aries-c30f33437c3f85ec48353a1ef811e148217a2aaf.tar.gz kernel_samsung_aries-c30f33437c3f85ec48353a1ef811e148217a2aaf.tar.bz2 | |
Merge branch 'for-linus' into for-2.6.33
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blkdev.h | 4 | ||||
| -rw-r--r-- | include/linux/genhd.h | 21 |
2 files changed, 14 insertions, 11 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 2511904..221cecd 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1172,11 +1172,7 @@ static inline void put_dev_sector(Sector p) } struct work_struct; -struct delayed_work; int kblockd_schedule_work(struct request_queue *q, struct work_struct *work); -int kblockd_schedule_delayed_work(struct request_queue *q, - struct delayed_work *work, - unsigned long delay); #define MODULE_ALIAS_BLOCKDEV(major,minor) \ MODULE_ALIAS("block-major-" __stringify(major) "-" __stringify(minor)) diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 7beaa21..297df45 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -98,7 +98,7 @@ struct hd_struct { int make_it_fail; #endif unsigned long stamp; - int in_flight; + int in_flight[2]; #ifdef CONFIG_SMP struct disk_stats *dkstats; #else @@ -322,18 +322,23 @@ static inline void free_part_stats(struct hd_struct *part) #define part_stat_sub(cpu, gendiskp, field, subnd) \ part_stat_add(cpu, gendiskp, field, -subnd) -static inline void part_inc_in_flight(struct hd_struct *part) +static inline void part_inc_in_flight(struct hd_struct *part, int rw) { - part->in_flight++; + part->in_flight[rw]++; if (part->partno) - part_to_disk(part)->part0.in_flight++; + part_to_disk(part)->part0.in_flight[rw]++; } -static inline void part_dec_in_flight(struct hd_struct *part) +static inline void part_dec_in_flight(struct hd_struct *part, int rw) { - part->in_flight--; + part->in_flight[rw]--; if (part->partno) - part_to_disk(part)->part0.in_flight--; + part_to_disk(part)->part0.in_flight[rw]--; +} + +static inline int part_in_flight(struct hd_struct *part) +{ + return part->in_flight[0] + part->in_flight[1]; } /* block/blk-core.c */ @@ -546,6 +551,8 @@ extern ssize_t part_size_show(struct device *dev, struct device_attribute *attr, char *buf); extern ssize_t part_stat_show(struct device *dev, struct device_attribute *attr, char *buf); +extern ssize_t part_inflight_show(struct device *dev, + struct device_attribute *attr, char *buf); #ifdef CONFIG_FAIL_MAKE_REQUEST extern ssize_t part_fail_show(struct device *dev, struct device_attribute *attr, char *buf); |