git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
ocfs2
/
dlm
/
dlmdomain.c
diff --git
a/fs/ocfs2/dlm/dlmdomain.c
b/fs/ocfs2/dlm/dlmdomain.c
index
8d1065f
..
f0b25f2
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);
@@
-919,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);
@@
-1222,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;
@@
-1296,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;