Subject: [merged] block-remove-unrelated-header-files-and-export-symbol.patch removed from -mm tree To: caizhiyong@xxxxxxxxxx,albert.wanglin@xxxxxxxxxxxxx,axboe@xxxxxxxxx,computersforpeace@xxxxxxxxx,dedekind1@xxxxxxxxx,dwmw2@xxxxxxxxxxxxx,ezequiel.garcia@xxxxxxxxxxxxxxxxxx,kzak@xxxxxxxxxx,shmulik.ladkani@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 23 Jan 2014 12:42:48 -0800 The patch titled Subject: block: remove unrelated header files and export symbol has been removed from the -mm tree. Its filename was block-remove-unrelated-header-files-and-export-symbol.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: CaiZhiyong <caizhiyong@xxxxxxxxxx> Subject: block: remove unrelated header files and export symbol Fix up the following items: - remove unrelated header files. - export interface function. - modify function cmdline_parts_parse return value, this will make it more friendly for the caller. Signed-off-by: CaiZhiyong <caizhiyong@xxxxxxxxxx> Cc: Ezequiel Garcia <ezequiel.garcia@xxxxxxxxxxxxxxxxxx> CC: Brian Norris <computersforpeace@xxxxxxxxx> Cc: "Wanglin (Albert)" <albert.wanglin@xxxxxxxxxxxxx> Cc: Artem Bityutskiy <dedekind1@xxxxxxxxx> Cc: Karel Zak <kzak@xxxxxxxxxx> Cc: Shmulik Ladkani <shmulik.ladkani@xxxxxxxxx> Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Cc: Jens Axboe <axboe@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- block/cmdline-parser.c | 18 +++++++++++------- include/linux/cmdline-parser.h | 8 ++++---- 2 files changed, 15 insertions(+), 11 deletions(-) diff -puN block/cmdline-parser.c~block-remove-unrelated-header-files-and-export-symbol block/cmdline-parser.c --- a/block/cmdline-parser.c~block-remove-unrelated-header-files-and-export-symbol +++ a/block/cmdline-parser.c @@ -4,8 +4,7 @@ * Written by Cai Zhiyong <caizhiyong@xxxxxxxxxx> * */ -#include <linux/buffer_head.h> -#include <linux/module.h> +#include <linux/export.h> #include <linux/cmdline-parser.h> static int parse_subpart(struct cmdline_subpart **subpart, char *partdef) @@ -159,6 +158,7 @@ void cmdline_parts_free(struct cmdline_p *parts = next_parts; } } +EXPORT_SYMBOL(cmdline_parts_free); int cmdline_parts_parse(struct cmdline_parts **parts, const char *cmdline) { @@ -206,6 +206,7 @@ fail: cmdline_parts_free(parts); goto done; } +EXPORT_SYMBOL(cmdline_parts_parse); struct cmdline_parts *cmdline_parts_find(struct cmdline_parts *parts, const char *bdev) @@ -214,17 +215,17 @@ struct cmdline_parts *cmdline_parts_find parts = parts->next_parts; return parts; } +EXPORT_SYMBOL(cmdline_parts_find); /* * add_part() * 0 success. * 1 can not add so many partitions. */ -void cmdline_parts_set(struct cmdline_parts *parts, sector_t disk_size, - int slot, - int (*add_part)(int, struct cmdline_subpart *, void *), - void *param) - +int cmdline_parts_set(struct cmdline_parts *parts, sector_t disk_size, + int slot, + int (*add_part)(int, struct cmdline_subpart *, void *), + void *param) { sector_t from = 0; struct cmdline_subpart *subpart; @@ -247,4 +248,7 @@ void cmdline_parts_set(struct cmdline_pa if (add_part(slot, subpart, param)) break; } + + return slot; } +EXPORT_SYMBOL(cmdline_parts_set); diff -puN include/linux/cmdline-parser.h~block-remove-unrelated-header-files-and-export-symbol include/linux/cmdline-parser.h --- a/include/linux/cmdline-parser.h~block-remove-unrelated-header-files-and-export-symbol +++ a/include/linux/cmdline-parser.h @@ -37,9 +37,9 @@ int cmdline_parts_parse(struct cmdline_p struct cmdline_parts *cmdline_parts_find(struct cmdline_parts *parts, const char *bdev); -void cmdline_parts_set(struct cmdline_parts *parts, sector_t disk_size, - int slot, - int (*add_part)(int, struct cmdline_subpart *, void *), - void *param); +int cmdline_parts_set(struct cmdline_parts *parts, sector_t disk_size, + int slot, + int (*add_part)(int, struct cmdline_subpart *, void *), + void *param); #endif /* CMDLINEPARSEH */ _ Patches currently in -mm which might be from caizhiyong@xxxxxxxxxx are linux-next.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