Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-2.6-microblaze.git] / net / ceph / crush / mapper.c

diff --git a/net/ceph/crush/mapper.c b/net/ceph/crush/mapper.c
index 417df67..3f323ed 100644 (file)
--- a/net/ceph/crush/mapper.c
+++ b/net/ceph/crush/mapper.c
@@ -514,7 +514,7 @@ static int crush_choose_firstn(const struct crush_map *map,
                                                in, work->work[-1-in->id],
                                                x, r,
                                                (choose_args ?
-                                                &choose_args[-1-in->id] : 0),
+                                                &choose_args[-1-in->id] : NULL),
                                                outpos);
                                if (item >= map->max_devices) {
                                        dprintk("   bad item %d\n", item);
@@ -725,7 +725,7 @@ static void crush_choose_indep(const struct crush_map *map,
                                        in, work->work[-1-in->id],
                                        x, r,
                                        (choose_args ?
-                                        &choose_args[-1-in->id] : 0),
+                                        &choose_args[-1-in->id] : NULL),
                                        outpos);
                                if (item >= map->max_devices) {
                                        dprintk("   bad item %d\n", item);