Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32a42d39 authored by Tao Ma's avatar Tao Ma
Browse files

ocfs2: Remove masklog ML_SUPER. 



Remove mlog(0) from fs/ocfs2/super.c and the masklog SUPER.

Signed-off-by: default avatarTao Ma <boyu.mt@taobao.com>
parent b5770f98

fs/ocfs2/cluster/masklog.c

+0 −1
Original line number Diff line number Diff line
@@ -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(SUPER),

	define_mask(DLM_GLUE),

	define_mask(BH_IO),

	define_mask(UPTODATE),

fs/ocfs2/cluster/masklog.h

+0 −1
Original line number Diff line number Diff line
@@ -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_SUPER	0x0000000000010000ULL /* ocfs2 mount / umount */

#define ML_DLM_GLUE	0x0000000000080000ULL /* ocfs2 dlm glue layer */

#define ML_BH_IO	0x0000000000100000ULL /* ocfs2 buffer I/O */

#define ML_UPTODATE	0x0000000000200000ULL /* ocfs2 caching sequence #'s */

fs/ocfs2/ocfs2_trace.h

+108 −0
Original line number Diff line number Diff line
@@ -57,6 +57,23 @@ DEFINE_EVENT(ocfs2__ull, name, \ 
	TP_PROTO(unsigned long long num),	\

	TP_ARGS(num))



DECLARE_EVENT_CLASS(ocfs2__pointer,

	TP_PROTO(void *pointer),

	TP_ARGS(pointer),

	TP_STRUCT__entry(

		__field(void *, pointer)

	),

	TP_fast_assign(

		__entry->pointer = pointer;

	),

	TP_printk("%p", __entry->pointer)

);



#define DEFINE_OCFS2_POINTER_EVENT(name)	\

DEFINE_EVENT(ocfs2__pointer, name,	\

	TP_PROTO(void *pointer),	\

	TP_ARGS(pointer))



