From afa53df869121fd4f6f1265cbe794d64387890ae Mon Sep 17 00:00:00 2001 From: Mikulas Patocka Date: Thu, 15 Mar 2018 16:02:31 -0400 Subject: [PATCH] dm bufio: move dm-bufio.h to include/linux/ Move dm-bufio.h to include/linux/ so that external GPL'd DM target modules can use it. It is better to allow the use of dm-bufio than force external modules to implement the equivalent buffered IO mechanism in some new way. The hope is this will encourage the use of dm-bufio; which will then make it easier for a GPL'd external DM target module to be included upstream. A couple dm-bufio EXPORT_SYMBOL exports have also been updated to use EXPORT_SYMBOL_GPL. Signed-off-by: Mikulas Patocka Signed-off-by: Mike Snitzer --- drivers/md/dm-bufio.c | 8 ++++---- drivers/md/dm-integrity.c | 2 +- drivers/md/dm-snap-persistent.c | 2 +- drivers/md/dm-verity.h | 2 +- drivers/md/persistent-data/dm-block-manager.c | 2 +- {drivers/md => include/linux}/dm-bufio.h | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) rename {drivers/md => include/linux}/dm-bufio.h (98%) diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c index f5360a6260ff..87795a361d09 100644 --- a/drivers/md/dm-bufio.c +++ b/drivers/md/dm-bufio.c @@ -6,7 +6,7 @@ * This file is released under the GPL. */ -#include "dm-bufio.h" +#include #include #include @@ -1478,13 +1478,13 @@ void dm_bufio_forget(struct dm_bufio_client *c, sector_t block) dm_bufio_unlock(c); } -EXPORT_SYMBOL(dm_bufio_forget); +EXPORT_SYMBOL_GPL(dm_bufio_forget); void dm_bufio_set_minimum_buffers(struct dm_bufio_client *c, unsigned n) { c->minimum_buffers = n; } -EXPORT_SYMBOL(dm_bufio_set_minimum_buffers); +EXPORT_SYMBOL_GPL(dm_bufio_set_minimum_buffers); unsigned dm_bufio_get_block_size(struct dm_bufio_client *c) { @@ -1690,7 +1690,7 @@ struct dm_bufio_client *dm_bufio_client_create(struct block_device *bdev, unsign INIT_LIST_HEAD(&c->reserved_buffers); c->need_reserved_buffers = reserved_buffers; - c->minimum_buffers = DM_BUFIO_MIN_BUFFERS; + dm_bufio_set_minimum_buffers(c, DM_BUFIO_MIN_BUFFERS); init_waitqueue_head(&c->free_buffer_wait); c->async_write_error = 0; diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c index 6c81b11d0521..77d9fe58dae2 100644 --- a/drivers/md/dm-integrity.c +++ b/drivers/md/dm-integrity.c @@ -18,7 +18,7 @@ #include #include #include -#include "dm-bufio.h" +#include #define DM_MSG_PREFIX "integrity" diff --git a/drivers/md/dm-snap-persistent.c b/drivers/md/dm-snap-persistent.c index c5534d294773..3c50c4e4da8f 100644 --- a/drivers/md/dm-snap-persistent.c +++ b/drivers/md/dm-snap-persistent.c @@ -14,7 +14,7 @@ #include #include #include -#include "dm-bufio.h" +#include #define DM_MSG_PREFIX "persistent snapshot" #define DM_CHUNK_SIZE_DEFAULT_SECTORS 32 /* 16KB */ diff --git a/drivers/md/dm-verity.h b/drivers/md/dm-verity.h index b675bc015512..69f9a298f8c9 100644 --- a/drivers/md/dm-verity.h +++ b/drivers/md/dm-verity.h @@ -12,7 +12,7 @@ #ifndef DM_VERITY_H #define DM_VERITY_H -#include "dm-bufio.h" +#include #include #include diff --git a/drivers/md/persistent-data/dm-block-manager.c b/drivers/md/persistent-data/dm-block-manager.c index ea15d220ced7..492a3f8ac119 100644 --- a/drivers/md/persistent-data/dm-block-manager.c +++ b/drivers/md/persistent-data/dm-block-manager.c @@ -5,8 +5,8 @@ */ #include "dm-block-manager.h" #include "dm-persistent-data-internal.h" -#include "../dm-bufio.h" +#include #include #include #include diff --git a/drivers/md/dm-bufio.h b/include/linux/dm-bufio.h similarity index 98% rename from drivers/md/dm-bufio.h rename to include/linux/dm-bufio.h index be732d3f8611..3c8b7d274bd9 100644 --- a/drivers/md/dm-bufio.h +++ b/include/linux/dm-bufio.h @@ -6,8 +6,8 @@ * This file is released under the GPL. */ -#ifndef DM_BUFIO_H -#define DM_BUFIO_H +#ifndef _LINUX_DM_BUFIO_H +#define _LINUX_DM_BUFIO_H #include #include