Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 309258
b: refs/heads/master
c: d366e7e
h: refs/heads/master
v: v3
  • Loading branch information
Tejun Heo committed Apr 1, 2012
1 parent 8e23ff7 commit a09c32b
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 42 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: af133ceb261033eb43c03d161a991c3b772e8c56
refs/heads/master: d366e7ec41882791c970dfb7c67b737be8c3a174
33 changes: 15 additions & 18 deletions trunk/block/blk-cgroup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ static const char *blkg_dev_name(struct blkio_group *blkg)
* cftype->read_seq_string method.
*/
void blkcg_print_blkgs(struct seq_file *sf, struct blkio_cgroup *blkcg,
u64 (*prfill)(struct seq_file *, struct blkg_policy_data *, int),
u64 (*prfill)(struct seq_file *, void *, int),
int pol, int data, bool show_total)
{
struct blkio_group *blkg;
Expand All @@ -369,7 +369,7 @@ void blkcg_print_blkgs(struct seq_file *sf, struct blkio_cgroup *blkcg,
spin_lock_irq(&blkcg->lock);
hlist_for_each_entry(blkg, n, &blkcg->blkg_list, blkcg_node)
if (blkg->pd[pol])
total += prfill(sf, blkg->pd[pol], data);
total += prfill(sf, blkg->pd[pol]->pdata, data);
spin_unlock_irq(&blkcg->lock);

if (show_total)
Expand All @@ -380,14 +380,14 @@ EXPORT_SYMBOL_GPL(blkcg_print_blkgs);
/**
* __blkg_prfill_u64 - prfill helper for a single u64 value
* @sf: seq_file to print to
* @pd: policy data of interest
* @pdata: policy private data of interest
* @v: value to print
*
* Print @v to @sf for the device assocaited with @pd.
* Print @v to @sf for the device assocaited with @pdata.
*/
u64 __blkg_prfill_u64(struct seq_file *sf, struct blkg_policy_data *pd, u64 v)
u64 __blkg_prfill_u64(struct seq_file *sf, void *pdata, u64 v)
{
const char *dname = blkg_dev_name(pd->blkg);
const char *dname = blkg_dev_name(pdata_to_blkg(pdata));

if (!dname)
return 0;
Expand All @@ -400,12 +400,12 @@ EXPORT_SYMBOL_GPL(__blkg_prfill_u64);
/**
* __blkg_prfill_rwstat - prfill helper for a blkg_rwstat
* @sf: seq_file to print to
* @pd: policy data of interest
* @pdata: policy private data of interest
* @rwstat: rwstat to print
*
* Print @rwstat to @sf for the device assocaited with @pd.
* Print @rwstat to @sf for the device assocaited with @pdata.
*/
u64 __blkg_prfill_rwstat(struct seq_file *sf, struct blkg_policy_data *pd,
u64 __blkg_prfill_rwstat(struct seq_file *sf, void *pdata,
const struct blkg_rwstat *rwstat)
{
static const char *rwstr[] = {
Expand All @@ -414,7 +414,7 @@ u64 __blkg_prfill_rwstat(struct seq_file *sf, struct blkg_policy_data *pd,
[BLKG_RWSTAT_SYNC] = "Sync",
[BLKG_RWSTAT_ASYNC] = "Async",
};
const char *dname = blkg_dev_name(pd->blkg);
const char *dname = blkg_dev_name(pdata_to_blkg(pdata));
u64 v;
int i;

Expand All @@ -430,19 +430,16 @@ u64 __blkg_prfill_rwstat(struct seq_file *sf, struct blkg_policy_data *pd,
return v;
}

static u64 blkg_prfill_stat(struct seq_file *sf, struct blkg_policy_data *pd,
int off)
static u64 blkg_prfill_stat(struct seq_file *sf, void *pdata, int off)
{
return __blkg_prfill_u64(sf, pd,
blkg_stat_read((void *)pd->pdata + off));
return __blkg_prfill_u64(sf, pdata, blkg_stat_read(pdata + off));
}

static u64 blkg_prfill_rwstat(struct seq_file *sf, struct blkg_policy_data *pd,
int off)
static u64 blkg_prfill_rwstat(struct seq_file *sf, void *pdata, int off)
{
struct blkg_rwstat rwstat = blkg_rwstat_read((void *)pd->pdata + off);
struct blkg_rwstat rwstat = blkg_rwstat_read(pdata + off);

return __blkg_prfill_rwstat(sf, pd, &rwstat);
return __blkg_prfill_rwstat(sf, pdata, &rwstat);
}

/* print blkg_stat specified by BLKCG_STAT_PRIV() */
Expand Down
6 changes: 3 additions & 3 deletions trunk/block/blk-cgroup.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@ extern void update_root_blkg_pd(struct request_queue *q,
enum blkio_policy_id plid);

void blkcg_print_blkgs(struct seq_file *sf, struct blkio_cgroup *blkcg,
u64 (*prfill)(struct seq_file *, struct blkg_policy_data *, int),
u64 (*prfill)(struct seq_file *, void *, int),
int pol, int data, bool show_total);
u64 __blkg_prfill_u64(struct seq_file *sf, struct blkg_policy_data *pd, u64 v);
u64 __blkg_prfill_rwstat(struct seq_file *sf, struct blkg_policy_data *pd,
u64 __blkg_prfill_u64(struct seq_file *sf, void *pdata, u64 v);
u64 __blkg_prfill_rwstat(struct seq_file *sf, void *pdata,
const struct blkg_rwstat *rwstat);
int blkcg_print_stat(struct cgroup *cgrp, struct cftype *cft,
struct seq_file *sf);
Expand Down
21 changes: 9 additions & 12 deletions trunk/block/blk-throttle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -924,10 +924,9 @@ throtl_schedule_delayed_work(struct throtl_data *td, unsigned long delay)
}
}

static u64 tg_prfill_cpu_rwstat(struct seq_file *sf,
struct blkg_policy_data *pd, int off)
static u64 tg_prfill_cpu_rwstat(struct seq_file *sf, void *pdata, int off)
{
struct throtl_grp *tg = (void *)pd->pdata;
struct throtl_grp *tg = pdata;
struct blkg_rwstat rwstat = { }, tmp;
int i, cpu;

Expand All @@ -939,7 +938,7 @@ static u64 tg_prfill_cpu_rwstat(struct seq_file *sf,
rwstat.cnt[i] += tmp.cnt[i];
}

return __blkg_prfill_rwstat(sf, pd, &rwstat);
return __blkg_prfill_rwstat(sf, pdata, &rwstat);
}

/* print per-cpu blkg_rwstat specified by BLKCG_STAT_PRIV() */
Expand All @@ -954,24 +953,22 @@ static int tg_print_cpu_rwstat(struct cgroup *cgrp, struct cftype *cft,
return 0;
}

static u64 tg_prfill_conf_u64(struct seq_file *sf, struct blkg_policy_data *pd,
int off)
static u64 tg_prfill_conf_u64(struct seq_file *sf, void *pdata, int off)
{
u64 v = *(u64 *)((void *)pd->pdata + off);
u64 v = *(u64 *)(pdata + off);

if (v == -1)
return 0;
return __blkg_prfill_u64(sf, pd, v);
return __blkg_prfill_u64(sf, pdata, v);
}

static u64 tg_prfill_conf_uint(struct seq_file *sf, struct blkg_policy_data *pd,
int off)
static u64 tg_prfill_conf_uint(struct seq_file *sf, void *pdata, int off)
{
unsigned int v = *(unsigned int *)((void *)pd->pdata + off);
unsigned int v = *(unsigned int *)(pdata + off);

if (v == -1)
return 0;
return __blkg_prfill_u64(sf, pd, v);
return __blkg_prfill_u64(sf, pdata, v);
}

static int tg_print_conf_u64(struct cgroup *cgrp, struct cftype *cft,
Expand Down
14 changes: 6 additions & 8 deletions trunk/block/cfq-iosched.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1368,14 +1368,13 @@ static void cfq_link_cfqq_cfqg(struct cfq_queue *cfqq, struct cfq_group *cfqg)
cfqg_get(cfqg);
}

static u64 cfqg_prfill_weight_device(struct seq_file *sf,
struct blkg_policy_data *pd, int off)
static u64 cfqg_prfill_weight_device(struct seq_file *sf, void *pdata, int off)
{
struct cfq_group *cfqg = (void *)pd->pdata;
struct cfq_group *cfqg = pdata;

if (!cfqg->dev_weight)
return 0;
return __blkg_prfill_u64(sf, pd, cfqg->dev_weight);
return __blkg_prfill_u64(sf, pdata, cfqg->dev_weight);
}

static int cfqg_print_weight_device(struct cgroup *cgrp, struct cftype *cft,
Expand Down Expand Up @@ -1443,18 +1442,17 @@ static int cfq_set_weight(struct cgroup *cgrp, struct cftype *cft, u64 val)
}

#ifdef CONFIG_DEBUG_BLK_CGROUP
static u64 cfqg_prfill_avg_queue_size(struct seq_file *sf,
struct blkg_policy_data *pd, int off)
static u64 cfqg_prfill_avg_queue_size(struct seq_file *sf, void *pdata, int off)
{
struct cfq_group *cfqg = (void *)pd->pdata;
struct cfq_group *cfqg = pdata;
u64 samples = blkg_stat_read(&cfqg->stats.avg_queue_size_samples);
u64 v = 0;

if (samples) {
v = blkg_stat_read(&cfqg->stats.avg_queue_size_sum);
do_div(v, samples);
}
__blkg_prfill_u64(sf, pd, v);
__blkg_prfill_u64(sf, pdata, v);
return 0;
}

Expand Down

0 comments on commit a09c32b

Please sign in to comment.