rbd: make ceph_parse_options() return a pointer

ceph_parse_options() takes the address of a pointer as an argument
and uses it to return the address of an allocated structure if
successful.  With this interface is not evident at call sites that
the pointer is always initialized.  Change the interface to return
the address instead (or a pointer-coded error code) to make the
validity of the returned pointer obvious.

Signed-off-by: Alex Elder <elder@dreamhost.com>
Signed-off-by: Sage Weil <sage@newdream.net>

1 files changed, 4 insertions, 2 deletions

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;