aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message/i2o/i2o_block.c
diff options
context:
space:
mode:
authorMarkus Lidel <Markus.Lidel@shadowconnect.com>2006-01-06 03:19:33 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 11:33:54 -0500
commitf6ed39a6e1a88240eec629a3da17c3a47ada3b89 (patch)
treeb19fee742b48865b94bb26ed4428ca00a1a95b2c /drivers/message/i2o/i2o_block.c
parent2e1973a3cd0b9fe31469be62df3583bdc5a34f51 (diff)
[PATCH] I2O: Optimizing
- make i2o_iop_free() static inline (from Adrian Bunk) - changed kmalloc() + memset(0) into kzalloc() Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/message/i2o/i2o_block.c')
-rw-r--r--drivers/message/i2o/i2o_block.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 3e865b793f2c..c5807d6e85cc 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -64,7 +64,7 @@
64#include "i2o_block.h" 64#include "i2o_block.h"
65 65
66#define OSM_NAME "block-osm" 66#define OSM_NAME "block-osm"
67#define OSM_VERSION "1.316" 67#define OSM_VERSION "1.325"
68#define OSM_DESCRIPTION "I2O Block Device OSM" 68#define OSM_DESCRIPTION "I2O Block Device OSM"
69 69
70static struct i2o_driver i2o_block_driver; 70static struct i2o_driver i2o_block_driver;
@@ -981,13 +981,12 @@ static struct i2o_block_device *i2o_block_device_alloc(void)
981 struct request_queue *queue; 981 struct request_queue *queue;
982 int rc; 982 int rc;
983 983
984 dev = kmalloc(sizeof(*dev), GFP_KERNEL); 984 dev = kzalloc(sizeof(*dev), GFP_KERNEL);
985 if (!dev) { 985 if (!dev) {
986 osm_err("Insufficient memory to allocate I2O Block disk.\n"); 986 osm_err("Insufficient memory to allocate I2O Block disk.\n");
987 rc = -ENOMEM; 987 rc = -ENOMEM;
988 goto exit; 988 goto exit;
989 } 989 }
990 memset(dev, 0, sizeof(*dev));
991 990
992 INIT_LIST_HEAD(&dev->open_queue); 991 INIT_LIST_HEAD(&dev->open_queue);
993 spin_lock_init(&dev->lock); 992 spin_lock_init(&dev->lock);