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 20/26] pnfsblock: merge rw extents
Date: Sat, 30 Jul 2011 20:52:50 -0400 [thread overview]
Message-ID: <1312073576-11024-21-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>
Signed-off-by: Fred Isaman <iisaman@citi.umich.edu>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Benny Halevy <bhalevy@tonian.com>
Signed-off-by: Jim Rees <rees@umich.edu>
---
fs/nfs/blocklayout/extents.c | 47 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/fs/nfs/blocklayout/extents.c b/fs/nfs/blocklayout/extents.c
index 473faee..292aadf 100644
--- a/fs/nfs/blocklayout/extents.c
+++ b/fs/nfs/blocklayout/extents.c
@@ -493,3 +493,50 @@ bl_find_get_extent(struct pnfs_block_layout *bl, sector_t isect,
print_bl_extent(ret);
return ret;
}
+
+/* Helper function to set_to_rw that initialize a new extent */
+static void
+_prep_new_extent(struct pnfs_block_extent *new,
+ struct pnfs_block_extent *orig,
+ sector_t offset, sector_t length, int state)
+{
+ kref_init(&new->be_refcnt);
+ /* don't need to INIT_LIST_HEAD(&new->be_node) */
+ memcpy(&new->be_devid, &orig->be_devid, sizeof(struct nfs4_deviceid));
+ new->be_mdev = orig->be_mdev;
+ new->be_f_offset = offset;
+ new->be_length = length;
+ new->be_v_offset = orig->be_v_offset - orig->be_f_offset + offset;
+ new->be_state = state;
+ new->be_inval = orig->be_inval;
+}
+
+/* Tries to merge be with extent in front of it in list.
+ * Frees storage if not used.
+ */
+static struct pnfs_block_extent *
+_front_merge(struct pnfs_block_extent *be, struct list_head *head,
+ struct pnfs_block_extent *storage)
+{
+ struct pnfs_block_extent *prev;
+
+ if (!storage)
+ goto no_merge;
+ if (&be->be_node == head || be->be_node.prev == head)
+ goto no_merge;
+ prev = list_entry(be->be_node.prev, struct pnfs_block_extent, be_node);
+ if ((prev->be_f_offset + prev->be_length != be->be_f_offset) ||
+ !extents_consistent(prev, be))
+ goto no_merge;
+ _prep_new_extent(storage, prev, prev->be_f_offset,
+ prev->be_length + be->be_length, prev->be_state);
+ list_replace(&prev->be_node, &storage->be_node);
+ bl_put_extent(prev);
+ list_del(&be->be_node);
+ bl_put_extent(be);
+ return storage;
+
+ no_merge:
+ kfree(storage);
+ return be;
+}
--
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 ` [PATCH v7 11/26] pnfsblock: basic extent code Jim Rees
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 ` Jim Rees [this message]
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-21-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.