← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to net/ceph/osdmap.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/ceph/osdmap.c
765
765
        }
766
766
 
767
767
        map->epoch++;
768
 
        map->modified = map->modified;
 
768
        map->modified = modified;
769
769
        if (newcrush) {
770
770
                if (map->crush)
771
771
                        crush_destroy(map->crush);
830
830
                map->osd_addr[osd] = addr;
831
831
        }
832
832
 
833
 
        /* new_down */
 
833
        /* new_state */
834
834
        ceph_decode_32_safe(p, end, len, bad);
835
835
        while (len--) {
836
836
                u32 osd;
 
837
                u8 xorstate;
837
838
                ceph_decode_32_safe(p, end, osd, bad);
 
839
                xorstate = **(u8 **)p;
838
840
                (*p)++;  /* clean flag */
839
 
                pr_info("osd%d down\n", osd);
 
841
                if (xorstate == 0)
 
842
                        xorstate = CEPH_OSD_UP;
 
843
                if (xorstate & CEPH_OSD_UP)
 
844
                        pr_info("osd%d down\n", osd);
840
845
                if (osd < map->max_osd)
841
 
                        map->osd_state[osd] &= ~CEPH_OSD_UP;
 
846
                        map->osd_state[osd] ^= xorstate;
842
847
        }
843
848
 
844
849
        /* new_weight */