lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

md: allow integers to be passed to md/level

Browse Source 
e.g. allow md to interpret 'echo 4 > md/level' as a request for raid4.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams
2010-05-02 10:04:16 -07:00
committed by NeilBrown
parent bb7f8d2217
commit f2859af671
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/md/md.c
View File

@@ -2934,9 +2934,10 @@ level_show(mddev_t *mddev, char *page)
static ssize_t static ssize_t
level_store(mddev_t *mddev, const char *buf, size_t len) level_store(mddev_t *mddev, const char *buf, size_t len)
{ {
char level[16]; char clevel[16];
ssize_t rv = len; ssize_t rv = len;
struct mdk_personality *pers; struct mdk_personality *pers;
long level;
void *priv; void *priv;
mdk_rdev_t *rdev; mdk_rdev_t *rdev;
@@ -2969,19 +2970,22 @@ level_store(mddev_t *mddev, const char *buf, size_t len)
} }
/* Now find the new personality */ /* Now find the new personality */
if (len == 0 || len >= sizeof(level)) if (len == 0 || len >= sizeof(clevel))
return -EINVAL; return -EINVAL;
strncpy(level, buf, len); strncpy(clevel, buf, len);
if (level[len-1] == '\n') if (clevel[len-1] == '\n')
len--; len--;
level[len] = 0; clevel[len] = 0;
if (strict_strtol(clevel, 10, &level))
level = LEVEL_NONE;
request_module("md-%s", level); if (request_module("md-%s", clevel) != 0)
request_module("md-level-%s", clevel);
spin_lock(&pers_lock); spin_lock(&pers_lock);
pers = find_pers(LEVEL_NONE, level); pers = find_pers(level, clevel);
if (!pers || !try_module_get(pers->owner)) { if (!pers || !try_module_get(pers->owner)) {
spin_unlock(&pers_lock); spin_unlock(&pers_lock);
printk(KERN_WARNING "md: personality %s not loaded\n", level); printk(KERN_WARNING "md: personality %s not loaded\n", clevel);
return -EINVAL; return -EINVAL;
} }
spin_unlock(&pers_lock); spin_unlock(&pers_lock);
@@ -2994,7 +2998,7 @@ level_store(mddev_t *mddev, const char *buf, size_t len)
if (!pers->takeover) { if (!pers->takeover) {
module_put(pers->owner); module_put(pers->owner);
printk(KERN_WARNING "md: %s: %s does not support personality takeover\n", printk(KERN_WARNING "md: %s: %s does not support personality takeover\n",
mdname(mddev), level); mdname(mddev), clevel);
return -EINVAL; return -EINVAL;
} }
@@ -3010,7 +3014,7 @@ level_store(mddev_t *mddev, const char *buf, size_t len)
mddev->delta_disks = 0; mddev->delta_disks = 0;
module_put(pers->owner); module_put(pers->owner);
printk(KERN_WARNING "md: %s: %s would not accept array\n", printk(KERN_WARNING "md: %s: %s would not accept array\n",
mdname(mddev), level); mdname(mddev), clevel);
return PTR_ERR(priv); return PTR_ERR(priv);
} }