Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
Merge commit. Changes below are compared with the first parent: 01370f06.
Changes
62 files changed · +2249 −1107
Only the first 600 diff lines are shown. Download the complete patch.
fs/dlm/Makefile
View filefs/dlm/config.c
View filefs/dlm/config.h
View filefs/dlm/debug_fs.c
View filefs/dlm/dlm_internal.h
View filefs/dlm/lock.c
View fileThis diff is incomplete. Download the complete patch.
fs/dlm/lock.h
View fileThis diff is incomplete. Download the complete patch.
fs/dlm/lockspace.c
View fileThis diff is incomplete. Download the complete patch.
fs/dlm/lowcomms.c
View fileThis diff is incomplete. Download the complete patch.
fs/dlm/main.c
View fileThis diff is incomplete. Download the complete patch.
fs/dlm/member.c
View fileThis diff is incomplete. Download the complete patch.
fs/dlm/netlink.c
View fileThis diff is incomplete. Download the complete patch.
fs/dlm/rcom.c
View fileThis diff is incomplete. Download the complete patch.
fs/dlm/recoverd.c
View fileThis diff is incomplete. Download the complete patch.
fs/dlm/user.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/Makefile
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/bmap.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/daemon.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/dir.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/dir.h
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/eattr.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/glock.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/glock.h
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/glops.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/incore.h
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/inode.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/inode.h
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/locking/dlm/lock.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/locking/dlm/lock_dlm.h
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/locking/dlm/mount.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/locking/dlm/plock.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/locking/dlm/thread.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/log.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/lops.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/lops.h
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/meta_io.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/meta_io.h
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/mount.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/ondisk.c
View before deletionThis diff is incomplete. Download the complete patch.
fs/gfs2/ops_address.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/ops_address.h
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/ops_dentry.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/ops_export.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/ops_export.h
View before deletionThis diff is incomplete. Download the complete patch.
fs/gfs2/ops_file.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/ops_fstype.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/ops_fstype.h
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/ops_inode.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/ops_super.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/ops_vm.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/quota.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/recovery.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/rgrp.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/rgrp.h
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/super.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/super.h
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/util.c
View fileThis 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/dlm_device.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/dlm_netlink.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/gfs2_ondisk.h
View fileThis diff is incomplete. Download the complete patch.