diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
| commit | 57d19e80f459dd845fb3cfeba8e6df8471bac142 (patch) | |
| tree | 8254766715720228db3d50f1ef3c7fe003c06d65 /drivers/md | |
| parent | ee9ec4f82049c678373a611ce20ac67fe9ad836e (diff) | |
| parent | e64851f5a0ad6ec991f74ebb3108c35aa0323d5f (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: (39 commits)
b43: fix comment typo reqest -> request
Haavard Skinnemoen has left Atmel
cris: typo in mach-fs Makefile
Kconfig: fix copy/paste-ism for dell-wmi-aio driver
doc: timers-howto: fix a typo ("unsgined")
perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
treewide: fix a few typos in comments
regulator: change debug statement be consistent with the style of the rest
Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
audit: acquire creds selectively to reduce atomic op overhead
rtlwifi: don't touch with treewide double semicolon removal
treewide: cleanup continuations and remove logging message whitespace
ath9k_hw: don't touch with treewide double semicolon removal
include/linux/leds-regulator.h: fix syntax in example code
tty: fix typo in descripton of tty_termios_encode_baud_rate
xtensa: remove obsolete BKL kernel option from defconfig
m68k: fix comment typo 'occcured'
arch:Kconfig.locks Remove unused config option.
treewide: remove extra semicolons
...
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/raid5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 34dd54539f7b..346e69bfdab3 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
| @@ -3958,7 +3958,7 @@ static int make_request(mddev_t *mddev, struct bio * bi) | |||
| 3958 | /* spinlock is needed as reshape_progress may be | 3958 | /* spinlock is needed as reshape_progress may be |
| 3959 | * 64bit on a 32bit platform, and so it might be | 3959 | * 64bit on a 32bit platform, and so it might be |
| 3960 | * possible to see a half-updated value | 3960 | * possible to see a half-updated value |
| 3961 | * Ofcourse reshape_progress could change after | 3961 | * Of course reshape_progress could change after |
| 3962 | * the lock is dropped, so once we get a reference | 3962 | * the lock is dropped, so once we get a reference |
| 3963 | * to the stripe that we think it is, we will have | 3963 | * to the stripe that we think it is, we will have |
| 3964 | * to check again. | 3964 | * to check again. |