summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* jbd: clear revoked flag on buffers before a new transaction startedYongqiang Yang2011-11-223-0/+41
| | | | | | | | | | | | | | | | | Currently, we clear revoked flag only when a block is reused. However, this can tigger a false journal error. Consider a situation when a block is used as a meta block and is deleted(revoked) in ordered mode, then the block is allocated as a data block to a file. At this moment, user changes the file's journal mode from ordered to journaled and truncates the file. The block will be considered re-revoked by journal because it has revoked flag still pending from the last transaction and an assertion triggers. We fix the problem by keeping the revoked status more uptodate - we clear revoked flag when switching revoke tables to reflect there is no revoked buffers in current transaction any more. Signed-off-by: Yongqiang Yang <xiaoqiangnk@gmail.com> Signed-off-by: Jan Kara <jack@suse.cz>
* ext3: call ext3_mark_recovery_complete() when recovery is really neededEryu Guan2011-11-091-2/+3
| | | | | | | | | | | | Call ext3_mark_recovery_complete() in ext3_fill_super() only if needs_recovery is non-zero. Besides that, print out "recovery complete" message after calling ext3_mark_recovery_complete(). Cc: Jan Kara <jack@suse.cz> Signed-off-by: Eryu Guan <guaneryu@gmail.com> Signed-off-by: Jan Kara <jack@suse.cz>
* Merge branch 'for-linus' of ↵Linus Torvalds2011-11-085-0/+5
|\ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: drivers/media: video/a5k6aa is a module and so needs module.h mfd: fix build failures in recently added ab5500 code hwspinlock/u8500: include linux/module.h MTD: MAPS: bcm963xx-flash.c: explicitly include module.h
| * drivers/media: video/a5k6aa is a module and so needs module.hPaul Gortmaker2011-11-081-0/+1
| | | | | | | | | | | | | | This file uses core functions like module_init() and module_exit() and so it explicitly needs to include the module.h header. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| * mfd: fix build failures in recently added ab5500 codePaul Gortmaker2011-11-072-0/+2
| | | | | | | | | | | | | | | | | | These files had implicit dependencies on modular support which now show up as build failures with the module cleanup work merged to mainline. Reported-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| * hwspinlock/u8500: include linux/module.hAxel Lin2011-11-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include module.h to fix below build error: CC drivers/hwspinlock/u8500_hsem.o drivers/hwspinlock/u8500_hsem.c:177: error: 'THIS_MODULE' undeclared here (not in a function) [...] drivers/hwspinlock/u8500_hsem.c:196: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR' drivers/hwspinlock/u8500_hsem.c:196: warning: function declaration isn't a prototype make[2]: *** [drivers/hwspinlock/u8500_hsem.o] Error 1 make[1]: *** [drivers/hwspinlock] Error 2 make: *** [drivers] Error 2 Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| * MTD: MAPS: bcm963xx-flash.c: explicitly include module.hJonas Gorski2011-11-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | module.h was previously implicitly included through mtd/mtd.h. Fixes the following build failure after the module.h cleanup: CC drivers/mtd/maps/bcm963xx-flash.o drivers/mtd/maps/bcm963xx-flash.c: In function 'bcm963xx_probe': drivers/mtd/maps/bcm963xx-flash.c:208:29: error: 'THIS_MODULE' undeclared (first use in this function) [...] drivers/mtd/maps/bcm963xx-flash.c:276:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR' drivers/mtd/maps/bcm963xx-flash.c:276:15: warning: function declaration isn't a prototype make[7]: *** [drivers/mtd/maps/bcm963xx-flash.o] Error 1 Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
* | Merge branch 'for-linus' of git://neil.brown.name/mdLinus Torvalds2011-11-081-6/+10
|\ \ | | | | | | | | | | | | | | | * 'for-linus' of git://neil.brown.name/md: md/raid5: STRIPE_ACTIVE has lock semantics, add barriers md/raid5: abort any pending parity operations when array fails.
| * | md/raid5: STRIPE_ACTIVE has lock semantics, add barriersDan Williams2011-11-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All updates that occur under STRIPE_ACTIVE should be globally visible when STRIPE_ACTIVE clears. test_and_set_bit() implies a barrier, but clear_bit() does not. This is suitable for 3.1-stable. Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: NeilBrown <neilb@suse.de> Cc: stable@kernel.org
| * | md/raid5: abort any pending parity operations when array fails.NeilBrown2011-11-081-4/+8
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the number of failed devices exceeds the allowed number we must abort any active parity operations (checks or updates) as they are no longer meaningful, and can lead to a BUG_ON in handle_parity_checks6. This bug was introduce by commit 6c0069c0ae9659e3a91b68eaed06a5c6c37f45c8 in 2.6.29. Reported-by: Manish Katiyar <mkatiyar@gmail.com> Tested-by: Manish Katiyar <mkatiyar@gmail.com> Acked-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: NeilBrown <neilb@suse.de> Cc: stable@kernel.org
* | Merge branch 'docs-move' of ↵Linus Torvalds2011-11-082-142/+170
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs * 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs: (45 commits) DocBook/drm: Clean up a todo-note DocBook/drm: `device aware' -> `device-aware' DocBook/drm: `(device|driver) specific' -> `(device|driver)-specific' DocBook/drm: Clean up the paragraph on framebuffer objects DocBook/drm: Use `; otherwise,' DocBook/drm: Better flow with `, and then' DocBook/drm: Refer to the domain-setting function as a device-specific ioctl DocBook/drm: Improve flow of GPU/CPU coherence sentence DocBook/drm: Use an <itemizelist> for fundamental GEM operations DocBook/drm: Insert a comma DocBook/drm: Use a <variablelist> for vblank ioctls DocBook/drm: Use an itemizedlist for what an encoder needs to provide DocBook/drm: Insert `the' for readability, and change `set' to `setting' DocBook/drm: Remove extraneous commas DocBook/drm: Use a colon DocBook/drm: Clarify `final initialization' via better formatting DocBook/drm: Remove redundancy DocBook/drm: Insert `it' for smooth reading DocBook/drm: The word `so-called'; I do not think it connotes what you think it connotes DocBook/drm: Use a singular subject for grammatical cleanliness ...
| * \ Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into ↵Randy Dunlap2011-11-062-142/+170
| |\ \ | | | | | | | | | | | | docs-move
| | * | DocBook/drm: Clean up a todo-noteMichael Witten2011-08-291-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: `device aware' -> `device-aware'Michael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: `(device|driver) specific' -> `(device|driver)-specific'Michael Witten2011-08-291-17/+17
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Clean up the paragraph on framebuffer objectsMichael Witten2011-08-291-8/+6
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Use `; otherwise,'Michael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Better flow with `, and then'Michael Witten2011-08-291-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Refer to the domain-setting function as a device-specific ioctlMichael Witten2011-08-291-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Improve flow of GPU/CPU coherence sentenceMichael Witten2011-08-291-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Use an <itemizelist> for fundamental GEM operationsMichael Witten2011-08-291-3/+7
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Insert a commaMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Use a <variablelist> for vblank ioctlsMichael Witten2011-08-291-14/+25
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Use an itemizedlist for what an encoder needs to provideMichael Witten2011-08-291-11/+19
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Insert `the' for readability, and change `set' to `setting'Michael Witten2011-08-291-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Remove extraneous commasMichael Witten2011-08-291-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Use a colonMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Clarify `final initialization' via better formattingMichael Witten2011-08-291-4/+13
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Remove redundancyMichael Witten2011-08-291-2/+1
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Insert `it' for smooth readingMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: The word `so-called'; I do not think it connotes what you think ↵Michael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it connotes From Webster's Revised Unabridged Dictionary (1913) [web1913]: So-called \So"-called`\, a. So named; called by such a name (but perhaps called thus with doubtful propriety). From WordNet (r) 2.0 [wn]: so-called adj : doubtful or suspect; "these so-called experts are no help" [syn: {alleged(a)}, {supposed}] My strong conviction is that widespread use of 'so gennant' or 'sogennant' in German has led to the creeping misuse of 'so-called' in English (especially through technical writings). In English, it would be better to use: what is called or a better translation of 'so gennant': so named Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Use a singular subject for grammatical cleanlinessMichael Witten2011-08-291-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: basic -> coreMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Streamline wording of GEM initializationMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Insert `()' after function nameMichael Witten2011-08-291-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Remove parentheses and unnecessary repetitionMichael Witten2011-08-291-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Insert missing commaMichael Witten2011-08-291-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: , -> :Michael Witten2011-08-291-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: can -> couldMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Offset modifiers with commasMichael Witten2011-08-291-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Use the passive voiceMichael Witten2011-08-291-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: `at driver load time' -> `when the driver is loaded'Michael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: `setup' is the noun; `to set up' is the verbMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Insert missing `an'Michael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Insert missing `that'Michael Witten2011-08-291-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Clearer wording with `for consumption by'Michael Witten2011-08-291-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Better wordingMichael Witten2011-08-291-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Replace the paragraph's first sentence with its last sentenceMichael Witten2011-08-291-7/+5
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Rearrange wording to make more senseMichael Witten2011-08-291-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * | DocBook/drm: Clean up `pre-memory management aware'Michael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
OpenPOWER on IntegriCloud