ocfs2: Remove DISK_ALLOC from masklog.

Since all 4 files, localalloc.c, suballoc.c, alloc.c and
resize.c, which use DISK_ALLOC are changed to trace events,
Remove masklog DISK_ALLOC totally.

Signed-off-by: Tao Ma <boyu.mt@taobao.com>

diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index f0e26c4adc94c45c9484f6f806153e7278e9a307..b27a0d86f8c584fd9f15aff29a4ceb3032d8910a 100644 (file)
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -30,7 +30,6 @@
 #include <linux/swap.h>
 #include <linux/quotaops.h>
 
-#define MLOG_MASK_PREFIX ML_DISK_ALLOC
 #include <cluster/masklog.h>
 
 #include "ocfs2.h"

diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c
index fdc302ddafe8228165126c17b132e495fcf537f3..caba07c2dac6d9c94ddb6a39e9e853c4fbbb041e 100644 (file)
--- a/fs/ocfs2/cluster/masklog.c
+++ b/fs/ocfs2/cluster/masklog.c
@@ -93,7 +93,6 @@ static struct mlog_attribute mlog_attrs[MLOG_MAX_BITS] = {
        define_mask(DLM_RECOVERY),
        define_mask(AIO),
        define_mask(JOURNAL),
-       define_mask(DISK_ALLOC),
        define_mask(SUPER),
        define_mask(FILE_IO),
        define_mask(EXTENT_MAP),

diff --git a/fs/ocfs2/cluster/masklog.h b/fs/ocfs2/cluster/masklog.h
index 51ee790c7678fbe604fb8ee6520916fdd1d9205d..155835a6b1c3ffc9e1ac9207cf157f3b7ffb1f9e 100644 (file)
--- a/fs/ocfs2/cluster/masklog.h
+++ b/fs/ocfs2/cluster/masklog.h
@@ -95,7 +95,6 @@
 #define ML_DLM_RECOVERY        0x0000000000001000ULL /* dlm master functions */
 #define ML_AIO         0x0000000000002000ULL /* ocfs2 aio read and write */
 #define ML_JOURNAL     0x0000000000004000ULL /* ocfs2 journalling functions */
-#define ML_DISK_ALLOC  0x0000000000008000ULL /* ocfs2 disk allocation */
 #define ML_SUPER       0x0000000000010000ULL /* ocfs2 mount / umount */
 #define ML_FILE_IO     0x0000000000020000ULL /* ocfs2 file I/O */
 #define ML_EXTENT_MAP  0x0000000000040000ULL /* ocfs2 extent map caching */

diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
index a311b1f658e23cebc5fc62dea83039d374dffd09..210c35237548be82f9d99966beb166cdd2ffc87d 100644 (file)
--- a/fs/ocfs2/localalloc.c
+++ b/fs/ocfs2/localalloc.c
@@ -29,7 +29,6 @@
 #include <linux/highmem.h>
 #include <linux/bitops.h>
 
-#define MLOG_MASK_PREFIX ML_DISK_ALLOC
 #include <cluster/masklog.h>
 
 #include "ocfs2.h"

diff --git a/fs/ocfs2/resize.c b/fs/ocfs2/resize.c
index 761d20da9dcd1c8f9cd8c00875b4740433ce4a30..ec55add7604a0e964447efa954e4424bf1a39016 100644 (file)
--- a/fs/ocfs2/resize.c
+++ b/fs/ocfs2/resize.c
@@ -27,7 +27,6 @@
 #include <linux/fs.h>
 #include <linux/types.h>
 
-#define MLOG_MASK_PREFIX ML_DISK_ALLOC
 #include <cluster/masklog.h>
 
 #include "ocfs2.h"

diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
index 94342bd9800dba14930cd419f32a67a8da0a6edf..ab6e2061074fafba4bdc9bf0b9cc7f911cb15dfd 100644 (file)
--- a/fs/ocfs2/suballoc.c
+++ b/fs/ocfs2/suballoc.c
@@ -29,7 +29,6 @@
 #include <linux/slab.h>
 #include <linux/highmem.h>
 
-#define MLOG_MASK_PREFIX ML_DISK_ALLOC
 #include <cluster/masklog.h>
 
 #include "ocfs2.h"