From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755149AbbERXJF (ORCPT ); Mon, 18 May 2015 19:09:05 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:35000 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755098AbbERXJB (ORCPT ); Mon, 18 May 2015 19:09:01 -0400 From: Brian Norris To: Jens Axboe Cc: Brian Norris , , Christoph Hellwig , Boaz Harrosh Subject: [RFC] block: remove never-modified global variable Date: Mon, 18 May 2015 16:08:52 -0700 Message-Id: <1431990532-7999-1-git-send-email-computersforpeace@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org AFAICT, 'warn_no_part' never takes (and never has? at least, not in the git history) taken a value besides 1. It also has a disgruntled warning comment next to it, suggesting it shouldn't be there at all. Signed-off-by: Brian Norris Cc: Christoph Hellwig Cc: Boaz Harrosh Cc: Jens Axboe --- Only compile tested for now, as it's trivial. Just an RFC, since I don't really understand the context of why this (or the comment) is here in the first place. I just ran across this in code reading. block/partitions/amiga.c | 10 ++++------ block/partitions/check.c | 7 ++----- block/partitions/check.h | 2 -- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/block/partitions/amiga.c b/block/partitions/amiga.c index 2b13533d60a2..9dbf1cec7152 100644 --- a/block/partitions/amiga.c +++ b/block/partitions/amiga.c @@ -41,9 +41,8 @@ int amiga_partition(struct parsed_partitions *state) goto rdb_done; data = read_part_sector(state, blk, §); if (!data) { - if (warn_no_part) - pr_err("Dev %s: unable to read RDB block %d\n", - bdevname(state->bdev, b), blk); + pr_err("Dev %s: unable to read RDB block %d\n", + bdevname(state->bdev, b), blk); res = -1; goto rdb_done; } @@ -84,9 +83,8 @@ int amiga_partition(struct parsed_partitions *state) blk *= blksize; /* Read in terms partition table understands */ data = read_part_sector(state, blk, §); if (!data) { - if (warn_no_part) - pr_err("Dev %s: unable to read partition block %d\n", - bdevname(state->bdev, b), blk); + pr_err("Dev %s: unable to read partition block %d\n", + bdevname(state->bdev, b), blk); res = -1; goto rdb_done; } diff --git a/block/partitions/check.c b/block/partitions/check.c index 16118d11dbfc..513c601b7874 100644 --- a/block/partitions/check.c +++ b/block/partitions/check.c @@ -36,8 +36,6 @@ #include "sysv68.h" #include "cmdline.h" -int warn_no_part = 1; /*This is ugly: should make genhd removable media aware*/ - static int (*check_part[])(struct parsed_partitions *) = { /* * Probe partition formats with tables at disk address 0 @@ -185,9 +183,8 @@ check_partition(struct gendisk *hd, struct block_device *bdev) /* The partition is unrecognized. So report I/O errors if there were any */ res = err; if (res) { - if (warn_no_part) - strlcat(state->pp_buf, - " unable to read partition table\n", PAGE_SIZE); + strlcat(state->pp_buf, + " unable to read partition table\n", PAGE_SIZE); printk(KERN_INFO "%s", state->pp_buf); } diff --git a/block/partitions/check.h b/block/partitions/check.h index eade17ea910b..e09fac216adc 100644 --- a/block/partitions/check.h +++ b/block/partitions/check.h @@ -50,5 +50,3 @@ put_partition(struct parsed_partitions *p, int n, sector_t from, sector_t size) } } -extern int warn_no_part; - -- 1.9.1