kclient: initializing kaddr (merge fix)

diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c
index a2bd06b20c0d09ea661a96446fc043e1517313be..74dc92f161a3a6d403d85fc68f8addddf8e3974b 100644 (file)
--- a/src/kernel/messenger.c
+++ b/src/kernel/messenger.c
@@ -686,7 +686,7 @@ static int write_partial_msg_pages(struct ceph_connection *con,
 
        while (con->out_msg_pos.page < con->out_msg->nr_pages) {
                struct page *page = NULL;
-               void *kaddr;
+               void *kaddr = 0;
 
                mutex_lock(&msg->page_mutex);
                if (msg->pages) {

diff --git a/src/kernel/super.c b/src/kernel/super.c
index f06cfa0da609a3fa1169c8ce50dd349b1cdee04b..233d97659e3aa23e9b2bf7e2cfdfcf5df7cc7095 100644 (file)
--- a/src/kernel/super.c
+++ b/src/kernel/super.c
@@ -987,11 +987,14 @@ static int ceph_init_bdi(struct super_block *sb, struct ceph_client *client)
 
        err = bdi_init(&client->backing_dev_info);
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
        if (err < 0)
                return err;
 
-       return bdi_register_dev(&client->backing_dev_info, sb->s_dev);
+       err = bdi_register_dev(&client->backing_dev_info, sb->s_dev);
+#endif
 
+       return err;
 }
 
 static int ceph_get_sb(struct file_system_type *fs_type,
@@ -1059,7 +1062,9 @@ static void ceph_kill_sb(struct super_block *s)
        struct ceph_client *client = ceph_sb_to_client(s);
        dout(1, "kill_sb %p\n", s);
        ceph_mdsc_pre_umount(&client->mdsc);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
        bdi_unregister(&client->backing_dev_info);
+#endif
        kill_anon_super(s);    /* will call put_super after sb is r/o */
        bdi_destroy(&client->backing_dev_info);
        ceph_destroy_client(client);