crush: return CRUSH_ITEM_UNDEF for failed placements with indep

For firstn mode, if we fail to make a valid placement choice, we just
continue and return a short result to the caller.  For indep mode, however,
we need to make the position stable, and return an undefined value on
failed placements to avoid shifting later results to the left.

Reflects ceph.git commit b1d4dd4eb044875874a1d01c01c7d766db5d0a80.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/net/ceph/crush/mapper.c b/net/ceph/crush/mapper.c
index dcf48bc504ea..a8605245d190 100644
--- a/net/ceph/crush/mapper.c
+++ b/net/ceph/crush/mapper.c
@@ -455,8 +455,12 @@ reject:
                 } while (retry_descent);
 
                 if (skip_rep) {
-                        dprintk("skip rep\n");
-                        continue;
+                        if (firstn) {
+                                dprintk("skip rep\n");
+                                continue;
+                        }
+                        dprintk("undef rep, continuing\n");
+                        item = CRUSH_ITEM_UNDEF;
                 }
 
                 dprintk("CHOOSE got %d\n", item);