1. 15 11月, 2013 36 次提交
  2. 14 11月, 2013 4 次提交
    • L
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 4fbf888a
      Linus Torvalds 提交于
      Pull ext4 changes from Ted Ts'o:
       "Ext4 updates for 3.13.  Mostly bug fixes and cleanups"
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: add prototypes for macro-generated functions
        ext4: return non-zero st_blocks for inline data
        ext4: use prandom_u32() instead of get_random_bytes()
        ext4: remove unreachable code after ext4_can_extents_be_merged()
        ext4: remove unreachable code in ext4_can_extents_be_merged()
        ext4: avoid bh leak in retry path of ext4_expand_extra_isize_ea()
        ext4: don't count free clusters from a corrupt block group
        ext4: fix FITRIM in no journal mode
        ext4: drop set but otherwise unused variable from ext4_add_dirent_to_inline()
        ext4: change ext4_read_inline_dir() to return 0 on success
        ext4: pair trace_ext4_writepages & trace_ext4_writepages_result
        ext4: add ratelimiting to ext4 messages
        ext4: fix performance regression in ext4_writepages
        ext4: fixup kerndoc annotation of mpage_map_and_submit_extent()
        ext4: fix assertion in ext4_add_complete_io()
      4fbf888a
    • L
      Merge tag 'xfs-for-linus-v3.13-rc1' of git://oss.sgi.com/xfs/xfs · 7e1a1e93
      Linus Torvalds 提交于
      Pull xfs update from Ben Myers:
       "For 3.13-rc1 we have an eclectic assortment of bugfixes, cleanups, and
        refactoring.  Bugfixes that stand out are the fix for the AGF/AGI
        deadlock, incore extent list fixes, verifier fixes for v4 superblocks
        and growfs, and memory leaks.  There are some asserts, warnings, and
        strings that were cleaned up.  There was further rearrangement of code
        to make libxfs and the kernel sync up more easily, differences between
        v2 and v3 directory code were abstracted using an ops vector,
        xfs_inactive was reworked, and the preallocation/hole punching code
        was refactored.
      
         - simplify kmem_zone_zalloc
         - add traces for AGF/AGI read ops
         - add additional AIL traces
         - fix xfs_remove AGF vs AGI deadlock
         - fix the extent count of new incore extent page in the indirection
           array
         - don't fail bad secondary superblocks verification on v4 filesystems
           due to unzeroed bits after v4 fields
         - fix possible NULL dereference in xlog_verify_iclog
         - remove redundant assert in xfs_dir2_leafn_split
         - prevent stack overflows from page cache allocation
         - fix some sparse warnings
         - fix directory block format verifier to check the leaf entry count
         - abstract the differences in dir2/dir3 via an ops vector
         - continue process of reorganization to make libxfs/kernel code
           merges easier
         - refactor the preallocation and hole punching code
         - fix for growfs and verifiers
         - remove unnecessary scary corruption error when probing non-xfs
           filesystems
         - remove extra newlines from strings passed to printk
         - prevent deadlock trying to cover an active log
         - rework xfs_inactive()
         - add the inode directory type support to XFS_IOC_FSGEOM
         - cleanup (remove) usage of is_bad_inode
         - fix miscalculation in xfs_iext_realloc_direct which results in
           oversized direct extent list
         - remove unnecessary count arg to xfs_iomap_write_allocate
         - fix memory leak in xlog_recover_add_to_trans
         - check superblock instead of block magic to determine if dtype field
           is present
         - fix lockdep annotation due to project quotas
         - fix regression in xfs_node_toosmall which can lead to incorrect
           directory btree node collapse
         - make log recovery verify filesystem uuid of recovering blocks
         - fix XFS_IOC_FREE_EOFBLOCKS definition
         - remove invalid assert in xfs_inode_free
         - fix for AIL lock regression"
      
      * tag 'xfs-for-linus-v3.13-rc1' of git://oss.sgi.com/xfs/xfs: (49 commits)
        xfs: simplify kmem_{zone_}zalloc
        xfs: add tracepoints to AGF/AGI read operations
        xfs: trace AIL manipulations
        xfs: xfs_remove deadlocks due to inverted AGF vs AGI lock ordering
        xfs: fix the extent count when allocating an new indirection array entry
        xfs: be more forgiving of a v4 secondary sb w/ junk in v5 fields
        xfs: fix possible NULL dereference in xlog_verify_iclog
        xfs:xfs_dir2_node.c: pointer use before check for null
        xfs: prevent stack overflows from page cache allocation
        xfs: fix static and extern sparse warnings
        xfs: validity check the directory block leaf entry count
        xfs: make dir2 ftype offset pointers explicit
        xfs: convert directory vector functions to constants
        xfs: convert directory vector functions to constants
        xfs: vectorise encoding/decoding directory headers
        xfs: vectorise DA btree operations
        xfs: vectorise directory leaf operations
        xfs: vectorise directory data operations part 2
        xfs: vectorise directory data operations
        xfs: vectorise remaining shortform dir2 ops
        ...
      7e1a1e93
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · fcd7476f
      Linus Torvalds 提交于
      Pull perf updates from Ingo Molnar:
       "A number of fixes:
      
         - Fix segfault on perf trace -i perf.data, from Namhyung Kim.
      
         - Fix segfault with --no-mmap-pages, from David Ahern.
      
         - Don't force a refresh during progress update in the TUI, greatly
           reducing startup costs, fix from Patrick Palka.
      
         - Fix sw clock event period test wrt not checking if using >
           max_sample_freq.
      
         - Handle throttle events in 'object code reading' test, fix from
           Adrian Hunter.
      
         - Prevent condition that all sort keys are elided, fix from Namhyung
           Kim.
      
         - Round mmap pages to power 2, from David Ahern.
      
        And a number of late arrival changes:
      
         - Add summary only option to 'perf trace', suppressing the decoding
           of events, from David Ahern
      
         - 'perf trace --summary' formatting simplifications, from Pekka
           Enberg.
      
         - Beautify fifth argument of mmap() as fd, in 'perf trace', from
           Namhyung Kim.
      
         - Add direct access to dynamic arrays in libtraceevent, from Steven
           Rostedt.
      
         - Synthesize non-exec MMAP records when --data used, allowing the
           resolution of data addresses to symbols (global variables, etc), by
           Arnaldo Carvalho de Melo.
      
         - Code cleanups by David Ahern and Adrian Hunter"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
        tools lib traceevent: Add direct access to dynamic arrays
        perf target: Shorten perf_target__ to target__
        perf tests: Handle throttle events in 'object code reading' test
        perf evlist: Refactor mmap_pages parsing
        perf evlist: Round mmap pages to power 2 - v2
        perf record: Fix segfault with --no-mmap-pages
        perf trace: Add summary only option
        perf trace: Simplify '--summary' output
        perf trace: Change syscall summary duration order
        perf tests: Compensate lower sample freq with longer test loop
        perf trace: Fix segfault on perf trace -i perf.data
        perf trace: Separate tp syscall field caching into init routine to be reused
        perf trace: Beautify fifth argument of mmap() as fd
        perf tests: Use lower sample_freq in sw clock event period test
        perf tests: Check return of perf_evlist__open sw clock event period test
        perf record: Move existing write_output into helper function
        perf record: Use correct return type for write()
        perf tools: Prevent condition that all sort keys are elided
        perf machine: Simplify synthesize_threads method
        perf machine: Introduce synthesize_threads method out of open coded equivalent
        ...
      fcd7476f
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d320e203
      Linus Torvalds 提交于
      Pull two x86 fixes from Ingo Molnar.
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/microcode/amd: Tone down printk(), don't treat a missing firmware file as an error
        x86/dumpstack: Fix printk_address for direct addresses
      d320e203