summaryrefslogtreecommitdiffstats
path: root/fs/configfs/item.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-07-18 10:01:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-18 10:01:04 -0700
commit3a26a5b1513cddfc018c8e264979bc6e28f8ec1f (patch)
tree56356f468ed5c3e62f30d6d5c075ddb3e627a4f9 /fs/configfs/item.c
parent8be5701342790eb42c67f4f8609e203d6a461a4a (diff)
parent5a09e6ce90e1bf26f0915e7e31329402766ffead (diff)
downloadtalos-op-linux-3a26a5b1513cddfc018c8e264979bc6e28f8ec1f.tar.gz
talos-op-linux-3a26a5b1513cddfc018c8e264979bc6e28f8ec1f.zip
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton: "25 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (25 commits) lib/decompress: set the compressor name to NULL on error mm/cma_debug: correct size input to bitmap function mm/cma_debug: fix debugging alloc/free interface mm/page_owner: set correct gfp_mask on page_owner mm/page_owner: fix possible access violation fsnotify: fix oops in fsnotify_clear_marks_by_group_flags() /proc/$PID/cmdline: fixup empty ARGV case dma-debug: skip debug_dma_assert_idle() when disabled hexdump: fix for non-aligned buffers checkpatch: fix long line messages about patch context mm: clean up per architecture MM hook header files MAINTAINERS: uclinux-h8-devel is moderated for non-subscribers mailmap: update Sudeep Holla's email id Update Viresh Kumar's email address mm, meminit: suppress unused memory variable warning configfs: fix kernel infoleak through user-controlled format string include, lib: add __printf attributes to several function prototypes s390/hugetlb: add hugepages_supported define mm: hugetlb: allow hugepages_supported to be architecture specific revert "s390/mm: make hugepages_supported a boot time decision" ...
Diffstat (limited to 'fs/configfs/item.c')
-rw-r--r--fs/configfs/item.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/configfs/item.c b/fs/configfs/item.c
index 4d6a30e76168..b863a09cd2f1 100644
--- a/fs/configfs/item.c
+++ b/fs/configfs/item.c
@@ -115,7 +115,7 @@ void config_item_init_type_name(struct config_item *item,
const char *name,
struct config_item_type *type)
{
- config_item_set_name(item, name);
+ config_item_set_name(item, "%s", name);
item->ci_type = type;
config_item_init(item);
}
@@ -124,7 +124,7 @@ EXPORT_SYMBOL(config_item_init_type_name);
void config_group_init_type_name(struct config_group *group, const char *name,
struct config_item_type *type)
{
- config_item_set_name(&group->cg_item, name);
+ config_item_set_name(&group->cg_item, "%s", name);
group->cg_item.ci_type = type;
config_group_init(group);
}
OpenPOWER on IntegriCloud