1. 22 5月, 2010 38 次提交
  2. 21 5月, 2010 2 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 · d7dbf4ff
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: (23 commits)
        nilfs2: disallow remount of snapshot from/to a regular mount
        nilfs2: use huge_encode_dev/huge_decode_dev
        nilfs2: update comment on deactivate_super at nilfs_get_sb
        nilfs2: replace MS_VERBOSE with MS_SILENT
        nilfs2: add missing initialization of s_mode
        nilfs2: fix misuse of open_bdev_exclusive/close_bdev_exclusive
        nilfs2: enlarge s_volume_name member in nilfs_super_block
        nilfs2: use checkpoint number instead of timestamp to select super block
        nilfs2: add missing endian conversion on super block magic number
        nilfs2: make nilfs_sc_*_ops static
        nilfs2: add kernel doc comments to persistent object allocator functions
        nilfs2: change sc_timer from a pointer to an embedded one in struct nilfs_sc_info
        nilfs2: remove nilfs_segctor_init() in segment.c
        nilfs2: insert checkpoint number in segment summary header
        nilfs2: add a print message after loading nilfs2
        nilfs2: cleanup multi kmem_cache_{create,destroy} code
        nilfs2: move out checksum routines to segment buffer code
        nilfs2: move pointer to super root block into logs
        nilfs2: change default of 'errors' mount option to 'remount-ro' mode
        nilfs2: Combine nilfs_btree_release_path() and nilfs_btree_free_path()
        ...
      d7dbf4ff
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 677abe49
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
        GFS2: Fix typo
        GFS2: stuck in inode wait, no glocks stuck
        GFS2: Eliminate useless err variable
        GFS2: Fix writing to non-page aligned gfs2_quota structures
        GFS2: Add some useful messages
        GFS2: fix quota state reporting
        GFS2: Various gfs2_logd improvements
        GFS2: glock livelock
        GFS2: Clean up stuffed file copying
        GFS2: docs update
        GFS2: Remove space from slab cache name
      677abe49