DECLARE_EVENT_CLASS(ocfs2__int_int,

	TP_PROTO(int value1, int value2),

	TP_ARGS(value1, value2),
@@ -1537,6 +1554,97 @@ DEFINE_OCFS2_INT_EVENT(ocfs2_do_node_down); 


/* End of trace events for fs/ocfs2/heartbeat.c. */



/* Trace events for fs/ocfs2/super.c. */



TRACE_EVENT(ocfs2_remount,

	TP_PROTO(unsigned long s_flags, unsigned long osb_flags, int flags),

	TP_ARGS(s_flags, osb_flags, flags),

	TP_STRUCT__entry(

		__field(unsigned long, s_flags)

		__field(unsigned long, osb_flags)

		__field(int, flags)

	),

	TP_fast_assign(

		__entry->s_flags = s_flags;

		__entry->osb_flags = osb_flags;

		__entry->flags = flags;

	),

	TP_printk("%lu %lu %d", __entry->s_flags,

		  __entry->osb_flags, __entry->flags)

);



TRACE_EVENT(ocfs2_fill_super,

	TP_PROTO(void *sb, void *data, int silent),

	TP_ARGS(sb, data, silent),

	TP_STRUCT__entry(

		__field(void *, sb)

		__field(void *, data)

		__field(int, silent)

	),

	TP_fast_assign(

		__entry->sb = sb;

		__entry->data = data;

		__entry->silent = silent;

	),

	TP_printk("%p %p %d", __entry->sb,

		  __entry->data, __entry->silent)

);



TRACE_EVENT(ocfs2_parse_options,

	TP_PROTO(int is_remount, char *options),

	TP_ARGS(is_remount, options),

	TP_STRUCT__entry(

		__field(int, is_remount)

		__string(options, options)

	),

	TP_fast_assign(

		__entry->is_remount = is_remount;

		__assign_str(options, options);

	),

	TP_printk("%d %s", __entry->is_remount, __get_str(options))

);



DEFINE_OCFS2_POINTER_EVENT(ocfs2_put_super);



TRACE_EVENT(ocfs2_statfs,

	TP_PROTO(void *sb, void *buf),

	TP_ARGS(sb, buf),

	TP_STRUCT__entry(

		__field(void *, sb)

		__field(void *, buf)

	),

	TP_fast_assign(

		__entry->sb = sb;

		__entry->buf = buf;

	),

	TP_printk("%p %p", __entry->sb, __entry->buf)

);



DEFINE_OCFS2_POINTER_EVENT(ocfs2_dismount_volume);



TRACE_EVENT(ocfs2_initialize_super,

	TP_PROTO(char *label, char *uuid_str, unsigned long long root_dir,

		 unsigned long long system_dir, int cluster_bits),

	TP_ARGS(label, uuid_str, root_dir, system_dir, cluster_bits),

	TP_STRUCT__entry(

		__string(label, label)

		__string(uuid_str, uuid_str)

		__field(unsigned long long, root_dir)

		__field(unsigned long long, system_dir)

		__field(int, cluster_bits)

	),

	TP_fast_assign(

		__assign_str(label, label);

		__assign_str(uuid_str, uuid_str);

		__entry->root_dir = root_dir;

		__entry->system_dir = system_dir;

		__entry->cluster_bits = cluster_bits;

	),

	TP_printk("%s %s %llu %llu %d", __get_str(label), __get_str(uuid_str),

		  __entry->root_dir, __entry->system_dir, __entry->cluster_bits)

);



/* End of trace events for fs/ocfs2/super.c. */

#endif /* _TRACE_OCFS2_H */



/* This part must be outside protection */

fs/ocfs2/super.c

+10 −19
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
#define CREATE_TRACE_POINTS

#include "ocfs2_trace.h"



#define MLOG_MASK_PREFIX ML_SUPER

#include <cluster/masklog.h>



#include "ocfs2.h"
@@ -680,12 +679,9 @@ static int ocfs2_remount(struct super_block *sb, int *flags, char *data) 
		}



		if (*flags & MS_RDONLY) {

			mlog(0, "Going to ro mode.\n");

			sb->s_flags |= MS_RDONLY;

			osb->osb_flags |= OCFS2_OSB_SOFT_RO;

		} else {

			mlog(0, "Making ro filesystem writeable.\n");



			if (osb->osb_flags & OCFS2_OSB_ERROR_FS) {

				mlog(ML_ERROR, "Cannot remount RDWR "

				     "filesystem due to previous errors.\n");
@@ -703,6 +699,7 @@ static int ocfs2_remount(struct super_block *sb, int *flags, char *data) 
			sb->s_flags &= ~MS_RDONLY;

			osb->osb_flags &= ~OCFS2_OSB_SOFT_RO;

		}

		trace_ocfs2_remount(sb->s_flags, osb->osb_flags, *flags);

unlock_osb:

		spin_unlock(&osb->osb_lock);

		/* Enable quota accounting after remounting RW */
@@ -1028,7 +1025,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) 
	char nodestr[8];

	struct ocfs2_blockcheck_stats stats;



	mlog(0, "%p, %p, %i", sb, data, silent);

	trace_ocfs2_fill_super(sb, data, silent);



	if (!ocfs2_parse_options(sb, data, &parsed_options, 0)) {

		status = -EINVAL;
@@ -1315,8 +1312,7 @@ static int ocfs2_parse_options(struct super_block *sb, 
	char *p;

	u32 tmp;



	mlog(0, "remount: %d, options: \"%s\"\n", is_remount,

	     options ? options : "(none)");

	trace_ocfs2_parse_options(is_remount, options ? options : "(none)");



	mopt->commit_interval = 0;

	mopt->mount_opt = OCFS2_MOUNT_NOINTR;
@@ -1692,7 +1688,7 @@ static void __exit ocfs2_exit(void) 


static void ocfs2_put_super(struct super_block *sb)

{

	mlog(0, "(0x%p)\n", sb);

	trace_ocfs2_put_super(sb);



	ocfs2_sync_blockdev(sb);

	ocfs2_dismount_volume(sb, 0);
@@ -1707,7 +1703,7 @@ static int ocfs2_statfs(struct dentry *dentry, struct kstatfs *buf) 
	struct buffer_head *bh = NULL;

	struct inode *inode = NULL;



	mlog(0, "(%p, %p)\n", dentry->d_sb, buf);

	trace_ocfs2_statfs(dentry->d_sb, buf);



	osb = OCFS2_SB(dentry->d_sb);
@@ -1928,7 +1924,7 @@ static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err) 
	struct ocfs2_super *osb = NULL;

	char nodestr[8];



	mlog(0, "(0x%p)\n", sb);

	trace_ocfs2_dismount_volume(sb);



	BUG_ON(!sb);

	osb = OCFS2_SB(sb);
@@ -2143,7 +2139,6 @@ static int ocfs2_initialize_super(struct super_block *sb, 
		status = -EINVAL;

		goto bail;

	}

	mlog(0, "max_slots for this device: %u\n", osb->max_slots);



	ocfs2_orphan_scan_init(osb);
@@ -2282,7 +2277,6 @@ static int ocfs2_initialize_super(struct super_block *sb, 
	osb->s_clustersize_bits =

		le32_to_cpu(di->id2.i_super.s_clustersize_bits);

	osb->s_clustersize = 1 << osb->s_clustersize_bits;

	mlog(0, "clusterbits=%d\n", osb->s_clustersize_bits);



	if (osb->s_clustersize < OCFS2_MIN_CLUSTERSIZE ||

	    osb->s_clustersize > OCFS2_MAX_CLUSTERSIZE) {
@@ -2321,11 +2315,10 @@ static int ocfs2_initialize_super(struct super_block *sb, 
		le64_to_cpu(di->id2.i_super.s_first_cluster_group);

	osb->fs_generation = le32_to_cpu(di->i_fs_generation);

	osb->uuid_hash = le32_to_cpu(di->id2.i_super.s_uuid_hash);

	mlog(0, "vol_label: %s\n", osb->vol_label);

	mlog(0, "uuid: %s\n", osb->uuid_str);

	mlog(0, "root_blkno=%llu, system_dir_blkno=%llu\n",

	trace_ocfs2_initialize_super(osb->vol_label, osb->uuid_str,

				     (unsigned long long)osb->root_blkno,

	     (unsigned long long)osb->system_dir_blkno);

				     (unsigned long long)osb->system_dir_blkno,

				     osb->s_clustersize_bits);



	osb->osb_dlm_debug = ocfs2_new_dlm_debug();

	if (!osb->osb_dlm_debug) {
@@ -2500,8 +2493,6 @@ static int ocfs2_check_volume(struct ocfs2_super *osb) 
		 * ourselves as mounted. */

	}



	mlog(0, "Journal loaded.\n");



	status = ocfs2_load_local_alloc(osb);

	if (status < 0) {

		mlog_errno(status);