diff options
Diffstat (limited to 'fs/dlm')
-rw-r--r-- | fs/dlm/config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/dlm/config.c b/fs/dlm/config.c index eac23bd288b2..c4e7d721bd8d 100644 --- a/fs/dlm/config.c +++ b/fs/dlm/config.c | |||
@@ -438,7 +438,7 @@ static struct config_group *make_cluster(struct config_group *g, | |||
438 | kfree(gps); | 438 | kfree(gps); |
439 | kfree(sps); | 439 | kfree(sps); |
440 | kfree(cms); | 440 | kfree(cms); |
441 | return NULL; | 441 | return ERR_PTR(-ENOMEM); |
442 | } | 442 | } |
443 | 443 | ||
444 | static void drop_cluster(struct config_group *g, struct config_item *i) | 444 | static void drop_cluster(struct config_group *g, struct config_item *i) |
@@ -495,7 +495,7 @@ static struct config_group *make_space(struct config_group *g, const char *name) | |||
495 | kfree(sp); | 495 | kfree(sp); |
496 | kfree(gps); | 496 | kfree(gps); |
497 | kfree(nds); | 497 | kfree(nds); |
498 | return NULL; | 498 | return ERR_PTR(-ENOMEM); |
499 | } | 499 | } |
500 | 500 | ||
501 | static void drop_space(struct config_group *g, struct config_item *i) | 501 | static void drop_space(struct config_group *g, struct config_item *i) |
@@ -528,7 +528,7 @@ static struct config_item *make_comm(struct config_group *g, const char *name) | |||
528 | 528 | ||
529 | cm = kzalloc(sizeof(struct comm), GFP_KERNEL); | 529 | cm = kzalloc(sizeof(struct comm), GFP_KERNEL); |
530 | if (!cm) | 530 | if (!cm) |
531 | return NULL; | 531 | return ERR_PTR(-ENOMEM); |
532 | 532 | ||
533 | config_item_init_type_name(&cm->item, name, &comm_type); | 533 | config_item_init_type_name(&cm->item, name, &comm_type); |
534 | cm->nodeid = -1; | 534 | cm->nodeid = -1; |
@@ -561,7 +561,7 @@ static struct config_item *make_node(struct config_group *g, const char *name) | |||
561 | 561 | ||
562 | nd = kzalloc(sizeof(struct node), GFP_KERNEL); | 562 | nd = kzalloc(sizeof(struct node), GFP_KERNEL); |
563 | if (!nd) | 563 | if (!nd) |
564 | return NULL; | 564 | return ERR_PTR(-ENOMEM); |
565 | 565 | ||
566 | config_item_init_type_name(&nd->item, name, &node_type); | 566 | config_item_init_type_name(&nd->item, name, &node_type); |
567 | nd->nodeid = -1; | 567 | nd->nodeid = -1; |