Received: by 2002:a05:6a10:9afc:0:0:0:0 with SMTP id t28csp2259768pxm; Fri, 4 Mar 2022 12:32:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJxwRsUKEAWHQrTe/7qAgzRPvpYOBTrxT3ptP+jFjk+ZkZbOkPL6Wc7CzAMSk3JLYluWP4OG X-Received: by 2002:a17:902:b28a:b0:151:bbc9:ec1c with SMTP id u10-20020a170902b28a00b00151bbc9ec1cmr194243plr.13.1646425926723; Fri, 04 Mar 2022 12:32:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646425926; cv=none; d=google.com; s=arc-20160816; b=0BUD3VlhyWEWqs8xxI7MexHKvbalxtN/dd1lvbnXgIs5BxSHbdihI/UPNoAwYxgPhZ LecovtvTbQaK3BqCmyaHDcmGet16ZPQEXeOYMlFSUkuvHi/pGmNJO150GQ8xrXMXNw2P I4BqK6MARMu1igdAucsqQMVTfeNzfISHcaoX/jRgSfHBPDxi2pqZOyw7ky6Y8zYKRTuP ty+N2NSQk4OCXSOsGW+Lbl9zcWip7aP6tfFQU2vJR1xoxv1nVF36alh7OD7hIL12Dr2W QDUIm6DsfFquPnNu1aOIGegMh6/Mnvs4R9l2JomoBgd1VxqNYPY8fKgT0KYDHfODaqpp DRcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=FG7ZP/ghVPa2lKPUR2l6I91okITwu/uLFXi8KaHWabo=; b=RE7Vxggtxv5XXWqvPBVGREDR0ZyZvT3I6szfWvAnvEHYc8x1nHAGP5kH7+inIoR+nT I+at58qA7lgiOWKaNUlbfmldZnMTCXklL3PgIORVGf6xTsCmjhWY3wlzxaJ99gNaNYPk Qyd9/pLE+7eMY6u8CLNdlqGsa8k6Wmcr4Ha9lynx4cHVMsoPDGkIBUZh9iQq0GM4Wb/K svxr/uMIdO8lxV0oqw6xzC2Sz/oQxeL4quX/GXwmgch5GSUngBSUj7l1Bek3mEtcHUAc rvWCDUSqJuE85nqXcyd0QofNTVSN1yUjzfplQ/BOtIb4AMlv8L1m7fYLnLCo9+YeRsdw HOfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=QzGD5bJu; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id l70-20020a638849000000b0037c6958aa7dsi4345425pgd.485.2022.03.04.12.32.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Mar 2022 12:32:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=QzGD5bJu; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A2B442C0577; Fri, 4 Mar 2022 11:36:18 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241443AbiCDSC0 (ORCPT + 99 others); Fri, 4 Mar 2022 13:02:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241440AbiCDSCY (ORCPT ); Fri, 4 Mar 2022 13:02:24 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B92811C8861; Fri, 4 Mar 2022 10:01:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=FG7ZP/ghVPa2lKPUR2l6I91okITwu/uLFXi8KaHWabo=; b=QzGD5bJuCRbXT2tw/3aWebtOiC /Hb40K/YrsOSWkIcp9OG9pQPiUEeYHZAvWV7iPmeR5/oNsyx/W+G9zx3DQheTYyN04itzCBv9vZcq XATIpnXem/DZqsM+y4jypiWOCPY4FiwrPBGt3oZvi0ZluI5J2dcLYyETSK7+YjfxtE0N1FGdiF1Y0 hnBVBRxjLM2ivbsduEf6g503/b/lbyHYN0J1DpI/jyIsxnB4cvGIjGj/Zz9iqsK9PZacxj4SLzCcS 5csWZoy9iFL8Ozl/rVRikm9PTPJjDUdWBmzbeoavMjgQLWkm8ceHLl0pPxGTZCJRx6ranK3x0CDNV /0+QyPaw==; Received: from [2001:4bb8:180:5296:cded:8d4b:ace6:f3c] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1nQCF4-00BUtw-JU; Fri, 04 Mar 2022 18:01:27 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Song Liu , "Theodore Ts'o" , linux-block@vger.kernel.org, dm-devel@redhat.com, linux-raid@vger.kernel.org, linux-ext4@vger.kernel.org Subject: [PATCH 07/10] raid1: stop using bio_devname Date: Fri, 4 Mar 2022 19:01:02 +0100 Message-Id: <20220304180105.409765-8-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220304180105.409765-1-hch@lst.de> References: <20220304180105.409765-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Use the %pg format specifier to save on stack consuption and code size. Signed-off-by: Christoph Hellwig --- drivers/md/raid1.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index c180c188da574..97574575ad0b4 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -2069,15 +2069,14 @@ static int fix_sync_read_error(struct r1bio *r1_bio) } while (!success && d != r1_bio->read_disk); if (!success) { - char b[BDEVNAME_SIZE]; int abort = 0; /* Cannot read from anywhere, this block is lost. * Record a bad block on each device. If that doesn't * work just disable and interrupt the recovery. * Don't fail devices as that won't really help. */ - pr_crit_ratelimited("md/raid1:%s: %s: unrecoverable I/O read error for block %llu\n", - mdname(mddev), bio_devname(bio, b), + pr_crit_ratelimited("md/raid1:%s: %pg: unrecoverable I/O read error for block %llu\n", + mdname(mddev), bio->bi_bdev, (unsigned long long)r1_bio->sector); for (d = 0; d < conf->raid_disks * 2; d++) { rdev = conf->mirrors[d].rdev; -- 2.30.2