diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 462fd182180..d84f42190af 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1505,9 +1505,8 @@ out:
 	return err;
 }
 
-static int lo_release(struct gendisk *disk, fmode_t mode)
+static int __lo_release(struct loop_device *lo)
 {
-	struct loop_device *lo = disk->private_data;
 	int err;
 
 	mutex_lock(&lo->lo_ctl_mutex);
@@ -1537,6 +1536,15 @@ out_unlocked:
 	return 0;
 }
 
+static int lo_release(struct gendisk *disk, fmode_t mode)
+{
+	int err;
+	mutex_lock(&loop_index_mutex);
+	err =__lo_release(disk->private_data);
+	mutex_unlock(&loop_index_mutex);
+	return err;
+}
+
 static const struct block_device_operations lo_fops = {
 	.owner =	THIS_MODULE,
 	.open =		lo_open,