diff --git a/driver/device-mapper/dm.c b/driver/device-mapper/dm.c
new file mode 100644
index 000000000..d7230f882
--- /dev/null
+++ b/driver/device-mapper/dm.c
@@ -0,0 +1,520 @@
+/*
+ * device-mapper.c
+ *
+ * Copyright (C) 2001 Sistina Software
+ *
+ * This software is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2, or (at
+ * your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU CC; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Changelog
+ *
+ *    14/08/2001 - First Version [Joe Thornber]
+ */
+
+
+/* TODO:
+ *
+ * dm_ctr_fn should provide the sector sizes, and hardsector_sizes set
+ * to the smallest of these.
+ */
+
+#include <linux/version.h>
+#include <linux/major.h>
+#include <linux/iobuf.h>
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/compatmac.h>
+#include <linux/cache.h>
+#include <linux/device-mapper.h>
+
+/* defines for blk.h */
+#define MAJOR_NR DM_BLK_MAJOR
+#define DEVICE_OFF(device)
+#define LOCAL_END_REQUEST
+
+#include <linux/blk.h>
+
+/*
+ * This driver attempts to provide a generic way of specifying logical
+ * devices which are mapped onto other devices.
+ *
+ * It does this by mapping sections of the logical device onto 'targets'.
+ *
+ * When the logical device is accessed the make_request function looks up
+ * the correct target for the given sector, and then asks this target
+ * to do the remapping.
+ *
+ * A btree like structure is used to hold the sector range -> target
+ * mapping.  Because we know all the entries in the btree in advance
+ * we can make a very compact tree, omitting pointers to child nodes,
+ * (child nodes locations can be calculated). Each node of the btree is
+ * 1 level cache line in size, this gives a small performance boost.
+ *
+ * A userland test program for the btree gave the following results on a
+ * 1 Gigahertz Athlon machine:
+ *
+ * entries in btree               lookups per second
+ * ----------------               ------------------
+ * 5                              25,000,000
+ * 1000                           7,700,000
+ * 10,000,000                     3,800,000
+ *
+ * Of course these results should be taken with a pinch of salt; the lookups
+ * were sequential and there were no other applications (other than X + emacs)
+ * running to give any pressure on the level 1 cache.
+ *
+ * Typically LVM users would find they have very few targets for each
+ * LV (probably less than 10).
+ *
+ * Target types are not hard coded, instead the
+ * register_mapping_type function should be called.  A target type
+ * is specified using three functions (see the header):
+ *
+ * dm_ctr_fn - takes a string and contructs a target specific piece of
+ *             context data.
+ * dm_dtr_fn - destroy contexts.
+ * dm_map_fn - function that takes a buffer_head and some previously
+ *             constructed context and performs the remapping.
+ *
+ * This file contains two trivial mappers, which are automatically
+ * registered: 'linear', and 'io_error'.  Linear alone is enough to
+ * implement most LVM features (omitting striped volumes and
+ * snapshots).
+ *
+ * At the moment this driver has a temporary ioctl interface, but I will
+ * move this to a read/write interface on either a /proc file or a
+ * char device.  This will allow scripts to simply cat a text mapping
+ * table in order to set up a volume.
+ *
+ * At the moment the table assumes 32 bit keys (sectors), the move to
+ * 64 bits will involve no interface changes, since the tables will be
+ * read in as ascii data.  A different table implementation can
+ * therefor be provided at another time.  Either just by changing offset_t
+ * to 64 bits, or maybe implementing a structure which looks up the keys in
+ * stages (ie, 32 bits at a time).
+ *
+ * More interesting targets:
+ *
+ * striped mapping; given a stripe size and a number of device regions
+ * this would stripe data across the regions.  Especially useful, since
+ * we could limit each striped region to a 32 bit area and then avoid
+ * nasy 64 bit %'s.
+ *
+ * mirror mapping (reflector ?); would set off a kernel thread slowly
+ * copying data from one region to another, ensuring that any new
+ * writes got copied to both destinations correctly.  Great for
+ * implementing pvmove.  Not sure how userland would be notified that
+ * the copying process had completed.  Possibly by reading a /proc entry
+ * for the LV.
+ */
+
+#define MAX_DEVICES 64
+#define DEFAULT_READ_AHEAD 64
+
+#define WARN(f, x...) printk(KERN_WARNING "%s " f "\n", _name , ## x)
+
+const char *_name = "device-mapper";
+int _version[3] = {1, 0, 0};
+
+spinlock_t _dev_lock;
+static int _dev_count = 0;
+static struct mapped_device *_devs[MAX_DEVICES];
+
+/* block device arrays */
+static int _block_size[MAX_DEVICES];
+static int _blksize_size[MAX_DEVICES];
+static int _hardsect_size[MAX_DEVICES];
+
+static int _ctl_open(struct inode *inode, struct file *file);
+static int _ctl_close(struct inode *inode, struct file *file);
+static int _ctl_ioctl(struct inode *inode, struct file *file,
+		      uint command, ulong a);
+
+static struct file_operations _ctl_fops = {
+	open:     _ctl_open,
+	release:  _ctl_close,
+	ioctl:    _ctl_ioctl,
+};
+
+static int _blk_open(struct inode *inode, struct file *file);
+static int _blk_close(struct inode *inode, struct file *file);
+static int _blk_ioctl(struct inode *inode, struct file *file,
+		      uint command, ulong a);
+
+static struct block_device_operations _blk_dops = {
+	open:     _blk_open,
+	release:  _blk_close,
+	ioctl:    _blk_ioctl
+};
+
+static struct mapped_device *_build_map(struct device_table *t);
+static int _request_fn(request_queue_t *q, int rw, struct buffer_head *bh);
+
+/*
+ * setup and teardown the driver
+ */
+static int _init(void)
+{
+	_init_mds();
+
+	if (!_register_std_targets())
+		return -EIO;	/* FIXME: better error value */
+
+	/* set up the arrays */
+	read_ahead[MAJOR_NR] = DEFAULT_READ_AHEAD;
+	blk_size[MAJOR_NR] = _block_size;
+	blksize_size[MAJOR_NR] = _blksize_size;
+	hardsect_size[MAJOR_NR] = _hardsect_size;
+
+	if (register_chrdev(DM_CTL_MAJOR, _name, &_ctl_fops) < 0) {
+		printk(KERN_ERR "%s - register_chrdev failed\n", _name);
+		return -EIO;
+	}
+
+	if (register_blkdev(MAJOR_NR, _name, &_blk_dops) < 0) {
+		printk(KERN_ERR "%s -- register_blkdev failed\n", _name);
+		if (unregister_chrdev(DM_CTL_MAJOR, _name) < 0)
+			printk(KERN_ERR "%s - unregister_chrdev failed\n",
+			       _name);
+		return -EIO;
+	}
+
+	blk_queue_make_request(BLK_DEFAULT_QUEUE(MAJOR_NR), _request_fn);
+
+	printk(KERN_INFO "%s(%d, %d, %d) successfully initialised\n", _name,
+	       _version[0], _version[1], _version[2]);
+	return 0;
+}
+
+static void _fin(void)
+{
+	if (unregister_chrdev(DM_CTL_MAJOR, _name) < 0)
+		printk(KERN_ERR "%s - unregister_chrdev failed\n", _name);
+
+	if (unregister_blkdev(MAJOR_NR, _name) < 0)
+		printk(KERN_ERR "%s -- unregister_blkdev failed\n", _name);
+
+	read_ahead[MAJOR_NR] = 0;
+	blk_size[MAJOR_NR] = 0;
+	blksize_size[MAJOR_NR] = 0;
+	hardsect_size[MAJOR_NR] = 0;
+
+	printk(KERN_INFO "%s(%d, %d, %d) successfully finalised\n", _name,
+	       _version[0], _version[1], _version[2]);
+}
+
+/*
+ * character device fns
+ */
+static int _ctl_open(struct inode *inode, struct file *file)
+{
+	if (!capable(CAP_SYS_ADMIN))
+		return -EACCES;
+
+	MOD_INC_USE_COUNT;
+	return 0;
+}
+
+static int _ctl_close(struct inode *inode, struct file *file)
+{
+	MOD_DEC_USE_COUNT;
+	return 0;
+}
+
+static int _ctl_ioctl(struct inode *inode, struct file *file,
+		      uint command, ulong a)
+{
+	struct dm_request req;
+
+	if (copy_from_user(&req, (void *) a, sizeof(req)))
+		return -EFAULT;
+
+	switch (command) {
+	case MAPPED_DEVICE_CREATE:
+		return _create_dev(req.minor, req.name);
+		break;
+
+	case MAPPED_DEVICE_DESTROY:
+		return _destroy_dev(req.minor);
+		break;
+
+	default:
+		WARN("_ctl_ioctl: unknown command 0x%x", command);
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+
+/*
+ * block device functions
+ */
+static int _blk_open(struct inode *inode, struct file *file)
+{
+	int minor = MINOR(inode->i_rdev);
+	struct mapped_device *md = _devices + minor;
+
+	if (minor >= MAX_DEVICES)
+		return -ENXIO;
+
+	spin_lock(&md->lock);
+
+	if (!md->in_use) {
+		spin_unlock(&md->lock);
+		return -ENXIO;
+	}
+
+	md->in_use++;
+	spin_unlock(&md->lock);
+
+	MOD_INC_USE_COUNT;
+	return 0;
+}
+
+static int _blk_close(struct inode *inode, struct file *file)
+{
+	int minor = MINOR(inode->i_rdev);
+	struct mapped_device *md = _devices + minor;
+
+	if (minor >= MAX_DEVICES)
+		return -ENXIO;
+
+	spin_lock(&md->lock);
+
+	if (md->in_use <= 1) {
+		WARN("reference count in mapped_device incorrect");
+		spin_unlock(&md->lock);
+		return -ENXIO;
+	}
+
+	md->in_use--;
+	spin_unlock(&md->lock);
+
+	MOD_INC_USE_COUNT;
+	return 0;
+}
+
+static int _blk_ioctl(struct inode *inode, struct file *file,
+		      uint command, ulong a)
+{
+	/* FIXME: check in the latest Rubini that all expected ioctl's
+	   are supported */
+
+	int minor = MINOR(inode->i_rdev);
+	long size;
+
+	switch (command) {
+	case BLKGETSIZE:
+		size = _block_size[minor] * 1024 / _hardsect_size[minor];
+		if (copy_to_user((void *) a, &size, sizeof(long)))
+			return -EFAULT;
+		break;
+
+	case BLKFLSBUF:
+		if (!capable(CAP_SYS_ADMIN))
+			return -EACCES;
+		fsync_dev(inode->i_rdev);
+		invalidate_buffers(inode->i_rdev);
+		return 0;
+
+	case BLKRAGET:
+		if (copy_to_user((void *) a, &read_ahead[MAJOR(inode->i_rdev)],
+				sizeof(long)))
+			return -EFAULT;
+		return 0;
+
+	case BLKRASET:
+		if (!capable(CAP_SYS_ADMIN))
+			return -EACCES;
+		read_ahead[MAJOR(inode->i_rdev)] = a;
+		return 0;
+
+	case BLKRRPART:
+		return -EINVAL;
+
+	default:
+		printk(KERN_WARNING "%s - unknown block ioctl %d",
+		       _name, command);
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int _request_fn(request_queue_t *q, int rw, struct buffer_head *bh)
+{
+	struct mapped_device *md;
+	offset_t *node;
+	int i = 0, l, next_node = 0, ret = 0;
+	int minor = MINOR(bh->b_rdev);
+	dm_map_fn fn;
+	void *context;
+
+	if (minor >= MAX_DEVICES)
+		return -ENXIO;
+
+	md = _devs[minor];
+	if (MINOR(md->dev != minor))
+		return -ENXIO;
+
+	for (l = 0; l < md->depth; l++) {
+		next_node = ((KEYS_PER_NODE + 1) * next_node) + i;
+		node = md->index[l] + (next_node * KEYS_PER_NODE);
+
+		for (i = 0; i < KEYS_PER_NODE; i++)
+			if (node[i] >= bh->b_rsector)
+				break;
+	}
+
+	next_node = (KEYS_PER_NODE * next_node) + i;
+	fn = md->targets[next_node];
+	context = md->contexts[next_node];
+
+	if (fn) {
+		if ((ret = fn(bh, context)))
+			atomic_inc(&md->pending);
+	} else
+		buffer_IO_error(bh);
+
+	return ret;
+}
+
+
+static inline int __specific_dev(int minor)
+{
+	if (minor > MAX_DEVICES) {
+		WARN("request for a mapped_device > than MAX_DEVICES");
+		return 0;
+	}
+
+	if (!_devs[minor])
+		return minor;
+
+	return -1;
+}
+
+static inline int __any_old_dev(void)
+{
+	int i;
+
+	for (i = 0; i < MAX_DEVICES; i++)
+		if (!_devs[i])
+			return i;
+
+	return -1;
+}
+
+static struct mapped_device *_alloc_dev(int minor)
+{
+	int i;
+	struct mapped_device *md = kmalloc(sizeof(*md), GFP_KERNEL);
+
+	spin_lock(&_dev_lock);
+	minor = (minor < 0) ? __any_old_dev() : __specific_dev(minor);
+
+	if (minor < 0) {
+		WARN("no free devices available");
+		spin_unlock(&_dev_lock);
+		kfree(md);
+		return 0;
+	}
+
+	md->dev = MKDEV(DM_BLK_MAJOR, minor);
+	md->name[0] = '\0';
+	clear_bit(md->status, DM_CREATED);
+
+	_devs[minor] = md;
+	spin_unlock(&_dev_lock);
+
+	return *d;
+}
+
+static void _free_dev(struct mapped_device *md)
+{
+	int i, minor = MINOR(md->dev);
+
+	spin_lock(&_dev_lock);
+	_devs[i] = 0;
+	spin_unlock(&_dev_lock);
+
+	kfree(md);
+}
+
+static struct mapped_device *__find_dev(const char *name)
+{
+	int i;
+	for (i = 0; i < MAX_DEVICES; i++)
+		if (_devs[i] && !strcmp(_devs[i]->name, name))
+			return _devs[i];
+
+	return 0;
+}
+
+static int _create_dev(int minor, const char *name)
+{
+	struct mapped_device *md = _alloc_dev(minor);
+
+	if (!md)
+		return -ENXIO;
+
+	spin_lock(&_dev_lock);
+	if (__find_dev(name)) {
+		WARN("device with that name already exists");
+		spin_unlock(&_dev_lock);
+		_free_dev(md);
+		return -EINVAL;
+	}
+
+	strcpy(md->name, name);
+	spin_unlock(&_dev_lock);
+
+	dm_fs_add_lv(md);
+}
+
+static int _destroy_dev(int minor)
+{
+	struct mapped_device *md;
+
+	spin_lock(&_dev_lock);
+	md = _devs[minor];
+	clear_bit(md->status, CREATED);
+	spin_unlock(&_dev_lock);
+
+	dm_clear_table(md);
+
+	spin_lock(&_dev_lock);
+	_free_dev(md);
+	spin_unlock(&_dev_lock);
+
+	dm_fs_remove_lv(md);
+	return 0;
+}
+
+/*
+ * module hooks
+ */
+module_init(_init);
+module_exit(_fin);
+
+/*
+ * Local variables:
+ * c-file-style: "linux"
+ * End:
+ */