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 v6 14/26] pnfsblock: lseg alloc and free
Date: Sat, 30 Jul 2011 13:08:37 -0400 [thread overview]
Message-ID: <1312045729-27554-15-git-send-email-rees@umich.edu> (raw)
In-Reply-To: <1312045729-27554-1-git-send-email-rees@umich.edu>
From: Fred Isaman <iisaman@citi.umich.edu>
Signed-off-by: Fred Isaman <iisaman@citi.umich.edu>
[pnfsblock: fix bug getting pnfs_layout_type in translate_devid().]
Signed-off-by: Tao Guo <guotao-U4AKAne5IzAR5TUyvShJeg@public.gmane.org>
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>
---
fs/nfs/blocklayout/blocklayout.c | 31 +++++++++++++++++++++++++------
fs/nfs/blocklayout/blocklayout.h | 6 ++++++
fs/nfs/blocklayout/blocklayoutdev.c | 8 ++++++++
3 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
index ed59a06..5793b0e 100644
--- a/fs/nfs/blocklayout/blocklayout.c
+++ b/fs/nfs/blocklayout/blocklayout.c
@@ -115,16 +115,35 @@ static struct pnfs_layout_hdr *bl_alloc_layout_hdr(struct inode *inode,
return &bl->bl_layout;
}
-static void
-bl_free_lseg(struct pnfs_layout_segment *lseg)
+static void bl_free_lseg(struct pnfs_layout_segment *lseg)
{
+ dprintk("%s enter\n", __func__);
+ kfree(lseg);
}
-static struct pnfs_layout_segment *
-bl_alloc_lseg(struct pnfs_layout_hdr *lo,
- struct nfs4_layoutget_res *lgr, gfp_t gfp_flags)
+/* We pretty much ignore lseg, and store all data layout wide, so we
+ * can correctly merge.
+ */
+static struct pnfs_layout_segment *bl_alloc_lseg(struct pnfs_layout_hdr *lo,
+ struct nfs4_layoutget_res *lgr,
+ gfp_t gfp_flags)
{
- return NULL;
+ struct pnfs_layout_segment *lseg;
+ int status;
+
+ dprintk("%s enter\n", __func__);
+ lseg = kzalloc(sizeof(*lseg), gfp_flags);
+ if (!lseg)
+ return ERR_PTR(-ENOMEM);
+ status = nfs4_blk_process_layoutget(lo, lgr, gfp_flags);
+ if (status) {
+ /* We don't want to call the full-blown bl_free_lseg,
+ * since on error extents were not touched.
+ */
+ kfree(lseg);
+ return ERR_PTR(status);
+ }
+ return lseg;
}
static void
diff --git a/fs/nfs/blocklayout/blocklayout.h b/fs/nfs/blocklayout/blocklayout.h
index 1527f88..3e05b08 100644
--- a/fs/nfs/blocklayout/blocklayout.h
+++ b/fs/nfs/blocklayout/blocklayout.h
@@ -96,6 +96,12 @@ static inline struct pnfs_block_layout *BLK_LO2EXT(struct pnfs_layout_hdr *lo)
return container_of(lo, struct pnfs_block_layout, bl_layout);
}
+static inline struct pnfs_block_layout *
+BLK_LSEG2EXT(struct pnfs_layout_segment *lseg)
+{
+ return BLK_LO2EXT(lseg->pls_layout);
+}
+
struct bl_dev_msg {
int status;
uint32_t major, minor;
diff --git a/fs/nfs/blocklayout/blocklayoutdev.c b/fs/nfs/blocklayout/blocklayoutdev.c
index 7e1377f..64da33a 100644
--- a/fs/nfs/blocklayout/blocklayoutdev.c
+++ b/fs/nfs/blocklayout/blocklayoutdev.c
@@ -189,3 +189,11 @@ out:
kfree(msg.data);
return rv;
}
+
+int
+nfs4_blk_process_layoutget(struct pnfs_layout_hdr *lo,
+ struct nfs4_layoutget_res *lgr, gfp_t gfp_flags)
+{
+ /* STUB */
+ return -EIO;
+}
--
1.7.4.1
next prev parent reply other threads:[~2011-07-30 17:09 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-30 17:08 [PATCH v6 00/26] add block layout driver to pnfs client Jim Rees
2011-07-30 17:08 ` [PATCH v6 01/26] pnfs: save layoutcommit lwb at layout header Jim Rees
2011-07-30 17:08 ` [PATCH v6 02/26] pnfs: save layoutcommit cred at layout header init Jim Rees
2011-07-30 17:08 ` [PATCH v6 03/26] pnfs: let layoutcommit handle a list of lseg Jim Rees
2011-07-30 17:08 ` [PATCH v6 04/26] pnfs: use lwb as layoutcommit length Jim Rees
2011-07-30 17:08 ` [PATCH v6 05/26] pnfs: GETDEVICELIST Jim Rees
2011-07-30 17:08 ` [PATCH v6 06/26] pnfs: add set-clear layoutdriver interface Jim Rees
2011-07-30 17:08 ` [PATCH v6 07/26] pnfs: ask for layout_blksize and save it in nfs_server Jim Rees
2011-07-30 17:08 ` [PATCH v6 08/26] pnfs: cleanup_layoutcommit Jim Rees
2011-07-30 17:08 ` [PATCH v6 09/26] pnfsblock: add blocklayout Kconfig option, Makefile, and stubs Jim Rees
2011-07-30 17:08 ` [PATCH v6 10/26] pnfsblock: use pageio_ops api Jim Rees
2011-07-30 17:08 ` [PATCH v6 11/26] pnfsblock: basic extent code Jim Rees
2011-07-30 17:08 ` [PATCH v6 12/26] pnfsblock: add device operations Jim Rees
2011-07-30 17:08 ` [PATCH v6 13/26] pnfsblock: remove " Jim Rees
2011-07-30 17:08 ` Jim Rees [this message]
2011-07-30 17:08 ` [PATCH v6 15/26] pnfsblock: merge extents Jim Rees
2011-07-30 17:08 ` [PATCH v6 16/26] pnfsblock: call and parse getdevicelist Jim Rees
2011-07-30 17:08 ` [PATCH v6 17/26] pnfsblock: xdr decode pnfs_block_layout4 Jim Rees
2011-07-30 17:08 ` [PATCH v6 18/26] pnfsblock: bl_find_get_extent Jim Rees
2011-07-30 17:08 ` [PATCH v6 19/26] pnfsblock: add extent manipulation functions Jim Rees
2011-07-30 17:08 ` [PATCH v6 20/26] pnfsblock: merge rw extents Jim Rees
2011-07-30 17:08 ` [PATCH v6 21/26] pnfsblock: encode_layoutcommit Jim Rees
2011-07-30 17:08 ` [PATCH v6 22/26] pnfsblock: cleanup_layoutcommit Jim Rees
2011-07-30 17:08 ` [PATCH v6 23/26] pnfsblock: bl_read_pagelist Jim Rees
2011-07-30 17:08 ` [PATCH v6 24/26] pnfsblock: bl_write_pagelist Jim Rees
2011-07-30 17:08 ` [PATCH v6 25/26] pnfsblock: note written INVAL areas for layoutcommit Jim Rees
2011-07-30 17:08 ` [PATCH v6 26/26] pnfsblock: write_pagelist handle zero invalid extents Jim Rees
2011-07-30 18:41 ` [PATCH v6 00/26] add block layout driver to pnfs client Trond Myklebust
[not found] ` <1312051292.26265.3.camel-SyLVLa/KEI9HwK5hSS5vWB2eb7JE58TQ@public.gmane.org>
2011-07-30 18:54 ` Sorin Faibish
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=1312045729-27554-15-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.