Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941823AbYCSXjj (ORCPT ); Wed, 19 Mar 2008 19:39:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S939753AbYCSWJW (ORCPT ); Wed, 19 Mar 2008 18:09:22 -0400 Received: from mx1.redhat.com ([66.187.233.31]:53499 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S939746AbYCSWJU (ORCPT ); Wed, 19 Mar 2008 18:09:20 -0400 Date: Wed, 19 Mar 2008 18:09:40 -0500 (EST) Message-Id: <20080319.180940.107944704.k-ueda@ct.jp.nec.com> To: jens.axboe@oracle.com, michaelc@cs.wisc.edu, hare@suse.de, agk@redhat.com, linux-kernel@vger.kernel.org Cc: linux-scsi@vger.kernel.org, dm-devel@redhat.com, j-nomura@ce.jp.nec.com, k-ueda@ct.jp.nec.com Subject: [RFC PATCH 05/13] dm: remove dead codes From: Kiyoshi Ueda X-Mailer: Mew version 4.2 on Emacs 21.4 / Mule 5.0 =?iso-2022-jp?B?KBskQjgtTFobKEIp?= Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1702 Lines: 53 This patch removes dead codes for the noflush suspend. No functional change. This patch is just a clean up of the codes and not functionally related to request-based dm. But included here due to literal dependency. The dm_queue_flush(md, DM_WQ_FLUSH_ALL, NULL) in dm_suspend() is never invoked because: - The 'goto flush_and_out' is same as 'goto out', because the 'goto flush_and_out' is called only when '!noflush' - If the 'r && noflush' is true, the interrupt check code above is invoked and 'goto out' Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura --- drivers/md/dm.c | 10 +--------- 1 files changed, 1 insertion(+), 9 deletions(-) Index: 2.6.25-rc5/drivers/md/dm.c =================================================================== --- 2.6.25-rc5.orig/drivers/md/dm.c +++ 2.6.25-rc5/drivers/md/dm.c @@ -1472,7 +1472,7 @@ int dm_suspend(struct mapped_device *md, if (!md->suspended_bdev) { DMWARN("bdget failed in dm_suspend"); r = -ENOMEM; - goto flush_and_out; + goto out; } /* @@ -1523,14 +1523,6 @@ int dm_suspend(struct mapped_device *md, set_bit(DMF_SUSPENDED, &md->flags); -flush_and_out: - if (r && noflush) - /* - * Because there may be already I/Os in the pushback list, - * flush them before return. - */ - dm_queue_flush(md, DM_WQ_FLUSH_ALL, NULL); - out: if (r && md->suspended_bdev) { bdput(md->suspended_bdev); -- 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/