libceph: fix pg_temp updates
authorSage Weil <sage@inktank.com>
Mon, 21 May 2012 16:45:23 +0000 (09:45 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 26 Nov 2012 19:38:09 +0000 (11:38 -0800)
commit1c201dffa3f4ef8e53dca7bffb8987a43e3e9139
tree0956508a8ec07169a20c7714477a1ca211da9bb6
parent15ba38ebcee664a5a5de57300ee721e0d65b2dd5
libceph: fix pg_temp updates

(cherry picked from commit 6bd9adbdf9ca6a052b0b7455ac67b925eb38cfad)

Usually, we are adding pg_temp entries or removing them.  Occasionally they
update.  In that case, osdmap_apply_incremental() was failing because the
rbtree entry already exists.

Fix by removing the existing entry before inserting a new one.

Fixes http://tracker.newdream.net/issues/2446

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Alex Elder <elder@inktank.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ceph/osdmap.c