1. 23 10月, 2010 12 次提交
    • L
      Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block · a2887097
      Linus Torvalds 提交于
      * 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block: (46 commits)
        xen-blkfront: disable barrier/flush write support
        Added blk-lib.c and blk-barrier.c was renamed to blk-flush.c
        block: remove BLKDEV_IFL_WAIT
        aic7xxx_old: removed unused 'req' variable
        block: remove the BH_Eopnotsupp flag
        block: remove the BLKDEV_IFL_BARRIER flag
        block: remove the WRITE_BARRIER flag
        swap: do not send discards as barriers
        fat: do not send discards as barriers
        ext4: do not send discards as barriers
        jbd2: replace barriers with explicit flush / FUA usage
        jbd2: Modify ASYNC_COMMIT code to not rely on queue draining on barrier
        jbd: replace barriers with explicit flush / FUA usage
        nilfs2: replace barriers with explicit flush / FUA usage
        reiserfs: replace barriers with explicit flush / FUA usage
        gfs2: replace barriers with explicit flush / FUA usage
        btrfs: replace barriers with explicit flush / FUA usage
        xfs: replace barriers with explicit flush / FUA usage
        block: pass gfp_mask and flags to sb_issue_discard
        dm: convey that all flushes are processed as empty
        ...
      a2887097
    • L
      Merge branch 'for-2.6.37/drivers' of git://git.kernel.dk/linux-2.6-block · 8abfc6e7
      Linus Torvalds 提交于
      * 'for-2.6.37/drivers' of git://git.kernel.dk/linux-2.6-block: (95 commits)
        cciss: fix PCI IDs for new Smart Array controllers
        drbd: add race-breaker to drbd_go_diskless
        drbd: use dynamic_dev_dbg to optionally log uuid changes
        dynamic_debug.h: Fix dynamic_dev_dbg() macro if CONFIG_DYNAMIC_DEBUG not set
        drbd: cleanup: change "<= 0" to "== 0"
        drbd: relax the grace period of the md_sync timer again
        drbd: add some more explicit drbd_md_sync
        drbd: drop wrong debug asserts, fix recently introduced race
        drbd: cleanup useless leftover warn/error printk's
        drbd: add explicit drbd_md_sync to drbd_resync_finished
        drbd: Do not log an ASSERT for P_OV_REQUEST packets while C_CONNECTED
        drbd: fix for possible deadlock on IO error during resync
        drbd: fix unlikely access after free and list corruption
        drbd: fix for spurious fullsync (uuids rotated too fast)
        drbd: allow for explicit resync-finished notifications
        drbd: preparation commit, using full state in receive_state()
        drbd: drbd_send_ack_dp must not rely on header information
        drbd: Fix regression in recv_bm_rle_bits (compressed bitmap)
        drbd: Fixed a stupid copy and paste error
        drbd: Allow larger values for c-fill-target.
        ...
      
      Fix up trivial conflict in drivers/block/ataflop.c due to BKL removal
      8abfc6e7
    • L
      Merge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block · e9dd2b68
      Linus Torvalds 提交于
      * 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block: (39 commits)
        cfq-iosched: Fix a gcc 4.5 warning and put some comments
        block: Turn bvec_k{un,}map_irq() into static inline functions
        block: fix accounting bug on cross partition merges
        block: Make the integrity mapped property a bio flag
        block: Fix double free in blk_integrity_unregister
        block: Ensure physical block size is unsigned int
        blkio-throttle: Fix possible multiplication overflow in iops calculations
        blkio-throttle: limit max iops value to UINT_MAX
        blkio-throttle: There is no need to convert jiffies to milli seconds
        blkio-throttle: Fix link failure failure on i386
        blkio: Recalculate the throttled bio dispatch time upon throttle limit change
        blkio: Add root group to td->tg_list
        blkio: deletion of a cgroup was causes oops
        blkio: Do not export throttle files if CONFIG_BLK_DEV_THROTTLING=n
        block: set the bounce_pfn to the actual DMA limit rather than to max memory
        block: revert bad fix for memory hotplug causing bounces
        Fix compile error in blk-exec.c for !CONFIG_DETECT_HUNG_TASK
        block: set the bounce_pfn to the actual DMA limit rather than to max memory
        block: Prevent hang_check firing during long I/O
        cfq: improve fsync performance for small files
        ...
      
      Fix up trivial conflicts due to __rcu sparse annotation in include/linux/genhd.h
      e9dd2b68
    • L
      Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 · 4f3a29da
      Linus Torvalds 提交于
      * 'linux-next' of git://git.infradead.org/ubi-2.6:
        UBI: tighten the corrupted PEB criteria
        UBI: fix check_data_ff return code
        UBI: remember copy_flag while scanning
        UBI: preserve corrupted PEBs
        UBI: add truly corrupted PEBs to corrupted list
        UBI: introduce debugging helper function
        UBI: make check_pattern function non-static
        UBI: do not put eraseblocks to the corrupted list unnecessarily
        UBI: separate out corrupted list
        UBI: change cascade of ifs to switch statements
        UBI: rename a local variable
        UBI: handle bit-flips when no header found
        UBI: remove duplicate IO error codes
        UBI: rename IO error code
        UBI: fix small 80 characters limit style issue
        UBI: cleanup and simplify Kconfig
      4f3a29da
    • L
      Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 · 06d36293
      Linus Torvalds 提交于
      * 'linux-next' of git://git.infradead.org/ubifs-2.6:
        UBIFS: do not allocate unneeded scan buffer
        UBIFS: do not forget to cancel timers
        UBIFS: remove a bit of unneeded code
        UBIFS: add a commentary about log recovery
        UBIFS: avoid kernel error if ubifs superblock read fails
        UBIFS: introduce new flags for RO mounts
        UBIFS: introduce new flag for RO due to errors
        UBIFS: check return code of pnode_lookup
        UBIFS: check return code of ubifs_lpt_lookup
        UBIFS: improve error reporting when reading bad node
        UBIFS: introduce list sorting debugging checks
        UBIFS: fix assertion warnings in comparison function
        UBIFS: mark unused key objects as invalid
        UBIFS: do not write rubbish into truncation scanning node
        UBIFS: improve assertion in node comparison functions
        UBIFS: do not use key type in list_sort
        UBIFS: do not look up truncation nodes
        UBIFS: fix assertion warning
        UBIFS: do not treat ENOSPC specially
        UBIFS: switch to RO mode after synchronizing
      06d36293
    • L
      Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 · f5d9d249
      Linus Torvalds 提交于
      * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
        pcmcia: fix ni_daq_700 compilation
        pcmcia: IOCARD is also required for using IRQs
      f5d9d249
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic · db08bf08
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
        asm-generic/io.h: allow people to override individual funcs
        bitops: remove duplicated extern declarations
        bitops: make asm-generic/bitops/find.h more generic
        asm-generic: kdebug.h: Checkpatch cleanup
        asm-generic: fcntl: make exported headers use strict posix types
        asm-generic: cmpxchg does not handle non-long arguments
        asm-generic: make atomic_add_unless a function
      db08bf08
    • L
      Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl · 092e0e7e
      Linus Torvalds 提交于
      * 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
        vfs: make no_llseek the default
        vfs: don't use BKL in default_llseek
        llseek: automatically add .llseek fop
        libfs: use generic_file_llseek for simple_attr
        mac80211: disallow seeks in minstrel debug code
        lirc: make chardev nonseekable
        viotape: use noop_llseek
        raw: use explicit llseek file operations
        ibmasmfs: use generic_file_llseek
        spufs: use llseek in all file operations
        arm/omap: use generic_file_llseek in iommu_debug
        lkdtm: use generic_file_llseek in debugfs
        net/wireless: use generic_file_llseek in debugfs
        drm: use noop_llseek
      092e0e7e
    • L
      Merge branch 'vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl · 79f14b7c
      Linus Torvalds 提交于
      * 'vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl: (30 commits)
        BKL: remove BKL from freevxfs
        BKL: remove BKL from qnx4
        autofs4: Only declare function when CONFIG_COMPAT is defined
        autofs: Only declare function when CONFIG_COMPAT is defined
        ncpfs: Lock socket in ncpfs while setting its callbacks
        fs/locks.c: prepare for BKL removal
        BKL: Remove BKL from ncpfs
        BKL: Remove BKL from OCFS2
        BKL: Remove BKL from squashfs
        BKL: Remove BKL from jffs2
        BKL: Remove BKL from ecryptfs
        BKL: Remove BKL from afs
        BKL: Remove BKL from USB gadgetfs
        BKL: Remove BKL from autofs4
        BKL: Remove BKL from isofs
        BKL: Remove BKL from fat
        BKL: Remove BKL from ext2 filesystem
        BKL: Remove BKL from do_new_mount()
        BKL: Remove BKL from cgroup
        BKL: Remove BKL from NTFS
        ...
      79f14b7c
    • L
      Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl · c37927d4
      Linus Torvalds 提交于
      * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
        block: autoconvert trivial BKL users to private mutex
        drivers: autoconvert trivial BKL users to private mutex
        ipmi: autoconvert trivial BKL users to private mutex
        mac: autoconvert trivial BKL users to private mutex
        mtd: autoconvert trivial BKL users to private mutex
        scsi: autoconvert trivial BKL users to private mutex
      
      Fix up trivial conflicts (due to addition of private mutex right next to
      deletion of a version string) in drivers/char/pcmcia/cm40[04]0_cs.c
      c37927d4
    • L
      Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl · 5704e44d
      Linus Torvalds 提交于
      * 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
        BKL: introduce CONFIG_BKL.
        dabusb: remove the BKL
        sunrpc: remove the big kernel lock
        init/main.c: remove BKL notations
        blktrace: remove the big kernel lock
        rtmutex-tester: make it build without BKL
        dvb-core: kill the big kernel lock
        dvb/bt8xx: kill the big kernel lock
        tlclk: remove big kernel lock
        fix rawctl compat ioctls breakage on amd64 and itanic
        uml: kill big kernel lock
        parisc: remove big kernel lock
        cris: autoconvert trivial BKL users
        alpha: kill big kernel lock
        isapnp: BKL removal
        s390/block: kill the big kernel lock
        hpet: kill BKL, add compat_ioctl
      5704e44d
    • D
      36845d09
  2. 22 10月, 2010 28 次提交