]> Pileus Git - ~andy/linux/commit
rbd: don't destroy ceph_opts in rbd_add()
authorAlex Elder <elder@inktank.com>
Thu, 16 May 2013 20:04:20 +0000 (15:04 -0500)
committerAlex Elder <elder@inktank.com>
Fri, 17 May 2013 17:50:03 +0000 (12:50 -0500)
commit7262cfca430a1a0e0707149af29ae86bc0ded230
tree30b8e36ffebad551fd4e4392ca9f49fd22d2298c
parent39be95e9c8c0b5668c9f8806ffe29bf9f4bc0f40
rbd: don't destroy ceph_opts in rbd_add()

Whether rbd_client_create() successfully creates a new client or
not, it takes responsibility for getting the ceph_opts structure
it's passed destroyed.  If successful, the structure becomes
associated with the created client; if not, rbd_client_create()
will destroy it.

Previously, rbd_get_client() would call ceph_destroy_options()
if rbd_get_client() failed, and that meant it got called twice.
That led freeing various pointers more than once, which is never a
good idea.

This resolves:
    http://tracker.ceph.com/issues/4559

Cc: stable@vger.kernel.org # 3.8+
Reported-by: Dan van der Ster <dan@vanderster.com>
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
drivers/block/rbd.c