From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756983Ab3B1XFM (ORCPT ); Thu, 28 Feb 2013 18:05:12 -0500 Received: from longford.logfs.org ([213.229.74.203]:58562 "EHLO longford.logfs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756702Ab3B1XFH (ORCPT ); Thu, 28 Feb 2013 18:05:07 -0500 From: Joern Engel To: linux-kernel@vger.kernel.org Cc: Andrew Morton , Borislav Petkov , Jeff Moyer , Joern Engel Subject: [PATCH 9/9] bcon: remove version 1.0 support Date: Thu, 28 Feb 2013 16:40:02 -0500 Message-Id: <1362087602-8979-10-git-send-email-joern@logfs.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1362087602-8979-1-git-send-email-joern@logfs.org> References: <1362087602-8979-1-git-send-email-joern@logfs.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Very few machines ever ran with 1.0 format and by now I doubt whether a single one still does. No need to carry that code along. Signed-off-by: Joern Engel --- drivers/block/blockconsole.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/drivers/block/blockconsole.c b/drivers/block/blockconsole.c index b4730f8..e88b8ee 100644 --- a/drivers/block/blockconsole.c +++ b/drivers/block/blockconsole.c @@ -18,7 +18,6 @@ #include #include -#define BLOCKCONSOLE_MAGIC_OLD "\nLinux blockconsole version 1.0\n" #define BLOCKCONSOLE_MAGIC "\nLinux blockconsole version 1.1\n" #define BCON_UUID_OFS (32) #define BCON_ROUND_OFS (41) @@ -234,18 +233,6 @@ static void bcon_advance_write_bytes(struct blockconsole *bc, int bytes) } } -static int bcon_convert_old_format(struct blockconsole *bc) -{ - bc->uuid = get_random_int(); - bc->round = 0; - bc->console_bytes = bc->write_bytes = 0; - bcon_advance_console_bytes(bc, 0); /* To skip the header */ - bcon_advance_write_bytes(bc, 0); /* To wrap around, if necessary */ - bcon_erase_segment(bc); - pr_info("converted %s from old format\n", bc->devname); - return 0; -} - static int bcon_find_end_of_log(struct blockconsole *bc) { u64 start = 0, end = bc->max_bytes, middle; @@ -258,8 +245,8 @@ static int bcon_find_end_of_log(struct blockconsole *bc) return err; /* Second sanity check, out of sheer paranoia */ version = bcon_magic_present(sec0); - if (version == 10) - return bcon_convert_old_format(bc); + if (!version) + return -EINVAL; bc->uuid = simple_strtoull(sec0 + BCON_UUID_OFS, NULL, 16); bc->round = simple_strtoull(sec0 + BCON_ROUND_OFS, NULL, 16); @@ -618,8 +605,6 @@ int bcon_magic_present(const void *data) { size_t len = strlen(BLOCKCONSOLE_MAGIC); - if (!memcmp(data, BLOCKCONSOLE_MAGIC_OLD, len)) - return 10; if (memcmp(data, BLOCKCONSOLE_MAGIC, len)) return 0; if (!is_four_byte_hex(data + BCON_UUID_OFS)) -- 1.7.10.4