Merge branch 'unstable' of ssh://patience@ceph.newdream.net/home/sage/ceph.newdream...

Conflicts:

	src/kernel/mon_client.h

diff --cc src/kernel/mds_client.c
index a5fa855b45c5d81475353afb2dda550695fff5a8,a469254b966aae6bf9f0a29b52343b99f0443e49..7932a4ffa562daf03d5962d03df629320e9353f9
--- 1/src/kernel/mds_client.c
--- 2/src/kernel/mds_client.c
+++ b/src/kernel/mds_client.c
@@@ -1532,15 -1533,27 +1533,19 @@@ void schedule_delayed(struct ceph_mds_c
        /*
         * renew at 1/2 the advertised timeout period.
         */
-       unsigned hz = (HZ * mdsc->mdsmap->m_cap_bit_timeout) >> 1;
-       schedule_delayed_work(&mdsc->delayed_work, hz);
+       int delay = mdsc->mdsmap->m_cap_bit_timeout >> 1;
+       unsigned hz = HZ * delay;
+       int r;
+       dout(10, "schedule_delayed for %d seconds (%u hz)\n", delay, hz);
+       r = schedule_delayed_work(&mdsc->delayed_work, hz);
+       dout(10, "r = %d\n", r);
  }
  
 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
  void delayed_work(struct work_struct *work)
 -#else
 -void delayed_work(void *arg)
 -#endif
  {
        int i;
 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
        struct ceph_mds_client *mdsc =
                container_of(work, struct ceph_mds_client, delayed_work.work);
 -#else
 -      struct ceph_mds_client *mdsc = arg;
 -#endif
  
        dout(10, "delayed_work on %p\n", mdsc);
  

diff --cc src/kernel/mds_client.h
Simple merge

diff --cc src/kernel/mon_client.c
Simple merge

diff --cc src/kernel/mon_client.h
index 10fc2435736bc9bd5e5b25ee21e8bb66429a7da9,19274b1438c161846d003d60533902e1ffd4f203..81b242c4496a217e3c8a10674f65faf87c7491cd
--- 1/src/kernel/mon_client.h
--- 2/src/kernel/mon_client.h
+++ b/src/kernel/mon_client.h
@@@ -32,10 -32,7 +32,11 @@@ struct ceph_mon_client 
        u64 last_tid;
  
        u32 want_mdsmap;  /* protected by caller's lock */
 +      struct delayed_work delayed_work;  /* delayed work */
 +      unsigned long delay;
 +
 +      struct ceph_msg *msg;
+       u32 want_osdmap;  /* protected by caller's lock */
  };
  
  extern struct ceph_monmap *ceph_monmap_decode(void *p, void *end);