Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967465AbXFHCql (ORCPT ); Thu, 7 Jun 2007 22:46:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S966614AbXFHCqc (ORCPT ); Thu, 7 Jun 2007 22:46:32 -0400 Received: from wip-cdc-wd.wipro.com ([203.91.201.26]:59073 "EHLO wip-cdc-wd.wipro.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966607AbXFHCqb (ORCPT ); Thu, 7 Jun 2007 22:46:31 -0400 Subject: Re: [PATCH]: complete cleanup of check_region From: Surya To: Jesper Juhl , emoenke@gwdg.de Cc: Linux Kernel , kernel-janitors@lists.osdl.org In-Reply-To: <9a8748490706070902i218e01bdq1c418c770e99ca4@mail.gmail.com> References: <1181209169.2422.12.camel@bluegenie> <9a8748490706070308m7c2212fq30fe712e26e2463b@mail.gmail.com> <1181215018.3275.2.camel@bluegenie> <9a8748490706070902i218e01bdq1c418c770e99ca4@mail.gmail.com> Content-Type: text/plain Content-Transfer-Encoding: 7bit Organization: Linux COE, Wipro Technologies, Bangalore, India. Date: Fri, 08 Jun 2007 08:16:12 +0530 Message-Id: <1181270772.3275.15.camel@bluegenie> Mime-Version: 1.0 X-Mailer: Evolution 2.8.3 (2.8.3-2.fc6) X-OriginalArrivalTime: 08 Jun 2007 02:46:35.0995 (UTC) FILETIME=[3B084AB0:01C7A977] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4561 Lines: 143 > > > > @@ -5640,6 +5645,7 @@ int __init sbpcd_init(void) > > int i=0, j=0; > > int addr[2]={1, CDROM_PORT}; > > int port_index; > > + int request_region_flag; > > > One could argue that it would be possible to just use the 'j' variable > for this since it's not used for anything else until the *_region() > stuff is all done, that would save adding a new variable... completely eliminated the variable, haven't felt the need for it. > > msg(DBG_INI,"check_drives done.\n"); > > + if(request_region_flag==0) > > + release_region(addr[1],4); > > I know the driver in its current version just tests if the region is > available and doesn't hang on to it, but I'm wondering if that's not a > bug. Shouldn't we actually hold on to this region as long as the > driver is loaded and only release the region in the sbpcd_exit() > function, just loke we do with the "CDo_command" region? But if any of the conditions fail after the request_region code, it is returning an error and exiting out of init. Dont we need to cleanup request_region's allocation before we exit. Infact I had a feeling that CDo_command region cleanup was not perfect. Did a cleanup of both the regions wherever we have a return out of the function. Please have a look at the below patch. diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c index a1283b1..0a85b1b 100644 --- a/drivers/cdrom/sbpcd.c +++ b/drivers/cdrom/sbpcd.c @@ -358,6 +358,10 @@ * Add bio/kdev_t changes for 2.5.x required to make it work again. * Still room for improvement in the request handling here if anyone * actually cares. Bring your own chainsaw. Paul G. 02/2002 + * + * + * Cleaned up the reference for deprecated check_region to + * request_region. - Surya Prabhakar N 08/07/2007 */ @@ -555,6 +559,8 @@ static struct cdrom_read_audio read_audio; static unsigned char msgnum; static char msgbuf[80]; +static int addr[2]; + static int max_drives = MAX_DRIVES; module_param(max_drives, int, 0); #ifndef MODULE @@ -5638,7 +5644,7 @@ int __init sbpcd_init(void) #endif { int i=0, j=0; - int addr[2]={1, CDROM_PORT}; + addr[2]={1, CDROM_PORT}; int port_index; sti(); @@ -5670,9 +5676,9 @@ int __init sbpcd_init(void) { addr[1]=sbpcd[port_index]; if (addr[1]==0) break; - if (check_region(addr[1],4)) + if (!request_region(addr[1],4, "sbpcd driver")) { - msg(DBG_INF,"check_region: %03X is not free.\n",addr[1]); + msg(DBG_INF,"request_region: %03X is not free.\n",addr[1]); continue; } if (sbpcd[port_index+1]==2) type=str_sp; @@ -5699,6 +5705,7 @@ int __init sbpcd_init(void) if (ndrives==0) { msg(DBG_INF, "No drive found.\n"); + release_region(addr[1],4); #ifdef MODULE return -EIO; #else @@ -5775,6 +5782,7 @@ int __init sbpcd_init(void) if (!request_region(CDo_command,4,major_name)) { printk(KERN_WARNING "sbpcd: Unable to request region 0x%x\n", CDo_command); + release_region(addr[1],4); return -EIO; } @@ -5788,6 +5796,8 @@ int __init sbpcd_init(void) #endif /* SOUND_BASE */ if (register_blkdev(MAJOR_NR, major_name)) { + release_region(CDo_command,4); + release_region(addr[1],4); #ifdef MODULE return -EIO; #else @@ -5801,6 +5811,7 @@ int __init sbpcd_init(void) sbpcd_queue = blk_init_queue(do_sbpcd_request, &sbpcd_lock); if (!sbpcd_queue) { release_region(CDo_command,4); + release_region(addr[1],4); unregister_blkdev(MAJOR_NR, major_name); return -ENOMEM; } @@ -5834,6 +5845,7 @@ int __init sbpcd_init(void) printk("Can't unregister %s\n", major_name); } release_region(CDo_command,4); + release_region(addr[1],4); blk_cleanup_queue(sbpcd_queue); return -EIO; } @@ -5850,6 +5862,7 @@ int __init sbpcd_init(void) if (sbpcd_infop == NULL) { release_region(CDo_command,4); + release_region(addr[1],4); blk_cleanup_queue(sbpcd_queue); return -ENOMEM; } @@ -5894,6 +5907,7 @@ static void sbpcd_exit(void) return; } release_region(CDo_command,4); + release_region(addr[1],4); blk_cleanup_queue(sbpcd_queue); for (j=0;j