cgroup: replace cftype->write_string() with cftype->write()

[linux-2.6-block.git] / net / core / netprio_cgroup.c

diff --git a/net/core/netprio_cgroup.c b/net/core/netprio_cgroup.c
index 3825f669147b429dc10efe2204c1b7523092c66c..b990cefd906b690419ad74014fee1bb0a7e72bc2 100644 (file)
--- a/net/core/netprio_cgroup.c
+++ b/net/core/netprio_cgroup.c
@@ -185,15 +185,15 @@ static int read_priomap(struct seq_file *sf, void *v)
        return 0;
 }
 
-static int write_priomap(struct cgroup_subsys_state *css, struct cftype *cft,
-                        char *buffer)
+static ssize_t write_priomap(struct kernfs_open_file *of,
+                            char *buf, size_t nbytes, loff_t off)
 {
        char devname[IFNAMSIZ + 1];
        struct net_device *dev;
        u32 prio;
        int ret;
 
-       if (sscanf(buffer, "%"__stringify(IFNAMSIZ)"s %u", devname, &prio) != 2)
+       if (sscanf(buf, "%"__stringify(IFNAMSIZ)"s %u", devname, &prio) != 2)
                return -EINVAL;
 
        dev = dev_get_by_name(&init_net, devname);
@@ -202,11 +202,11 @@ static int write_priomap(struct cgroup_subsys_state *css, struct cftype *cft,
 
        rtnl_lock();
 
-       ret = netprio_set_prio(css, dev, prio);
+       ret = netprio_set_prio(of_css(of), dev, prio);
 
        rtnl_unlock();
        dev_put(dev);
-       return ret;
+       return ret ?: nbytes;
 }
 
 static int update_netprio(const void *v, struct file *file, unsigned n)
@@ -239,7 +239,7 @@ static struct cftype ss_files[] = {
        {
                .name = "ifpriomap",
                .seq_show = read_priomap,
-               .write_string = write_priomap,
+               .write = write_priomap,
        },
        { }     /* terminate */
 };