Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
Merge commit. Changes below are compared with the first parent: 2ba14a01.
Changes
53 files changed · +2005 −1592
Only the first 600 diff lines are shown. Download the complete patch.
Documentation/filesystems/ocfs2.txt
View fileDocumentation/ioctl-number.txt
View filefs/Kconfig
View filefs/configfs/dir.c
View filefs/configfs/file.c
View filefs/ocfs2/Makefile
View filefs/ocfs2/alloc.c
View filefs/ocfs2/aops.c
View filefs/ocfs2/buffer_head_io.c
View filefs/ocfs2/buffer_head_io.h
View filefs/ocfs2/cluster/heartbeat.h
View filefs/ocfs2/cluster/tcp.h
View filefs/ocfs2/cluster/tcp_internal.h
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/cluster/ver.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/dcache.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/dir.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/dlm/dlmfsver.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/dlm/dlmrecovery.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/dlm/dlmver.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/dlmglue.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/dlmglue.h
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/endian.h
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/export.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/file.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/file.h
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/heartbeat.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/heartbeat.h
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/inode.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/inode.h
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/ioctl.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/journal.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/journal.h
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/localalloc.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/locks.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/locks.h
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/mmap.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/namei.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/ocfs2.h
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/ocfs2_fs.h
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/ocfs2_lockid.h
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/resize.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/resize.h
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/slot_map.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/slot_map.h
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/suballoc.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/suballoc.h
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/super.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/sysfile.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/ver.c
View fileThis diff is incomplete. Download the complete patch.
fs/ocfs2/vote.c
View before deletionThis diff is incomplete. Download the complete patch.
include/linux/Kbuild
View fileThis diff is incomplete. Download the complete patch.
include/linux/dlm.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/dlmconstants.h
View fileThis diff is incomplete. Download the complete patch.