Skip to contentSkip to conversation

cciss: return 0 from driver probe function on success, not 1

PATCH New Stephen M. Cameron 2 participants 3 messages Nov 1, 2013 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cciss: return 0 from driver probe function on success, not 1

Just resending the patch with a better change log message (as requested by Andrew Morton) and cc'ing [email protected], (as I originally had intended.)

---

Stephen M. Cameron (1):
cciss: return 0 from driver probe function on success, not 1

 drivers/block/cciss.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Signature · 1 line
-- steve
#1 lore raw

PATCH 1/1 cciss: return 0 from driver probe function on success, not 1

From: Stephen M. Cameron <[email protected]>

A return value of 1 is interpreted as an error. See pci_driver. in local_pci_probe(). If you're wondering how this ever could have worked, it's because it used to be the case that only return values less than zero were interpreted as failure. But even in the current kernel if the driver registers its various entry points with the kernel, and then returns a value which is interpreted as failure, those registrations aren't undone, so the driver still mostly works. However, the driver's remove function wouldn't be called on rmmod, and pci power management functions wouldn't work. In the case of Smart Array, since it has a battery backed cache (or else no cache) even if the driver is not shut down properly as long as there is no outstanding i/o, nothing too bad happens, which is why it took so long to notice.

Requesting backport to stable because the change to pci-driver.c which requires driver probe functions to return 0 occurred between 2.6.35 and 2.6.36 (the pci power management breakage) and again between 3.7 and 3.8 (pci_dev->driver getting set to NULL in local_pci_probe() preventing driver remove function from being called on rmmod.)

---
 drivers/block/cciss.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/block/cciss.c +1 -1
index edfa251..0c004ac 100644
@@ -5183,7 +5183,7 @@ reinit_after_soft_reset:
 	rebuild_lun_table(h, 1, 0);
 	cciss_engage_scsi(h);
 	h->busy_initializing = 0;
-	return 1;
+	return 0;
 
 clean4:
 	cciss_free_cmd_pool(h);
maintainer
#2 lore raw
Quoted 17 lines · Stephen M. Cameron

From: Stephen M. Cameron <[email protected]>

A return value of 1 is interpreted as an error. See pci_driver. in local_pci_probe(). If you're wondering how this ever could have worked, it's because it used to be the case that only return values less than zero were interpreted as failure. But even in the current kernel if the driver registers its various entry points with the kernel, and then returns a value which is interpreted as failure, those registrations aren't undone, so the driver still mostly works. However, the driver's remove function wouldn't be called on rmmod, and pci power management functions wouldn't work. In the case of Smart Array, since it has a battery backed cache (or else no cache) even if the driver is not shut down properly as long as there is no outstanding i/o, nothing too bad happens, which is why it took so long to notice.

Quoted 6 lines

Requesting backport to stable because the change to pci-driver.c which requires driver probe functions to return 0 occurred between 2.6.35 and 2.6.36 (the pci power management breakage) and again between 3.7 and 3.8 (pci_dev->driver getting set to NULL in local_pci_probe() preventing driver remove function from being called on rmmod.)

The original patch went in two days ago, so it's a little difficult for me to update it unfortunately. But you can include lots of this in the pci-driver.c warning print patch instead.

Signature · 1 line
Jens Axboe