Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[~andy/linux] / fs / ocfs2 / cluster / masklog.c

diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c
index ef140ab7dcf84665228a4ac42ab4dfd4d01539ec..07ac24fd92520f604f6d3cfeff4cd4bd2c6ad85c 100644 (file)
--- a/fs/ocfs2/cluster/masklog.c
+++ b/fs/ocfs2/cluster/masklog.c
@@ -91,20 +91,11 @@ 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(QUOTA),
        define_mask(BASTS),
-       define_mask(RESERVATIONS),
        define_mask(CLUSTER),
        define_mask(ERROR),
        define_mask(NOTICE),