UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ocfs2: Remove masklog ML_QUOTA. 

Remove mlog(0) from fs/ocfs2/quota_global.c and
the masklog QUOTA.

Signed-off-by: Tao Ma <boyu.mt@taobao.com>
This commit is contained in:
Tao Ma 2011-02-23 22:19:12 +08:00
parent 38877a4379
commit 1db986a839
4 changed files with 90 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/ocfs2/cluster/masklog.c
View File

@ -102,7 +102,6 @@ static struct mlog_attribute mlog_attrs[MLOG_MAX_BITS] = {
define_mask(CONN),
define_mask(QUORUM),
define_mask(EXPORT),
define_mask(QUOTA),
define_mask(BASTS),
define_mask(CLUSTER),
define_mask(ERROR),

1
fs/ocfs2/cluster/masklog.h
View File

@ -104,7 +104,6 @@
#define ML_CONN 0x0000000004000000ULL /* net connection management */
#define ML_QUORUM 0x0000000008000000ULL /* net connection quorum */
#define ML_EXPORT 0x0000000010000000ULL /* ocfs2 export operations */
#define ML_QUOTA 0x0000000040000000ULL /* ocfs2 quota operations */
#define ML_BASTS 0x0000000100000000ULL /* dlmglue asts and basts */
#define ML_CLUSTER 0x0000000400000000ULL /* cluster stack */

78
fs/ocfs2/ocfs2_trace.h
View File

@ -110,6 +110,25 @@ DEFINE_EVENT(ocfs2__int_int, name, \
TP_PROTO(int val1, int val2), \
TP_ARGS(val1, val2))
DECLARE_EVENT_CLASS(ocfs2__uint_int,
TP_PROTO(unsigned int value1, int value2),
TP_ARGS(value1, value2),
TP_STRUCT__entry(
__field(unsigned int, value1)
__field(int, value2)
),
TP_fast_assign(
__entry->value1 = value1;
__entry->value2 = value2;
),
TP_printk("%u %d", __entry->value1, __entry->value2)
);
#define DEFINE_OCFS2_UINT_INT_EVENT(name) \
DEFINE_EVENT(ocfs2__uint_int, name, \
TP_PROTO(unsigned int val1, int val2), \
TP_ARGS(val1, val2))
DECLARE_EVENT_CLASS(ocfs2__uint_uint,
TP_PROTO(unsigned int value1, unsigned int value2),
TP_ARGS(value1, value2),
@ -1935,6 +1954,65 @@ DEFINE_OCFS2_INT_EVENT(ocfs2_finish_quota_recovery);
DEFINE_OCFS2_ULL_ULL_UINT_EVENT(olq_set_dquot);
/* End of trace events for fs/ocfs2/quota_local.c. */
/* Trace events for fs/ocfs2/quota_global.c. */
DEFINE_OCFS2_ULL_EVENT(ocfs2_validate_quota_block);
TRACE_EVENT(ocfs2_sync_dquot,
TP_PROTO(unsigned int dq_id, long long dqb_curspace,
long long spacechange, long long curinodes,
long long inodechange),
TP_ARGS(dq_id, dqb_curspace, spacechange, curinodes, inodechange),
TP_STRUCT__entry(
__field(unsigned int, dq_id)
__field(long long, dqb_curspace)
__field(long long, spacechange)
__field(long long, curinodes)
__field(long long, inodechange)
),
TP_fast_assign(
__entry->dq_id = dq_id;
__entry->dqb_curspace = dqb_curspace;
__entry->spacechange = spacechange;
__entry->curinodes = curinodes;
__entry->inodechange = inodechange;
),
TP_printk("%u %lld %lld %lld %lld", __entry->dq_id,
__entry->dqb_curspace, __entry->spacechange,
__entry->curinodes, __entry->inodechange)
);
TRACE_EVENT(ocfs2_sync_dquot_helper,
TP_PROTO(unsigned int dq_id, unsigned int dq_type, unsigned long type,
const char *s_id),
TP_ARGS(dq_id, dq_type, type, s_id),
TP_STRUCT__entry(
__field(unsigned int, dq_id)
__field(unsigned int, dq_type)
__field(unsigned long, type)
__string(s_id, s_id)
),
TP_fast_assign(
__entry->dq_id = dq_id;
__entry->dq_type = dq_type;
__entry->type = type;
__assign_str(s_id, s_id);
),
TP_printk("%u %u %lu %s", __entry->dq_id, __entry->dq_type,
__entry->type, __get_str(s_id))
);
DEFINE_OCFS2_UINT_INT_EVENT(ocfs2_write_dquot);
DEFINE_OCFS2_UINT_INT_EVENT(ocfs2_release_dquot);
DEFINE_OCFS2_UINT_INT_EVENT(ocfs2_acquire_dquot);
DEFINE_OCFS2_UINT_INT_EVENT(ocfs2_mark_dquot_dirty);
/* End of trace events for fs/ocfs2/quota_global.c. */
#endif /* _TRACE_OCFS2_H */
/* This part must be outside protection */

24
fs/ocfs2/quota_global.c
View File

@ -11,7 +11,6 @@
#include <linux/writeback.h>
#include <linux/workqueue.h>
#define MLOG_MASK_PREFIX ML_QUOTA
#include <cluster/masklog.h>
#include "ocfs2_fs.h"
@ -27,6 +26,7 @@
#include "super.h"
#include "buffer_head_io.h"
#include "quota.h"
#include "ocfs2_trace.h"
/*
* Locking of quotas with OCFS2 is rather complex. Here are rules that
@ -132,8 +132,7 @@ int ocfs2_validate_quota_block(struct super_block *sb, struct buffer_head *bh)
struct ocfs2_disk_dqtrailer *dqt =
ocfs2_block_dqtrailer(sb->s_blocksize, bh->b_data);
mlog(0, "Validating quota block %llu\n",
(unsigned long long)bh->b_blocknr);
trace_ocfs2_validate_quota_block((unsigned long long)bh->b_blocknr);
BUG_ON(!buffer_uptodate(bh));
@ -509,9 +508,10 @@ int __ocfs2_sync_dquot(struct dquot *dquot, int freeing)
olditime = dquot->dq_dqb.dqb_itime;
oldbtime = dquot->dq_dqb.dqb_btime;
ocfs2_global_disk2memdqb(dquot, &dqblk);
mlog(0, "Syncing global dquot %u space %lld+%lld, inodes %lld+%lld\n",
dquot->dq_id, dquot->dq_dqb.dqb_curspace, (long long)spacechange,
dquot->dq_dqb.dqb_curinodes, (long long)inodechange);
trace_ocfs2_sync_dquot(dquot->dq_id, dquot->dq_dqb.dqb_curspace,
(long long)spacechange,
dquot->dq_dqb.dqb_curinodes,
(long long)inodechange);
if (!test_bit(DQ_LASTSET_B + QIF_SPACE_B, &dquot->dq_flags))
dquot->dq_dqb.dqb_curspace += spacechange;
if (!test_bit(DQ_LASTSET_B + QIF_INODES_B, &dquot->dq_flags))
@ -595,8 +595,8 @@ static int ocfs2_sync_dquot_helper(struct dquot *dquot, unsigned long type)
struct ocfs2_super *osb = OCFS2_SB(sb);
int status = 0;
mlog(0, "id=%u qtype=%u type=%lu device=%s\n", dquot->dq_id,
dquot->dq_type, type, sb->s_id);
trace_ocfs2_sync_dquot_helper(dquot->dq_id, dquot->dq_type,
type, sb->s_id);
if (type != dquot->dq_type)
goto out;
status = ocfs2_lock_global_qf(oinfo, 1);
@ -647,7 +647,7 @@ static int ocfs2_write_dquot(struct dquot *dquot)
struct ocfs2_super *osb = OCFS2_SB(dquot->dq_sb);
int status = 0;
mlog(0, "id=%u, type=%d", dquot->dq_id, dquot->dq_type);
trace_ocfs2_write_dquot(dquot->dq_id, dquot->dq_type);
handle = ocfs2_start_trans(osb, OCFS2_QWRITE_CREDITS);
if (IS_ERR(handle)) {
@ -685,7 +685,7 @@ static int ocfs2_release_dquot(struct dquot *dquot)
struct ocfs2_super *osb = OCFS2_SB(dquot->dq_sb);
int status = 0;
mlog(0, "id=%u, type=%d", dquot->dq_id, dquot->dq_type);
trace_ocfs2_release_dquot(dquot->dq_id, dquot->dq_type);
mutex_lock(&dquot->dq_lock);
/* Check whether we are not racing with some other dqget() */
@ -743,7 +743,7 @@ static int ocfs2_acquire_dquot(struct dquot *dquot)
int need_alloc = ocfs2_global_qinit_alloc(sb, type);
handle_t *handle;
mlog(0, "id=%u, type=%d", dquot->dq_id, type);
trace_ocfs2_acquire_dquot(dquot->dq_id, type);
mutex_lock(&dquot->dq_lock);
/*
* We need an exclusive lock, because we're going to update use count
@ -830,7 +830,7 @@ static int ocfs2_mark_dquot_dirty(struct dquot *dquot)
handle_t *handle;
struct ocfs2_super *osb = OCFS2_SB(sb);
mlog(0, "id=%u, type=%d", dquot->dq_id, type);
trace_ocfs2_mark_dquot_dirty(dquot->dq_id, type);
/* In case user set some limits, sync dquot immediately to global
* quota file so that information propagates quicker */