From 326eb17d73a6b424ed7c47c693ff53721618fc48 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 30 Sep 2014 15:36:28 +1000 Subject: [PATCH] md: remove unnecessary test for MD_MAJOR in md_ioctl() unknown ioctls no longer get this deep into md_ioctl since md_ioctl_valid() was introduced in 3.14. So remove the test and the misleading comment. Signed-off-by: NeilBrown --- drivers/md/md.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 9939122ca00c..90e1537d1b0a 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -6559,11 +6559,8 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode, /* * The remaining ioctls are changing the state of the * superblock, so we do not allow them on read-only arrays. - * However non-MD ioctls (e.g. get-size) will still come through - * here and hit the 'default' below, so only disallow - * 'md' ioctls, and switch to rw mode if started auto-readonly. */ - if (_IOC_TYPE(cmd) == MD_MAJOR && mddev->ro && mddev->pers) { + if (mddev->ro && mddev->pers) { if (mddev->ro == 2) { mddev->ro = 0; sysfs_notify_dirent_safe(mddev->sysfs_state);