From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757418AbYILOoW (ORCPT ); Fri, 12 Sep 2008 10:44:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752935AbYILOoH (ORCPT ); Fri, 12 Sep 2008 10:44:07 -0400 Received: from mx1.redhat.com ([66.187.233.31]:44853 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752685AbYILOoF (ORCPT ); Fri, 12 Sep 2008 10:44:05 -0400 Date: Fri, 12 Sep 2008 10:44:55 -0400 (EDT) Message-Id: <20080912.104455.27955868.k-ueda@ct.jp.nec.com> To: jens.axboe@oracle.com, agk@redhat.com, James.Bottomley@HansenPartnership.com Cc: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, dm-devel@redhat.com, j-nomura@ce.jp.nec.com, k-ueda@ct.jp.nec.com Subject: [PATCH 07/13] dm: tidy local_init From: Kiyoshi Ueda In-Reply-To: <20080912.103814.74754581.k-ueda@ct.jp.nec.com> References: <20080912.103814.74754581.k-ueda@ct.jp.nec.com> 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 This patch tidies local_init() as preparation for another patch (PATCH 08), which creates some kmem_cache for request-based dm. 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. Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Cc: Alasdair G Kergon --- drivers/md/dm.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) Index: 2.6.27-rc6/drivers/md/dm.c =================================================================== --- 2.6.27-rc6.orig/drivers/md/dm.c +++ 2.6.27-rc6/drivers/md/dm.c @@ -150,40 +150,40 @@ static struct kmem_cache *_tio_cache; static int __init local_init(void) { - int r; + int r = -ENOMEM; /* allocate a slab for the dm_ios */ _io_cache = KMEM_CACHE(dm_io, 0); if (!_io_cache) - return -ENOMEM; + return r; /* allocate a slab for the target ios */ _tio_cache = KMEM_CACHE(dm_target_io, 0); - if (!_tio_cache) { - kmem_cache_destroy(_io_cache); - return -ENOMEM; - } + if (!_tio_cache) + goto out_free_io_cache; r = dm_uevent_init(); - if (r) { - kmem_cache_destroy(_tio_cache); - kmem_cache_destroy(_io_cache); - return r; - } + if (r) + goto out_free_tio_cache; _major = major; r = register_blkdev(_major, _name); - if (r < 0) { - kmem_cache_destroy(_tio_cache); - kmem_cache_destroy(_io_cache); - dm_uevent_exit(); - return r; - } + if (r < 0) + goto out_uevent_exit; if (!_major) _major = r; return 0; + +out_uevent_exit: + dm_uevent_exit(); +out_free_tio_cache: + kmem_cache_destroy(_tio_cache); +out_free_io_cache: + kmem_cache_destroy(_io_cache); + + return r; } static void local_exit(void)