removed ifdef junk..

diff --git a/src/kernel/mds_client.c b/src/kernel/mds_client.c
index db130bc39dbabe6cc77eb6e68c80eadb4f2c55b0..c37dd9a6ca089d7157d61f6ff640a928ae3b43dc 100644 (file)
--- a/src/kernel/mds_client.c
+++ b/src/kernel/mds_client.c
@@ -1534,19 +1534,11 @@ void schedule_delayed(struct ceph_mds_client *mdsc)
        schedule_delayed_work(&mdsc->delayed_work, hz);
 }
 
-#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);
 
@@ -1578,11 +1570,7 @@ void ceph_mdsc_init(struct ceph_mds_client *mdsc, struct ceph_client *client)
        mdsc->last_requested_map = 0;
        init_completion(&mdsc->map_waiters);
        init_completion(&mdsc->session_close_waiters);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
        INIT_DELAYED_WORK(&mdsc->delayed_work, delayed_work);
-#else
-       INIT_WORK(&mdsc->delayed_work, delayed_work, mdsc);
-#endif
 }
 
 void ceph_mdsc_stop(struct ceph_mds_client *mdsc)
@@ -1614,12 +1602,7 @@ void ceph_mdsc_stop(struct ceph_mds_client *mdsc)
                spin_lock(&mdsc->lock);
        }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
        cancel_delayed_work_sync(&mdsc->delayed_work); /* cancel timer */
-#else
-       cancel_delayed_work(&mdsc->delayed_work); /* cancel timer */
-       flush_scheduled_work();
-#endif
        spin_unlock(&mdsc->lock);
 }