1. 08 8月, 2010 6 次提交
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 09dc942c
      Linus Torvalds 提交于
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (40 commits)
        ext4: Adding error check after calling ext4_mb_regular_allocator()
        ext4: Fix dirtying of journalled buffers in data=journal mode
        ext4: re-inline ext4_rec_len_(to|from)_disk functions
        jbd2: Remove t_handle_lock from start_this_handle()
        jbd2: Change j_state_lock to be a rwlock_t
        jbd2: Use atomic variables to avoid taking t_handle_lock in jbd2_journal_stop
        ext4: Add mount options in superblock
        ext4: force block allocation on quota_off
        ext4: fix freeze deadlock under IO
        ext4: drop inode from orphan list if ext4_delete_inode() fails
        ext4: check to make make sure bd_dev is set before dereferencing it
        jbd2: Make barrier messages less scary
        ext4: don't print scary messages for allocation failures post-abort
        ext4: fix EFBIG edge case when writing to large non-extent file
        ext4: fix ext4_get_blocks references
        ext4: Always journal quota file modifications
        ext4: Fix potential memory leak in ext4_fill_super
        ext4: Don't error out the fs if the user tries to make a file too big
        ext4: allocate stripe-multiple IOs on stripe boundaries
        ext4: move aio completion after unwritten extent conversion
        ...
      
      Fix up conflicts in fs/ext4/inode.c as per Ted.
      
      Fix up xfs conflicts as per earlier xfs merge.
      09dc942c
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 · 90e0c225
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
        ext3: Fix dirtying of journalled buffers in data=journal mode
        ext3: default to ordered mode
        quota: Use mark_inode_dirty_sync instead of mark_inode_dirty
        quota: Change quota error message to print out disk and function name
        MAINTAINERS: Update entries of ext2 and ext3
        MAINTAINERS: Update address of Andreas Dilger
        ext3: Avoid filesystem corruption after a crash under heavy delete load
        ext3: remove vestiges of nobh support
        ext3: Fix set but unused variables
        quota: clean up quota active checks
        quota: Clean up the namespace in dqblk_xfs.h
        quota: check quota reservation on remove_dquot_ref
      90e0c225
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm · 938a73b9
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
        fs/dlm: Drop unnecessary null test
        dlm: use genl_register_family_with_ops()
      938a73b9
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6 · 45480aa7
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
        udf: super.c Fix warning: variable 'sbi' set but not used
        udf: remove duplicated #include
      45480aa7
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 1fc7995d
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        [DNS RESOLVER] Minor typo correction
        DNS: Fixes for the DNS query module
        cifs: Include linux/err.h for IS_ERR and PTR_ERR
        DNS: Make AFS go to the DNS for AFSDB records for unknown cells
        DNS: Separate out CIFS DNS Resolver code
        cifs: account for new creduid=0x%x parameter in spnego upcall string
        cifs: reduce false positives with inode aliasing serverino autodisable
        CIFS: Make cifs_convert_address() take a const src pointer and a length
        cifs: show features compiled in as part of DebugData
        cifs: update README
      
      Fix up trivial conflicts in fs/cifs/cifsfs.c due to workqueue changes
      1fc7995d
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 3b7433b8
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (55 commits)
        workqueue: mark init_workqueues() as early_initcall()
        workqueue: explain for_each_*cwq_cpu() iterators
        fscache: fix build on !CONFIG_SYSCTL
        slow-work: kill it
        gfs2: use workqueue instead of slow-work
        drm: use workqueue instead of slow-work
        cifs: use workqueue instead of slow-work
        fscache: drop references to slow-work
        fscache: convert operation to use workqueue instead of slow-work
        fscache: convert object to use workqueue instead of slow-work
        workqueue: fix how cpu number is stored in work->data
        workqueue: fix mayday_mask handling on UP
        workqueue: fix build problem on !CONFIG_SMP
        workqueue: fix locking in retry path of maybe_create_worker()
        async: use workqueue for worker pool
        workqueue: remove WQ_SINGLE_CPU and use WQ_UNBOUND instead
        workqueue: implement unbound workqueue
        workqueue: prepare for WQ_UNBOUND implementation
        libata: take advantage of cmwq and remove concurrency limitations
        workqueue: fix worker management invocation without pending works
        ...
      
      Fixed up conflicts in fs/cifs/* as per Tejun. Other trivial conflicts in
      include/linux/workqueue.h, kernel/trace/Kconfig and kernel/workqueue.c
      3b7433b8
  2. 07 8月, 2010 34 次提交