aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-05-14 15:30:48 -0400
committerJoel Becker <joel.becker@oracle.com>2010-05-18 15:31:11 -0400
commit316ce2ba8e74a7bb9153b9f93adc883cb1ceb9fd (patch)
tree642a2394a1e12e6c850243c3b1aac8b91c56c0b9 /fs/ocfs2
parent3914ed0cec6532ab4feb202424fc95ad05024497 (diff)
fs/ocfs2/dlm: Use kstrdup
Use kstrdup when the goal of an allocation is copy a string into the allocated region. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression from,to; expression flag,E1,E2; statement S; @@ - to = kmalloc(strlen(from) + 1,flag); + to = kstrdup(from, flag); ... when != \(from = E1 \| to = E1 \) if (to==NULL || ...) S ... when != \(from = E2 \| to = E2 \) - strcpy(to, from); // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/dlm/dlmdomain.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index e82c0537eff9..6b5a492e1749 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -1523,7 +1523,7 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
1523 goto leave; 1523 goto leave;
1524 } 1524 }
1525 1525
1526 dlm->name = kmalloc(strlen(domain) + 1, GFP_KERNEL); 1526 dlm->name = kstrdup(domain, GFP_KERNEL);
1527 if (dlm->name == NULL) { 1527 if (dlm->name == NULL) {
1528 mlog_errno(-ENOMEM); 1528 mlog_errno(-ENOMEM);
1529 kfree(dlm); 1529 kfree(dlm);
@@ -1557,7 +1557,6 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
1557 for (i = 0; i < DLM_HASH_BUCKETS; i++) 1557 for (i = 0; i < DLM_HASH_BUCKETS; i++)
1558 INIT_HLIST_HEAD(dlm_master_hash(dlm, i)); 1558 INIT_HLIST_HEAD(dlm_master_hash(dlm, i));
1559 1559
1560 strcpy(dlm->name, domain);
1561 dlm->key = key; 1560 dlm->key = key;
1562 dlm->node_num = o2nm_this_node(); 1561 dlm->node_num = o2nm_this_node();
1563 1562