From: Jim Rees <rees@umich.edu>
To: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: linux-nfs@vger.kernel.org, peter honeyman <honey@citi.umich.edu>
Subject: [PATCH v7 11/26] pnfsblock: basic extent code
Date: Sat, 30 Jul 2011 20:52:41 -0400 [thread overview]
Message-ID: <1312073576-11024-12-git-send-email-rees@umich.edu> (raw)
In-Reply-To: <1312073576-11024-1-git-send-email-rees@umich.edu>
From: Fred Isaman <iisaman@citi.umich.edu>
Adds structures and basic create/delete code for extents.
Signed-off-by: Fred Isaman <iisaman@citi.umich.edu>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Zhang Jingwang <Jingwang.Zhang@emc.com>
Signed-off-by: Benny Halevy <bhalevy@tonian.com>
Signed-off-by: Jim Rees <rees@umich.edu>
---
fs/nfs/blocklayout/Makefile | 2 +-
fs/nfs/blocklayout/blocklayout.c | 20 +++++++--
fs/nfs/blocklayout/blocklayout.h | 1 +
fs/nfs/blocklayout/extents.c | 89 ++++++++++++++++++++++++++++++++++++++
4 files changed, 107 insertions(+), 5 deletions(-)
create mode 100644 fs/nfs/blocklayout/extents.c
diff --git a/fs/nfs/blocklayout/Makefile b/fs/nfs/blocklayout/Makefile
index 6bf49cd..5cfadf6 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
+blocklayoutdriver-objs := blocklayout.o extents.o
diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
index 1f5287c..8dde372 100644
--- a/fs/nfs/blocklayout/blocklayout.c
+++ b/fs/nfs/blocklayout/blocklayout.c
@@ -53,12 +53,24 @@ bl_write_pagelist(struct nfs_write_data *wdata,
return PNFS_NOT_ATTEMPTED;
}
-/* STUB */
+/* FIXME - range ignored */
static void
-release_extents(struct pnfs_block_layout *bl,
- struct pnfs_layout_range *range)
+release_extents(struct pnfs_block_layout *bl, struct pnfs_layout_range *range)
{
- return;
+ int i;
+ struct pnfs_block_extent *be;
+
+ spin_lock(&bl->bl_ext_lock);
+ for (i = 0; i < EXTENT_LISTS; i++) {
+ while (!list_empty(&bl->bl_extents[i])) {
+ be = list_first_entry(&bl->bl_extents[i],
+ struct pnfs_block_extent,
+ be_node);
+ list_del(&be->be_node);
+ bl_put_extent(be);
+ }
+ }
+ spin_unlock(&bl->bl_ext_lock);
}
/* STUB */
diff --git a/fs/nfs/blocklayout/blocklayout.h b/fs/nfs/blocklayout/blocklayout.h
index 8bfa466..98e2f60 100644
--- a/fs/nfs/blocklayout/blocklayout.h
+++ b/fs/nfs/blocklayout/blocklayout.h
@@ -88,4 +88,5 @@ static inline struct pnfs_block_layout *BLK_LO2EXT(struct pnfs_layout_hdr *lo)
return container_of(lo, struct pnfs_block_layout, bl_layout);
}
+void bl_put_extent(struct pnfs_block_extent *be);
#endif /* FS_NFS_NFS4BLOCKLAYOUT_H */
diff --git a/fs/nfs/blocklayout/extents.c b/fs/nfs/blocklayout/extents.c
new file mode 100644
index 0000000..d0ca760
--- /dev/null
+++ b/fs/nfs/blocklayout/extents.c
@@ -0,0 +1,89 @@
+/*
+ * linux/fs/nfs/blocklayout/blocklayout.h
+ *
+ * Module for the NFSv4.1 pNFS block layout driver.
+ *
+ * Copyright (c) 2006 The Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Andy Adamson <andros@citi.umich.edu>
+ * Fred Isaman <iisaman@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 "blocklayout.h"
+#define NFSDBG_FACILITY NFSDBG_PNFS_LD
+
+static void print_bl_extent(struct pnfs_block_extent *be)
+{
+ dprintk("PRINT EXTENT extent %p\n", be);
+ if (be) {
+ dprintk(" be_f_offset %llu\n", (u64)be->be_f_offset);
+ dprintk(" be_length %llu\n", (u64)be->be_length);
+ dprintk(" be_v_offset %llu\n", (u64)be->be_v_offset);
+ dprintk(" be_state %d\n", be->be_state);
+ }
+}
+
+static void
+destroy_extent(struct kref *kref)
+{
+ struct pnfs_block_extent *be;
+
+ be = container_of(kref, struct pnfs_block_extent, be_refcnt);
+ dprintk("%s be=%p\n", __func__, be);
+ kfree(be);
+}
+
+void
+bl_put_extent(struct pnfs_block_extent *be)
+{
+ if (be) {
+ dprintk("%s enter %p (%i)\n", __func__, be,
+ atomic_read(&be->be_refcnt.refcount));
+ kref_put(&be->be_refcnt, destroy_extent);
+ }
+}
+
+struct pnfs_block_extent *bl_alloc_extent(void)
+{
+ struct pnfs_block_extent *be;
+
+ be = kmalloc(sizeof(struct pnfs_block_extent), GFP_NOFS);
+ if (!be)
+ return NULL;
+ INIT_LIST_HEAD(&be->be_node);
+ kref_init(&be->be_refcnt);
+ be->be_inval = NULL;
+ return be;
+}
+
+static void print_elist(struct list_head *list)
+{
+ struct pnfs_block_extent *be;
+ dprintk("****************\n");
+ dprintk("Extent list looks like:\n");
+ list_for_each_entry(be, list, be_node) {
+ print_bl_extent(be);
+ }
+ dprintk("****************\n");
+}
--
1.7.4.1
next prev parent reply other threads:[~2011-07-31 0:53 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-31 0:52 [PATCH v7 00/26] add block layout driver to pnfs client Jim Rees
2011-07-31 0:52 ` [PATCH v7 01/26] pnfs: save layoutcommit lwb at layout header Jim Rees
2011-07-31 0:52 ` [PATCH v7 02/26] pnfs: save layoutcommit cred at layout header init Jim Rees
2011-07-31 0:52 ` [PATCH v7 03/26] pnfs: let layoutcommit handle a list of lseg Jim Rees
2011-07-31 0:52 ` [PATCH v7 04/26] pnfs: use lwb as layoutcommit length Jim Rees
2011-07-31 0:52 ` [PATCH v7 05/26] pnfs: GETDEVICELIST Jim Rees
2011-07-31 0:52 ` [PATCH v7 06/26] pnfs: add set-clear layoutdriver interface Jim Rees
2011-07-31 0:52 ` [PATCH v7 07/26] pnfs: ask for layout_blksize and save it in nfs_server Jim Rees
2011-07-31 0:52 ` [PATCH v7 08/26] pnfs: cleanup_layoutcommit Jim Rees
2011-07-31 0:52 ` [PATCH v7 09/26] pnfsblock: add blocklayout Kconfig option, Makefile, and stubs Jim Rees
2011-07-31 0:52 ` [PATCH v7 10/26] pnfsblock: use pageio_ops api Jim Rees
2011-07-31 0:52 ` Jim Rees [this message]
2011-07-31 0:52 ` [PATCH v7 12/26] pnfsblock: add device operations Jim Rees
2011-09-13 15:14 ` Jeff Layton
2011-09-13 15:16 ` Jeff Layton
2011-09-13 15:49 ` Peng Tao
2011-07-31 0:52 ` [PATCH v7 13/26] pnfsblock: remove " Jim Rees
2011-07-31 0:52 ` [PATCH v7 14/26] pnfsblock: lseg alloc and free Jim Rees
2011-07-31 0:52 ` [PATCH v7 15/26] pnfsblock: merge extents Jim Rees
2011-07-31 0:52 ` [PATCH v7 16/26] pnfsblock: call and parse getdevicelist Jim Rees
2011-07-31 0:52 ` [PATCH v7 17/26] pnfsblock: xdr decode pnfs_block_layout4 Jim Rees
2011-07-31 0:52 ` [PATCH v7 18/26] pnfsblock: bl_find_get_extent Jim Rees
2011-07-31 0:52 ` [PATCH v7 19/26] pnfsblock: add extent manipulation functions Jim Rees
2011-07-31 0:52 ` [PATCH v7 20/26] pnfsblock: merge rw extents Jim Rees
2011-07-31 0:52 ` [PATCH v7 21/26] pnfsblock: encode_layoutcommit Jim Rees
2011-07-31 0:52 ` [PATCH v7 22/26] pnfsblock: cleanup_layoutcommit Jim Rees
2011-07-31 0:52 ` [PATCH v7 23/26] pnfsblock: bl_read_pagelist Jim Rees
2011-07-31 0:52 ` [PATCH v7 24/26] pnfsblock: bl_write_pagelist Jim Rees
2011-07-31 0:52 ` [PATCH v7 25/26] pnfsblock: note written INVAL areas for layoutcommit Jim Rees
2011-07-31 0:52 ` [PATCH v7 26/26] pnfsblock: write_pagelist handle zero invalid extents Jim Rees
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=1312073576-11024-12-git-send-email-rees@umich.edu \
--to=rees@umich.edu \
--cc=Trond.Myklebust@netapp.com \
--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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).