1. 11 8月, 2010 3 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs · 8196867c
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs:
        omfs: fix uninitialized variable warning
        omfs: sanity check cluster size
        omfs: refuse to mount if bitmap pointer is obviously wrong
        omfs: check bounds on block numbers before passing to sb_bread
        omfs: fix memory leak
      8196867c
    • L
      Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify · 8c8946f5
      Linus Torvalds 提交于
      * 'for-linus' of git://git.infradead.org/users/eparis/notify: (132 commits)
        fanotify: use both marks when possible
        fsnotify: pass both the vfsmount mark and inode mark
        fsnotify: walk the inode and vfsmount lists simultaneously
        fsnotify: rework ignored mark flushing
        fsnotify: remove global fsnotify groups lists
        fsnotify: remove group->mask
        fsnotify: remove the global masks
        fsnotify: cleanup should_send_event
        fanotify: use the mark in handler functions
        audit: use the mark in handler functions
        dnotify: use the mark in handler functions
        inotify: use the mark in handler functions
        fsnotify: send fsnotify_mark to groups in event handling functions
        fsnotify: Exchange list heads instead of moving elements
        fsnotify: srcu to protect read side of inode and vfsmount locks
        fsnotify: use an explicit flag to indicate fsnotify_destroy_mark has been called
        fsnotify: use _rcu functions for mark list traversal
        fsnotify: place marks on object in order of group memory address
        vfs/fsnotify: fsnotify_close can delay the final work in fput
        fsnotify: store struct file not struct path
        ...
      
      Fix up trivial delete/modify conflict in fs/notify/inotify/inotify.c.
      8c8946f5
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · 5f248c9c
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (96 commits)
        no need for list_for_each_entry_safe()/resetting with superblock list
        Fix sget() race with failing mount
        vfs: don't hold s_umount over close_bdev_exclusive() call
        sysv: do not mark superblock dirty on remount
        sysv: do not mark superblock dirty on mount
        btrfs: remove junk sb_dirt change
        BFS: clean up the superblock usage
        AFFS: wait for sb synchronization when needed
        AFFS: clean up dirty flag usage
        cifs: truncate fallout
        mbcache: fix shrinker function return value
        mbcache: Remove unused features
        add f_flags to struct statfs(64)
        pass a struct path to vfs_statfs
        update VFS documentation for method changes.
        All filesystems that need invalidate_inode_buffers() are doing that explicitly
        convert remaining ->clear_inode() to ->evict_inode()
        Make ->drop_inode() just return whether inode needs to be dropped
        fs/inode.c:clear_inode() is gone
        fs/inode.c:evict() doesn't care about delete vs. non-delete paths now
        ...
      
      Fix up trivial conflicts in fs/nilfs2/super.c
      5f248c9c
  2. 10 8月, 2010 37 次提交