diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-11-01 14:27:38 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-11-01 14:27:38 -0300 |
| commit | 1eae9639aac0f8de4d284f567ec722a822b52513 (patch) | |
| tree | 34e45a5c5e6a1033a444bea952ba9199e57f3a19 /block | |
| parent | 037d32aa8f748e39844d2a5b607fb063b4583843 (diff) | |
Linux-libre 4.8.6-gnupck-4.8.6-gnu
Diffstat (limited to 'block')
| -rw-r--r-- | block/bfq-iosched.c | 3 | ||||
| -rw-r--r-- | block/blk-cgroup.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index eef6ff49c..ecb949ec6 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -4264,8 +4264,7 @@ static void bfq_insert_request(struct request_queue *q, struct request *rq) bfq_add_request(rq); - rq->fifo_time = ktime_get_ns() + - jiffies_to_nsecs(bfqd->bfq_fifo_expire[rq_is_sync(rq)]); + rq->fifo_time = ktime_get_ns() + bfqd->bfq_fifo_expire[rq_is_sync(rq)]; list_add_tail(&rq->queuelist, &bfqq->fifo); bfq_rq_enqueued(bfqd, bfqq, rq); diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index dd38e5ced..b08ccbb93 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1340,10 +1340,8 @@ int blkcg_policy_register(struct blkcg_policy *pol) struct blkcg_policy_data *cpd; cpd = pol->cpd_alloc_fn(GFP_KERNEL); - if (!cpd) { - mutex_unlock(&blkcg_pol_mutex); + if (!cpd) goto err_free_cpds; - } blkcg->cpd[pol->plid] = cpd; cpd->blkcg = blkcg; |