This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.

Linus Torvalds 03e4970c10 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: (39 commits) Treat writes as new when holes span across page boundaries fs,ocfs2: Move o2net_get_func_run_time under CONFIG_OCFS2_FS_STATS. ocfs2/dlm: Move kmalloc() outside the spinlock ocfs2: Make the left masklogs compat. ocfs2: Remove masklog ML_AIO. ocfs2: Remove masklog ML_UPTODATE. ocfs2: Remove masklog ML_BH_IO. ocfs2: Remove masklog ML_JOURNAL. ocfs2: Remove masklog ML_EXPORT. ocfs2: Remove masklog ML_DCACHE. ocfs2: Remove masklog ML_NAMEI. ocfs2: Remove mlog(0) from fs/ocfs2/dir.c ocfs2: remove NAMEI from symlink.c ocfs2: Remove masklog ML_QUOTA. ocfs2: Remove mlog(0) from quota_local.c. ocfs2: Remove masklog ML_RESERVATIONS. ocfs2: Remove masklog ML_XATTR. ocfs2: Remove masklog ML_SUPER. ocfs2: Remove mlog(0) from fs/ocfs2/heartbeat.c ocfs2: Remove mlog(0) from fs/ocfs2/slot_map.c ... Fix up trivial conflict in fs/ocfs2/super.c		2011-03-28 13:03:31 -07:00
..
Makefile	fs: change to new flag variable	2011-03-17 14:02:57 +01:00
dlmapi.h	ocfs2/trivial: Remove trailing whitespaces	2010-01-25 19:20:51 -08:00
dlmast.c	ocfs2/dlm: Cleanup mlogs in dlmthread.c, dlmast.c and dlmdomain.c	2010-12-16 00:46:05 -08:00
dlmcommon.h	ocfs2/dlm: Hard code the values for enums	2010-12-22 18:34:46 -08:00
dlmconvert.c	ocfs2: Remove ENTRY from masklog.	2011-02-21 11:10:44 +08:00
dlmconvert.h	[PATCH] OCFS2: The Second Oracle Cluster Filesystem	2006-01-03 11:45:47 -08:00
dlmdebug.c	ocfs2/dlm: Minor cleanup	2010-12-22 18:34:45 -08:00
dlmdebug.h	ocfs2/dlm: Cleanup dlmdebug.c	2010-12-22 18:34:44 -08:00
dlmdomain.c	Merge branch 'mlog_replace_for_39' of git://repo.or.cz/taoma-kernel into ocfs2-merge-window-fix	2011-03-28 09:44:26 -07:00
dlmdomain.h	[PATCH] OCFS2: The Second Oracle Cluster Filesystem	2006-01-03 11:45:47 -08:00
dlmlock.c	ocfs2: Remove ENTRY from masklog.	2011-02-21 11:10:44 +08:00
dlmmaster.c	ocfs2: Remove ENTRY from masklog.	2011-02-21 11:10:44 +08:00
dlmrecovery.c	ocfs2: Remove EXIT from masklog.	2011-03-07 16:43:21 +08:00
dlmthread.c	ocfs2/dlm: Cleanup mlogs in dlmthread.c, dlmast.c and dlmdomain.c	2010-12-16 00:46:05 -08:00
dlmunlock.c	ocfs2: Remove ENTRY from masklog.	2011-02-21 11:10:44 +08:00
dlmver.c	ocfs2: bump version number	2008-01-25 15:05:46 -08:00
dlmver.h	[PATCH] OCFS2: The Second Oracle Cluster Filesystem	2006-01-03 11:45:47 -08:00