OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

zpool: remove redundant zpool->type string, const-ify zpool_get_type 

Make the return type of zpool_get_type const; the string belongs to the
zpool driver and should not be modified.  Remove the redundant type field
in the struct zpool; it is private to zpool.c and isn't needed since
->driver->type can be used directly.  Add comments indicating strings must
be null-terminated.

Signed-off-by: Dan Streetman <ddstreet@ieee.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Seth Jennings <sjennings@variantweb.net>
Cc: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Dan Streetman 2015-11-06 16:29:18 -08:00 committed by Linus Torvalds
parent c99b42c352
commit 69e18f4dbe
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/zpool.h
View File

@ -41,7 +41,7 @@ bool zpool_has_pool(char *type);
struct zpool *zpool_create_pool(char *type, char *name, struct zpool *zpool_create_pool(char *type, char *name,
gfp_t gfp, const struct zpool_ops *ops); gfp_t gfp, const struct zpool_ops *ops);
char *zpool_get_type(struct zpool *pool); const char *zpool_get_type(struct zpool *pool);
void zpool_destroy_pool(struct zpool *pool); void zpool_destroy_pool(struct zpool *pool);

14
mm/zpool.c
View File

@ -18,8 +18,6 @@
#include <linux/zpool.h> #include <linux/zpool.h>
struct zpool { struct zpool {
char *type;
struct zpool_driver *driver; struct zpool_driver *driver;
void *pool; void *pool;
const struct zpool_ops *ops; const struct zpool_ops *ops;
@ -73,6 +71,7 @@ int zpool_unregister_driver(struct zpool_driver *driver)
} }
EXPORT_SYMBOL(zpool_unregister_driver); EXPORT_SYMBOL(zpool_unregister_driver);
/* this assumes @type is null-terminated. */
static struct zpool_driver *zpool_get_driver(char *type) static struct zpool_driver *zpool_get_driver(char *type)
{ {
struct zpool_driver *driver; struct zpool_driver *driver;
@ -113,6 +112,8 @@ static void zpool_put_driver(struct zpool_driver *driver)
* not be loaded, and calling @zpool_create_pool() with the pool type will * not be loaded, and calling @zpool_create_pool() with the pool type will
* fail. * fail.
* *
* The @type string must be null-terminated.
*
* Returns: true if @type pool is available, false if not * Returns: true if @type pool is available, false if not
*/ */
bool zpool_has_pool(char *type) bool zpool_has_pool(char *type)
@ -145,6 +146,8 @@ EXPORT_SYMBOL(zpool_has_pool);
* *
* Implementations must guarantee this to be thread-safe. * Implementations must guarantee this to be thread-safe.
* *
* The @type and @name strings must be null-terminated.
*
* Returns: New zpool on success, NULL on failure. * Returns: New zpool on success, NULL on failure.
*/ */
struct zpool *zpool_create_pool(char *type, char *name, gfp_t gfp, struct zpool *zpool_create_pool(char *type, char *name, gfp_t gfp,
@ -174,7 +177,6 @@ struct zpool *zpool_create_pool(char *type, char *name, gfp_t gfp,
return NULL; return NULL;
} }
zpool->type = driver->type;
zpool->driver = driver; zpool->driver = driver;
zpool->pool = driver->create(name, gfp, ops, zpool); zpool->pool = driver->create(name, gfp, ops, zpool);
zpool->ops = ops; zpool->ops = ops;
@ -208,7 +210,7 @@ struct zpool *zpool_create_pool(char *type, char *name, gfp_t gfp,
*/ */
void zpool_destroy_pool(struct zpool *zpool) void zpool_destroy_pool(struct zpool *zpool)
{ {
pr_debug("destroying pool type %s\n", zpool->type); pr_debug("destroying pool type %s\n", zpool->driver->type);
spin_lock(&pools_lock); spin_lock(&pools_lock);
list_del(&zpool->list); list_del(&zpool->list);
@ -228,9 +230,9 @@ void zpool_destroy_pool(struct zpool *zpool)
* *
* Returns: The type of zpool. * Returns: The type of zpool.
*/ */
char *zpool_get_type(struct zpool *zpool) const char *zpool_get_type(struct zpool *zpool)
{ {
return zpool->type; return zpool->driver->type;
} }
/** /**