Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>

authored by

Mikulas Patocka and committed by
Mike Snitzer
afa53df8 1f013174

+10 -10
+4 -4
drivers/md/dm-bufio.c
··· 6 6 * This file is released under the GPL. 7 7 */ 8 8 9 - #include "dm-bufio.h" 9 + #include <linux/dm-bufio.h> 10 10 11 11 #include <linux/device-mapper.h> 12 12 #include <linux/dm-io.h> ··· 1478 1478 1479 1479 dm_bufio_unlock(c); 1480 1480 } 1481 - EXPORT_SYMBOL(dm_bufio_forget); 1481 + EXPORT_SYMBOL_GPL(dm_bufio_forget); 1482 1482 1483 1483 void dm_bufio_set_minimum_buffers(struct dm_bufio_client *c, unsigned n) 1484 1484 { 1485 1485 c->minimum_buffers = n; 1486 1486 } 1487 - EXPORT_SYMBOL(dm_bufio_set_minimum_buffers); 1487 + EXPORT_SYMBOL_GPL(dm_bufio_set_minimum_buffers); 1488 1488 1489 1489 unsigned dm_bufio_get_block_size(struct dm_bufio_client *c) 1490 1490 { ··· 1690 1690 INIT_LIST_HEAD(&c->reserved_buffers); 1691 1691 c->need_reserved_buffers = reserved_buffers; 1692 1692 1693 - c->minimum_buffers = DM_BUFIO_MIN_BUFFERS; 1693 + dm_bufio_set_minimum_buffers(c, DM_BUFIO_MIN_BUFFERS); 1694 1694 1695 1695 init_waitqueue_head(&c->free_buffer_wait); 1696 1696 c->async_write_error = 0;
+2 -2
drivers/md/dm-bufio.h include/linux/dm-bufio.h
··· 6 6 * This file is released under the GPL. 7 7 */ 8 8 9 - #ifndef DM_BUFIO_H 10 - #define DM_BUFIO_H 9 + #ifndef _LINUX_DM_BUFIO_H 10 + #define _LINUX_DM_BUFIO_H 11 11 12 12 #include <linux/blkdev.h> 13 13 #include <linux/types.h>
+1 -1
drivers/md/dm-integrity.c
··· 18 18 #include <crypto/hash.h> 19 19 #include <crypto/skcipher.h> 20 20 #include <linux/async_tx.h> 21 - #include "dm-bufio.h" 21 + #include <linux/dm-bufio.h> 22 22 23 23 #define DM_MSG_PREFIX "integrity" 24 24
+1 -1
drivers/md/dm-snap-persistent.c
··· 14 14 #include <linux/export.h> 15 15 #include <linux/slab.h> 16 16 #include <linux/dm-io.h> 17 - #include "dm-bufio.h" 17 + #include <linux/dm-bufio.h> 18 18 19 19 #define DM_MSG_PREFIX "persistent snapshot" 20 20 #define DM_CHUNK_SIZE_DEFAULT_SECTORS 32 /* 16KB */
+1 -1
drivers/md/dm-verity.h
··· 12 12 #ifndef DM_VERITY_H 13 13 #define DM_VERITY_H 14 14 15 - #include "dm-bufio.h" 15 + #include <linux/dm-bufio.h> 16 16 #include <linux/device-mapper.h> 17 17 #include <crypto/hash.h> 18 18
+1 -1
drivers/md/persistent-data/dm-block-manager.c
··· 5 5 */ 6 6 #include "dm-block-manager.h" 7 7 #include "dm-persistent-data-internal.h" 8 - #include "../dm-bufio.h" 9 8 9 + #include <linux/dm-bufio.h> 10 10 #include <linux/crc32c.h> 11 11 #include <linux/module.h> 12 12 #include <linux/slab.h>