diff --git a/[refs] b/[refs]
index d16bab3082c4..53b24fa8e20c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a91ee1f628ef6bfe3f13067c0ddf9db520cb86b
+refs/heads/master: b492b852cd8c99505708152c29a5e09a787af9de
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index 954456532acc..641b211fe3fe 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -5567,7 +5567,7 @@ static struct block_device_operations md_fops =
 	.owner		= THIS_MODULE,
 	.open		= md_open,
 	.release	= md_release,
-	.locked_ioctl	= md_ioctl,
+	.ioctl		= md_ioctl,
 	.getgeo		= md_getgeo,
 	.media_changed	= md_media_changed,
 	.revalidate_disk= md_revalidate,