From: Jonathan Brassow Subject: [PATCH 13 of 17] dm-snap-possible-code-optimization.patch Date: Fri, 20 Feb 2009 17:28:35 -0600 Message-ID: <1235172515.24593.45.camel@hydrogen.msp.redhat.com> Reply-To: device-mapper development Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com To: dm-devel@redhat.com List-Id: dm-devel.ids Minor code clean-up. The reason I broke this out into a separate patch is so people can check if I'm not missing anything... I don't see a reason to check 's->valid' separately anymore. RFC-by: Jonathan Brassow Index: linux-2.6/drivers/md/dm-snap.c =================================================================== --- linux-2.6.orig/drivers/md/dm-snap.c +++ linux-2.6/drivers/md/dm-snap.c @@ -740,20 +740,14 @@ static void pending_complete(struct dm_s struct bio *snapshot_bios = NULL; int error = 0; + down_write(&s->lock); if (!success) { /* Read/write error - snapshot is unusable */ - down_write(&s->lock); __invalidate_snapshot(s, -EIO); error = 1; goto out; } - down_write(&s->lock); - if (!s->valid) { - error = 1; - goto out; - } - /* * Check for conflicting reads. This is extremely improbable, * so msleep(1) is sufficient and there is no need for a wait queue.