Commit afa53df8 authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Mike Snitzer

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: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 1f013174
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* This file is released under the GPL. * This file is released under the GPL.
*/ */
#include "dm-bufio.h" #include <linux/dm-bufio.h>
#include <linux/device-mapper.h> #include <linux/device-mapper.h>
#include <linux/dm-io.h> #include <linux/dm-io.h>
...@@ -1478,13 +1478,13 @@ void dm_bufio_forget(struct dm_bufio_client *c, sector_t block) ...@@ -1478,13 +1478,13 @@ void dm_bufio_forget(struct dm_bufio_client *c, sector_t block)
dm_bufio_unlock(c); 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) void dm_bufio_set_minimum_buffers(struct dm_bufio_client *c, unsigned n)
{ {
c->minimum_buffers = 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) 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 ...@@ -1690,7 +1690,7 @@ struct dm_bufio_client *dm_bufio_client_create(struct block_device *bdev, unsign
INIT_LIST_HEAD(&c->reserved_buffers); INIT_LIST_HEAD(&c->reserved_buffers);
c->need_reserved_buffers = 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); init_waitqueue_head(&c->free_buffer_wait);
c->async_write_error = 0; c->async_write_error = 0;
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <crypto/hash.h> #include <crypto/hash.h>
#include <crypto/skcipher.h> #include <crypto/skcipher.h>
#include <linux/async_tx.h> #include <linux/async_tx.h>
#include "dm-bufio.h" #include <linux/dm-bufio.h>
#define DM_MSG_PREFIX "integrity" #define DM_MSG_PREFIX "integrity"
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/export.h> #include <linux/export.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/dm-io.h> #include <linux/dm-io.h>
#include "dm-bufio.h" #include <linux/dm-bufio.h>
#define DM_MSG_PREFIX "persistent snapshot" #define DM_MSG_PREFIX "persistent snapshot"
#define DM_CHUNK_SIZE_DEFAULT_SECTORS 32 /* 16KB */ #define DM_CHUNK_SIZE_DEFAULT_SECTORS 32 /* 16KB */
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#ifndef DM_VERITY_H #ifndef DM_VERITY_H
#define DM_VERITY_H #define DM_VERITY_H
#include "dm-bufio.h" #include <linux/dm-bufio.h>
#include <linux/device-mapper.h> #include <linux/device-mapper.h>
#include <crypto/hash.h> #include <crypto/hash.h>
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
*/ */
#include "dm-block-manager.h" #include "dm-block-manager.h"
#include "dm-persistent-data-internal.h" #include "dm-persistent-data-internal.h"
#include "../dm-bufio.h"
#include <linux/dm-bufio.h>
#include <linux/crc32c.h> #include <linux/crc32c.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
* This file is released under the GPL. * This file is released under the GPL.
*/ */
#ifndef DM_BUFIO_H #ifndef _LINUX_DM_BUFIO_H
#define DM_BUFIO_H #define _LINUX_DM_BUFIO_H
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/types.h> #include <linux/types.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment