diff options
Diffstat (limited to 'block/blk-throttle.c')
-rw-r--r-- | block/blk-throttle.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 004964bb6fdd..bd6dbfe1e4e9 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c | |||
@@ -924,10 +924,9 @@ throtl_schedule_delayed_work(struct throtl_data *td, unsigned long delay) | |||
924 | } | 924 | } |
925 | } | 925 | } |
926 | 926 | ||
927 | static u64 tg_prfill_cpu_rwstat(struct seq_file *sf, | 927 | static u64 tg_prfill_cpu_rwstat(struct seq_file *sf, void *pdata, int off) |
928 | struct blkg_policy_data *pd, int off) | ||
929 | { | 928 | { |
930 | struct throtl_grp *tg = (void *)pd->pdata; | 929 | struct throtl_grp *tg = pdata; |
931 | struct blkg_rwstat rwstat = { }, tmp; | 930 | struct blkg_rwstat rwstat = { }, tmp; |
932 | int i, cpu; | 931 | int i, cpu; |
933 | 932 | ||
@@ -939,7 +938,7 @@ static u64 tg_prfill_cpu_rwstat(struct seq_file *sf, | |||
939 | rwstat.cnt[i] += tmp.cnt[i]; | 938 | rwstat.cnt[i] += tmp.cnt[i]; |
940 | } | 939 | } |
941 | 940 | ||
942 | return __blkg_prfill_rwstat(sf, pd, &rwstat); | 941 | return __blkg_prfill_rwstat(sf, pdata, &rwstat); |
943 | } | 942 | } |
944 | 943 | ||
945 | /* print per-cpu blkg_rwstat specified by BLKCG_STAT_PRIV() */ | 944 | /* print per-cpu blkg_rwstat specified by BLKCG_STAT_PRIV() */ |
@@ -954,24 +953,22 @@ static int tg_print_cpu_rwstat(struct cgroup *cgrp, struct cftype *cft, | |||
954 | return 0; | 953 | return 0; |
955 | } | 954 | } |
956 | 955 | ||
957 | static u64 tg_prfill_conf_u64(struct seq_file *sf, struct blkg_policy_data *pd, | 956 | static u64 tg_prfill_conf_u64(struct seq_file *sf, void *pdata, int off) |
958 | int off) | ||
959 | { | 957 | { |
960 | u64 v = *(u64 *)((void *)pd->pdata + off); | 958 | u64 v = *(u64 *)(pdata + off); |
961 | 959 | ||
962 | if (v == -1) | 960 | if (v == -1) |
963 | return 0; | 961 | return 0; |
964 | return __blkg_prfill_u64(sf, pd, v); | 962 | return __blkg_prfill_u64(sf, pdata, v); |
965 | } | 963 | } |
966 | 964 | ||
967 | static u64 tg_prfill_conf_uint(struct seq_file *sf, struct blkg_policy_data *pd, | 965 | static u64 tg_prfill_conf_uint(struct seq_file *sf, void *pdata, int off) |
968 | int off) | ||
969 | { | 966 | { |
970 | unsigned int v = *(unsigned int *)((void *)pd->pdata + off); | 967 | unsigned int v = *(unsigned int *)(pdata + off); |
971 | 968 | ||
972 | if (v == -1) | 969 | if (v == -1) |
973 | return 0; | 970 | return 0; |
974 | return __blkg_prfill_u64(sf, pd, v); | 971 | return __blkg_prfill_u64(sf, pdata, v); |
975 | } | 972 | } |
976 | 973 | ||
977 | static int tg_print_conf_u64(struct cgroup *cgrp, struct cftype *cft, | 974 | static int tg_print_conf_u64(struct cgroup *cgrp, struct cftype *cft, |