Cleanups by comments from Bart Van Assche.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

4 files changed, 7 insertions, 37 deletions

diff --git a/drivers/block/drbd/drbd_buildtag.c b/drivers/block/drbd/drbd_buildtag.c
index 278f88474ece..395c3841261e 100644
--- a/drivers/block/drbd/drbd_buildtag.c
+++ b/drivers/block/drbd/drbd_buildtag.c
@@ -2,6 +2,6 @@
 #include <linux/drbd_config.h>
 const char *drbd_buildtag(void)
 {
-	return "GIT-hash: bbadddd7bad33396ebb8c0c12da9aab594d00c4e drbd/Makefile-2.6"
-		" build by phil@fat-tyre, 2009-04-01 10:29:21";
+	return "GIT-hash: eb9569104c13fe9d08fc47fdbe171a2fd9d36bd3 drbd/drbd_nl.c drbd/drbd_wrappers.h drbd/lru_cache.h"
+		" build by phil@fat-tyre, 2009-04-14 15:18:35";
 }
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index eddfcae9052d..2ae42baf24f4 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -394,7 +394,7 @@ int drbd_set_role(struct drbd_conf *mdev, enum drbd_role new_role, int force)
 
 	drbd_md_sync(mdev);
 
-	drbd_kobject_uevent(mdev);
+	kobject_uevent(&disk_to_dev(mdev->vdisk)->kobj, KOBJ_CHANGE);
  fail:
 	mutex_unlock(&mdev->state_mutex);
 	return r;
@@ -1154,7 +1154,7 @@ STATIC int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp
 	drbd_md_mark_dirty(mdev);
 	drbd_md_sync(mdev);
 
-	drbd_kobject_uevent(mdev);
+	kobject_uevent(&disk_to_dev(mdev->vdisk)->kobj, KOBJ_CHANGE);
 	dec_local(mdev);
 	reply->ret_code = retcode;
 	return 0;
@@ -1440,7 +1440,7 @@ STATIC int drbd_nl_net_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
 	if (retcode >= SS_Success)
 		drbd_thread_start(&mdev->worker);
 
-	drbd_kobject_uevent(mdev);
+	kobject_uevent(&disk_to_dev(mdev->vdisk)->kobj, KOBJ_CHANGE);
 	reply->ret_code = retcode;
 	return 0;
 
@@ -1733,7 +1733,7 @@ STATIC int drbd_nl_syncer_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *n
 		mdev->worker.reset_cpu_mask = 1;
 	}
 
-	drbd_kobject_uevent(mdev);
+	kobject_uevent(&disk_to_dev(mdev->vdisk)->kobj, KOBJ_CHANGE);
 fail:
 	crypto_free_hash(csums_tfm);
 	crypto_free_hash(verify_tfm);
diff --git a/drivers/block/drbd/drbd_wrappers.h b/drivers/block/drbd/drbd_wrappers.h
index 49ff68d11e8c..3ebacbc7a39f 100644
--- a/drivers/block/drbd/drbd_wrappers.h
+++ b/drivers/block/drbd/drbd_wrappers.h
@@ -40,36 +40,6 @@ extern void drbd_endio_read_sec(struct bio *bio, int error);
 extern void drbd_endio_write_sec(struct bio *bio, int error);
 extern void drbd_endio_pri(struct bio *bio, int error);
 
-/* how to get to the kobj of a gendisk.
- * see also upstream commits
- * edfaa7c36574f1bf09c65ad602412db9da5f96bf
- * ed9e1982347b36573cd622ee5f4e2a7ccd79b3fd
- * 548b10eb2959c96cef6fc29fc96e0931eeb53bc5
- */
-#ifndef dev_to_disk
-# define disk_to_kobj(disk) (&(disk)->kobj)
-#else
-# ifndef disk_to_dev
-#  define disk_to_dev(disk) (&(disk)->dev)
-# endif
-# define disk_to_kobj(disk) (&disk_to_dev(disk)->kobj)
-#endif
-static inline void drbd_kobject_uevent(struct drbd_conf *mdev)
-{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-	kobject_uevent(disk_to_kobj(mdev->vdisk), KOBJ_CHANGE, NULL);
-#else
-	kobject_uevent(disk_to_kobj(mdev->vdisk), KOBJ_CHANGE);
-	/* rhel4 / sles9 and older don't have this at all,
-	 * which means user space (udev) won't get events about possible changes of
-	 * corresponding resource + disk names after the initial drbd minor creation.
-	 */
-#endif
-#endif
-}
-
-
 /*
  * used to submit our private bio
  */
diff --git a/drivers/block/drbd/lru_cache.h b/drivers/block/drbd/lru_cache.h
index 6c095df24c04..eabf897948d0 100644
--- a/drivers/block/drbd/lru_cache.h
+++ b/drivers/block/drbd/lru_cache.h
@@ -1,5 +1,5 @@
 /*
-   lru_cache.c
+   lru_cache.h
 
    This file is part of DRBD by Philipp Reisner and Lars Ellenberg.