2 files changed, 11 insertions, 2 deletions

diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 32a9ab67a5f6..057ffed6eb7e 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -2318,6 +2318,11 @@ static inline void drbd_md_flush(struct drbd_conf *mdev)
 {
         int r;
 
+        if (mdev->ldev == NULL) {
+                dev_warn(DEV, "mdev->ldev == NULL in drbd_md_flush\n");
+                return;
+        }
+
         if (test_bit(MD_NO_FUA, &mdev->flags))
                 return;
 
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 0f73e157dee0..be4f58277124 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -3235,8 +3235,12 @@ static int w_go_diskless(struct drbd_work *w, int unused)
          * (Do we want a specific meta data flag for this?)
          *
          * If that does not make it to stable storage either,
-         * we cannot do anything about that anymore.  */
-        if (mdev->bitmap) {
+         * we cannot do anything about that anymore.
+         *
+         * We still need to check if both bitmap and ldev are present, we may
+         * end up here after a failed attach, before ldev was even assigned.
+         */
+        if (mdev->bitmap && mdev->ldev) {
                 if (drbd_bitmap_io_from_worker(mdev, drbd_bm_write,
                                         "detach", BM_LOCKED_MASK)) {
                         if (test_bit(WAS_READ_ERROR, &mdev->flags)) {