diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 19:17:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 19:17:56 -0700 |
| commit | a5f08c1ce08f2d8ce9a0e3e35a4c32e875fb7225 (patch) | |
| tree | a8ae5bbcfe14cbc083d163b664d5976b6a7dd3ba /drivers/md/dm-hw-handler.c | |
| parent | c1cb8e48bddd9e16ef488ea5d50885908c5a4081 (diff) | |
| parent | 80fd662683be5dc2a3b41b27e30942d5fd7b5d5c (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/agk/linux-2.6-dm
* master.kernel.org:/pub/scm/linux/kernel/git/agk/linux-2.6-dm: (29 commits)
dm crypt: tidy pending
dm mpath: send uevents
dm: uevent generate events
dm: add uevent to core
dm: export name and uuid
dm raid1: add mirror_set to struct mirror
dm log: split suspend
dm mpath: hp retry if not ready
dm mpath: add hp handler
dm mpath: add retry pg init
dm crypt: tidy labels
dm crypt: tidy whitespace
dm crypt: add post processing queue
dm crypt: use per device singlethread workqueues
dm mpath: emc fix an error message
dm: bio_list macro renaming
dm io:ctl remove vmalloc void cast
dm: tidy bio_io_error usage
kcopyd use mutex instead of semaphore
dm: use kzalloc
...
Diffstat (limited to 'drivers/md/dm-hw-handler.c')
| -rw-r--r-- | drivers/md/dm-hw-handler.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/md/dm-hw-handler.c b/drivers/md/dm-hw-handler.c index baafaaba4d4..2ee84d8aa0b 100644 --- a/drivers/md/dm-hw-handler.c +++ b/drivers/md/dm-hw-handler.c @@ -91,12 +91,10 @@ void dm_put_hw_handler(struct hw_handler_type *hwht) static struct hwh_internal *_alloc_hw_handler(struct hw_handler_type *hwht) { - struct hwh_internal *hwhi = kmalloc(sizeof(*hwhi), GFP_KERNEL); + struct hwh_internal *hwhi = kzalloc(sizeof(*hwhi), GFP_KERNEL); - if (hwhi) { - memset(hwhi, 0, sizeof(*hwhi)); + if (hwhi) hwhi->hwht = *hwht; - } return hwhi; } |