From 1e035a19ead502fbf35b2f4aa00123104b9be935 Mon Sep 17 00:00:00 2001 From: mav Date: Sat, 14 Sep 2013 10:11:09 +0000 Subject: [PATCH] MFC r254275: Return error when opening read-only volumes (like RAID4/5/...) for writing. Previously opens succeeded, but actual write operations returned errors. git-svn-id: svn://svn.freebsd.org/base/stable/9@255565 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/geom/raid/g_raid.c | 5 +++++ sys/geom/raid/g_raid.h | 1 + sys/geom/raid/tr_raid5.c | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/geom/raid/g_raid.c b/sys/geom/raid/g_raid.c index fd6d69c7a..41a1f9668 100644 --- a/sys/geom/raid/g_raid.c +++ b/sys/geom/raid/g_raid.c @@ -1863,6 +1863,11 @@ g_raid_access(struct g_provider *pp, int acr, int acw, int ace) error = ENXIO; goto out; } + /* Deny write opens for read-only volumes. */ + if (vol->v_read_only && acw > 0) { + error = EROFS; + goto out; + } if (dcw == 0) g_raid_clean(vol, dcw); vol->v_provider_open += acr + acw + ace; diff --git a/sys/geom/raid/g_raid.h b/sys/geom/raid/g_raid.h index 183edff67..993b1000b 100644 --- a/sys/geom/raid/g_raid.h +++ b/sys/geom/raid/g_raid.h @@ -306,6 +306,7 @@ struct g_raid_volume { int v_stopping; /* Volume is stopping */ int v_provider_open; /* Number of opens. */ int v_global_id; /* Global volume ID (rX). */ + int v_read_only; /* Volume is read-only. */ TAILQ_ENTRY(g_raid_volume) v_next; /* List of volumes entry. */ LIST_ENTRY(g_raid_volume) v_global_next; /* Global list entry. */ }; diff --git a/sys/geom/raid/tr_raid5.c b/sys/geom/raid/tr_raid5.c index 989343be3..6e54d168c 100644 --- a/sys/geom/raid/tr_raid5.c +++ b/sys/geom/raid/tr_raid5.c @@ -185,8 +185,9 @@ g_raid_tr_start_raid5(struct g_raid_tr_object *tr) struct g_raid_volume *vol; trs = (struct g_raid_tr_raid5_object *)tr; - vol = tr->tro_volume; trs->trso_starting = 0; + vol = tr->tro_volume; + vol->v_read_only = 1; g_raid_tr_update_state_raid5(vol, NULL); return (0); } -- 2.45.0