OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "usb: dwc3: turn off VBUS when leaving host mode"
[sagit-ice-cold/kernel_xiaomi_msm8998.git]
/
block
/
blk-sysfs.c
diff --git
a/block/blk-sysfs.c
b/block/blk-sysfs.c
index
68155dd
..
f86fc86
100644
(file)
--- a/
block/blk-sysfs.c
+++ b/
block/blk-sysfs.c
@@
-75,7
+75,7
@@
queue_requests_store(struct request_queue *q, const char *page, size_t count)
static ssize_t queue_ra_show(struct request_queue *q, char *page)
{
static ssize_t queue_ra_show(struct request_queue *q, char *page)
{
- unsigned long ra_kb = q->backing_dev_info
.
ra_pages <<
+ unsigned long ra_kb = q->backing_dev_info
->
ra_pages <<
(PAGE_CACHE_SHIFT - 10);
return queue_var_show(ra_kb, (page));
(PAGE_CACHE_SHIFT - 10);
return queue_var_show(ra_kb, (page));
@@
-90,7
+90,7
@@
queue_ra_store(struct request_queue *q, const char *page, size_t count)
if (ret < 0)
return ret;
if (ret < 0)
return ret;
- q->backing_dev_info
.
ra_pages = ra_kb >> (PAGE_CACHE_SHIFT - 10);
+ q->backing_dev_info
->
ra_pages = ra_kb >> (PAGE_CACHE_SHIFT - 10);
return ret;
}
return ret;
}
@@
-213,7
+213,7
@@
queue_max_sectors_store(struct request_queue *q, const char *page, size_t count)
spin_lock_irq(q->queue_lock);
q->limits.max_sectors = max_sectors_kb << 1;
spin_lock_irq(q->queue_lock);
q->limits.max_sectors = max_sectors_kb << 1;
- q->backing_dev_info
.
io_pages = max_sectors_kb >> (PAGE_SHIFT - 10);
+ q->backing_dev_info
->
io_pages = max_sectors_kb >> (PAGE_SHIFT - 10);
spin_unlock_irq(q->queue_lock);
return ret;
spin_unlock_irq(q->queue_lock);
return ret;
@@
-579,7
+579,7
@@
static void blk_release_queue(struct kobject *kobj)
struct request_queue *q =
container_of(kobj, struct request_queue, kobj);
struct request_queue *q =
container_of(kobj, struct request_queue, kobj);
- bdi_
exit(&
q->backing_dev_info);
+ bdi_
put(
q->backing_dev_info);
blkcg_exit_queue(q);
if (q->elevator) {
blkcg_exit_queue(q);
if (q->elevator) {