From patchwork Mon May 11 07:58:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 6373801 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D70D2BEEE1 for ; Mon, 11 May 2015 07:58:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 10C8D202EC for ; Mon, 11 May 2015 07:58:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 18F3D202E9 for ; Mon, 11 May 2015 07:58:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752530AbbEKH6g (ORCPT ); Mon, 11 May 2015 03:58:36 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:34412 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752493AbbEKH6d (ORCPT ); Mon, 11 May 2015 03:58:33 -0400 Received: by pdbqa5 with SMTP id qa5so138289455pdb.1 for ; Mon, 11 May 2015 00:58:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=xMwcEj9XkaISb6+UJI3EuB9lmWvAR11dgTVxainpFdc=; b=MFBkz4tFc/dhXIXFwJZYyz8QrvXRA+Kn9swfmFJC+S9v+WG/tb5udiwdcuZB3eMbkU NzI1Sm9rDYu1y3rdBwfQJ/WYyp1gEq1AuLyRInxMHvq5NrVSO/soXChu0l0VpAzhY+dI 4A+nAPoTo0HwOoiUT0NYokivnhPPDx0f0Or6Qek8/AgMC/LRvrJTw+DEj3XcGjTB32eT UYL/BuNAuQJdBzFlOpmBzd9xPBhxwXUihDZJmAKKxpbXjYrlaMl1sDUAMFzn2plJQ77w m8VEZvaNHys9TUbJLz99Gyj/UKpCpM2b/w8Tx7MrKfoqwWoHo5nK5ThezUFNMgrERbzz nEmA== X-Gm-Message-State: ALoCoQnv0Ra71vakKq2ixENESe4CPud+DOToPKv4lthfWqkJj51Xisnr012YSi9ovHgg3DE6JUv1 X-Received: by 10.68.190.131 with SMTP id gq3mr16756771pbc.113.1431331113200; Mon, 11 May 2015 00:58:33 -0700 (PDT) Received: from mew.localdomain (c-76-104-211-44.hsd1.wa.comcast.net. [76.104.211.44]) by mx.google.com with ESMTPSA id bq3sm12174498pbd.24.2015.05.11.00.58.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 May 2015 00:58:32 -0700 (PDT) From: Omar Sandoval To: linux-btrfs@vger.kernel.org Cc: Miao Xie , Philip , Omar Sandoval Subject: [PATCH 1/4] Btrfs: remove misleading handling of missing device scrub Date: Mon, 11 May 2015 00:58:12 -0700 Message-Id: X-Mailer: git-send-email 2.4.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP scrub_submit() claims that it can handle a bio with a NULL block device, but this is misleading, as calling bio_add_page() on a bio with a NULL ->bi_bdev would've already crashed. Delete this, as we're about to properly handle a missing block device. Signed-off-by: Omar Sandoval --- fs/btrfs/scrub.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index ab58115..633fa7b 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -2087,21 +2087,7 @@ static void scrub_submit(struct scrub_ctx *sctx) sbio = sctx->bios[sctx->curr]; sctx->curr = -1; scrub_pending_bio_inc(sctx); - - if (!sbio->bio->bi_bdev) { - /* - * this case should not happen. If btrfs_map_block() is - * wrong, it could happen for dev-replace operations on - * missing devices when no mirrors are available, but in - * this case it should already fail the mount. - * This case is handled correctly (but _very_ slowly). - */ - printk_ratelimited(KERN_WARNING - "BTRFS: scrub_submit(bio bdev == NULL) is unexpected!\n"); - bio_endio(sbio->bio, -EIO); - } else { - btrfsic_submit_bio(READ, sbio->bio); - } + btrfsic_submit_bio(READ, sbio->bio); } static int scrub_add_page_to_rd_bio(struct scrub_ctx *sctx,