mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 00:20:32 +00:00
Code Issues Releases Wiki Activity

rbd: pass and populate rbd_options structure

Browse source 
Have the caller pass the address of an rbd_options structure to
rbd_add_parse_args(), to be initialized with the information
gleaned as a result of the parse.

I know, this is another near-reversal of a recent change...

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Alex Elder 2012-10-25 23:34:41 -05:00
parent 819d52bf72
commit 4e9afeba7a
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/block/rbd.c
View file

@ -2842,15 +2842,16 @@ static inline char *dup_token(const char **buf, size_t *lenp)
* Note: rbd_dev is assumed to have been initially zero-filled. * Note: rbd_dev is assumed to have been initially zero-filled.
*/ */
static struct ceph_options *rbd_add_parse_args(struct rbd_device *rbd_dev, static struct ceph_options *rbd_add_parse_args(struct rbd_device *rbd_dev,
const char *buf) const char *buf,
struct rbd_options **opts)
{ {
size_t len; size_t len;
const char *mon_addrs; const char *mon_addrs;
size_t mon_addrs_size; size_t mon_addrs_size;
char *options; char *options;
struct ceph_options *err_ptr = ERR_PTR(-EINVAL); struct ceph_options *err_ptr = ERR_PTR(-EINVAL);
struct rbd_options rbd_opts;
struct ceph_options *ceph_opts; struct ceph_options *ceph_opts;
struct rbd_options *rbd_opts = NULL;
/* The first four tokens are required */ /* The first four tokens are required */
@ -2899,17 +2900,17 @@ static struct ceph_options *rbd_add_parse_args(struct rbd_device *rbd_dev,
/* Initialize all rbd options to the defaults */ /* Initialize all rbd options to the defaults */
rbd_opts.read_only = RBD_READ_ONLY_DEFAULT; rbd_opts = kzalloc(sizeof (*rbd_opts), GFP_KERNEL);
if (!rbd_opts)
goto out_mem;
rbd_opts->read_only = RBD_READ_ONLY_DEFAULT;
ceph_opts = ceph_parse_options(options, mon_addrs, ceph_opts = ceph_parse_options(options, mon_addrs,
mon_addrs + mon_addrs_size - 1, mon_addrs + mon_addrs_size - 1,
parse_rbd_opts_token, &rbd_opts); parse_rbd_opts_token, rbd_opts);
kfree(options); kfree(options);
*opts = rbd_opts;
/* Record the parsed rbd options */
if (!IS_ERR(ceph_opts))
rbd_dev->mapping.read_only = rbd_opts.read_only;
return ceph_opts; return ceph_opts;
out_mem: out_mem:
@ -3131,6 +3132,7 @@ static ssize_t rbd_add(struct bus_type *bus,
{ {
struct rbd_device *rbd_dev = NULL; struct rbd_device *rbd_dev = NULL;
struct ceph_options *ceph_opts; struct ceph_options *ceph_opts;
struct rbd_options *rbd_opts = NULL;
struct ceph_osd_client *osdc; struct ceph_osd_client *osdc;
int rc = -ENOMEM; int rc = -ENOMEM;
@ -3139,7 +3141,7 @@ static ssize_t rbd_add(struct bus_type *bus,
rbd_dev = kzalloc(sizeof(*rbd_dev), GFP_KERNEL); rbd_dev = kzalloc(sizeof(*rbd_dev), GFP_KERNEL);
if (!rbd_dev) if (!rbd_dev)
goto err_out_mem; return -ENOMEM;
/* static rbd_device initialization */ /* static rbd_device initialization */
spin_lock_init(&rbd_dev->lock); spin_lock_init(&rbd_dev->lock);
@ -3148,11 +3150,12 @@ static ssize_t rbd_add(struct bus_type *bus,
init_rwsem(&rbd_dev->header_rwsem); init_rwsem(&rbd_dev->header_rwsem);
/* parse add command */ /* parse add command */
ceph_opts = rbd_add_parse_args(rbd_dev, buf); ceph_opts = rbd_add_parse_args(rbd_dev, buf, &rbd_opts);
if (IS_ERR(ceph_opts)) { if (IS_ERR(ceph_opts)) {
rc = PTR_ERR(ceph_opts); rc = PTR_ERR(ceph_opts);
goto err_out_mem; goto err_out_mem;
} }
rbd_dev->mapping.read_only = rbd_opts->read_only;
rc = rbd_get_client(rbd_dev, ceph_opts); rc = rbd_get_client(rbd_dev, ceph_opts);
if (rc < 0) if (rc < 0)
@ -3219,6 +3222,8 @@ static ssize_t rbd_add(struct bus_type *bus,
if (rc) if (rc)
goto err_out_bus; goto err_out_bus;
kfree(rbd_opts);
/* Everything's ready. Announce the disk to the world. */ /* Everything's ready. Announce the disk to the world. */
add_disk(rbd_dev->disk); add_disk(rbd_dev->disk);
@ -3232,6 +3237,8 @@ static ssize_t rbd_add(struct bus_type *bus,
/* this will also clean up rest of rbd_dev stuff */ /* this will also clean up rest of rbd_dev stuff */
rbd_bus_del_dev(rbd_dev); rbd_bus_del_dev(rbd_dev);
kfree(rbd_opts);
return rc; return rc;
err_out_disk: err_out_disk:
@ -3254,6 +3261,7 @@ static ssize_t rbd_add(struct bus_type *bus,
kfree(rbd_dev->snap_name); kfree(rbd_dev->snap_name);
kfree(rbd_dev->image_name); kfree(rbd_dev->image_name);
kfree(rbd_dev->pool_name); kfree(rbd_dev->pool_name);
kfree(rbd_opts);
err_out_mem: err_out_mem:
kfree(rbd_dev); kfree(rbd_dev);