Skip to content

Commit

Permalink
dm cache: return -EINVAL if the user specifies unknown cache policy
Browse files Browse the repository at this point in the history
Return -EINVAL when the specified cache policy is unknown rather than
returning -ENOMEM.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
  • Loading branch information
Mikulas Patocka authored and Mike Snitzer committed Nov 9, 2013
1 parent dd8b0c2 commit 4cb3e1d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions drivers/md/dm-cache-policy.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@ struct dm_cache_policy *dm_cache_policy_create(const char *name,
type = get_policy(name);
if (!type) {
DMWARN("unknown policy type");
return NULL;
return ERR_PTR(-EINVAL);
}

p = type->create(cache_size, origin_size, cache_block_size);
if (!p) {
put_policy(type);
return NULL;
return ERR_PTR(-ENOMEM);
}
p->private = type;

Expand Down
13 changes: 7 additions & 6 deletions drivers/md/dm-cache-target.c
Original file line number Diff line number Diff line change
Expand Up @@ -1879,14 +1879,15 @@ static int set_config_values(struct cache *cache, int argc, const char **argv)
static int create_cache_policy(struct cache *cache, struct cache_args *ca,
char **error)
{
cache->policy = dm_cache_policy_create(ca->policy_name,
cache->cache_size,
cache->origin_sectors,
cache->sectors_per_block);
if (!cache->policy) {
struct dm_cache_policy *p = dm_cache_policy_create(ca->policy_name,
cache->cache_size,
cache->origin_sectors,
cache->sectors_per_block);
if (IS_ERR(p)) {
*error = "Error creating cache's policy";
return -ENOMEM;
return PTR_ERR(p);
}
cache->policy = p;

return 0;
}
Expand Down

0 comments on commit 4cb3e1d

Please sign in to comment.