Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

Tao Ma 81bad697 a5438702

-6
-1
fs/ocfs2/alloc.c
··· 30 30 #include <linux/swap.h> 31 31 #include <linux/quotaops.h> 32 32 33 - #define MLOG_MASK_PREFIX ML_DISK_ALLOC 34 33 #include <cluster/masklog.h> 35 34 36 35 #include "ocfs2.h"
-1
fs/ocfs2/cluster/masklog.c
··· 93 93 define_mask(DLM_RECOVERY), 94 94 define_mask(AIO), 95 95 define_mask(JOURNAL), 96 - define_mask(DISK_ALLOC), 97 96 define_mask(SUPER), 98 97 define_mask(FILE_IO), 99 98 define_mask(EXTENT_MAP),
-1
fs/ocfs2/cluster/masklog.h
··· 95 95 #define ML_DLM_RECOVERY 0x0000000000001000ULL /* dlm master functions */ 96 96 #define ML_AIO 0x0000000000002000ULL /* ocfs2 aio read and write */ 97 97 #define ML_JOURNAL 0x0000000000004000ULL /* ocfs2 journalling functions */ 98 - #define ML_DISK_ALLOC 0x0000000000008000ULL /* ocfs2 disk allocation */ 99 98 #define ML_SUPER 0x0000000000010000ULL /* ocfs2 mount / umount */ 100 99 #define ML_FILE_IO 0x0000000000020000ULL /* ocfs2 file I/O */ 101 100 #define ML_EXTENT_MAP 0x0000000000040000ULL /* ocfs2 extent map caching */
-1
fs/ocfs2/localalloc.c
··· 29 29 #include <linux/highmem.h> 30 30 #include <linux/bitops.h> 31 31 32 - #define MLOG_MASK_PREFIX ML_DISK_ALLOC 33 32 #include <cluster/masklog.h> 34 33 35 34 #include "ocfs2.h"
-1
fs/ocfs2/resize.c
··· 27 27 #include <linux/fs.h> 28 28 #include <linux/types.h> 29 29 30 - #define MLOG_MASK_PREFIX ML_DISK_ALLOC 31 30 #include <cluster/masklog.h> 32 31 33 32 #include "ocfs2.h"
-1
fs/ocfs2/suballoc.c
··· 29 29 #include <linux/slab.h> 30 30 #include <linux/highmem.h> 31 31 32 - #define MLOG_MASK_PREFIX ML_DISK_ALLOC 33 32 #include <cluster/masklog.h> 34 33 35 34 #include "ocfs2.h"