[Cbe-oss-dev] [PATCH 03/33] ps3vram: Use proc_create_data() instead of proc_create()

Geert Uytterhoeven Geert.Uytterhoeven at sonycom.com
Thu Jun 11 00:38:38 EST 2009


Use proc_create_data() to avoid race conditions.

Reported-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven at sonycom.com>
Cc: Jim Paris <jim at jtan.com>
Cc: Jens Axboe <axboe at kernel.dk>
---
 drivers/block/ps3vram.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c
index 2e79d2c..6e73868 100644
--- a/drivers/block/ps3vram.c
+++ b/drivers/block/ps3vram.c
@@ -546,12 +546,10 @@ static void __devinit ps3vram_proc_init(struct ps3_system_bus_device *dev)
 	struct ps3vram_priv *priv = dev->core.driver_data;
 	struct proc_dir_entry *pde;
 
-	pde = proc_create(DEVICE_NAME, 0444, NULL, &ps3vram_proc_fops);
-	if (!pde) {
+	pde = proc_create_data(DEVICE_NAME, 0444, NULL, &ps3vram_proc_fops,
+			       priv);
+	if (!pde)
 		dev_warn(&dev->core, "failed to create /proc entry\n");
-		return;
-	}
-	pde->data = priv;
 }
 
 static int ps3vram_make_request(struct request_queue *q, struct bio *bio)
-- 
1.6.2.4




More information about the cbe-oss-dev mailing list