5 files changed, 33 insertions, 33 deletions

diff --git a/block/bio.c b/block/bio.c
index 96d28eee8a1e..1ba33657160f 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1971,7 +1971,7 @@ int bio_associate_current(struct bio *bio)
         /* associate blkcg if exists */
         rcu_read_lock();
         css = task_css(current, blkio_cgrp_id);
-        if (css && css_tryget(css))
+        if (css && css_tryget_online(css))
                 bio->bi_css = css;
         rcu_read_unlock();
 
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 1039fb9ff5f5..9f5bce33e6fe 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -185,7 +185,7 @@ static struct blkcg_gq *blkg_create(struct blkcg *blkcg,
         lockdep_assert_held(q->queue_lock);
 
         /* blkg holds a reference to blkcg */
-        if (!css_tryget(&blkcg->css)) {
+        if (!css_tryget_online(&blkcg->css)) {
                 ret = -EINVAL;
                 goto err_free_blkg;
         }
diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
index 371fe8e92ab5..d692b29c083a 100644
--- a/block/blk-cgroup.h
+++ b/block/blk-cgroup.h
@@ -204,7 +204,7 @@ static inline struct blkcg *bio_blkcg(struct bio *bio)
  */
 static inline struct blkcg *blkcg_parent(struct blkcg *blkcg)
 {
-        return css_to_blkcg(css_parent(&blkcg->css));
+        return css_to_blkcg(blkcg->css.parent);
 }
 
 /**
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 9353b4683359..3fdb21a390c1 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -1346,10 +1346,10 @@ static int tg_print_conf_uint(struct seq_file *sf, void *v)
         return 0;
 }
 
-static int tg_set_conf(struct cgroup_subsys_state *css, struct cftype *cft,
-                       const char *buf, bool is_u64)
+static ssize_t tg_set_conf(struct kernfs_open_file *of,
+                           char *buf, size_t nbytes, loff_t off, bool is_u64)
 {
-        struct blkcg *blkcg = css_to_blkcg(css);
+        struct blkcg *blkcg = css_to_blkcg(of_css(of));
         struct blkg_conf_ctx ctx;
         struct throtl_grp *tg;
         struct throtl_service_queue *sq;
@@ -1368,9 +1368,9 @@ static int tg_set_conf(struct cgroup_subsys_state *css, struct cftype *cft,
                 ctx.v = -1;
 
         if (is_u64)
-                *(u64 *)((void *)tg + cft->private) = ctx.v;
+                *(u64 *)((void *)tg + of_cft(of)->private) = ctx.v;
         else
-                *(unsigned int *)((void *)tg + cft->private) = ctx.v;
+                *(unsigned int *)((void *)tg + of_cft(of)->private) = ctx.v;
 
         throtl_log(&tg->service_queue,
                    "limit change rbps=%llu wbps=%llu riops=%u wiops=%u",
@@ -1404,19 +1404,19 @@ static int tg_set_conf(struct cgroup_subsys_state *css, struct cftype *cft,
         }
 
         blkg_conf_finish(&ctx);
-        return 0;
+        return nbytes;
 }
 
-static int tg_set_conf_u64(struct cgroup_subsys_state *css, struct cftype *cft,
-                           char *buf)
+static ssize_t tg_set_conf_u64(struct kernfs_open_file *of,
+                               char *buf, size_t nbytes, loff_t off)
 {
-        return tg_set_conf(css, cft, buf, true);
+        return tg_set_conf(of, buf, nbytes, off, true);
 }
 
-static int tg_set_conf_uint(struct cgroup_subsys_state *css, struct cftype *cft,
-                            char *buf)
+static ssize_t tg_set_conf_uint(struct kernfs_open_file *of,
+                                char *buf, size_t nbytes, loff_t off)
 {
-        return tg_set_conf(css, cft, buf, false);
+        return tg_set_conf(of, buf, nbytes, off, false);
 }
 
 static struct cftype throtl_files[] = {
@@ -1424,25 +1424,25 @@ static struct cftype throtl_files[] = {
                 .name = "throttle.read_bps_device",
                 .private = offsetof(struct throtl_grp, bps[READ]),
                 .seq_show = tg_print_conf_u64,
-                .write_string = tg_set_conf_u64,
+                .write = tg_set_conf_u64,
         },
         {
                 .name = "throttle.write_bps_device",
                 .private = offsetof(struct throtl_grp, bps[WRITE]),
                 .seq_show = tg_print_conf_u64,
-                .write_string = tg_set_conf_u64,
+                .write = tg_set_conf_u64,
         },
         {
                 .name = "throttle.read_iops_device",
                 .private = offsetof(struct throtl_grp, iops[READ]),
                 .seq_show = tg_print_conf_uint,
-                .write_string = tg_set_conf_uint,
+                .write = tg_set_conf_uint,
         },
         {
                 .name = "throttle.write_iops_device",
                 .private = offsetof(struct throtl_grp, iops[WRITE]),
                 .seq_show = tg_print_conf_uint,
-                .write_string = tg_set_conf_uint,
+                .write = tg_set_conf_uint,
         },
         {
                 .name = "throttle.io_service_bytes",
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 22dffebc7c73..cadc37841744 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1670,11 +1670,11 @@ static int cfq_print_leaf_weight(struct seq_file *sf, void *v)
         return 0;
 }
 
-static int __cfqg_set_weight_device(struct cgroup_subsys_state *css,
-                                    struct cftype *cft, const char *buf,
-                                    bool is_leaf_weight)
+static ssize_t __cfqg_set_weight_device(struct kernfs_open_file *of,
+                                        char *buf, size_t nbytes, loff_t off,
+                                        bool is_leaf_weight)
 {
-        struct blkcg *blkcg = css_to_blkcg(css);
+        struct blkcg *blkcg = css_to_blkcg(of_css(of));
         struct blkg_conf_ctx ctx;
         struct cfq_group *cfqg;
         int ret;
@@ -1697,19 +1697,19 @@ static int __cfqg_set_weight_device(struct cgroup_subsys_state *css,
         }
 
         blkg_conf_finish(&ctx);
-        return ret;
+        return ret ?: nbytes;
 }
 
-static int cfqg_set_weight_device(struct cgroup_subsys_state *css,
-                                  struct cftype *cft, char *buf)
+static ssize_t cfqg_set_weight_device(struct kernfs_open_file *of,
+                                      char *buf, size_t nbytes, loff_t off)
 {
-        return __cfqg_set_weight_device(css, cft, buf, false);
+        return __cfqg_set_weight_device(of, buf, nbytes, off, false);
 }
 
-static int cfqg_set_leaf_weight_device(struct cgroup_subsys_state *css,
-                                       struct cftype *cft, char *buf)
+static ssize_t cfqg_set_leaf_weight_device(struct kernfs_open_file *of,
+                                           char *buf, size_t nbytes, loff_t off)
 {
-        return __cfqg_set_weight_device(css, cft, buf, true);
+        return __cfqg_set_weight_device(of, buf, nbytes, off, true);
 }
 
 static int __cfq_set_weight(struct cgroup_subsys_state *css, struct cftype *cft,
@@ -1837,7 +1837,7 @@ static struct cftype cfq_blkcg_files[] = {
                 .name = "weight_device",
                 .flags = CFTYPE_ONLY_ON_ROOT,
                 .seq_show = cfqg_print_leaf_weight_device,
-                .write_string = cfqg_set_leaf_weight_device,
+                .write = cfqg_set_leaf_weight_device,
         },
         {
                 .name = "weight",
@@ -1851,7 +1851,7 @@ static struct cftype cfq_blkcg_files[] = {
                 .name = "weight_device",
                 .flags = CFTYPE_NOT_ON_ROOT,
                 .seq_show = cfqg_print_weight_device,
-                .write_string = cfqg_set_weight_device,
+                .write = cfqg_set_weight_device,
         },
         {
                 .name = "weight",
@@ -1863,7 +1863,7 @@ static struct cftype cfq_blkcg_files[] = {
         {
                 .name = "leaf_weight_device",
                 .seq_show = cfqg_print_leaf_weight_device,
-                .write_string = cfqg_set_leaf_weight_device,
+                .write = cfqg_set_leaf_weight_device,
         },
         {
                 .name = "leaf_weight",