Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755330AbbK0V13 (ORCPT ); Fri, 27 Nov 2015 16:27:29 -0500 Received: from mailrelay119.isp.belgacom.be ([195.238.20.146]:27588 "EHLO mailrelay119.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755225AbbK0V1G (ORCPT ); Fri, 27 Nov 2015 16:27:06 -0500 X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2B/AgCCyVhW/6YUtFtegmlSgUK8BYIaAQ2BZIYPAoE+ORQBAQEBAQEBgQqENQEBBCcvIxBROR4ZiDIBsnKKDgEBCCOGVIolhBIFh0qPDY04jzGNMB8BAUKCER2BVz00hVIBAQE From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Philipp Reisner , Fabian Frederick , Lars Ellenberg , drbd-dev@lists.linbit.com Subject: [PATCH 02/21] drbd: simplify drbd_md_set_sector_offsets() Date: Fri, 27 Nov 2015 22:26:07 +0100 Message-Id: <1448659575-13485-3-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1448659575-13485-1-git-send-email-fabf@skynet.be> References: <1448659575-13485-1-git-send-email-fabf@skynet.be> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2166 Lines: 63 Some metadata informations were duplicated in layout switch. Signed-off-by: Fabian Frederick --- drivers/block/drbd/drbd_nl.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index c055c5e..ef136a9 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -794,20 +794,9 @@ static void drbd_md_set_sector_offsets(struct drbd_device *device, unsigned int al_size_sect = bdev->md.al_size_4k * 8; bdev->md.md_offset = drbd_md_ss(bdev); + md_size_sect = MD_128MB_SECT; switch (bdev->md.meta_dev_idx) { - default: - /* v07 style fixed size indexed meta data */ - bdev->md.md_size_sect = MD_128MB_SECT; - bdev->md.al_offset = MD_4kB_SECT; - bdev->md.bm_offset = MD_4kB_SECT + al_size_sect; - break; - case DRBD_MD_INDEX_FLEX_EXT: - /* just occupy the full device; unit: sectors */ - bdev->md.md_size_sect = drbd_get_capacity(bdev->md_bdev); - bdev->md.al_offset = MD_4kB_SECT; - bdev->md.bm_offset = MD_4kB_SECT + al_size_sect; - break; case DRBD_MD_INDEX_INTERNAL: case DRBD_MD_INDEX_FLEX_INT: /* al size is still fixed */ @@ -822,11 +811,20 @@ static void drbd_md_set_sector_offsets(struct drbd_device *device, * and the activity log; */ md_size_sect += MD_4kB_SECT + al_size_sect; - bdev->md.md_size_sect = md_size_sect; /* bitmap offset is adjusted by 'super' block size */ bdev->md.bm_offset = -md_size_sect + MD_4kB_SECT; break; + case DRBD_MD_INDEX_FLEX_EXT: + /* just occupy the full device; unit: sectors */ + md_size_sect = drbd_get_capacity(bdev->md_bdev); + default: + /* v07 style fixed size indexed meta data */ + bdev->md.al_offset = MD_4kB_SECT; + bdev->md.bm_offset = MD_4kB_SECT + al_size_sect; + break; } + + bdev->md.md_size_sect = md_size_sect; } /* input size is expected to be in KB */ -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/