Skip to contentSkip to conversation

device-mapper snapshot: metadata reading separation

PATCH In review Alasdair G Kergon 2 participants 2 messages Nov 18, 2005 – Nov 19, 2005 Device mapper

lore
Share & tools
lore

Alasdair G Kergon

author maintainer
#0 lore raw

PATCH 1/1 device-mapper snapshot: metadata reading separation

More snapshot metadata reading into separate function, to prepare for changing the place it gets called from.

drivers/md/dm-snap.c +15 -10
Index: linux-2.6.14/drivers/md/dm-snap.c
===================================================================
@@ -371,6 +371,20 @@ static inline ulong round_up(ulong n, ul
 	return (n + size) & ~size;
 }
 
+static void read_snapshot_metadata(struct dm_snapshot *s)
+{
+	if (s->have_metadata)
+		return;
+
+	if (s->store.read_metadata(&s->store)) {
+		down_write(&s->lock);
+		s->valid = 0;
+		up_write(&s->lock);
+	}
+
+	s->have_metadata = 1;
+}
+
 /*
  * Construct a snapshot mapping: <origin_dev> <COW-dev> <p/n> <chunk-size>
  */
@@ -848,16 +862,7 @@ static void snapshot_resume(struct dm_ta
 {
 	struct dm_snapshot *s = (struct dm_snapshot *) ti->private;
 
-	if (s->have_metadata)
-		return;
-
-	if (s->store.read_metadata(&s->store)) {
-		down_write(&s->lock);
-		s->valid = 0;
-		up_write(&s->lock);
-	}
-
-	s->have_metadata = 1;
+	read_snapshot_metadata(s);
 }
 
 static int snapshot_status(struct dm_target *ti, status_type_t type,
#1 lore raw
Quoted 15 lines · Alasdair G Kergon

+static void read_snapshot_metadata(struct dm_snapshot *s)
+{
+ if (s->have_metadata)
+ return;
+
+ if (s->store.read_metadata(&s->store)) {
+ down_write(&s->lock);
+ s->valid = 0;
+ up_write(&s->lock);
+ }
+
+ s->have_metadata = 1;
+}
+

I always get suspicious when I see a lock around a plain assignment. Sometimes it's legitimate, usually when some other user of the LHS expects its value to be stable across an entire locked region - it is read multiple times and those reads are expected to return the same thing. (I can't think of any other case).

Maybe this is such a case?