Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro: "Assorted fixes + unifying __d_move() and __d_materialise_dentry() + minimal regression fix for d_path() of victims of overwriting rename() ported on top of that" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: vfs: Don't exchange "short" filenames unconditionally. fold swapping ->d_name.hash into switch_names() fold unlocking the children into dentry_unlock_parents_for_move() kill __d_materialise_dentry() __d_materialise_dentry(): flip the order of arguments __d_move(): fold manipulations with ->d_child/->d_subdirs don't open-code d_rehash() in d_materialise_unique() pull rehashing and unlocking the target dentry into __d_materialise_dentry() ufs: deal with nfsd/iget races fuse: honour max_read and max_write in direct_io mode shmem: fix nlink for rename overwrite directory
Showing
- fs/dcache.c 36 additions, 76 deletionsfs/dcache.c
- fs/direct-io.c 1 addition, 1 deletionfs/direct-io.c
- fs/fuse/file.c 1 addition, 0 deletionsfs/fuse/file.c
- fs/ufs/ialloc.c 5 additions, 1 deletionfs/ufs/ialloc.c
- fs/ufs/namei.c 4 additions, 0 deletionsfs/ufs/namei.c
- include/linux/uio.h 1 addition, 1 deletioninclude/linux/uio.h
- mm/iov_iter.c 9 additions, 5 deletionsmm/iov_iter.c
- mm/shmem.c 3 additions, 1 deletionmm/shmem.c
Loading
Please register or sign in to comment