From patchwork Mon Apr 29 18:09:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: henrikno@gmail.com X-Patchwork-Id: 2500851 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 215D53FD85 for ; Mon, 29 Apr 2013 18:09:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758139Ab3D2SJf (ORCPT ); Mon, 29 Apr 2013 14:09:35 -0400 Received: from mail-la0-f48.google.com ([209.85.215.48]:49076 "EHLO mail-la0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757464Ab3D2SJe (ORCPT ); Mon, 29 Apr 2013 14:09:34 -0400 Received: by mail-la0-f48.google.com with SMTP id eo20so5617059lab.7 for ; Mon, 29 Apr 2013 11:09:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=MBaq+mPImVzoghMLT1Wa3XvfJNTT5JAhG2940dr9q90=; b=bwIIYWjhtxXYZp6IGEzC3C4TdToi7ZLNMXfJYWTrp9wA64XS6pttmqs+rlAKCUxJzZ eaadYE28dMc83ulvwBY9Q0hA0hk5YorMIXaDNnUckuizpOVlp4oOjfOifei9zlRlkcSh u6nWeGCEZkrRlupKayId5bQsJD9GEwBVZpiIhGd9Lv2Q2uiZ1PXvaLDyGZUIItjrkHlo X4iFa0RfGWuPfQzpAFhl26rjD9GMnS0XKXNrvZY2eUPQu931njkyhTglfa/mtntEQAXv 4T5pXL6YRAsJp9iFcXngYTfkHEqQ7AyZpqtUqTK+5DMid8oyjPC4Kmsdy+C7+1H8kL5Q T2Uw== X-Received: by 10.152.5.106 with SMTP id r10mr27757861lar.18.1367258972830; Mon, 29 Apr 2013 11:09:32 -0700 (PDT) Received: from localhost.localdomain (17.103.34.95.customer.cdi.no. [95.34.103.17]) by mx.google.com with ESMTPSA id v10sm10261082lae.9.2013.04.29.11.09.31 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 29 Apr 2013 11:09:32 -0700 (PDT) From: henrikno@gmail.com To: chris.mason@fusionio.com Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, Henrik Nordvik Subject: [PATCH] Btrfs: fix check on same raid type flag twice Date: Mon, 29 Apr 2013 20:09:23 +0200 Message-Id: <1367258963-27134-1-git-send-email-henrikno@gmail.com> X-Mailer: git-send-email 1.8.1.2 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Henrik Nordvik Code checked for raid 5 flag in two else-if branches, so code would never be reached. Probably a copy-paste bug. Signed-off-by: Henrik Nordvik --- fs/btrfs/disk-io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 6d19a0a..19a327d 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3141,7 +3141,7 @@ int btrfs_calc_num_tolerated_disk_barrier_failures( BTRFS_BLOCK_GROUP_RAID10)) { num_tolerated_disk_barrier_failures = 1; } else if (flags & - BTRFS_BLOCK_GROUP_RAID5) { + BTRFS_BLOCK_GROUP_RAID6) { num_tolerated_disk_barrier_failures = 2; } }