Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier...

[cascardo/linux.git] / fs / ocfs2 / cluster / masklog.c

diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c
index 90ed4c0..07ac24f 100644 (file)
--- a/fs/ocfs2/cluster/masklog.c
+++ b/fs/ocfs2/cluster/masklog.c
@@ -91,17 +91,10 @@ static struct mlog_attribute mlog_attrs[MLOG_MAX_BITS] = {
        define_mask(DLM_THREAD),
        define_mask(DLM_MASTER),
        define_mask(DLM_RECOVERY),
-       define_mask(AIO),
-       define_mask(JOURNAL),
        define_mask(DLM_GLUE),
-       define_mask(BH_IO),
-       define_mask(UPTODATE),
-       define_mask(NAMEI),
        define_mask(VOTE),
-       define_mask(DCACHE),
        define_mask(CONN),
        define_mask(QUORUM),
-       define_mask(EXPORT),
        define_mask(BASTS),
        define_mask(CLUSTER),
        define_mask(ERROR),