From: Jim Rees <rees@umich.edu> To: linux-nfs@vger.kernel.org Cc: peter honeyman <honey@citi.umich.edu> Subject: [PATCH 14/34] pnfsblock: remove device operations Date: Sun, 12 Jun 2011 19:44:22 -0400 Message-ID: <a702af417872abc11fc5f5639d605f0154059cf2.1307921138.git.rees@umich.edu> (raw) In-Reply-To: <cover.1307921137.git.rees@umich.edu> Signed-off-by: Fred Isaman <iisaman@citi.umich.edu> Signed-off-by: Benny Halevy <bhalevy@panasas.com> --- fs/nfs/blocklayout/Makefile | 2 +- fs/nfs/blocklayout/blocklayout.h | 2 + fs/nfs/blocklayout/blocklayoutdm.c | 120 ++++++++++++++++++++++++++++++++++++ 3 files changed, 123 insertions(+), 1 deletions(-) create mode 100644 fs/nfs/blocklayout/blocklayoutdm.c diff --git a/fs/nfs/blocklayout/Makefile b/fs/nfs/blocklayout/Makefile index bd69aad..bdbf180 100644 --- a/fs/nfs/blocklayout/Makefile +++ b/fs/nfs/blocklayout/Makefile @@ -2,4 +2,4 @@ # Makefile for the pNFS block layout driver kernel module # obj-$(CONFIG_PNFS_BLOCK) += blocklayoutdriver.o -blocklayoutdriver-objs := blocklayout.o block-device-discovery-pipe.o extents.o blocklayoutdev.o +blocklayoutdriver-objs := blocklayout.o block-device-discovery-pipe.o extents.o blocklayoutdev.o blocklayoutdm.o diff --git a/fs/nfs/blocklayout/blocklayout.h b/fs/nfs/blocklayout/blocklayout.h index 6c01d8c..e5ee11c 100644 --- a/fs/nfs/blocklayout/blocklayout.h +++ b/fs/nfs/blocklayout/blocklayout.h @@ -102,6 +102,8 @@ struct pnfs_block_dev *nfs4_blk_decode_device(struct nfs_server *server, struct list_head *sdlist); int nfs4_blk_process_layoutget(struct pnfs_layout_hdr *lo, struct nfs4_layoutget_res *lgr, gfp_t gfp_flags); +/* blocklayoutdm.c */ +void free_block_dev(struct pnfs_block_dev *bdev); #include <linux/sunrpc/simple_rpc_pipefs.h> diff --git a/fs/nfs/blocklayout/blocklayoutdm.c b/fs/nfs/blocklayout/blocklayoutdm.c new file mode 100644 index 0000000..097dd05 --- /dev/null +++ b/fs/nfs/blocklayout/blocklayoutdm.c @@ -0,0 +1,120 @@ +/* + * linux/fs/nfs/blocklayout/blocklayoutdm.c + * + * Module for the NFSv4.1 pNFS block layout driver. + * + * Copyright (c) 2007 The Regents of the University of Michigan. + * All rights reserved. + * + * Fred Isaman <iisaman@umich.edu> + * Andy Adamson <andros@citi.umich.edu> + * + * permission is granted to use, copy, create derivative works and + * redistribute this software and such derivative works for any purpose, + * so long as the name of the university of michigan is not used in + * any advertising or publicity pertaining to the use or distribution + * of this software without specific, written prior authorization. if + * the above copyright notice or any other identification of the + * university of michigan is included in any copy of any portion of + * this software, then the disclaimer below must also be included. + * + * this software is provided as is, without representation from the + * university of michigan as to its fitness for any purpose, and without + * warranty by the university of michigan of any kind, either express + * or implied, including without limitation the implied warranties of + * merchantability and fitness for a particular purpose. the regents + * of the university of michigan shall not be liable for any damages, + * including special, indirect, incidental, or consequential damages, + * with respect to any claim arising out or in connection with the use + * of the software, even if it has been or is hereafter advised of the + * possibility of such damages. + */ + +#include <linux/genhd.h> /* gendisk - used in a dprintk*/ +#include <linux/sched.h> +#include <linux/hash.h> + +#include "blocklayout.h" + +#define NFSDBG_FACILITY NFSDBG_PNFS_LD + +/* Defines used for calculating memory usage in nfs4_blk_flatten() */ +#define ARGSIZE 24 /* Max bytes needed for linear target arg string */ +#define SPECSIZE (sizeof8(struct dm_target_spec) + ARGSIZE) +#define SPECS_PER_PAGE (PAGE_SIZE / SPECSIZE) +#define SPEC_HEADER_ADJUST (SPECS_PER_PAGE - \ + (PAGE_SIZE - sizeof8(struct dm_ioctl)) / SPECSIZE) +#define roundup8(x) (((x)+7) & ~7) +#define sizeof8(x) roundup8(sizeof(x)) + +static int dev_remove(dev_t dev) +{ + int ret = 1; + struct pipefs_hdr *msg = NULL, *reply = NULL; + uint64_t bl_dev; + uint32_t major = MAJOR(dev), minor = MINOR(dev); + + dprintk("Entering %s\n", __func__); + + if (IS_ERR(bl_device_pipe)) + return ret; + + memcpy((void *)&bl_dev, &major, sizeof(uint32_t)); + memcpy((void *)&bl_dev + sizeof(uint32_t), &minor, sizeof(uint32_t)); + msg = pipefs_alloc_init_msg(0, BL_DEVICE_UMOUNT, 0, (void *)&bl_dev, + sizeof(uint64_t)); + if (IS_ERR(msg)) { + dprintk("ERROR: couldn't make pipefs message.\n"); + goto out; + } + msg->msgid = hash_ptr(&msg, sizeof(msg->msgid) * 8); + msg->status = BL_DEVICE_REQUEST_INIT; + + reply = pipefs_queue_upcall_waitreply(bl_device_pipe, msg, + &bl_device_list, 0, 0); + if (IS_ERR(reply)) { + dprintk("ERROR: upcall_waitreply failed\n"); + goto out; + } + + if (reply->status == BL_DEVICE_REQUEST_PROC) + ret = 0; /*TODO: what to return*/ +out: + if (!IS_ERR(reply)) + kfree(reply); + if (!IS_ERR(msg)) + kfree(msg); + return ret; +} + +/* + * Release meta device + */ +static int nfs4_blk_metadev_release(struct pnfs_block_dev *bdev) +{ + int rv; + + dprintk("%s Releasing\n", __func__); + /* XXX Check return? */ + rv = nfs4_blkdev_put(bdev->bm_mdev); + dprintk("%s nfs4_blkdev_put returns %d\n", __func__, rv); + + rv = dev_remove(bdev->bm_mdev->bd_dev); + dprintk("%s Returns %d\n", __func__, rv); + return rv; +} + +void free_block_dev(struct pnfs_block_dev *bdev) +{ + if (bdev) { + if (bdev->bm_mdev) { + dprintk("%s Removing DM device: %d:%d\n", + __func__, + MAJOR(bdev->bm_mdev->bd_dev), + MINOR(bdev->bm_mdev->bd_dev)); + /* XXX Check status ?? */ + nfs4_blk_metadev_release(bdev); + } + kfree(bdev); + } +} -- 1.7.4.1
next prev parent reply index Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-06-12 23:43 [PATCH 00/34] pnfs block layout driver based on v3.0-rc2 Jim Rees 2011-06-12 23:43 ` [PATCH 01/34] pnfs: GETDEVICELIST Jim Rees 2011-06-12 23:43 ` [PATCH 02/34] pnfs: add set-clear layoutdriver interface Jim Rees 2011-06-12 23:43 ` [PATCH 03/34] pnfs: let layoutcommit code handle multiple segments Jim Rees 2011-06-13 14:36 ` Fred Isaman 2011-06-14 10:40 ` tao.peng 2011-06-14 13:58 ` Fred Isaman 2011-06-14 14:28 ` Benny Halevy 2011-06-12 23:43 ` [PATCH 04/34] pnfs: hook nfs_write_begin/end to allow layout driver manipulation Jim Rees 2011-06-13 14:44 ` Fred Isaman 2011-06-14 11:01 ` tao.peng 2011-06-14 14:05 ` Fred Isaman 2011-06-14 15:53 ` Peng Tao 2011-06-14 16:02 ` Fred Isaman 2011-06-12 23:43 ` [PATCH 05/34] pnfs: ask for layout_blksize and save it in nfs_server Jim Rees 2011-06-14 15:01 ` Benny Halevy 2011-06-14 15:08 ` Peng Tao 2011-06-12 23:44 ` [PATCH 06/34] pnfs: cleanup_layoutcommit Jim Rees 2011-06-13 21:19 ` Benny Halevy 2011-06-14 15:16 ` Peng Tao 2011-06-14 15:10 ` Benny Halevy 2011-06-14 15:21 ` Peng Tao 2011-06-14 15:19 ` Benny Halevy 2011-06-12 23:44 ` [PATCH 07/34] pnfsblock: define PNFS_BLOCK Kconfig option Jim Rees 2011-06-14 15:13 ` Benny Halevy 2011-06-12 23:44 ` [PATCH 08/34] pnfsblock: blocklayout stub Jim Rees 2011-06-12 23:44 ` [PATCH 09/34] pnfsblock: layout alloc and free Jim Rees 2011-06-12 23:44 ` [PATCH 10/34] Add support for simple rpc pipefs Jim Rees 2011-06-12 23:44 ` [PATCH 11/34] pnfs-block: Add block device discovery pipe Jim Rees 2011-06-12 23:44 ` [PATCH 12/34] pnfsblock: basic extent code Jim Rees 2011-06-12 23:44 ` [PATCH 13/34] pnfsblock: add device operations Jim Rees 2011-06-12 23:44 ` Jim Rees [this message] 2011-06-12 23:44 ` [PATCH 15/34] pnfsblock: lseg alloc and free Jim Rees 2011-06-12 23:44 ` [PATCH 16/34] pnfsblock: merge extents Jim Rees 2011-06-12 23:44 ` [PATCH 17/34] pnfsblock: call and parse getdevicelist Jim Rees 2011-06-14 15:36 ` Benny Halevy 2011-06-12 23:44 ` [PATCH 18/34] pnfsblock: allow use of PG_owner_priv_1 flag Jim Rees 2011-06-13 15:56 ` Fred Isaman 2011-06-12 23:44 ` [PATCH 19/34] pnfsblock: xdr decode pnfs_block_layout4 Jim Rees 2011-06-12 23:44 ` [PATCH 20/34] pnfsblock: find_get_extent Jim Rees 2011-06-12 23:44 ` [PATCH 21/34] pnfsblock: SPLITME: add extent manipulation functions Jim Rees 2011-06-14 15:40 ` Benny Halevy 2011-06-12 23:44 ` [PATCH 22/34] pnfsblock: merge rw extents Jim Rees 2011-06-12 23:44 ` [PATCH 23/34] pnfsblock: encode_layoutcommit Jim Rees 2011-06-14 15:44 ` Benny Halevy 2011-06-12 23:44 ` [PATCH 24/34] pnfsblock: cleanup_layoutcommit Jim Rees 2011-06-12 23:44 ` [PATCH 25/34] pnfsblock: bl_read_pagelist Jim Rees 2011-06-12 23:44 ` [PATCH 26/34] pnfsblock: write_begin Jim Rees 2011-06-12 23:44 ` [PATCH 27/34] pnfsblock: write_end Jim Rees 2011-06-12 23:44 ` [PATCH 28/34] pnfsblock: write_end_cleanup Jim Rees 2011-06-12 23:45 ` [PATCH 29/34] pnfsblock: bl_write_pagelist support functions Jim Rees 2011-06-12 23:45 ` [PATCH 30/34] pnfsblock: bl_write_pagelist Jim Rees 2011-06-12 23:45 ` [PATCH 31/34] pnfsblock: note written INVAL areas for layoutcommit Jim Rees 2011-06-12 23:45 ` [PATCH 32/34] pnfsblock: Implement release_inval_marks Jim Rees 2011-06-12 23:45 ` [PATCH 33/34] Add configurable prefetch size for layoutget Jim Rees 2011-06-12 23:45 ` [PATCH 34/34] NFS41: do not update isize if inode needs layoutcommit Jim Rees 2011-06-14 16:15 ` Benny Halevy 2011-06-14 16:22 ` Fred Isaman
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=a702af417872abc11fc5f5639d605f0154059cf2.1307921138.git.rees@umich.edu \ --to=rees@umich.edu \ --cc=honey@citi.umich.edu \ --cc=linux-nfs@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux-NFS Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-nfs/0 linux-nfs/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-nfs linux-nfs/ https://lore.kernel.org/linux-nfs \ linux-nfs@vger.kernel.org public-inbox-index linux-nfs Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-nfs AGPL code for this site: git clone https://public-inbox.org/public-inbox.git