Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
ocfs2: Adjust masklog flag values
Two masklogs had the same flag value.
Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
authored by Sunil Mushran and committed by Joel Becker 41b41a26 39c99f12
+2
-1
fs/ocfs2/cluster/masklog.c
+2
-1
fs/ocfs2/cluster/masklog.c
···
113
113
define_mask(QUOTA),
114
114
define_mask(REFCOUNT),
115
115
define_mask(BASTS),
116
+
define_mask(RESERVATIONS),
117
+
define_mask(CLUSTER),
116
118
define_mask(ERROR),
117
119
define_mask(NOTICE),
118
120
define_mask(KTHREAD),
119
-
define_mask(RESERVATIONS),
120
121
};
121
122
122
123
static struct attribute *mlog_attr_ptrs[MLOG_MAX_BITS] = {NULL, };
+8
-7
fs/ocfs2/cluster/masklog.h
+8
-7
fs/ocfs2/cluster/masklog.h
···
81
81
#include <linux/sched.h>
82
82
83
83
/* bits that are frequently given and infrequently matched in the low word */
84
-
/* NOTE: If you add a flag, you need to also update mlog.c! */
84
+
/* NOTE: If you add a flag, you need to also update masklog.c! */
85
85
#define ML_ENTRY 0x0000000000000001ULL /* func call entry */
86
86
#define ML_EXIT 0x0000000000000002ULL /* func call exit */
87
87
#define ML_TCP 0x0000000000000004ULL /* net cluster/tcp.c */
···
114
114
#define ML_XATTR 0x0000000020000000ULL /* ocfs2 extended attributes */
115
115
#define ML_QUOTA 0x0000000040000000ULL /* ocfs2 quota operations */
116
116
#define ML_REFCOUNT 0x0000000080000000ULL /* refcount tree operations */
117
-
#define ML_BASTS 0x0000001000000000ULL /* dlmglue asts and basts */
117
+
#define ML_BASTS 0x0000000100000000ULL /* dlmglue asts and basts */
118
+
#define ML_RESERVATIONS 0x0000000200000000ULL /* ocfs2 alloc reservations */
119
+
#define ML_CLUSTER 0x0000000400000000ULL /* cluster stack */
120
+
118
121
/* bits that are infrequently given and frequently matched in the high word */
119
-
#define ML_ERROR 0x0000000100000000ULL /* sent to KERN_ERR */
120
-
#define ML_NOTICE 0x0000000200000000ULL /* setn to KERN_NOTICE */
121
-
#define ML_KTHREAD 0x0000000400000000ULL /* kernel thread activity */
122
-
#define ML_RESERVATIONS 0x0000000800000000ULL /* ocfs2 alloc reservations */
123
-
#define ML_CLUSTER 0x0000001000000000ULL /* cluster stack */
122
+
#define ML_ERROR 0x1000000000000000ULL /* sent to KERN_ERR */
123
+
#define ML_NOTICE 0x2000000000000000ULL /* setn to KERN_NOTICE */
124
+
#define ML_KTHREAD 0x4000000000000000ULL /* kernel thread activity */
124
125
125
126
#define MLOG_INITIAL_AND_MASK (ML_ERROR|ML_NOTICE)
126
127
#define MLOG_INITIAL_NOT_MASK (ML_ENTRY|ML_EXIT)