git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sunrpc/cache: fix module refcnt leak in a failure path
[safe/jmp/linux-2.6]
/
fs
/
dlm
/
memory.c
diff --git
a/fs/dlm/memory.c
b/fs/dlm/memory.c
index
f778386
..
8e0d00d
100644
(file)
--- a/
fs/dlm/memory.c
+++ b/
fs/dlm/memory.c
@@
-18,7
+18,7
@@
static struct kmem_cache *lkb_cache;
static struct kmem_cache *lkb_cache;
-int dlm_memory_init(void)
+int
__init
dlm_memory_init(void)
{
int ret = 0;
{
int ret = 0;
@@
-39,7
+39,7
@@
char *dlm_allocate_lvb(struct dlm_ls *ls)
{
char *p;
{
char *p;
- p = kzalloc(ls->ls_lvblen, GFP_
KERNEL
);
+ p = kzalloc(ls->ls_lvblen, GFP_
NOFS
);
return p;
}
return p;
}
@@
-57,7
+57,7
@@
struct dlm_rsb *dlm_allocate_rsb(struct dlm_ls *ls, int namelen)
DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,);
DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,);
- r = kzalloc(sizeof(*r) + namelen, GFP_
KERNEL
);
+ r = kzalloc(sizeof(*r) + namelen, GFP_
NOFS
);
return r;
}
return r;
}
@@
-72,7
+72,7
@@
struct dlm_lkb *dlm_allocate_lkb(struct dlm_ls *ls)
{
struct dlm_lkb *lkb;
{
struct dlm_lkb *lkb;
- lkb = kmem_cache_zalloc(lkb_cache, GFP_
KERNEL
);
+ lkb = kmem_cache_zalloc(lkb_cache, GFP_
NOFS
);
return lkb;
}
return lkb;
}
@@
-80,7
+80,7
@@
void dlm_free_lkb(struct dlm_lkb *lkb)
{
if (lkb->lkb_flags & DLM_IFL_USER) {
struct dlm_user_args *ua;
{
if (lkb->lkb_flags & DLM_IFL_USER) {
struct dlm_user_args *ua;
- ua =
(struct dlm_user_args *)lkb->lkb_astparam
;
+ ua =
lkb->lkb_ua
;
if (ua) {
if (ua->lksb.sb_lvbptr)
kfree(ua->lksb.sb_lvbptr);
if (ua) {
if (ua->lksb.sb_lvbptr)
kfree(ua->lksb.sb_lvbptr);