diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 06:11:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 06:11:02 -0400 |
commit | 59e52534172d845ebffb0d7e85fc56fb7b857051 (patch) | |
tree | 49552e03f1bdb413cd8b5f7542e91770688d7047 /drivers/block | |
parent | 73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26 (diff) | |
parent | 0d89e54c8249645404283436d952afc261a04e1e (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)
MAINTAINERS: linux-m32r is moderated for non-subscribers
linux@lists.openrisc.net is moderated for non-subscribers
Drop default from "DM365 codec select" choice
parisc: Kconfig: cleanup Kernel page size default
Kconfig: remove redundant CONFIG_ prefix on two symbols
cris: remove arch/cris/arch-v32/lib/nand_init.S
microblaze: add missing CONFIG_ prefixes
h8300: drop puzzling Kconfig dependencies
MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers
tty: drop superfluous dependency in Kconfig
ARM: mxc: fix Kconfig typo 'i.MX51'
Fix file references in Kconfig files
aic7xxx: fix Kconfig references to READMEs
Fix file references in drivers/ide/
thinkpad_acpi: Fix printk typo 'bluestooth'
bcmring: drop commented out line in Kconfig
btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888'
doc: raw1394: Trivial typo fix
CIFS: Don't free volume_info->UNC until we are entirely done with it.
treewide: Correct spelling of successfully in comments
...
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/drbd/drbd_bitmap.c | 5 | ||||
-rw-r--r-- | drivers/block/drbd/drbd_int.h | 3 | ||||
-rw-r--r-- | drivers/block/drbd/drbd_nl.c | 4 | ||||
-rw-r--r-- | drivers/block/rbd.c | 2 | ||||
-rw-r--r-- | drivers/block/xen-blkback/common.h | 1 |
5 files changed, 6 insertions, 9 deletions
diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c index 7b976296b56..912f585a760 100644 --- a/drivers/block/drbd/drbd_bitmap.c +++ b/drivers/block/drbd/drbd_bitmap.c | |||
@@ -378,15 +378,14 @@ static struct page **bm_realloc_pages(struct drbd_bitmap *b, unsigned long want) | |||
378 | * thread. As we have no disk yet, we are not in the IO path, | 378 | * thread. As we have no disk yet, we are not in the IO path, |
379 | * not even the IO path of the peer. */ | 379 | * not even the IO path of the peer. */ |
380 | bytes = sizeof(struct page *)*want; | 380 | bytes = sizeof(struct page *)*want; |
381 | new_pages = kmalloc(bytes, GFP_KERNEL); | 381 | new_pages = kzalloc(bytes, GFP_KERNEL); |
382 | if (!new_pages) { | 382 | if (!new_pages) { |
383 | new_pages = vmalloc(bytes); | 383 | new_pages = vzalloc(bytes); |
384 | if (!new_pages) | 384 | if (!new_pages) |
385 | return NULL; | 385 | return NULL; |
386 | vmalloced = 1; | 386 | vmalloced = 1; |
387 | } | 387 | } |
388 | 388 | ||
389 | memset(new_pages, 0, bytes); | ||
390 | if (want >= have) { | 389 | if (want >= have) { |
391 | for (i = 0; i < have; i++) | 390 | for (i = 0; i < have; i++) |
392 | new_pages[i] = old_pages[i]; | 391 | new_pages[i] = old_pages[i]; |
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index ef2ceed3be4..1706d60b8c9 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h | |||
@@ -28,7 +28,6 @@ | |||
28 | 28 | ||
29 | #include <linux/compiler.h> | 29 | #include <linux/compiler.h> |
30 | #include <linux/types.h> | 30 | #include <linux/types.h> |
31 | #include <linux/version.h> | ||
32 | #include <linux/list.h> | 31 | #include <linux/list.h> |
33 | #include <linux/sched.h> | 32 | #include <linux/sched.h> |
34 | #include <linux/bitops.h> | 33 | #include <linux/bitops.h> |
@@ -928,7 +927,7 @@ struct drbd_md { | |||
928 | #define NL_INT64(pn,pr,member) __u64 member; | 927 | #define NL_INT64(pn,pr,member) __u64 member; |
929 | #define NL_BIT(pn,pr,member) unsigned member:1; | 928 | #define NL_BIT(pn,pr,member) unsigned member:1; |
930 | #define NL_STRING(pn,pr,member,len) unsigned char member[len]; int member ## _len; | 929 | #define NL_STRING(pn,pr,member,len) unsigned char member[len]; int member ## _len; |
931 | #include "linux/drbd_nl.h" | 930 | #include <linux/drbd_nl.h> |
932 | 931 | ||
933 | struct drbd_backing_dev { | 932 | struct drbd_backing_dev { |
934 | struct block_device *backing_bdev; | 933 | struct block_device *backing_bdev; |
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 0feab261e29..af2a25049bc 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c | |||
@@ -94,7 +94,7 @@ static int name ## _from_tags(struct drbd_conf *mdev, \ | |||
94 | arg->member ## _len = dlen; \ | 94 | arg->member ## _len = dlen; \ |
95 | memcpy(arg->member, tags, min_t(size_t, dlen, len)); \ | 95 | memcpy(arg->member, tags, min_t(size_t, dlen, len)); \ |
96 | break; | 96 | break; |
97 | #include "linux/drbd_nl.h" | 97 | #include <linux/drbd_nl.h> |
98 | 98 | ||
99 | /* Generate the struct to tag_list functions */ | 99 | /* Generate the struct to tag_list functions */ |
100 | #define NL_PACKET(name, number, fields) \ | 100 | #define NL_PACKET(name, number, fields) \ |
@@ -129,7 +129,7 @@ name ## _to_tags(struct drbd_conf *mdev, \ | |||
129 | put_unaligned(arg->member ## _len, tags++); \ | 129 | put_unaligned(arg->member ## _len, tags++); \ |
130 | memcpy(tags, arg->member, arg->member ## _len); \ | 130 | memcpy(tags, arg->member, arg->member ## _len); \ |
131 | tags = (unsigned short *)((char *)tags + arg->member ## _len); | 131 | tags = (unsigned short *)((char *)tags + arg->member ## _len); |
132 | #include "linux/drbd_nl.h" | 132 | #include <linux/drbd_nl.h> |
133 | 133 | ||
134 | void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name); | 134 | void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name); |
135 | void drbd_nl_send_reply(struct cn_msg *, int); | 135 | void drbd_nl_send_reply(struct cn_msg *, int); |
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 15f65b5f3fc..fe3c3249cec 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c | |||
@@ -192,7 +192,7 @@ static ssize_t rbd_snap_add(struct device *dev, | |||
192 | const char *buf, | 192 | const char *buf, |
193 | size_t count); | 193 | size_t count); |
194 | static void __rbd_remove_snap_dev(struct rbd_device *rbd_dev, | 194 | static void __rbd_remove_snap_dev(struct rbd_device *rbd_dev, |
195 | struct rbd_snap *snap);; | 195 | struct rbd_snap *snap); |
196 | 196 | ||
197 | 197 | ||
198 | static struct rbd_device *dev_to_rbd(struct device *dev) | 198 | static struct rbd_device *dev_to_rbd(struct device *dev) |
diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback/common.h index 00c57c90e2d..c4bd34063ec 100644 --- a/drivers/block/xen-blkback/common.h +++ b/drivers/block/xen-blkback/common.h | |||
@@ -27,7 +27,6 @@ | |||
27 | #ifndef __XEN_BLKIF__BACKEND__COMMON_H__ | 27 | #ifndef __XEN_BLKIF__BACKEND__COMMON_H__ |
28 | #define __XEN_BLKIF__BACKEND__COMMON_H__ | 28 | #define __XEN_BLKIF__BACKEND__COMMON_H__ |
29 | 29 | ||
30 | #include <linux/version.h> | ||
31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
32 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
33 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |