The patch titled
dlm: use kzalloc
has been removed from the -mm tree. Its filename is
dlm-device-interface-use-kzalloc.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: David Teigland <teigland@xxxxxxxxxx>
Use kzalloc.
Signed-off-by: David Teigland <teigland@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
Cc: Steven Whitehouse <swhiteho@xxxxxxxxxx>
---
drivers/dlm/device.c | 12 +++++-------
drivers/dlm/lockspace.c | 3 +--
drivers/dlm/member.c | 5 ++---
3 files changed, 8 insertions(+), 12 deletions(-)
diff -puN drivers/dlm/device.c~dlm-device-interface-use-kzalloc drivers/dlm/device.c
--- 25/drivers/dlm/device.c~dlm-device-interface-use-kzalloc Thu Jan 19 16:24:45 2006
+++ 25-akpm/drivers/dlm/device.c Thu Jan 19 16:24:45 2006
@@ -237,12 +237,11 @@ static int register_lockspace(char *name
namelen = strlen(name)+strlen(name_prefix)+2;
- newls = kmalloc(sizeof(struct user_ls), GFP_KERNEL);
+ newls = kzalloc(sizeof(struct user_ls), GFP_KERNEL);
if (!newls)
return -ENOMEM;
- memset(newls, 0, sizeof(struct user_ls));
- newls->ls_miscinfo.name = kmalloc(namelen, GFP_KERNEL);
+ newls->ls_miscinfo.name = kzalloc(namelen, GFP_KERNEL);
if (!newls->ls_miscinfo.name) {
kfree(newls);
return -ENOMEM;
@@ -307,11 +306,10 @@ static int unregister_lockspace(struct u
static void add_to_astqueue(struct lock_info *li, void *astaddr, void *astparam,
int lvb_updated)
{
- struct ast_info *ast = kmalloc(sizeof(struct ast_info), GFP_KERNEL);
+ struct ast_info *ast = kzalloc(sizeof(struct ast_info), GFP_KERNEL);
if (!ast)
return;
- memset(ast, 0, sizeof(*ast));
ast->result.user_astparam = astparam;
ast->result.user_astaddr = astaddr;
ast->result.user_lksb = li->li_user_lksb;
@@ -440,7 +438,7 @@ static int dlm_open(struct inode *inode,
if (!lsinfo)
return -ENOENT;
- f = kmalloc(sizeof(struct file_info), GFP_KERNEL);
+ f = kzalloc(sizeof(struct file_info), GFP_KERNEL);
if (!f)
return -ENOMEM;
@@ -755,7 +753,7 @@ static struct lock_info *allocate_lockin
if (!try_module_get(THIS_MODULE))
return NULL;
- li = kmalloc(sizeof(struct lock_info), GFP_KERNEL);
+ li = kzalloc(sizeof(struct lock_info), GFP_KERNEL);
if (li) {
li->li_magic = LOCKINFO_MAGIC;
li->li_file = fi;
diff -puN drivers/dlm/lockspace.c~dlm-device-interface-use-kzalloc drivers/dlm/lockspace.c
--- 25/drivers/dlm/lockspace.c~dlm-device-interface-use-kzalloc Thu Jan 19 16:24:45 2006
+++ 25-akpm/drivers/dlm/lockspace.c Thu Jan 19 16:24:45 2006
@@ -207,10 +207,9 @@ static int new_lockspace(char *name, int
return -EEXIST;
}
- ls = kmalloc(sizeof(struct dlm_ls) + namelen, GFP_KERNEL);
+ ls = kzalloc(sizeof(struct dlm_ls) + namelen, GFP_KERNEL);
if (!ls)
goto out;
- memset(ls, 0, sizeof(struct dlm_ls) + namelen);
memcpy(ls->ls_name, name, namelen);
ls->ls_namelen = namelen;
ls->ls_lvblen = lvblen;
diff -puN drivers/dlm/member.c~dlm-device-interface-use-kzalloc drivers/dlm/member.c
--- 25/drivers/dlm/member.c~dlm-device-interface-use-kzalloc Thu Jan 19 16:24:45 2006
+++ 25-akpm/drivers/dlm/member.c Thu Jan 19 16:24:45 2006
@@ -51,7 +51,7 @@ static int dlm_add_member(struct dlm_ls
{
struct dlm_member *memb;
- memb = kmalloc(sizeof(struct dlm_member), GFP_KERNEL);
+ memb = kzalloc(sizeof(struct dlm_member), GFP_KERNEL);
if (!memb)
return -ENOMEM;
@@ -292,10 +292,9 @@ int dlm_ls_start(struct dlm_ls *ls, int
struct dlm_recover *rv;
int error = 0;
- rv = kmalloc(sizeof(struct dlm_recover), GFP_KERNEL);
+ rv = kzalloc(sizeof(struct dlm_recover), GFP_KERNEL);
if (!rv)
return -ENOMEM;
- memset(rv, 0, sizeof(struct dlm_recover));
spin_lock(&ls->ls_recover_lock);
_
Patches currently in -mm which might be from teigland@xxxxxxxxxx are
git-gfs2.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
