From patchwork Fri Dec  4 21:40:08 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Mike Snitzer <snitzer@redhat.com>
X-Patchwork-Id: 64973
X-Patchwork-Delegate: agk@redhat.com
Received: from hormel.redhat.com (hormel1.redhat.com [209.132.177.33])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nB4LeSYf020772
	for <patchwork-dm-devel@patchwork.kernel.org>;
	Fri, 4 Dec 2009 21:40:28 GMT
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com
	[10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP id 18672619AD1;
	Fri,  4 Dec 2009 16:40:10 -0500 (EST)
Received: from int-mx05.intmail.prod.int.phx2.redhat.com
	(nat-pool.util.phx.redhat.com [10.8.5.200])
	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
	nB4Le8IJ006433 for <dm-devel@listman.util.phx.redhat.com>;
	Fri, 4 Dec 2009 16:40:09 -0500
Received: from localhost (dhcp-100-19-150.bos.redhat.com [10.16.19.150])
	by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id nB4Le8uQ002999
	for <dm-devel@redhat.com>; Fri, 4 Dec 2009 16:40:08 -0500
From: Mike Snitzer <snitzer@redhat.com>
To: dm-devel@redhat.com
Date: Fri,  4 Dec 2009 16:40:08 -0500
Message-Id: <1259962808-13939-1-git-send-email-snitzer@redhat.com>
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18
X-loop: dm-devel@redhat.com
Subject: [dm-devel] [PATCH] dm snapshot: introduce common
	__check_for_conflicting_io
X-BeenThere: dm-devel@redhat.com
X-Mailman-Version: 2.1.5
Precedence: junk
Reply-To: device-mapper development <dm-devel@redhat.com>
List-Id: device-mapper development <dm-devel.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/listinfo/dm-devel>,
	<mailto:dm-devel-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/dm-devel>
List-Post: <mailto:dm-devel@redhat.com>
List-Help: <mailto:dm-devel-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/dm-devel>,
	<mailto:dm-devel-request@redhat.com?subject=subscribe>
Sender: dm-devel-bounces@redhat.com
Errors-To: dm-devel-bounces@redhat.com


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
@@ -236,6 +236,16 @@ static int __chunk_is_tracked(struct dm_
 }
 
 /*
+ * This conflicting I/O is extremely improbable in the caller,
+ * so msleep(1) is sufficient and there is no need for a wait queue.
+ */
+static void __check_for_conflicting_io(struct dm_snapshot *s, chunk_t chunk)
+{
+	while (__chunk_is_tracked(s, chunk))
+		msleep(1);
+}
+
+/*
  * One of these per registered origin, held in the snapshot_origins hash
  */
 struct origin {
@@ -832,10 +842,8 @@ test_again:
 	up_write(&s->lock);
 
 	/* Wait until writes to all 'linear_chunks' drain */
-	for (i = 0; i < linear_chunks; i++) {
-		while (__chunk_is_tracked(s, old_chunk + i))
-			msleep(1);
-	}
+	for (i = 0; i < linear_chunks; i++)
+		__check_for_conflicting_io(s, old_chunk + i);
 
 	dm_kcopyd_copy(s->kcopyd_client, &src, 1, &dest, 0, merge_callback, s);
 	return;
@@ -1340,12 +1348,8 @@ static void pending_complete(struct dm_s
 		goto out;
 	}
 
-	/*
-	 * Check for conflicting reads. This is extremely improbable,
-	 * so msleep(1) is sufficient and there is no need for a wait queue.
-	 */
-	while (__chunk_is_tracked(s, pe->e.old_chunk))
-		msleep(1);
+	/* Check for conflicting reads */
+	__check_for_conflicting_io(s, pe->e.old_chunk);
 
 	/*
 	 * Add a proper exception, and remove the