iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blkcg: simplify blkg_conf_prep()

Browse Source 
blkg_conf_prep() implements "MAJ:MIN VAL" parsing manually, which is
unnecessary.  Just use sscanf("%u:%u %llu").  This might not reject
some malformed input (extra input at the end) but we don't care.

Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Tejun Heo 2012-04-01 14:38:43 -07:00
parent 3a8b31d396
commit 726fa6945e
1 changed files with 10 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
block/blk-cgroup.c
View File

@ -987,57 +987,16 @@ static int blkg_conf_prep(struct blkio_cgroup *blkcg, const char *input,
{ {
struct gendisk *disk; struct gendisk *disk;
struct blkio_group *blkg; struct blkio_group *blkg;
char *buf, *s[4], *p, *major_s, *minor_s; unsigned int major, minor;
unsigned long major, minor; unsigned long long v;
int i = 0, ret = -EINVAL; int part, ret;
int part;
dev_t dev;
u64 temp;
buf = kstrdup(input, GFP_KERNEL); if (sscanf(input, "%u:%u %llu", &major, &minor, &v) != 3)
if (!buf) return -EINVAL;
return -ENOMEM;
memset(s, 0, sizeof(s)); disk = get_gendisk(MKDEV(major, minor), &part);
while ((p = strsep(&buf, " ")) != NULL) {
if (!*p)
continue;
s[i++] = p;
/* Prevent from inputing too many things */
if (i == 3)
break;
}
if (i != 2)
goto out;
p = strsep(&s[0], ":");
if (p != NULL)
major_s = p;
else
goto out;
minor_s = s[0];
if (!minor_s)
goto out;
if (strict_strtoul(major_s, 10, &major))
goto out;
if (strict_strtoul(minor_s, 10, &minor))
goto out;
dev = MKDEV(major, minor);
if (strict_strtoull(s[1], 10, &temp))
goto out;
disk = get_gendisk(dev, &part);
if (!disk || part) if (!disk || part)
goto out; return -EINVAL;
rcu_read_lock(); rcu_read_lock();
@ -1059,16 +1018,13 @@ static int blkg_conf_prep(struct blkio_cgroup *blkcg, const char *input,
msleep(10); msleep(10);
ret = restart_syscall(); ret = restart_syscall();
} }
goto out; return ret;
} }
ctx->disk = disk; ctx->disk = disk;
ctx->blkg = blkg; ctx->blkg = blkg;
ctx->v = temp; ctx->v = v;
ret = 0; return 0;
out:
kfree(buf);
return ret;
} }
/** /**