From patchwork Thu Sep 10 21:13:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 46673 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 n8AMGZFA013671 for ; Thu, 10 Sep 2009 22:16:36 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 6E3C761939E; Thu, 10 Sep 2009 17:13:48 -0400 (EDT) Received: from int-mx01.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 n8ALDk5d017573 for ; Thu, 10 Sep 2009 17:13:46 -0400 Received: from mx1.redhat.com (ext-mx06.extmail.prod.ext.phx2.redhat.com [10.5.110.10]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8ALDkHP028641 for ; Thu, 10 Sep 2009 17:13:46 -0400 Received: from gerard.telenet-ops.be (gerard.telenet-ops.be [195.130.132.48]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8ALDV4h016060 for ; Thu, 10 Sep 2009 17:13:32 -0400 Received: from ayla.of.borg ([94.224.189.99]) by gerard.telenet-ops.be with bizsmtp id f9DU1c009297A260H9DU8g; Thu, 10 Sep 2009 23:13:31 +0200 Received: from geert (helo=localhost) by ayla.of.borg with local-esmtp (Exim 4.69) (envelope-from ) id 1MlqxM-0002j1-Jf; Thu, 10 Sep 2009 23:13:28 +0200 Date: Thu, 10 Sep 2009 23:13:28 +0200 (CEST) From: Geert Uytterhoeven To: Linus Torvalds , Jonathan Brassow Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 X-RedHat-Spam-Score: 0 () X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-Scanned-By: MIMEDefang 2.67 on 10.5.110.10 X-loop: dm-devel@redhat.com Cc: "Rafael J. Wysocki" , dm-devel@redhat.com, Andrew Morton , Linux/m68k , Linux Kernel Development Subject: [dm-devel] [PATCH] md: Fix "strchr" [drivers/md/dm-log-userspace.ko] undefined! X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.5 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com Commit b8313b6da7e2e7c7f47d93d8561969a3ff9ba0ea ("dm log: remove incorrect field from userspace table output") added a call to strstr() with a single-character "needle" string parameter. Unfortunately some versions of gcc replace such calls to strstr() by calls to strchr() behind our back. This causes linking errors if strchr() is defined as an inline function in (e.g. on m68k): | WARNING: "strchr" [drivers/md/dm-log-userspace.ko] undefined! Avoid this by explicitly calling strchr() instead. Signed-off-by: Geert Uytterhoeven Cc: stable@kernel.org --- This fixes a regression introduced in 2.6.31-rc9, and detected by m68k allmodconfig, cfr. http://kisskb.ellerman.id.au/kisskb/config/164/ drivers/md/dm-log-userspace-base.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/md/dm-log-userspace-base.c b/drivers/md/dm-log-userspace-base.c index 6e186b1..652bd33 100644 --- a/drivers/md/dm-log-userspace-base.c +++ b/drivers/md/dm-log-userspace-base.c @@ -582,7 +582,7 @@ static int userspace_status(struct dm_dirty_log *log, status_type_t status_type, break; case STATUSTYPE_TABLE: sz = 0; - table_args = strstr(lc->usr_argv_str, " "); + table_args = strchr(lc->usr_argv_str, ' '); BUG_ON(!table_args); /* There will always be a ' ' */ table_args++;