From nobody Fri Dec 19 21:47:35 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9A083291B81; Sun, 24 Mar 2024 23:50:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711324240; cv=none; b=QNUJYdt13jc5SxYV+SUapGz61ZYvO3ZPYkfrJl5sVGpU79i9orR186HFA0YbRN/Zycjz55jLxl9voXat7RBEwVlXuXBknKm4utaJLx3tXO0oz41+y2Q00370jOIE3bq1KhNw2QPDJZiMXOAfFWhj2uqRmEyLo5aoshJwkmiD0Tc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711324240; c=relaxed/simple; bh=so3jRYMGbySBRs2qMRh+Igr+9lA6q80jvIqCKMuk8bc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B05bocf2QJ9uO0fmMUM7mA7SqwbQTVbZ/n1p7bPEJHIgPT5vCwffJeL5iiKK4rZp0Z5A5RUqT0kjyMCIRMeCHHWeCXDehJEzzyszCcX6Rwnu+GmzfnAR48BfMNEzjBZpabHh7KeXcqkhKQxtRzBT+1yBd38XoN8dq6GPBOm7mUA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RaZQbhPr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RaZQbhPr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B9917C433F1; Sun, 24 Mar 2024 23:50:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711324239; bh=so3jRYMGbySBRs2qMRh+Igr+9lA6q80jvIqCKMuk8bc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RaZQbhPrCBWEYs7QSceJr3g8ReJAn6BahZ7BHRHfJtTzyi7Outae4SqGUnFHTO7eu 2g0GJyIAn1LGV32w2gronUOFF+I8qHQTM8viIu0JO28yQprM+89sVGpITu9+KP9UMU sSQrN7rkwZRxxjMzMBZxFIDLfiIhyyv0mHkDBs0UDag4ZxRdbN/z3MAYVEBVxeBJOe 9LY9qTci39RaQDZopYBzq0zdvGmsp8KsDkWSlMocCCkx/fzgbyQkucjESWWqz81cBn 8Bbx1PXDHLDx8blSNaF1CmgkB9dFvftepcV0j82YTgjXrLOiiGqY3peOHAtiC6Y1MR yF0YQMg8errUQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christoph Hellwig , Song Liu , Jens Axboe , Sasha Levin Subject: [PATCH 4.19 022/148] md: implement ->set_read_only to hook into BLKROSET processing Date: Sun, 24 Mar 2024 19:48:06 -0400 Message-ID: <20240324235012.1356413-23-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324235012.1356413-1-sashal@kernel.org> References: <20240324235012.1356413-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Christoph Hellwig [ Upstream commit 118cf084adb3964d06e1667cf7d702e56e5cd2c5 ] Implement the ->set_read_only method instead of parsing the actual ioctl command. Signed-off-by: Christoph Hellwig Acked-by: Song Liu Signed-off-by: Jens Axboe Stable-dep-of: 9674f54e41ff ("md: Don't clear MD_CLOSING when the raid is a= bout to stop") Signed-off-by: Sasha Levin --- drivers/md/md.c | 62 ++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index a137f8b4a0541..8123c44de7dc8 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -7172,7 +7172,6 @@ static inline bool md_ioctl_valid(unsigned int cmd) { switch (cmd) { case ADD_NEW_DISK: - case BLKROSET: case GET_ARRAY_INFO: case GET_BITMAP_FILE: case GET_DISK_INFO: @@ -7200,7 +7199,6 @@ static int md_ioctl(struct block_device *bdev, fmode_= t mode, int err =3D 0; void __user *argp =3D (void __user *)arg; struct mddev *mddev =3D NULL; - int ro; bool did_set_md_closing =3D false; =20 if (!md_ioctl_valid(cmd)) @@ -7391,35 +7389,6 @@ static int md_ioctl(struct block_device *bdev, fmode= _t mode, goto unlock; } break; - - case BLKROSET: - if (get_user(ro, (int __user *)(arg))) { - err =3D -EFAULT; - goto unlock; - } - err =3D -EINVAL; - - /* if the bdev is going readonly the value of mddev->ro - * does not matter, no writes are coming - */ - if (ro) - goto unlock; - - /* are we are already prepared for writes? */ - if (mddev->ro !=3D 1) - goto unlock; - - /* transitioning to readauto need only happen for - * arrays that call md_write_start - */ - if (mddev->pers) { - err =3D restart_array(mddev); - if (err =3D=3D 0) { - mddev->ro =3D 2; - set_disk_ro(mddev->gendisk, 0); - } - } - goto unlock; } =20 /* @@ -7513,6 +7482,36 @@ static int md_compat_ioctl(struct block_device *bdev= , fmode_t mode, } #endif /* CONFIG_COMPAT */ =20 +static int md_set_read_only(struct block_device *bdev, bool ro) +{ + struct mddev *mddev =3D bdev->bd_disk->private_data; + int err; + + err =3D mddev_lock(mddev); + if (err) + return err; + + if (!mddev->raid_disks && !mddev->external) { + err =3D -ENODEV; + goto out_unlock; + } + + /* + * Transitioning to read-auto need only happen for arrays that call + * md_write_start and which are not ready for writes yet. + */ + if (!ro && mddev->ro =3D=3D 1 && mddev->pers) { + err =3D restart_array(mddev); + if (err) + goto out_unlock; + mddev->ro =3D 2; + } + +out_unlock: + mddev_unlock(mddev); + return err; +} + static int md_open(struct block_device *bdev, fmode_t mode) { /* @@ -7588,6 +7587,7 @@ static const struct block_device_operations md_fops = =3D #endif .getgeo =3D md_getgeo, .check_events =3D md_check_events, + .set_read_only =3D md_set_read_only, }; =20 static int md_thread(void *arg) --=20 2.43.0