1. 27 5月, 2011 4 次提交
    • L
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 8a0599dd
      Linus Torvalds 提交于
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: correctly decrement the extent buffer index in xfs_bmap_del_extent
        xfs: check for valid indices in xfs_iext_get_ext and xfs_iext_idx_to_irec
        xfs: fix up asserts in xfs_iflush_fork
        xfs: do not do pointer arithmetic on extent records
        xfs: do not use unchecked extent indices in xfs_bunmapi
        xfs: do not use unchecked extent indices in xfs_bmapi
        xfs: do not use unchecked extent indices in xfs_bmap_add_extent_*
        xfs: remove if_lastex
        xfs: remove the unused XFS_BMAPI_RSVBLOCKS flag
        xfs: do not discard alloc btree blocks
        xfs: add online discard support
      8a0599dd
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 35806b4f
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (61 commits)
        jbd2: Add MAINTAINERS entry
        jbd2: fix a potential leak of a journal_head on an error path
        ext4: teach ext4_ext_split to calculate extents efficiently
        ext4: Convert ext4 to new truncate calling convention
        ext4: do not normalize block requests from fallocate()
        ext4: enable "punch hole" functionality
        ext4: add "punch hole" flag to ext4_map_blocks()
        ext4: punch out extents
        ext4: add new function ext4_block_zero_page_range()
        ext4: add flag to ext4_has_free_blocks
        ext4: reserve inodes and feature code for 'quota' feature
        ext4: add support for multiple mount protection
        ext4: ensure f_bfree returned by ext4_statfs() is non-negative
        ext4: protect bb_first_free in ext4_trim_all_free() with group lock
        ext4: only load buddy bitmap in ext4_trim_fs() when it is needed
        jbd2: Fix comment to match the code in jbd2__journal_start()
        ext4: fix waiting and sending of a barrier in ext4_sync_file()
        jbd2: Add function jbd2_trans_will_send_data_barrier()
        jbd2: fix sending of data flush on journal commit
        ext4: fix ext4_ext_fiemap_cb() to handle blocks before request range correctly
        ...
      35806b4f
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · 32e51f14
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (25 commits)
        cifs: remove unnecessary dentry_unhash on rmdir/rename_dir
        ocfs2: remove unnecessary dentry_unhash on rmdir/rename_dir
        exofs: remove unnecessary dentry_unhash on rmdir/rename_dir
        nfs: remove unnecessary dentry_unhash on rmdir/rename_dir
        ext2: remove unnecessary dentry_unhash on rmdir/rename_dir
        ext3: remove unnecessary dentry_unhash on rmdir/rename_dir
        ext4: remove unnecessary dentry_unhash on rmdir/rename_dir
        btrfs: remove unnecessary dentry_unhash in rmdir/rename_dir
        ceph: remove unnecessary dentry_unhash calls
        vfs: clean up vfs_rename_other
        vfs: clean up vfs_rename_dir
        vfs: clean up vfs_rmdir
        vfs: fix vfs_rename_dir for FS_RENAME_DOES_D_MOVE filesystems
        libfs: drop unneeded dentry_unhash
        vfs: update dentry_unhash() comment
        vfs: push dentry_unhash on rename_dir into file systems
        vfs: push dentry_unhash on rmdir into file systems
        vfs: remove dget() from dentry_unhash()
        vfs: dentry_unhash immediately prior to rmdir
        vfs: Block mmapped writes while the fs is frozen
        ...
      32e51f14
    • K
      mm: don't access vm_flags as 'int' · ca16d140
      KOSAKI Motohiro 提交于
      The type of vma->vm_flags is 'unsigned long'. Neither 'int' nor
      'unsigned int'. This patch fixes such misuse.
      Signed-off-by: NKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
      [ Changed to use a typedef - we'll extend it to cover more cases
        later, since there has been discussion about making it a 64-bit
        type..                      - Linus ]
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ca16d140
  2. 26 5月, 2011 36 次提交