svn commit: r255565 - stable/9/sys/geom/raid

[Alexander Motin]

Author: mav
Date: Sat Sep 14 10:11:09 2013
New Revision: 255565
URL: http://svnweb.freebsd.org/changeset/base/255565

Log:
  MFC r254275:
  Return error when opening read-only volumes (like RAID4/5/...) for writing.
  Previously opens succeeded, but actual write operations returned errors.

Modified:
  stable/9/sys/geom/raid/g_raid.c
  stable/9/sys/geom/raid/g_raid.h
  stable/9/sys/geom/raid/tr_raid5.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/geom/raid/g_raid.c
==============================================================================
--- stable/9/sys/geom/raid/g_raid.c	Sat Sep 14 10:10:01 2013	(r255564)
+++ stable/9/sys/geom/raid/g_raid.c	Sat Sep 14 10:11:09 2013	(r255565)
@@ -1863,6 +1863,11 @@ g_raid_access(struct g_provider *pp, int
 		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;

Modified: stable/9/sys/geom/raid/g_raid.h
==============================================================================
--- stable/9/sys/geom/raid/g_raid.h	Sat Sep 14 10:10:01 2013	(r255564)
+++ stable/9/sys/geom/raid/g_raid.h	Sat Sep 14 10:11:09 2013	(r255565)
@@ -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. */
 };

Modified: stable/9/sys/geom/raid/tr_raid5.c
==============================================================================
--- stable/9/sys/geom/raid/tr_raid5.c	Sat Sep 14 10:10:01 2013	(r255564)
+++ stable/9/sys/geom/raid/tr_raid5.c	Sat Sep 14 10:11:09 2013	(r255565)
@@ -185,8 +185,9 @@ g_raid_tr_start_raid5(struct g_raid_tr_o
 	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);
 }