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: ocfs2: fix regression in ocfs2_read_blocks_sync() ocfs2: fix return value set in init_dlmfs_fs() ocfs2: Small documentation update ocfs2: fix wake_up in unlock_ast ocfs2: initialize stack_user lvbptr ocfs2: comments typo fix
No related branches found
No related tags found
Showing
- Documentation/filesystems/ocfs2.txt 0 additions, 3 deletionsDocumentation/filesystems/ocfs2.txt
- fs/ocfs2/buffer_head_io.c 4 additions, 11 deletionsfs/ocfs2/buffer_head_io.c
- fs/ocfs2/dlm/dlmfs.c 3 additions, 1 deletionfs/ocfs2/dlm/dlmfs.c
- fs/ocfs2/dlm/userdlm.h 1 addition, 1 deletionfs/ocfs2/dlm/userdlm.h
- fs/ocfs2/dlmglue.c 1 addition, 2 deletionsfs/ocfs2/dlmglue.c
- fs/ocfs2/ocfs2.h 1 addition, 1 deletionfs/ocfs2/ocfs2.h
- fs/ocfs2/stack_user.c 3 additions, 0 deletionsfs/ocfs2/stack_user.c
Loading
Please register or sign in to comment