1. 02 8月, 2011 34 次提交
  2. 28 7月, 2011 6 次提交
    • L
      Merge branch 'for-linus' of git://neil.brown.name/md · 6140333d
      Linus Torvalds 提交于
      * 'for-linus' of git://neil.brown.name/md: (75 commits)
        md/raid10: handle further errors during fix_read_error better.
        md/raid10: Handle read errors during recovery better.
        md/raid10: simplify read error handling during recovery.
        md/raid10: record bad blocks due to write errors during resync/recovery.
        md/raid10:  attempt to fix read errors during resync/check
        md/raid10:  Handle write errors by updating badblock log.
        md/raid10: clear bad-block record when write succeeds.
        md/raid10: avoid writing to known bad blocks on known bad drives.
        md/raid10 record bad blocks as needed during recovery.
        md/raid10: avoid reading known bad blocks during resync/recovery.
        md/raid10 - avoid reading from known bad blocks - part 3
        md/raid10: avoid reading from known bad blocks - part 2
        md/raid10: avoid reading from known bad blocks - part 1
        md/raid10: Split handle_read_error out from raid10d.
        md/raid10: simplify/reindent some loops.
        md/raid5: Clear bad blocks on successful write.
        md/raid5.  Don't write to known bad block on doubtful devices.
        md/raid5: write errors should be recorded as bad blocks if possible.
        md/raid5: use bad-block log to improve handling of uncorrectable read errors.
        md/raid5: avoid reading from known bad blocks.
        ...
      6140333d
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 6f56c218
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        sound: oss: rename local change_bits to avoid powerpc bitsops.h definition
        ALSA: hda - Fix duplicated DAC assignments for Realtek
        ALSA: asihpi - off by one in asihpi_hpi_ioctl()
        ALSA: hda - Fix Oops with Realtek quirks with NULL adc_nids
        ALSA: asihpi - bug fix pa use before init.
        ALSA: hda - Add support for vref-out based mute LED control on IDT codecs
      6f56c218
    • L
      Merge branch 'for-linus' of... · 95b68865
      Linus Torvalds 提交于
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (54 commits)
        tpm_nsc: Fix bug when loading multiple TPM drivers
        tpm: Move tpm_tis_reenable_interrupts out of CONFIG_PNP block
        tpm: Fix compilation warning when CONFIG_PNP is not defined
        TOMOYO: Update kernel-doc.
        tpm: Fix a typo
        tpm_tis: Probing function for Intel iTPM bug
        tpm_tis: Fix the probing for interrupts
        tpm_tis: Delay ACPI S3 suspend while the TPM is busy
        tpm_tis: Re-enable interrupts upon (S3) resume
        tpm: Fix display of data in pubek sysfs entry
        tpm_tis: Add timeouts sysfs entry
        tpm: Adjust interface timeouts if they are too small
        tpm: Use interface timeouts returned from the TPM
        tpm_tis: Introduce durations sysfs entry
        tpm: Adjust the durations if they are too small
        tpm: Use durations returned from TPM
        TOMOYO: Enable conditional ACL.
        TOMOYO: Allow using argv[]/envp[] of execve() as conditions.
        TOMOYO: Allow using executable's realpath and symlink's target as conditions.
        TOMOYO: Allow using owner/group etc. of file objects as conditions.
        ...
      
      Fix up trivial conflict in security/tomoyo/realpath.c
      95b68865
    • N
      md/raid10: handle further errors during fix_read_error better. · 58c54fcc
      NeilBrown 提交于
      If we find more read/write errors we should record a bad block before
      failing the device.
      Signed-off-by: NNeilBrown <neilb@suse.de>
      58c54fcc
    • N
      md/raid10: Handle read errors during recovery better. · 5e570289
      NeilBrown 提交于
      Currently when we get a read error during recovery, we simply abort
      the recovery.
      
      Instead, repeat the read in page-sized blocks.
      On successful reads, write to the target.
      On read errors, record a bad block on the destination,
      and only if that fails do we abort the recovery.
      
      As we now retry reads we need to know where we read from.  This was in
      bi_sector but that can be changed during a read attempt.
      So store the correct from_addr and to_addr in the r10_bio for later
      access.
      
      
      Signed-off-by: NeilBrown<neilb@suse.de>
      5e570289
    • N
      md/raid10: simplify read error handling during recovery. · e684e41d
      NeilBrown 提交于
      If a read error is detected during recovery the code currently
      fails the read device.
      This isn't really necessary.  recovery_request_write will signal
      a write error to end_sync_write and it will record a write
      error on the destination device which will record a bad block
      there or kick it from the array.
      
      So just remove this call to do md_error.
      Signed-off-by: NNeilBrown <neilb@suse.de>
      e684e41d