Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (31 commits) ocfs2: implement i_op->permission configfs: make configfs_dirent_exists() static ocfs2: update file system paths to set atime ocfs2: core atime update functions ocfs2: Add splice support ocfs2: Remove ocfs2_write_should_remove_suid() [PATCH] Export should_remove_suid() configfs: mutex_lock_nested() fix ocfs2: Remove struct ocfs2_journal_handle in favor of handle_t ocfs2: remove handle argument to ocfs2_start_trans() ocfs2: remove ocfs2_journal_handle journal field ocfs2: pass ocfs2_super * into ocfs2_commit_trans() ocfs2: remove unused handle argument from ocfs2_meta_lock_full() ocfs2: make ocfs2_alloc_handle() static ocfs2: remove unused ocfs2_handle_add_lock() ocfs2: remove unused ocfs2_handle_add_inode() ocfs2: Don't allocate handle early in ocfs2_rename() ocfs2: don't use handle for locking in allocation functions ocfs2: don't pass handle to ocfs2_meta_lock in ocfs2_rename() ocfs2: don't pass handle to ocfs2_meta_lock in ocfs2_symlink() ...
Showing
- fs/configfs/dir.c 5 additions, 4 deletionsfs/configfs/dir.c
- fs/ocfs2/alloc.c 39 additions, 51 deletionsfs/ocfs2/alloc.c
- fs/ocfs2/alloc.h 1 addition, 1 deletionfs/ocfs2/alloc.h
- fs/ocfs2/aops.c 11 additions, 11 deletionsfs/ocfs2/aops.c
- fs/ocfs2/aops.h 1 addition, 1 deletionfs/ocfs2/aops.h
- fs/ocfs2/dir.c 17 additions, 16 deletionsfs/ocfs2/dir.c
- fs/ocfs2/dir.h 1 addition, 1 deletionfs/ocfs2/dir.h
- fs/ocfs2/dlm/dlmdomain.c 2 additions, 1 deletionfs/ocfs2/dlm/dlmdomain.c
- fs/ocfs2/dlmglue.c 45 additions, 15 deletionsfs/ocfs2/dlmglue.c
- fs/ocfs2/dlmglue.h 4 additions, 5 deletionsfs/ocfs2/dlmglue.h
- fs/ocfs2/export.c 1 addition, 1 deletionfs/ocfs2/export.c
- fs/ocfs2/file.c 239 additions, 104 deletionsfs/ocfs2/file.c
- fs/ocfs2/file.h 9 additions, 2 deletionsfs/ocfs2/file.h
- fs/ocfs2/inode.c 13 additions, 20 deletionsfs/ocfs2/inode.c
- fs/ocfs2/inode.h 1 addition, 8 deletionsfs/ocfs2/inode.h
- fs/ocfs2/ioctl.c 5 additions, 5 deletionsfs/ocfs2/ioctl.c
- fs/ocfs2/journal.c 31 additions, 240 deletionsfs/ocfs2/journal.c
- fs/ocfs2/journal.h 11 additions, 67 deletionsfs/ocfs2/journal.h
- fs/ocfs2/localalloc.c 54 additions, 72 deletionsfs/ocfs2/localalloc.c
- fs/ocfs2/localalloc.h 1 addition, 2 deletionsfs/ocfs2/localalloc.h
Please register or sign in to comment