From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4364 invoked by alias); 29 Sep 2008 14:48:41 -0000 Received: (qmail 4358 invoked by alias); 29 Sep 2008 14:48:41 -0000 X-Spam-Status: No, hits=-0.2 required=5.0 tests=AWL,BAYES_50,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com X-Spam-Level: Subject: RHEL5 - dm-log-clustered.ko: Fix bug 464481 - 'block_on_error' flag should not be required To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: c387199bca6c04c79b1224638a8474e9bec53dbb X-Git-Newrev: a5af1f999f1b36a46bcd83f71856852be47a85ac From: Jonathan Brassow Message-Id: <20080929144729.75584120468@lists.fedorahosted.org> Date: Mon, 29 Sep 2008 17:11:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q3/txt/msg00556.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a5af1f999f1b36a46bcd83f71856852be47a85ac Commit: a5af1f999f1b36a46bcd83f71856852be47a85ac Parent: c387199bca6c04c79b1224638a8474e9bec53dbb Author: Jonathan Brassow AuthorDate: Mon Sep 29 09:44:39 2008 -0500 Committer: Jonathan Brassow CommitterDate: Mon Sep 29 09:47:20 2008 -0500 dm-log-clustered.ko: Fix bug 464481 - 'block_on_error' flag should not be required Requiring 'block_on_error' flag to the log constructor table breaks pvmove. --- cmirror-kernel/src/dm-clog.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmirror-kernel/src/dm-clog.c b/cmirror-kernel/src/dm-clog.c index 1e2b80e..f21823e 100644 --- a/cmirror-kernel/src/dm-clog.c +++ b/cmirror-kernel/src/dm-clog.c @@ -172,7 +172,7 @@ static int cluster_ctr(struct dm_dirty_log *log, struct dm_target *ti, * @argv * * argv contains: - * [[no]sync] + * [[no]sync] [block_on_error] * * Returns: 0 on success, -XXX on failure */ @@ -180,7 +180,7 @@ static int cluster_core_ctr(struct dm_dirty_log *log, struct dm_target *ti, unsigned int argc, char **argv) { int i, r; - if ((argc < 3) || (argc > 4)) { + if ((argc < 2) || (argc > 4)) { DMERR("Too %s arguments to clustered-core mirror log type.", (argc < 2) ? "few" : "many"); DMERR(" %d arguments supplied:", argc); @@ -203,7 +203,7 @@ static int cluster_core_ctr(struct dm_dirty_log *log, struct dm_target *ti, * @argv * * argv contains: - * [[no]sync] + * [[no]sync] [block_on_error] * * Returns: 0 on success, -XXX on failure */ @@ -213,7 +213,7 @@ static int cluster_disk_ctr(struct dm_dirty_log *log, struct dm_target *ti, int r, i; struct dm_dev *dev; - if ((argc < 4) || (argc > 5)) { + if ((argc < 3) || (argc > 5)) { DMERR("Too %s arguments to clustered-disk mirror log type.", (argc < 3) ? "few" : "many"); DMERR(" %d arguments supplied:", argc);