4 files changed, 17 insertions, 13 deletions

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index b9371f0b9532..ed6711e35323 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -371,11 +371,13 @@ static int rbd_get_client(struct rbd_device *rbd_dev, const char *mon_addr,
 
         rbd_opts->notify_timeout = RBD_NOTIFY_TIMEOUT_DEFAULT;
 
-        ret = ceph_parse_options(&opt, options, mon_addr,
+        opt = ceph_parse_options(options, mon_addr,
                                 mon_addr + strlen(mon_addr),
                                 parse_rbd_opts_token, rbd_opts);
-        if (ret < 0)
+        if (IS_ERR(opt)) {
+                ret = PTR_ERR(opt);
                 goto done_err;
+        }
 
         spin_lock(&node_lock);
         rbdc = __rbd_client_find(opt);
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index c3da3b32bdde..4fab1fdcfa6a 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -334,10 +334,12 @@ static int parse_mount_options(struct ceph_mount_options **pfsopt,
         *path += 2;
         dout("server path '%s'\n", *path);
 
-        err = ceph_parse_options(popt, options, dev_name, dev_name_end,
+        *popt = ceph_parse_options(options, dev_name, dev_name_end,
                                  parse_fsopt_token, (void *)fsopt);
-        if (err)
+        if (IS_ERR(*popt)) {
+                err = PTR_ERR(*popt);
                 goto out;
+        }
 
         /* success */
         *pfsopt = fsopt;
diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
index 95bd8502e715..92eef7c3d3c5 100644
--- a/include/linux/ceph/libceph.h
+++ b/include/linux/ceph/libceph.h
@@ -207,7 +207,7 @@ extern struct kmem_cache *ceph_cap_cachep;
 extern struct kmem_cache *ceph_dentry_cachep;
 extern struct kmem_cache *ceph_file_cachep;
 
-extern int ceph_parse_options(struct ceph_options **popt, char *options,
+extern struct ceph_options *ceph_parse_options(char *options,
                               const char *dev_name, const char *dev_name_end,
                               int (*parse_extra_token)(char *c, void *private),
                               void *private);
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index 761ad9d6cc3b..621c3221b393 100644
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -277,10 +277,11 @@ out:
         return err;
 }
 
-int ceph_parse_options(struct ceph_options **popt, char *options,
-                       const char *dev_name, const char *dev_name_end,
-                       int (*parse_extra_token)(char *c, void *private),
-                       void *private)
+struct ceph_options *
+ceph_parse_options(char *options, const char *dev_name,
+                        const char *dev_name_end,
+                        int (*parse_extra_token)(char *c, void *private),
+                        void *private)
 {
         struct ceph_options *opt;
         const char *c;
@@ -289,7 +290,7 @@ int ceph_parse_options(struct ceph_options **popt, char *options,
 
         opt = kzalloc(sizeof(*opt), GFP_KERNEL);
         if (!opt)
-                return err;
+                return ERR_PTR(-ENOMEM);
         opt->mon_addr = kcalloc(CEPH_MAX_MON, sizeof(*opt->mon_addr),
                                 GFP_KERNEL);
         if (!opt->mon_addr)
@@ -412,12 +413,11 @@ int ceph_parse_options(struct ceph_options **popt, char *options,
         }
 
         /* success */
-        *popt = opt;
-        return 0;
+        return opt;
 
 out:
         ceph_destroy_options(opt);
-        return err;
+        return ERR_PTR(err);
 }
 EXPORT_SYMBOL(ceph_parse_options);