Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758308Ab3JKPsV (ORCPT ); Fri, 11 Oct 2013 11:48:21 -0400 Received: from mail-vb0-f45.google.com ([209.85.212.45]:51539 "EHLO mail-vb0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758531Ab3JKPsQ (ORCPT ); Fri, 11 Oct 2013 11:48:16 -0400 MIME-Version: 1.0 In-Reply-To: <1381451492.2367.63.camel@buesod1.americas.hpqcorp.net> References: <20131009232642.GA12776@jtriplet-mobl1> <1381447702-6240-1-git-send-email-dianders@chromium.org> <1381451492.2367.63.camel@buesod1.americas.hpqcorp.net> Date: Fri, 11 Oct 2013 08:48:14 -0700 X-Google-Sender-Auth: 5I3mwZNCc-e_wXXrqvQfztOrbcA Message-ID: Subject: Re: [PATCH] partitions/efi: treat size mismatch as a warning, not an error From: Doug Anderson To: Davidlohr Bueso Cc: "linux-kernel@vger.kernel.org" , Andrew Morton , Jens Axboe , Karel Zak , Matt Fleming , Sean Paul , Olof Johansson , Bill Richardson , Josh Triplett Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2262 Lines: 60 Davidlohr, On Thu, Oct 10, 2013 at 5:31 PM, Davidlohr Bueso wrote: > On Thu, 2013-10-10 at 16:28 -0700, Doug Anderson wrote: >> In (27a7c64 partitions/efi: account for pmbr size in lba) we started >> treating bad sizes in lba field of the partition that has the 0xEE >> (GPT protective) as errors. However, we may run into these "bad >> sizes" in the real world if someone uses dd to copy an image from a >> smaller disk to a bigger disk. Since this case used to work (even >> without using force_gpt), keep it working and treat the size mismatch >> as a warning instead of an error. >> >> Reported-by: Josh Triplett >> Reported-by: Sean Paul >> Signed-off-by: Doug Anderson >> --- >> block/partitions/efi.c | 6 +++++- >> 1 file changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/block/partitions/efi.c b/block/partitions/efi.c >> index 1eb09ee..ac23dc1 100644 >> --- a/block/partitions/efi.c >> +++ b/block/partitions/efi.c >> @@ -222,11 +222,15 @@ check_hybrid: >> * the disk size. >> * >> * Hybrid MBRs do not necessarily comply with this. >> + * >> + * Consider a bad value here to be a warning to support dd-ing > > dd'ing instead? Done. >> + * an image from a smaller disk to a bigger disk. > > 'larger' disk sounds better. Done. >> */ >> if (ret == GPT_MBR_PROTECTIVE) { >> sz = le32_to_cpu(mbr->partition_record[part].size_in_lba); >> if (sz != (uint32_t) total_sectors - 1 && sz != 0xFFFFFFFF) >> - ret = 0; >> + pr_warn("%s: mbr size mismatch (%u != %u)\n", __func__, >> + sz, (uint32_t)((uint32_t) total_sectors - 1)); > > How about this instead? > pr_debug("GPT: mbr size in lba (%d) different than whole disk (%d).\n", sz, min(total_sectors -1, 0xFFFFFFFF)); Done with modifications to avoid kernel compiler warnings (%u vs %d, min_t vs min). -Doug -- 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/