Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: ocfs2: Fix system inodes cache overflow. ocfs2: Hold ip_lock when set/clear flags for indexed dir. ocfs2: Adjust masklog flag values Ocfs2: Teach 'coherency=full' O_DIRECT writes to correctly up_read i_alloc_sem. ocfs2/dlm: Migrate lockres with no locks if it has a reference
No related branches found
No related tags found
Showing
- fs/ocfs2/aops.c 5 additions, 2 deletionsfs/ocfs2/aops.c
- fs/ocfs2/aops.h 21 additions, 2 deletionsfs/ocfs2/aops.h
- fs/ocfs2/cluster/masklog.c 2 additions, 1 deletionfs/ocfs2/cluster/masklog.c
- fs/ocfs2/cluster/masklog.h 8 additions, 7 deletionsfs/ocfs2/cluster/masklog.h
- fs/ocfs2/dir.c 4 additions, 0 deletionsfs/ocfs2/dir.c
- fs/ocfs2/dlm/dlmmaster.c 27 additions, 13 deletionsfs/ocfs2/dlm/dlmmaster.c
- fs/ocfs2/file.c 13 additions, 2 deletionsfs/ocfs2/file.c
- fs/ocfs2/ocfs2_fs.h 1 addition, 1 deletionfs/ocfs2/ocfs2_fs.h
Loading
Please register or sign in to comment