3 files changed, 1 insertions, 20 deletions

diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 72b500176083..e306a22a60f1 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -1468,7 +1468,6 @@ static inline void drbd_generic_make_request(struct drbd_device *device,
                 printk(KERN_ERR "drbd%d: drbd_generic_make_request: "
                                 "bio->bi_bdev == NULL\n",
                        device_to_minor(device));
-                dump_stack();
                 bio_endio(bio, -ENODEV);
                 return;
         }
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 68ec774d52ea..7c060243ae46 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2125,20 +2125,6 @@ Enomem:
         return -ENOMEM;
 }
 
-static int drbd_notify_sys(struct notifier_block *this, unsigned long code,
-        void *unused)
-{
-        /* just so we have it.  you never know what interesting things we
-         * might want to do here some day...
-         */
-
-        return NOTIFY_DONE;
-}
-
-static struct notifier_block drbd_notifier = {
-        .notifier_call = drbd_notify_sys,
-};
-
 static void drbd_release_all_peer_reqs(struct drbd_device *device)
 {
         int rr;
@@ -2314,8 +2300,6 @@ static void drbd_cleanup(void)
         struct drbd_device *device;
         struct drbd_resource *resource, *tmp;
 
-        unregister_reboot_notifier(&drbd_notifier);
-
         /* first remove proc,
          * drbdsetup uses it's presence to detect
          * whether DRBD is loaded.
@@ -2899,8 +2883,6 @@ static int __init drbd_init(void)
                 return err;
         }
 
-        register_reboot_notifier(&drbd_notifier);
-
         /*
          * allocate all necessary structs
          */
diff --git a/drivers/block/drbd/drbd_proc.c b/drivers/block/drbd/drbd_proc.c
index 46bb8dd7890d..886f6bef70dc 100644
--- a/drivers/block/drbd/drbd_proc.c
+++ b/drivers/block/drbd/drbd_proc.c
@@ -299,7 +299,7 @@ static int drbd_proc_open(struct inode *inode, struct file *file)
         int err;
 
         if (try_module_get(THIS_MODULE)) {
-                err = single_open(file, drbd_seq_show, PDE_DATA(inode));
+                err = single_open(file, drbd_seq_show, NULL);
                 if (err)
                         module_put(THIS_MODULE);
                 return err;