diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
| commit | 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 (patch) | |
| tree | 5adc1ff2eaf64d450bf28bb6b2ce890db2567288 /drivers/block | |
| parent | 5cf65713f87775c548e3eb48dbafa32e12f28000 (diff) | |
| parent | 0ea6e61122196509af82cc4f36cbdaacbefb8227 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)
Documentation: update broken web addresses.
fix comment typo "choosed" -> "chosen"
hostap:hostap_hw.c Fix typo in comment
Fix spelling contorller -> controller in comments
Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
fs/Kconfig: Fix typo Userpace -> Userspace
Removing dead MACH_U300_BS26
drivers/infiniband: Remove unnecessary casts of private_data
fs/ocfs2: Remove unnecessary casts of private_data
libfc: use ARRAY_SIZE
scsi: bfa: use ARRAY_SIZE
drm: i915: use ARRAY_SIZE
drm: drm_edid: use ARRAY_SIZE
synclink: use ARRAY_SIZE
block: cciss: use ARRAY_SIZE
comment typo fixes: charater => character
fix comment typos concerning "challenge"
arm: plat-spear: fix typo in kerneldoc
reiserfs: typo comment fix
update email address
...
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/cciss.c | 2 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 2 | ||||
| -rw-r--r-- | drivers/block/nbd.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 51ceaee98f9..e1e7143ca1e 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
| @@ -335,7 +335,7 @@ static void cciss_map_sg_chain_block(ctlr_info_t *h, CommandList_struct *c, | |||
| 335 | static const char *raid_label[] = { "0", "4", "1(1+0)", "5", "5+1", "ADG", | 335 | static const char *raid_label[] = { "0", "4", "1(1+0)", "5", "5+1", "ADG", |
| 336 | "UNKNOWN" | 336 | "UNKNOWN" |
| 337 | }; | 337 | }; |
| 338 | #define RAID_UNKNOWN (sizeof(raid_label) / sizeof(raid_label[0])-1) | 338 | #define RAID_UNKNOWN (ARRAY_SIZE(raid_label)-1) |
| 339 | 339 | ||
| 340 | #ifdef CONFIG_PROC_FS | 340 | #ifdef CONFIG_PROC_FS |
| 341 | 341 | ||
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index dff48701b84..ec1711f7c5c 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
| @@ -1087,7 +1087,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev, | |||
| 1087 | } else { | 1087 | } else { |
| 1088 | epoch->flags = 0; | 1088 | epoch->flags = 0; |
| 1089 | atomic_set(&epoch->epoch_size, 0); | 1089 | atomic_set(&epoch->epoch_size, 0); |
| 1090 | /* atomic_set(&epoch->active, 0); is alrady zero */ | 1090 | /* atomic_set(&epoch->active, 0); is already zero */ |
| 1091 | if (rv == FE_STILL_LIVE) | 1091 | if (rv == FE_STILL_LIVE) |
| 1092 | rv = FE_RECYCLED; | 1092 | rv = FE_RECYCLED; |
| 1093 | } | 1093 | } |
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 218d091f3c5..16c3c8613cd 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * Note that you can not swap over this thing, yet. Seems to work but | 4 | * Note that you can not swap over this thing, yet. Seems to work but |
| 5 | * deadlocks sometimes - you can not swap over TCP in general. | 5 | * deadlocks sometimes - you can not swap over TCP in general. |
| 6 | * | 6 | * |
| 7 | * Copyright 1997-2000, 2008 Pavel Machek <pavel@suse.cz> | 7 | * Copyright 1997-2000, 2008 Pavel Machek <pavel@ucw.cz> |
| 8 | * Parts copyright 2001 Steven Whitehouse <steve@chygwyn.com> | 8 | * Parts copyright 2001 Steven Whitehouse <steve@chygwyn.com> |
| 9 | * | 9 | * |
| 10 | * This file is released under GPLv2 or later. | 10 | * This file is released under GPLv2 or later. |