projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Fix numerous kcalloc() calls, convert to kzalloc()
[deliverable/linux.git]
/
fs
/
ocfs2
/
dlm
/
dlmdomain.c
diff --git
a/fs/ocfs2/dlm/dlmdomain.c
b/fs/ocfs2/dlm/dlmdomain.c
index ba27c5c5e95939192f0bacfe5bfeb7c2776d67a3..f0b25f2dd205317d51b3508a6b48cc41c184d0ac 100644
(file)
--- a/
fs/ocfs2/dlm/dlmdomain.c
+++ b/
fs/ocfs2/dlm/dlmdomain.c
@@
-68,7
+68,8
@@
static void **dlm_alloc_pagevec(int pages)
goto out_free;
mlog(0, "Allocated DLM hash pagevec; %d pages (%lu expected), %lu buckets per page\n",
goto out_free;
mlog(0, "Allocated DLM hash pagevec; %d pages (%lu expected), %lu buckets per page\n",
- pages, DLM_HASH_PAGES, (unsigned long)DLM_BUCKETS_PER_PAGE);
+ pages, (unsigned long)DLM_HASH_PAGES,
+ (unsigned long)DLM_BUCKETS_PER_PAGE);
return vec;
out_free:
dlm_free_pagevec(vec, i);
return vec;
out_free:
dlm_free_pagevec(vec, i);
@@
-88,7
+89,7
@@
out_free:
*
*/
*
*/
-
spinlock_t dlm_domain_lock = SPIN_LOCK_UNLOCKED
;
+
DEFINE_SPINLOCK(dlm_domain_lock)
;
LIST_HEAD(dlm_domains);
static DECLARE_WAIT_QUEUE_HEAD(dlm_domain_events);
LIST_HEAD(dlm_domains);
static DECLARE_WAIT_QUEUE_HEAD(dlm_domain_events);
@@
-408,12
+409,13
@@
static void __dlm_print_nodes(struct dlm_ctxt *dlm)
assert_spin_locked(&dlm->spinlock);
assert_spin_locked(&dlm->spinlock);
-
mlog(ML_NOTICE, "Nodes in my domain (\"%s\"):\n
", dlm->name);
+
printk(KERN_INFO "ocfs2_dlm: Nodes in domain (\"%s\"):
", dlm->name);
while ((node = find_next_bit(dlm->domain_map, O2NM_MAX_NODES,
node + 1)) < O2NM_MAX_NODES) {
while ((node = find_next_bit(dlm->domain_map, O2NM_MAX_NODES,
node + 1)) < O2NM_MAX_NODES) {
-
mlog(ML_NOTICE, " node %d\n
", node);
+
printk("%d
", node);
}
}
+ printk("\n");
}
static int dlm_exit_domain_handler(struct o2net_msg *msg, u32 len, void *data)
}
static int dlm_exit_domain_handler(struct o2net_msg *msg, u32 len, void *data)
@@
-429,7
+431,7
@@
static int dlm_exit_domain_handler(struct o2net_msg *msg, u32 len, void *data)
node = exit_msg->node_idx;
node = exit_msg->node_idx;
-
mlog(0, "
Node %u leaves domain %s\n", node, dlm->name);
+
printk(KERN_INFO "ocfs2_dlm:
Node %u leaves domain %s\n", node, dlm->name);
spin_lock(&dlm->spinlock);
clear_bit(node, dlm->domain_map);
spin_lock(&dlm->spinlock);
clear_bit(node, dlm->domain_map);
@@
-678,6
+680,8
@@
static int dlm_assert_joined_handler(struct o2net_msg *msg, u32 len, void *data)
set_bit(assert->node_idx, dlm->domain_map);
__dlm_set_joining_node(dlm, DLM_LOCK_RES_OWNER_UNKNOWN);
set_bit(assert->node_idx, dlm->domain_map);
__dlm_set_joining_node(dlm, DLM_LOCK_RES_OWNER_UNKNOWN);
+ printk(KERN_INFO "ocfs2_dlm: Node %u joins domain %s\n",
+ assert->node_idx, dlm->name);
__dlm_print_nodes(dlm);
/* notify anything attached to the heartbeat events */
__dlm_print_nodes(dlm);
/* notify anything attached to the heartbeat events */
@@
-916,7
+920,7
@@
static int dlm_try_to_join_domain(struct dlm_ctxt *dlm)
mlog_entry("%p", dlm);
mlog_entry("%p", dlm);
- ctxt = k
calloc(1,
sizeof(*ctxt), GFP_KERNEL);
+ ctxt = k
zalloc(
sizeof(*ctxt), GFP_KERNEL);
if (!ctxt) {
status = -ENOMEM;
mlog_errno(status);
if (!ctxt) {
status = -ENOMEM;
mlog_errno(status);
@@
-1219,7
+1223,7
@@
static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
int i;
struct dlm_ctxt *dlm = NULL;
int i;
struct dlm_ctxt *dlm = NULL;
- dlm = k
calloc(1,
sizeof(*dlm), GFP_KERNEL);
+ dlm = k
zalloc(
sizeof(*dlm), GFP_KERNEL);
if (!dlm) {
mlog_errno(-ENOMEM);
goto leave;
if (!dlm) {
mlog_errno(-ENOMEM);
goto leave;
@@
-1293,7
+1297,7
@@
static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
spin_lock_init(&dlm->work_lock);
INIT_LIST_HEAD(&dlm->work_list);
spin_lock_init(&dlm->work_lock);
INIT_LIST_HEAD(&dlm->work_list);
- INIT_WORK(&dlm->dispatched_work, dlm_dispatch_work
, dlm
);
+ INIT_WORK(&dlm->dispatched_work, dlm_dispatch_work);
kref_init(&dlm->dlm_refs);
dlm->dlm_state = DLM_CTXT_NEW;
kref_init(&dlm->dlm_refs);
dlm->dlm_state = DLM_CTXT_NEW;
This page took
0.028273 seconds
and
5
git commands to generate.