1. 28 3月, 2011 10 次提交
  2. 26 3月, 2011 5 次提交
    • L
      Merge branch 'nfs-for-2.6.39' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · 40471856
      Linus Torvalds 提交于
      * 'nfs-for-2.6.39' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (28 commits)
        Cleanup XDR parsing for LAYOUTGET, GETDEVICEINFO
        NFSv4.1 convert layoutcommit sync to boolean
        NFSv4.1 pnfs_layoutcommit_inode fixes
        NFS: Determine initial mount security
        NFS: use secinfo when crossing mountpoints
        NFS: Add secinfo procedure
        NFS: lookup supports alternate client
        NFS: convert call_sync() to a function
        NFSv4.1 remove temp code that prevented ds commits
        NFSv4.1: layoutcommit
        NFSv4.1: filelayout driver specific code for COMMIT
        NFSv4.1: remove GETATTR from ds commits
        NFSv4.1: add generic layer hooks for pnfs COMMIT
        NFSv4.1: alloc and free commit_buckets
        NFSv4.1: shift filelayout_free_lseg
        NFSv4.1: pull out code from nfs_commit_release
        NFSv4.1: pull error handling out of nfs_commit_list
        NFSv4.1: add callback to nfs4_commit_done
        NFSv4.1: rearrange nfs_commit_rpcsetup
        NFSv4.1: don't send COMMIT to ds for data sync writes
        ...
      40471856
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · ae005cbe
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (43 commits)
        ext4: fix a BUG in mb_mark_used during trim.
        ext4: unused variables cleanup in fs/ext4/extents.c
        ext4: remove redundant set_buffer_mapped() in ext4_da_get_block_prep()
        ext4: add more tracepoints and use dev_t in the trace buffer
        ext4: don't kfree uninitialized s_group_info members
        ext4: add missing space in printk's in __ext4_grp_locked_error()
        ext4: add FITRIM to compat_ioctl.
        ext4: handle errors in ext4_clear_blocks()
        ext4: unify the ext4_handle_release_buffer() api
        ext4: handle errors in ext4_rename
        jbd2: add COW fields to struct jbd2_journal_handle
        jbd2: add the b_cow_tid field to journal_head struct
        ext4: Initialize fsync transaction ids in ext4_new_inode()
        ext4: Use single thread to perform DIO unwritten convertion
        ext4: optimize ext4_bio_write_page() when no extent conversion is needed
        ext4: skip orphan cleanup if fs has unknown ROCOMPAT features
        ext4: use the nblocks arg to ext4_truncate_restart_trans()
        ext4: fix missing iput of root inode for some mount error paths
        ext4: make FIEMAP and delayed allocation play well together
        ext4: suppress verbose debugging information if malloc-debug is off
        ...
      
      Fi up conflicts in fs/ext4/super.c due to workqueue changes
      ae005cbe
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block · 3961cdf8
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
        block: fix issue with calling blk_stop_queue() from the request_fn handler
        block: fix bug with inserting flush requests as sort/merge
      3961cdf8
    • J
      block: fix issue with calling blk_stop_queue() from the request_fn handler · ad3d9d7e
      Jens Axboe 提交于
      When the queue work handler was converted to delayed work, the
      stopping was inadvertently made sync as well. Change this back
      to being async stop, using __cancel_delayed_work() instead of
      cancel_delayed_work().
      Reported-by: NJeremy Fitzhardinge <jeremy@goop.org>
      Reported-by: NChris Mason <chris.mason@oracle.com>
      Signed-off-by: NJens Axboe <jaxboe@fusionio.com>
      ad3d9d7e
    • J
      block: fix bug with inserting flush requests as sort/merge · 401a18e9
      Jens Axboe 提交于
      With the introduction of the on-stack plugging, we would assume
      that any request being inserted was a normal file system request.
      As flush/fua requires a special insert mode, this caused problems.
      
      Fix this up by checking for this in flush_plug_list() and use
      the appropriate insert mechanism.
      
      Big thanks goes to Markus Tripplesdorf for tirelessly testing
      patches, and to Sergey Senozhatsky for helping find the real
      issue.
      Reported-by: NMarkus Tripplesdorf <markus@trippelsdorf.de>
      Signed-off-by: NJens Axboe <jaxboe@fusionio.com>
      401a18e9
  3. 25 3月, 2011 25 次提交