The patch titled
revert agk-dm-dm-loop
has been added to the -mm tree. Its filename is
revert-agk-dm-dm-loop.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: revert agk-dm-dm-loop
From: Andrew Morton <[EMAIL PROTECTED]>
filp_open() is going away.
Cc: Bryn Reeves <[EMAIL PROTECTED]>
Cc: Alasdair G Kergon <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/md/Kconfig | 9
drivers/md/Makefile | 1
drivers/md/dm-loop.c | 1039 -----------------------------------------
3 files changed, 1049 deletions(-)
diff -puN drivers/md/Kconfig~revert-agk-dm-dm-loop drivers/md/Kconfig
--- a/drivers/md/Kconfig~revert-agk-dm-dm-loop
+++ a/drivers/md/Kconfig
@@ -229,15 +229,6 @@ config DM_CRYPT
If unsure, say N.
-config DM_LOOP
- tristate "Loop target (EXPERIMENTAL)"
- depends on BLK_DEV_DM && EXPERIMENTAL
- ---help---
- This device-mapper target allows you to treat a regular file as
- a block device.
-
- If unsure, say N.
-
config DM_SNAPSHOT
tristate "Snapshot target"
depends on BLK_DEV_DM
diff -puN drivers/md/Makefile~revert-agk-dm-dm-loop drivers/md/Makefile
--- a/drivers/md/Makefile~revert-agk-dm-dm-loop
+++ a/drivers/md/Makefile
@@ -34,7 +34,6 @@ obj-$(CONFIG_BLK_DEV_MD) += md-mod.o
obj-$(CONFIG_BLK_DEV_DM) += dm-mod.o
obj-$(CONFIG_DM_CRYPT) += dm-crypt.o
obj-$(CONFIG_DM_DELAY) += dm-delay.o
-obj-$(CONFIG_DM_LOOP) += dm-loop.o
obj-$(CONFIG_DM_MULTIPATH) += dm-multipath.o dm-round-robin.o
obj-$(CONFIG_DM_MULTIPATH_EMC) += dm-emc.o
obj-$(CONFIG_DM_MULTIPATH_HP) += dm-hp-sw.o
diff -puN drivers/md/dm-loop.c~revert-agk-dm-dm-loop /dev/null
--- a/drivers/md/dm-loop.c
+++ /dev/null
@@ -1,1039 +0,0 @@
-/*
- * Copyright (C) 2006-2008 Red Hat, Inc. All rights reserved.
- *
- * This file is part of device-mapper.
- *
- * Extent mapping implementation heavily influenced by mm/swapfile.c
- * Bryn Reeves <[EMAIL PROTECTED]>
- *
- * File mapping and block lookup algorithms support by
- * Heinz Mauelshagen <[EMAIL PROTECTED]>.
- *
- * This file is released under the GPL.
- */
-
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/fs.h>
-#include <linux/module.h>
-#include <linux/vmalloc.h>
-#include <linux/syscalls.h>
-#include <linux/workqueue.h>
-#include <linux/file.h>
-#include <linux/bio.h>
-
-#include "dm.h"
-#include "dm-bio-list.h"
-
-#define DM_LOOP_DAEMON "kloopd"
-#define DM_MSG_PREFIX "loop"
-
-enum flags { DM_LOOP_BMAP, DM_LOOP_FSIO };
-
-/*--------------------------------------------------------------------
- * Loop context
- *--------------------------------------------------------------------*/
-
-struct loop_c {
- unsigned long flags;
-
- /* Backing store */
-
- struct file *filp;
- char *path;
- loff_t offset;
- struct block_device *bdev;
- unsigned blkbits; /* file system block size shift bits */
-
- loff_t size; /* size of entire file in bytes */
- loff_t blocks; /* blocks allocated to loop file */
- sector_t mapped_sectors; /* size of mapped area in sectors */
-
- int (*map_fn)(struct dm_target *, struct bio *);
- void *map_data;
-};
-
-/*
- * Block map extent
- */
-struct dm_loop_extent {
- sector_t start; /* start sector in mapped device */
- sector_t to; /* start sector on target device */
- sector_t len; /* length in sectors */
-};
-
-/*
- * Temporary extent list
- */
-struct extent_list {
- struct dm_loop_extent *extent;
- struct list_head list;
-};
-
-static struct kmem_cache *dm_loop_extent_cache;
-
-/*
- * Block map private context
- */
-struct block_map_c {
- int nr_extents; /* number of extents in map */
- struct dm_loop_extent **map; /* linear map of extent pointers */
- struct dm_loop_extent **mru; /* pointer to mru entry */
- spinlock_t mru_lock; /* protects mru */
-};
-
-/*
- * File map private context
- */
-struct file_map_c {
- spinlock_t lock; /* protects in */
- struct bio_list in; /* new bios for processing */
- struct bio_list work; /* bios queued for processing */
- struct workqueue_struct *wq; /* workqueue */
- struct work_struct ws; /* loop work */
- struct loop_c *loop; /* for filp & offset */
-};
-
-/*--------------------------------------------------------------------
- * Generic helpers
- *--------------------------------------------------------------------*/
-
-static sector_t blk2sect(struct loop_c *lc, blkcnt_t block)
-{
- return block << (lc->blkbits - SECTOR_SHIFT);
-}
-
-static blkcnt_t sec2blk(struct loop_c *lc, sector_t sector)
-{
- return sector >> (lc->blkbits - SECTOR_SHIFT);
-}
-
-/*--------------------------------------------------------------------
- * File I/O helpers
- *--------------------------------------------------------------------*/
-
-/*
- * transfer data to/from file using the read/write file_operations.
- */
-static int fs_io(int rw, struct file *filp, loff_t *pos, struct bio_vec *bv)
-{
- ssize_t r;
- void __user *ptr = (void __user __force *) kmap(bv->bv_page) +
- bv->bv_offset;
- mm_segment_t old_fs = get_fs();
-
- set_fs(get_ds());
- r = (rw == READ) ? filp->f_op->read(filp, ptr, bv->bv_len, pos) :
- filp->f_op->write(filp, ptr, bv->bv_len, pos);
- set_fs(old_fs);
- kunmap(bv->bv_page);
-
- return (r == bv->bv_len) ? 0 : -EIO;
-}
-
-/*
- * Handle I/O for one bio
- */
-static void do_one_bio(struct file_map_c *fc, struct bio *bio)
-{
- int r = 0, rw = bio_data_dir(bio);
- loff_t start = (bio->bi_sector << 9) + fc->loop->offset, pos = start;
- struct bio_vec *bv, *bv_end = bio->bi_io_vec + bio->bi_vcnt;
-
- for (bv = bio->bi_io_vec; bv < bv_end; bv++) {
- r = fs_io(rw, fc->loop->filp, &pos, bv);
- if (r) {
- DMERR("%s error %d", rw ? "write" : "read", r);
- break;
- }
- }
-
- bio_endio(bio, r);
-}
-
-/*
- * Worker thread for a 'file' type loop device
- */
-static void do_loop_work(struct work_struct *ws)
-{
- struct file_map_c *fc = container_of(ws, struct file_map_c, ws);
- struct bio *bio;
-
- /* quickly grab all new bios queued and add them to the work list */
- spin_lock_irq(&fc->lock);
- bio_list_merge(&fc->work, &fc->in);
- bio_list_init(&fc->in);
- spin_unlock_irq(&fc->lock);
-
- /* work the list and do file I/O on all bios */
- while ((bio = bio_list_pop(&fc->work)))
- do_one_bio(fc, bio);
-}
-
-/*
- * Create work queue and initialize work
- */
-static int loop_work_init(struct loop_c *lc)
-{
- struct file_map_c *fc = lc->map_data;
-
- fc->wq = create_singlethread_workqueue(DM_LOOP_DAEMON);
- if (!fc->wq)
- return -ENOMEM;
-
- return 0;
-}
-
-/*
- * Destroy work queue
- */
-static void loop_work_exit(struct loop_c *lc)
-{
- struct file_map_c *fc = lc->map_data;
-
- if (fc->wq)
- destroy_workqueue(fc->wq);
-}
-
-/*
- * DM_LOOP_FSIO map_fn. Mapping just queues bios to the file map
- * context and lets the daemon deal with them.
- */
-static int loop_file_map(struct dm_target *ti, struct bio *bio)
-{
- int wake;
- struct loop_c *lc = ti->private;
- struct file_map_c *fc = lc->map_data;
-
- spin_lock_irq(&fc->lock);
- wake = bio_list_empty(&fc->in);
- bio_list_add(&fc->in, bio);
- spin_unlock_irq(&fc->lock);
-
- /*
- * Only call queue_work() if necessary to avoid
- * superfluous preempt_{disable/enable}() overhead.
- */
- if (wake)
- queue_work(fc->wq, &fc->ws);
-
- /* Handling bio - will submit later. */
- return 0;
-}
-
-/*
- * Shutdown the workqueue and free a file mapping
- */
-static void destroy_file_map(struct loop_c *lc)
-{
- loop_work_exit(lc);
- kfree(lc->map_data);
-}
-
-/*
- * Set up a file map context and workqueue
- */
-static int setup_file_map(struct loop_c *lc)
-{
- struct file_map_c *fc = kzalloc(sizeof(*fc), GFP_KERNEL);
-
- if (!fc)
- return -ENOMEM;
-
- spin_lock_init(&fc->lock);
- bio_list_init(&fc->in);
- bio_list_init(&fc->work);
- INIT_WORK(&fc->ws, do_loop_work);
- fc->loop = lc;
-
- lc->map_data = fc;
- lc->map_fn = loop_file_map;
-
- return loop_work_init(lc);
-}
-
-/*--------------------------------------------------------------------
- * Block I/O helpers
- *--------------------------------------------------------------------*/
-
-static int contains_sector(struct dm_loop_extent *e, sector_t s)
-{
- if (likely(e))
- return s < (e->start + (e->len)) && s >= e->start;
-
- return 0;
-}
-
-/*
- * Walk over a linked list of extent_list structures, freeing them as
- * we go. Does not free el->extent.
- */
-static void destroy_extent_list(struct list_head *head)
-{
- struct list_head *curr, *n;
- struct extent_list *el;
-
- if (list_empty(head))
- return;
-
- list_for_each_safe(curr, n, head) {
- el = list_entry(curr, struct extent_list, list);
- list_del(curr);
- kfree(el);
- }
-}
-
-/*
- * Add a new extent to the tail of the list at *head with
- * start/to/len parameters. Allocates from the extent cache.
- */
-static int list_add_extent(struct list_head *head, sector_t start,
- sector_t to, sector_t len)
-{
- struct dm_loop_extent *extent;
- struct extent_list *list;
-
- extent = kmem_cache_alloc(dm_loop_extent_cache, GFP_KERNEL);
- if (!extent)
- goto out;
-
- list = kmalloc(sizeof(*list), GFP_KERNEL);
- if (!list)
- goto out;
-
- extent->start = start;
- extent->to = to;
- extent->len = len;
-
- list->extent = extent;
- list_add_tail(&list->list, head);
-
- return 0;
-out:
- if (extent)
- kmem_cache_free(dm_loop_extent_cache, extent);
- return -ENOMEM;
-}
-
-/*
- * Return an extent range (i.e. beginning and ending physical block numbers).
- */
-static int extent_range(struct inode *inode,
- blkcnt_t logical_blk, blkcnt_t last_blk,
- blkcnt_t *begin_blk, blkcnt_t *end_blk)
-{
- sector_t dist = 0, phys_blk, probe_blk = logical_blk;
-
- /* Find beginning physical block of extent starting at logical_blk. */
- *begin_blk = phys_blk = bmap(inode, probe_blk);
- if (!phys_blk)
- return -ENXIO;
-
- for (; phys_blk == *begin_blk + dist; dist++) {
- *end_blk = phys_blk;
- if (++probe_blk > last_blk)
- break;
-
- phys_blk = bmap(inode, probe_blk);
- if (unlikely(!phys_blk))
- return -ENXIO;
- }
-
- return 0;
-}
-
-/*
- * Create a sequential list of extents from an inode and return
- * it in *head. On success return the number of extents found or
- * -ERRNO on failure.
- */
-static int loop_extents(struct loop_c *lc, struct inode *inode,
- struct list_head *head)
-{
- sector_t start = 0;
- int r, nr_extents = 0;
- blkcnt_t nr_blks = 0, begin_blk = 0, end_blk = 0;
- blkcnt_t after_last_blk = sec2blk(lc,
- (lc->mapped_sectors + (lc->offset >> 9)));
- blkcnt_t logical_blk = sec2blk(lc, (lc->offset >> 9));
-
- /* for each block in the mapped region */
- while (logical_blk < after_last_blk) {
- r = extent_range(inode, logical_blk, after_last_blk - 1,
- &begin_blk, &end_blk);
-
- /* sparse file fallback */
- if (unlikely(r)) {
- DMWARN("%s has a hole; sparse file detected - "
- "switching to filesystem I/O", lc->path);
- clear_bit(DM_LOOP_BMAP, &lc->flags);
- set_bit(DM_LOOP_FSIO, &lc->flags);
- return r;
- }
-
- nr_blks = 1 + end_blk - begin_blk;
-
- if (unlikely(!nr_blks))
- continue;
-
- r = list_add_extent(head, start, blk2sect(lc, begin_blk),
- blk2sect(lc, nr_blks));
- if (unlikely(r))
- return r;
-
- /* advance to next extent */
- nr_extents++;
- start += blk2sect(lc, nr_blks);
- logical_blk += nr_blks;
- }
-
- return nr_extents;
-}
-
-/*
- * Walk over the extents in a block_map_c, returning them to the cache and
- * freeing bc->map and bc.
- */
-static void destroy_block_map(struct block_map_c *bc)
-{
- unsigned i;
-
- if (!bc)
- return;
-
- for (i = 0; i < bc->nr_extents; i++)
- kmem_cache_free(dm_loop_extent_cache, bc->map[i]);
-
- DMDEBUG("destroying block map of %d entries", i);
-
- vfree(bc->map);
- kfree(bc);
-}
-
-/*
- * Find an extent in *bc using binary search. Returns a pointer into the
- * extent map. Calculate index as (extent - bc->map).
- */
-static struct dm_loop_extent **extent_binary_lookup(struct block_map_c *bc,
- struct dm_loop_extent **extent_mru, sector_t sector)
-{
- unsigned nr_extents = bc->nr_extents;
- unsigned delta, dist, prev_dist = 0;
- struct dm_loop_extent **eptr;
-
- /* Optimize lookup range based on MRU extent. */
- dist = extent_mru - bc->map;
- if ((*extent_mru)->start >= sector)
- delta = dist = dist / 2;
- else {
- delta = (nr_extents - dist) / 2;
- dist += delta;
- }
-
- eptr = bc->map + dist;
- while (*eptr && !contains_sector(*eptr, sector)) {
- if (sector >= (*eptr)->start + (*eptr)->len) {
- prev_dist = dist;
- if (delta > 1)
- delta /= 2;
- dist += delta;
- } else {
- delta = (dist - prev_dist) / 2;
- if (!delta)
- delta = 1;
- dist -= delta;
- }
- eptr = bc->map + dist;
- }
-
- return eptr;
-}
-
-/*
- * Lookup an extent for a sector using the mru cache and binary search.
- */
-static struct dm_loop_extent *extent_lookup(struct block_map_c *bc,
- sector_t sector)
-{
- struct dm_loop_extent **eptr;
-
- spin_lock_irq(&bc->mru_lock);
- eptr = bc->mru;
- spin_unlock_irq(&bc->mru_lock);
-
- if (contains_sector(*eptr, sector))
- return *eptr;
-
- eptr = extent_binary_lookup(bc, eptr, sector);
- if (!eptr)
- return NULL;
-
- spin_lock_irq(&bc->mru_lock);
- bc->mru = eptr;
- spin_unlock_irq(&bc->mru_lock);
-
- return *eptr;
-}
-
-/*
- * DM_LOOP_BMAP map_fn. Looks up the sector in the extent map and
- * rewrites the bio device and bi_sector fields.
- */
-static int loop_block_map(struct dm_target *ti, struct bio *bio)
-{
- struct loop_c *lc = ti->private;
- struct dm_loop_extent *extent = extent_lookup(lc->map_data,
- bio->bi_sector);
-
- if (likely(extent)) {
- bio->bi_bdev = lc->bdev;
- bio->bi_sector = extent->to + (bio->bi_sector - extent->start);
- return 1; /* Done with bio -> submit */
- }
-
- DMERR("no matching extent in map for sector %llu",
- (unsigned long long) bio->bi_sector + ti->begin);
- BUG();
-
- return -EIO;
-}
-
-/*
- * Turn an extent_list into a linear pointer map of nr_extents + 1 entries
- * and set the final entry to NULL.
- */
-static struct dm_loop_extent **build_extent_map(struct list_head *head,
- int nr_extents,
- unsigned long *flags)
-{
- unsigned map_size, cache_size;
- struct dm_loop_extent **map, **curr;
- struct list_head *pos;
- struct extent_list *el;
-
- map_size = 1 + (sizeof(*map) * nr_extents);
- cache_size = kmem_cache_size(dm_loop_extent_cache) * nr_extents;
-
- map = vmalloc(map_size);
- curr = map;
-
- DMDEBUG("allocated extent map of %u %s for %d extents (%u %s)",
- (map_size < 8192) ? map_size : map_size >> 10,
- (map_size < 8192) ? "bytes" : "kilobytes", nr_extents,
- (cache_size < 8192) ? cache_size : cache_size >> 10,
- (cache_size < 8192) ? "bytes" : "kilobytes");
-
- list_for_each(pos, head) {
- el = list_entry(pos, struct extent_list, list);
- *(curr++) = el->extent;
- }
- *curr = NULL;
-
- return map;
-}
-
-/*
- * Set up a block map context and extent map
- */
-static int setup_block_map(struct loop_c *lc, struct inode *inode)
-{
- int r, nr_extents;
- struct block_map_c *bc;
- LIST_HEAD(head);
-
- if (!inode || !inode->i_sb || !inode->i_sb->s_bdev)
- return -ENXIO;
-
- /* build a linked list of extents in linear order */
- r = nr_extents = loop_extents(lc, inode, &head);
- if (nr_extents < 1)
- goto out;
-
- r = -ENOMEM;
- bc = kzalloc(sizeof(*bc), GFP_KERNEL);
- if (!bc)
- goto out;
-
- /* create a linear map of pointers into the extent cache */
- bc->map = build_extent_map(&head, nr_extents, &lc->flags);
- destroy_extent_list(&head);
-
- if (IS_ERR(bc->map)) {
- r = PTR_ERR(bc->map);
- goto out;
- }
-
- spin_lock_init(&bc->mru_lock);
- bc->mru = bc->map;
- bc->nr_extents = nr_extents;
- lc->bdev = inode->i_sb->s_bdev;
- lc->map_data = bc;
- lc->map_fn = loop_block_map;
-
- return 0;
-
-out:
- return r;
-}
-
-/*--------------------------------------------------------------------
- * Generic helpers
- *--------------------------------------------------------------------*/
-
-/*
- * Invalidate all unlocked loop file pages
- */
-static int loop_invalidate_file(struct file *filp)
-{
- int r;
-
- /* Same as generic_file_direct_IO() */
- unmap_mapping_range(filp->f_mapping, 0, ~0UL, 0);
-
- r = filemap_write_and_wait(filp->f_mapping);
- if (r)
- return r;
-
- /*
- * This will remove all pages except dirty ones.
- * If there are dirty pages at this point, it means that the user
- * is writing to the file and the coherency is lost anyway.
- * If the user was writing to the file simultaneously, this
- * returns non-zero, but we ignore that.
- */
- invalidate_inode_pages2_range(filp->f_mapping, 0, ~0UL);
-
- return 0;
-}
-
-/*
- * Acquire or release a "no-truncate" lock on *filp.
- * We overload the S_SWAPFILE flag for loop targets because
- * it provides the same no-truncate semantics we require, and
- * holding onto i_sem is no longer an option.
- */
-static void file_truncate_lock(struct file *filp)
-{
- struct inode *inode = filp->f_mapping->host;
-
- mutex_lock(&inode->i_mutex);
- inode->i_flags |= S_SWAPFILE;
- mutex_unlock(&inode->i_mutex);
-}
-
-static void file_truncate_unlock(struct file *filp)
-{
- struct inode *inode = filp->f_mapping->host;
-
- mutex_lock(&inode->i_mutex);
- inode->i_flags &= ~S_SWAPFILE;
- mutex_unlock(&inode->i_mutex);
-}
-
-/*
- * Fill out split_io for taget backing store
- */
-static void set_split_io(struct dm_target *ti)
-{
- struct loop_c *lc = ti->private;
-
- if (test_bit(DM_LOOP_BMAP, &lc->flags))
- /* Split I/O at block boundaries */
- ti->split_io = 1 << (lc->blkbits - SECTOR_SHIFT);
- else
- ti->split_io = 64;
-
- DMDEBUG("splitting io at %llu sector boundaries",
- (unsigned long long) ti->split_io);
-}
-
-/*
- * Check that the loop file is regular and available.
- */
-static int loop_check_file(struct dm_target *ti)
-{
- struct loop_c *lc = ti->private;
- struct file *filp = lc->filp;
- struct inode *inode = filp->f_mapping->host;
-
- if (!inode)
- return -ENXIO;
-
- ti->error = "backing file must be a regular file";
- if (!S_ISREG(inode->i_mode))
- return -EINVAL;
-
- ti->error = "backing file is mapped into userspace for writing";
- if (mapping_writably_mapped(filp->f_mapping))
- return -EBUSY;
-
- if (mapping_mapped(filp->f_mapping))
- DMWARN("%s is mapped into userspace", lc->path);
-
- if (!inode->i_sb || !inode->i_sb->s_bdev) {
- DMWARN("%s has no blockdevice - switching to filesystem I/O",
- lc->path);
- clear_bit(DM_LOOP_BMAP, &lc->flags);
- set_bit(DM_LOOP_FSIO, &lc->flags);
- }
-
- ti->error = "backing file already in use";
- if (IS_SWAPFILE(inode))
- return -EBUSY;
-
- return 0;
-}
-
-/*
- * Check loop file size and store it in the loop context
- */
-static int loop_setup_size(struct dm_target *ti)
-{
- struct loop_c *lc = ti->private;
- struct inode *inode = lc->filp->f_mapping->host;
- int r = -EINVAL;
-
- lc->size = i_size_read(inode);
- lc->blkbits = inode->i_blkbits;
-
- ti->error = "backing file is empty";
- if (!lc->size)
- goto out;
-
- DMDEBUG("set backing file size to %llu", (unsigned long long) lc->size);
-
- ti->error = "backing file cannot be less than one block in size";
- if (lc->size < (blk2sect(lc, 1) << 9))
- goto out;
-
- ti->error = "loop file offset must be a multiple of fs blocksize";
- if (lc->offset & ((1 << lc->blkbits) - 1))
- goto out;
-
- ti->error = "loop file offset too large";
- if (lc->offset > (lc->size - (1 << 9)))
- goto out;
-
- lc->mapped_sectors = (lc->size - lc->offset) >> 9;
- DMDEBUG("set mapped sectors to %llu (%llu bytes)",
- (unsigned long long) lc->mapped_sectors,
- (lc->size - lc->offset));
-
- if ((lc->offset + (lc->mapped_sectors << 9)) < lc->size)
- DMWARN("not using %llu bytes in incomplete block at EOF",
- lc->size - (lc->offset + (lc->mapped_sectors << 9)));
-
- ti->error = "mapped region cannot be smaller than target size";
- if (lc->size - lc->offset < (ti->len << 9))
- goto out;
-
- r = 0;
-
-out:
- return r;
-}
-
-/*
- * release a loop file
- */
-static void loop_put_file(struct file *filp)
-{
- if (!filp)
- return;
-
- file_truncate_unlock(filp);
- filp_close(filp, NULL);
-}
-
-/*
- * Open loop file and perform type, availability and size checks.
- */
-static int loop_get_file(struct dm_target *ti)
-{
- int flags = ((dm_table_get_mode(ti->table) & FMODE_WRITE) ?
- O_RDWR : O_RDONLY) | O_LARGEFILE;
- struct loop_c *lc = ti->private;
- struct file *filp;
- int r = 0;
-
- ti->error = "could not open backing file";
- filp = filp_open(lc->path, flags, 0);
- if (IS_ERR(filp))
- return PTR_ERR(filp);
- lc->filp = filp;
- r = loop_check_file(ti);
- if (r)
- goto err;
-
- r = loop_setup_size(ti);
- if (r)
- goto err;
-
- file_truncate_lock(filp);
- return 0;
-
-err:
- fput(filp);
- return r;
-}
-
-/*
- * invalidate mapped pages belonging to the loop file
- */
-static void loop_flush(struct dm_target *ti)
-{
- struct loop_c *lc = ti->private;
-
- loop_invalidate_file(lc->filp);
-}
-
-/*--------------------------------------------------------------------
- * Device-mapper target methods
- *--------------------------------------------------------------------*/
-
-/*
- * Generic loop map function. Re-base I/O to target begin and submit
- */
-static int loop_map(struct dm_target *ti, struct bio *bio,
- union map_info *context)
-{
- struct loop_c *lc = ti->private;
-
- if (unlikely(bio_barrier(bio)))
- return -EOPNOTSUPP;
-
- bio->bi_sector -= ti->begin;
-
- if (lc->map_fn)
- return lc->map_fn(ti, bio);
-
- return -EIO;
-}
-
-/*
- * Block status helper
- */
-static ssize_t loop_file_status(struct loop_c *lc, char *result,
- unsigned maxlen)
-{
- ssize_t sz = 0;
- struct file_map_c *fc = lc->map_data;
- int qlen;
-
- spin_lock_irq(&fc->lock);
- qlen = bio_list_size(&fc->work);
- qlen += bio_list_size(&fc->in);
- spin_unlock_irq(&fc->lock);
-
- DMEMIT("file %d", qlen);
-
- return sz;
-}
-
-/*
- * File status helper
- */
-static ssize_t loop_block_status(struct loop_c *lc, char *result,
- unsigned maxlen)
-{
- ssize_t sz = 0;
- struct block_map_c *bc = lc->map_data;
- int mru;
-
- spin_lock_irq(&bc->mru_lock);
- mru = bc->mru - bc->map;
- spin_unlock_irq(&bc->mru_lock);
-
- DMEMIT("block %d %d", bc->nr_extents, mru);
-
- return sz;
-}
-
-/*
- * This needs some thought on handling unlinked backing files. some parts of
- * the kernel return a cached name (now invalid), while others return a dcache
- * "/path/to/foo (deleted)" name (never was/is valid). Which is "better" is
- * debatable.
- *
- * On the one hand, using a cached name gives table output which is directly
- * usable assuming the user re-creates the unlinked image file, on the other
- * it is more consistent with e.g. swap to use the dcache name.
- *
-*/
-static int loop_status(struct dm_target *ti, status_type_t type, char *result,
- unsigned maxlen)
-{
- struct loop_c *lc = ti->private;
- ssize_t sz = 0;
-
- switch (type) {
- case STATUSTYPE_INFO:
- if (test_bit(DM_LOOP_BMAP, &lc->flags))
- sz += loop_block_status(lc, result, maxlen - sz);
- else if (test_bit(DM_LOOP_FSIO, &lc->flags))
- sz += loop_file_status(lc, result, maxlen - sz);
- break;
-
- case STATUSTYPE_TABLE:
- DMEMIT("%s %llu", lc->path, lc->offset);
- break;
- }
- return 0;
-}
-
-/*
- * Destroy a loopback mapping
- */
-static void loop_dtr(struct dm_target *ti)
-{
- struct loop_c *lc = ti->private;
-
- if ((dm_table_get_mode(ti->table) & FMODE_WRITE))
- loop_invalidate_file(lc->filp);
-
- if (test_bit(DM_LOOP_BMAP, &lc->flags) && lc->map_data)
- destroy_block_map((struct block_map_c *)lc->map_data);
- if (test_bit(DM_LOOP_FSIO, &lc->flags) && lc->map_data)
- destroy_file_map(lc);
-
- loop_put_file(lc->filp);
- DMINFO("released file %s", lc->path);
-
- kfree(lc);
-}
-
-/*
- * Construct a loopback mapping: <path> <offset>
- */
-static int loop_ctr(struct dm_target *ti, unsigned argc, char **argv)
-{
- struct loop_c *lc = NULL;
- int r = -EINVAL;
-
- ti->error = "invalid argument count";
- if (argc != 2)
- goto err;
-
- r = -ENOMEM;
- ti->error = "cannot allocate loop context";
- lc = kzalloc(sizeof(*lc), GFP_KERNEL);
- if (!lc)
- goto err;
-
- /* default */
- set_bit(DM_LOOP_BMAP, &lc->flags);
- ti->error = "cannot allocate loop path";
- lc->path = kstrdup(argv[0], GFP_KERNEL);
- if (!lc->path)
- goto err;
-
- ti->private = lc;
-
- r = -EINVAL;
- ti->error = "invalid file offset";
- if (sscanf(argv[1], "%lld", &lc->offset) != 1)
- goto err;
-
- if (lc->offset)
- DMDEBUG("setting file offset to %lld", lc->offset);
-
- /* open & check file and set size parameters */
- r = loop_get_file(ti);
-
- /* ti->error has been set by loop_get_file */
- if (r)
- goto err;
-
- ti->error = "could not create loop mapping";
- if (test_bit(DM_LOOP_BMAP, &lc->flags))
- r = setup_block_map(lc, lc->filp->f_mapping->host);
- if (test_bit(DM_LOOP_FSIO, &lc->flags))
- r = setup_file_map(lc);
-
- if (r)
- goto err_putf;
-
- loop_invalidate_file(lc->filp);
-
- set_split_io(ti);
- if (lc->bdev)
- dm_set_device_limits(ti, lc->bdev);
-
- DMDEBUG("constructed loop target on %s "
- "(%lldk, %llu sectors)", lc->path,
- (lc->size >> 10), (unsigned long long)lc->mapped_sectors);
- ti->error = NULL;
-
- return 0;
-
-err_putf:
- loop_put_file(lc->filp);
-err:
- kfree(lc);
- return r;
-}
-
-static struct target_type loop_target = {
- .name = "loop",
- .version = {0, 0, 2},
- .module = THIS_MODULE,
- .ctr = loop_ctr,
- .dtr = loop_dtr,
- .map = loop_map,
- .presuspend = loop_flush,
- .flush = loop_flush,
- .status = loop_status,
-};
-
-/*--------------------------------------------------------------------
- * Module bits
- *--------------------------------------------------------------------*/
-static int __init dm_loop_init(void)
-{
- int r;
-
- r = dm_register_target(&loop_target);
- if (r < 0) {
- DMERR("register failed %d", r);
- goto err;
- }
-
- r = -ENOMEM;
- dm_loop_extent_cache = KMEM_CACHE(dm_loop_extent, SLAB_HWCACHE_ALIGN);
- if (!dm_loop_extent_cache)
- goto err;
-
- DMINFO("version %u.%u.%u loaded",
- loop_target.version[0], loop_target.version[1],
- loop_target.version[2]);
-
- return 0;
-
-err:
- if (dm_loop_extent_cache)
- kmem_cache_destroy(dm_loop_extent_cache);
-
- return r;
-}
-
-static void __exit dm_loop_exit(void)
-{
- int r;
-
- r = dm_unregister_target(&loop_target);
- kmem_cache_destroy(dm_loop_extent_cache);
-
- if (r < 0)
- DMERR("target unregister failed %d", r);
- else
- DMINFO("version %u.%u.%u unloaded",
- loop_target.version[0], loop_target.version[1],
- loop_target.version[2]);
-}
-
-module_init(dm_loop_init);
-module_exit(dm_loop_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Bryn Reeves <[EMAIL PROTECTED]>");
-MODULE_DESCRIPTION("device-mapper loop target");
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
origin.patch
address-hfs-on-disk-corruption-robustness-review-comments-checkpatch-fixes.patch
get_task_comm-return-the-result.patch
clone-prepare-to-recycle-clone_detached-and-clone_stopped.patch
clone-prepare-to-recycle-clone_detached-and-clone_stopped-fix.patch
timerfd-v3-new-timerfd-api-make-the-returned-time-to-be-the-remaining-time-till-the-next-expiration-checkpatch-fixes.patch
timerfd-v3-new-timerfd-api-ia64-fix.patch
timerfd-v3-new-timerfd-api-m68k-fix.patch
timerfd-v3-new-timerfd-api-mips-fix.patch
timerfd-v3-new-timerfd-api-arch-fixes.patch
timerfd-v3-new-timerfd-api-powerpc-fix.patch
timerfd-v3-new-timerfd-api-sparc64-fix.patch
git-acpi.patch
acpi-enable-c3-power-state-on-dell-inspiron-8200.patch
small-acpica-extension-to-be-able-to-store-the-name-of.patch
git-alsa.patch
git-alsa-fixup.patch
git-agpgart.patch
git-agpgart-intel-agp-dont-zero-an-already-registered-resource-during-resume.patch
working-3d-dri-intel-agpko-resume-for-i815-chip.patch
intel_agp-add-new-chipset-ids-checkpatch-fixes.patch
git-arm.patch
git-audit-master.patch
git-audit-printk-warning-fix.patch
git-cifs.patch
git-cpufreq.patch
revert-agk-dm-dm-loop.patch
git-powerpc.patch
git-powerpc-fixup.patch
revert-gregkh-driver-atm-convert-struct-class_device-to-struct-device.patch
gregkh-driver-kset-convert-to-kobj_sysfs_ops-vs-git-acpi.patch
revert-gregkh-driver-pm-acquire-device-locks-prior-to-suspending.patch
pm-acquire-device-locks-on-suspend-rev-3-checkpatch-fixes.patch
pm-acquire-device-locks-on-suspend-rev-3-checkpatch-fixes-2.patch
unbork-gregkh-driver-kset-convert-sys-devices-to-use-kset_create-vioc.patch
drivers-pcmcia-i82092c-fix-up-after-pci_bus_region-changes.patch
git-drm.patch
intel-agp-enable-i915-recognition.patch
drm-convert-from-nopage-to-fault-checkpatch-fixes.patch
git-dvb.patch
fix-jdelvare-i2c-i2c-constify-client-address-data.patch
hwmon-new-chip-driver-for-ti-ads7828-a-d.patch
hwmon-new-chip-driver-for-ti-ads7828-a-d-checkpatch-fixes.patch
git-hid.patch
revert-git-hrt.patch
git-ieee1394.patch
git-infiniband.patch
git-infiniband-versus-driver-tree.patch
git-kbuild.patch
git-kvm.patch
git-libata-all.patch
git-libata-all-wtf.patch
git-libata-drivers-ata-pata_pcmciac-fixup.patch
git-libata-more-pata-fixes.patch
git-md-accel.patch
git-mmc.patch
git-mtd.patch
git-net.patch
git-net-fix-conflicts.patch
git-net-vs-git-lblnet.patch
git-net-vs-git-lblnet-2.patch
git-netdev-all.patch
git-netdev-all-fix-conflicts.patch
git-net-vs-git-netdev-all.patch
update-smc91x-driver-with-arm-versatile-board-info.patch
git-backlight.patch
git-battery.patch
bluetooth-uninlining.patch
net-sunrpc-schedc-revert-git-net-changes.patch
net-sunrpc-schedc-reapply-git-net-changes.patch
net-sunrpc-svcsockc-revert-git-nfs-changes.patch
serial-add-addi-data-gmbh-communication-cardsin8250_pcic-and-pci_idsh-checkpatch-fixes.patch
revert-gregkh-pci-pci-use-dev_printk-in-x86-quirk-messages.patch
cleanup-gregkh-pci-pci-fix-bus-resource-assignment-on-32-bits-with-64b-resources.patch
quirks-set-en-bit-of-msi-mapping-for-devices-onht-based-nvidia-platform-checkpatch-fixes.patch
x86-validate-against-acpi-motherboard-resources.patch
git-sched.patch
git-sched-fixup.patch
git-sh.patch
git-scsi-misc.patch
git-scsi-misc-vs-git-libata-all.patch
scsi-aic94xx-cleanups-checkpatch-fixes.patch
scsi-aic94xx-cleanups-checkpatch-fixes-checkpatch-fixes.patch
libsas-convert-ata-bridge-to-use-new-eh.patch
git-unionfs.patch
vfs-swap-do_ioctl-and-vfs_ioctl-names-fix.patch
ehci-hcd-fix-sparse-warning-about-shadowing-status-symbol-checkpatch-fixes.patch
9p-util-fix-semaphore-handling.patch
git-watchdog.patch
git-watchdog-fixup.patch
wdt-fix-locking-checkpatch-fixes.patch
git-wireless.patch
git-ipwireless_cs.patch
revert-kvm-stuff-to-make-git-x86-apply.patch
git-x86.patch
git-x86-fix-conflicts.patch
git-x86-fixup.patch
git-x86-vs-pm-acquire-device-locks-on-suspend-rev-3.patch
git-x86-fix-doubly-merged-patch.patch
pci-dont-load-acpi_php-when-acpi-is-disabled.patch
git-cryptodev.patch
git-cryptodev-fixup.patch
git-xtensa.patch
bonding-locking-fix.patch
usbtouchscreen-fix-buffer-overflow-make-more-egalax-work.patch
pagecache-zeroing-zero_user_segment-zero_user_segments-and-zero_user-fix.patch
pagecache-zeroing-zero_user_segment-zero_user_segments-and-zero_user-fix-2.patch
vmalloc-add-const-to-void-parameters-fix.patch
i386-resolve-dependency-of-asm-i386-pgtableh-on-highmemh-checkpatch-fixes.patch
slub-fix-coding-style-violations-checkpatch-fixes.patch
slub-provide-unique-end-marker-for-each-slab-fix.patch
slub-do-our-own-locking-via-slab_lock-and-slab_unlock-checkpatch-fixes.patch
bufferhead-revert-constructor-removal-checkpatch-fixes.patch
shmem-factor-out-sbi-free_inodes-manipulations-fix.patch
maps4-rework-task_size-macros-mips-fix.patch
maps4-add-proc-kpagecount-interface-fix.patch
maps4-add-proc-kpageflags-interface-fix.patch
maps4-add-proc-kpageflags-interface-fix-2-fix.patch
maps4-make-page-monitoring-proc-file-optional-fix.patch
page-allocator-clean-up-pcp-draining-functions-swsusp-fix-fix.patch
mm-page-writeback-highmem_is_dirtyable-option-fix.patch
mm-remove-fastcall-from-mm-checkpatch-fixes.patch
vmscan-give-referenced-active-and-unmapped-pages-a-second-trip-around-the-lru.patch
vm-dont-run-touch_buffer-during-buffercache-lookups.patch
revert-capabilities-clean-up-file-capability-reading.patch
revert-capabilities-clean-up-file-capability-reading-checkpatch-fixes.patch
add-64-bit-capability-support-to-the-kernel-checkpatch-fixes.patch
add-64-bit-capability-support-to-the-kernel-fix.patch
add-64-bit-capability-support-to-the-kernel-fix-modify-old-libcap-warning-message-checkpatch-fixes.patch
add-64-bit-capability-support-to-the-kernel-fix-modify-old-libcap-warning-message-fix.patch
alpha-atomic_add_return-should-return-int.patch
alpha-fix-warning-by-fixing-flush_tlb_kernel_range.patch
pm-qos-infrastructure-and-interface.patch
pm-qos-infrastructure-and-interface-static-initialization-with-blocking-notifiers.patch
dio-array_size-cleanup-update-checkpatch-fixes.patch
uml-get-rid-of-asmlinkage-checkpatch-fixes.patch
uml-improve-detection-of-host-cmov-checkpatch-fixes.patch
uml-further-bugsc-tidying-checkpatch-fixes.patch
kernel-printkc-concerns-about-the-console-handover.patch
riscom8-fix-smp-brokenness-fix.patch
use-macros-instead-of-task_-flags-checkpatch-fixes.patch
sound-oss-pss-set_io_base-always-returns-success-mark-it-void-checkpatch-fixes.patch
remove-warnings-for-longstanding-conditions-fix.patch
genericizing-iova-fix.patch
parallel-port-convert-port_mutex-to-the-mutex-api-checkpatch-fixes.patch
remove-support-for-un-needed-_extratext-section-checkpatch-fixes.patch
allow-auto-destruction-of-loop-devices-checkpatch-fixes.patch
remove-__attribute_used__-checkpatch-fixes.patch
read_current_time-cleanups.patch
read_current_time-cleanups-build-fix-fix.patch
get-rid-of-nr_open-and-introduce-a-sysctl_nr_open-fix.patch
kallsyms-should-prefer-non-weak-symbols-checkpatch-fixes.patch
deprecate-smbfs-in-favour-of-cifs.patch
quota-improve-inode-list-scanning-in-add_dquot_ref-fix.patch
tty-enable-the-echoing-of-c-in-the-n_tty-discipline-checkpatch-fixes.patch
stopmachine-semaphore-to-mutex-fix.patch
parport-add-support-for-the-quatech-sppxp-100-parallel-port-pci-expresscard-fix.patch
debug_smp_processor_id-fixlets.patch
use-ilog2-in-fs-namespacec-fix.patch
export-iov_shorten-for-ext4s-use-fix.patch
system-timer-fix-crash-in-100hz-system-timer-cleanup.patch
speed-up-jiffies-conversion-functions-if-hz==user_hz.patch
add-have_oprofile.patch
ecryptfs-make-show_options-reflect-actual-mount-options-fix.patch
rtc-ds1302-rtc-support-checkpatch-fixes.patch
rtc-add-support-for-the-s-35390a-rtc-chip.patch
fbmon-cleanup-trailing-whitespaces-checkpatch-fixes.patch
neofb-avoid-overwriting-fb_info-fields.patch
vermilionc-use-align-not-__align_mask.patch
declare-pnp-option-parsing-functions-as-__init-checkpatch-fixes.patch
isapnp-driver-semaphore-to-mutex-fix.patch
isapnp-driver-semaphore-to-mutex-fix-fix.patch
ext4-mm-ext4_store_maxbytes_for_bitmaped_files-warning-fix.patch
kill-filp_open-checkpatch-fixes.patch
rename-open_namei-to-open_pathname-fix.patch
r-o-bind-mounts-elevate-write-count-during-entire-ncp_ioctl-fix.patch
r-o-bind-mounts-elevate-write-count-for-do_utimes.patch
r-o-bind-mounts-elevate-write-count-for-some-ioctls-checkpatch-fixes.patch
r-o-bind-mounts-elevate-write-count-for-some-ioctls-vs-forbid-user-to-change-file-flags-on-quota-files.patch
r-o-bind-mounts-elevate-write-count-opened-files-oops-fix.patch
r-o-bind-mounts-nfs-check-mnt-instead-of-superblock-directly-checkpatch-fixes.patch
r-o-bind-mounts-track-number-of-mount-writer-fix-buggy-loop-checkpatch-fixes.patch
cgroup-simplify-space-stripping-fix.patch
memory-controller-memory-accounting-v7.patch
memory-controller-add-per-container-lru-and-reclaim-v7.patch
memory-controller-oom-handling-v7.patch
memory-controller-add-switch-to-control-what-type-of-pages-to-limit-v7.patch
memcontrol-move-oom-task-exclusion-to-tasklist.patch
memory-cgroup-enhancements-fix-zone-handling-in-try_to_free_mem_cgroup_page.patch
memory-cgroup-enhancements-add-status-accounting-function-for-memory-cgroup.patch
memory-cgroup-enhancements-add-memorystat-file.patch
per-zone-and-reclaim-enhancements-for-memory-controller-take-3-remember-reclaim-priority-in-memory-cgroup.patch
per-zone-and-reclaim-enhancements-for-memory-controller-take-3-modifies-vmscanc-for-isolate-globa-cgroup-lru-activity.patch
cgroups-mechanism-to-process-each-task-in-a-cgroup-cleanup.patch
cgroups-mechanism-to-process-each-task-in-a-cgroup-checkpatch-fixes.patch
hotplug-cpu-move-tasks-in-empty-cpusets-to-parent-checkpatch-fixes.patch
cpusets-update_cpumask-revision-fix.patch
cpusets-update_cpumask-revision-checkpatch-fixes.patch
drivers-edac-add-marvell-mv64x60-driver-fix.patch
introduce-flags-for-reserve_bootmem-checkpatch-fixes.patch
iget-stop-affs-from-using-iget-and-read_inode-try-checkpatch-fixes.patch
iget-stop-efs-from-using-iget-and-read_inode-try-checkpatch-fixes.patch
iget-stop-ext2-from-using-iget-and-read_inode-try-checkpatch-fixes.patch
iget-stop-ext3-from-using-iget-and-read_inode-try-checkpatch-fixes.patch
iget-stop-freevxfs-from-using-iget-and-read_inode-checkpatch-fixes.patch
iget-stop-the-minix-filesystem-from-using-iget-and-checkpatch-fixes.patch
iget-stop-procfs-from-using-iget-and-read_inode-checkpatch-fixes.patch
iget-stop-qnx4-from-using-iget-and-read_inode-try-checkpatch-fixes.patch
iget-stop-romfs-from-using-iget-and-read_inode-checkpatch-fixes.patch
iget-stop-the-sysv-filesystem-from-using-iget-and-checkpatch-fixes.patch
iget-stop-ufs-from-using-iget-and-read_inode-try-checkpatch-fixes.patch
iget-stop-hostfs-from-using-iget-and-read_inode-checkpatch-fixes.patch
iget-stop-unionfs-from-using-iget-and-read_inode-fix-2.patch
embed-a-struct-path-into-struct-nameidata-instead-of-nd-dentrymnt-checkpatch-fixes.patch
embed-a-struct-path-into-struct-nameidata-instead-of-nd-dentrymnt-vs-git-unionfs.patch
one-less-parameter-to-__d_path-checkpatch-fixes.patch
d_path-use-struct-path-in-struct-avc_audit_data-checkpatch-fixes.patch
d_path-make-get_dcookie-use-a-struct-path-argument-checkpatch-fixes.patch
use-struct-path-in-struct-svc_export-checkpatch-fixes.patch
cleanup-the-code-managed-with-the-user_ns-option-checkpatch-fixes.patch
cleanup-the-code-managed-with-pid_ns-option-checkpatch-fixes.patch
proc-detect-duplicate-names-on-registration-fix.patch
proc-seqfile-convert-proc_pid_status-to-properly-handle-pid-namespaces-checkpatch-fixes.patch
proc-seqfile-convert-proc_pid_status-to-properly-handle-pid-namespaces-fix.patch
proc-seqfile-convert-proc_pid_status-to-properly-handle-pid-namespaces-fix-2.patch
proc-seqfile-convert-proc_pid_status-to-properly-handle-pid-namespaces-fix-3.patch
proc-fix-openless-usage-due-to-proc_fops-flip-checkpatch-fixes.patch
intel-iommu-fault_reason_index_cleanuppatch-fix.patch
pid-sys_wait-fixes-v2-checkpatch-fixes.patch
aout-suppress-aout-library-support-if-config_arch_supports_aout-vs-git-x86.patch
aout-suppress-aout-library-support-if-config_arch_supports_aout-vs-sanitize-the-type-of-struct-useru_ar0.patch
aout-remove-unnecessary-inclusions-of-asm-linux-aouth-alpha-fix.patch
mn10300-add-the-mn10300-am33-architecture-to-the-kernel-fix.patch
rewrite-rd-fixes.patch
fs-remove-fastcall-it-is-always-empty-checkpatch-fixes.patch
kernel-remove-fastcall-in-kernel-checkpatch-fixes.patch
lib-remove-fastcall-from-lib-checkpatch-fixes.patch
remove-fastcall-from-linux-include-checkpatch-fixes.patch
constify-tables-in-kernel-sysctl_checkc-fix.patch
aoe-statically-initialise-devlist_lock.patch
ufs-fix-symlink-creation-on-ufs2-fix.patch
libfs-allow-error-return-from-simple-attributes-fix.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
reiser4.patch
jens-broke-reiser4patch-added-to-mm-tree.patch
page-owner-tracking-leak-detector.patch
nr_blockdev_pages-in_interrupt-warning.patch
slab-leaks3-default-y.patch
profile-likely-unlikely-macros-fix.patch
put_bh-debug.patch
shrink_slab-handle-bad-shrinkers.patch
getblk-handle-2tb-devices.patch
getblk-handle-2tb-devices-fix.patch
undeprecate-pci_find_device.patch
w1-build-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
