From: Jim Rees <rees@umich.edu>
To: Benny Halevy <bhalevy@panasas.com>
Cc: linux-nfs@vger.kernel.org, peter honeyman <honey@citi.umich.edu>
Subject: [PATCH 15/33] pnfsblock: lseg alloc and free
Date: Mon, 13 Jun 2011 22:32:38 -0400 [thread overview]
Message-ID: <a35a43caa31b3e66f678cd2a7ffbcd0625a14a0c.1308017749.git.rees@umich.edu> (raw)
In-Reply-To: <cover.1308017749.git.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@nrchpc.ac.cn>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Zhang Jingwang <Jingwang.Zhang@emc.com>
---
fs/nfs/blocklayout/blocklayout.c | 39 +++++++++++++++++++++++++++++-----
fs/nfs/blocklayout/blocklayout.h | 6 +++++
fs/nfs/blocklayout/blocklayoutdev.c | 8 +++++++
3 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
index 4ca0838..992fd31 100644
--- a/fs/nfs/blocklayout/blocklayout.c
+++ b/fs/nfs/blocklayout/blocklayout.c
@@ -110,16 +110,43 @@ 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)
+/* Because the generic infrastructure does not correctly merge layouts,
+ * we pretty much ignore lseg, and store all data layout wide, so we
+ * can correctly merge. Eventually we should push some correct merge
+ * behavior up to the generic code, as the current behavior tends to
+ * cause lots of unnecessary overlapping LAYOUTGET requests.
+ */
+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) + 0, gfp_flags);
+ if (!lseg)
+ return NULL;
+ 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.
+ */
+ /* STUB - we really want to distinguish between 2 error
+ * conditions here. This lseg failed, but lo data structures
+ * are OK, or we hosed the lo data structures. The calling
+ * code probably needs to distinguish this too.
+ */
+ 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 839b81d..5c1ccc1 100644
--- a/fs/nfs/blocklayout/blocklayout.h
+++ b/fs/nfs/blocklayout/blocklayout.h
@@ -93,6 +93,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);
+}
+
/* blocklayoutdev.c */
struct block_device *nfs4_blkdev_get(dev_t dev);
int nfs4_blkdev_put(struct block_device *bdev);
diff --git a/fs/nfs/blocklayout/blocklayoutdev.c b/fs/nfs/blocklayout/blocklayoutdev.c
index 9a65a66..0fedf50 100644
--- a/fs/nfs/blocklayout/blocklayoutdev.c
+++ b/fs/nfs/blocklayout/blocklayoutdev.c
@@ -149,3 +149,11 @@ out_err:
kfree(msg);
return NULL;
}
+
+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-06-14 2:32 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-14 2:31 [PATCH 00/33] v2 block layout patches Jim Rees
2011-06-14 2:32 ` [PATCH 01/33] pnfs: GETDEVICELIST Jim Rees
2011-06-14 2:32 ` [PATCH 02/33] pnfs: add set-clear layoutdriver interface Jim Rees
2011-06-14 2:32 ` [PATCH 03/33] pnfs: let layoutcommit code handle multiple segments Jim Rees
2011-06-14 2:32 ` [PATCH 04/33] pnfs: hook nfs_write_begin/end to allow layout driver manipulation Jim Rees
2011-06-14 2:32 ` [PATCH 05/33] pnfs: ask for layout_blksize and save it in nfs_server Jim Rees
2011-06-14 2:32 ` [PATCH 06/33] pnfs: cleanup_layoutcommit Jim Rees
2011-06-14 2:32 ` [PATCH 07/33] pnfsblock: define PNFS_BLOCK Kconfig option Jim Rees
2011-06-14 2:32 ` [PATCH 08/33] pnfsblock: blocklayout stub Jim Rees
2011-06-14 2:32 ` [PATCH 09/33] pnfsblock: layout alloc and free Jim Rees
2011-06-14 2:32 ` [PATCH 10/33] pnfsblock: add support for simple rpc pipefs Jim Rees
2011-06-14 15:52 ` Benny Halevy
2011-06-14 2:32 ` [PATCH 11/33] pnfsblock: add block device discovery pipe Jim Rees
2011-06-14 2:32 ` [PATCH 12/33] pnfsblock: basic extent code Jim Rees
2011-06-14 2:32 ` [PATCH 13/33] pnfsblock: add device operations Jim Rees
2011-06-14 2:32 ` [PATCH 14/33] pnfsblock: remove " Jim Rees
2011-06-14 2:32 ` Jim Rees [this message]
2011-06-14 2:32 ` [PATCH 16/33] pnfsblock: merge extents Jim Rees
2011-06-14 2:32 ` [PATCH 17/33] pnfsblock: call and parse getdevicelist Jim Rees
2011-06-14 2:32 ` [PATCH 18/33] pnfsblock: allow use of PG_owner_priv_1 flag Jim Rees
2011-06-14 2:32 ` [PATCH 19/33] pnfsblock: xdr decode pnfs_block_layout4 Jim Rees
2011-06-14 2:32 ` [PATCH 20/33] pnfsblock: find_get_extent Jim Rees
2011-06-14 2:32 ` [PATCH 21/33] pnfsblock: SPLITME: add extent manipulation functions Jim Rees
2011-06-14 2:32 ` [PATCH 22/33] pnfsblock: merge rw extents Jim Rees
2011-06-14 2:32 ` [PATCH 23/33] pnfsblock: encode_layoutcommit Jim Rees
2011-06-14 2:33 ` [PATCH 24/33] pnfsblock: cleanup_layoutcommit Jim Rees
2011-06-14 2:33 ` [PATCH 25/33] pnfsblock: bl_read_pagelist Jim Rees
2011-06-14 2:33 ` [PATCH 26/33] pnfsblock: write_begin Jim Rees
2011-06-14 2:33 ` [PATCH 27/33] pnfsblock: write_end Jim Rees
2011-06-14 2:33 ` [PATCH 28/33] pnfsblock: write_end_cleanup Jim Rees
2011-06-14 2:33 ` [PATCH 29/33] pnfsblock: bl_write_pagelist support functions Jim Rees
2011-06-14 2:33 ` [PATCH 30/33] pnfsblock: bl_write_pagelist Jim Rees
2011-06-14 2:33 ` [PATCH 31/33] pnfsblock: note written INVAL areas for layoutcommit Jim Rees
2011-06-14 2:33 ` [PATCH 32/33] pnfsblock: Implement release_inval_marks Jim Rees
2011-06-14 2:33 ` [PATCH 33/33] pnfsblock DEVONLY: Add configurable prefetch size for layoutget 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=a35a43caa31b3e66f678cd2a7ffbcd0625a14a0c.1308017749.git.rees@umich.edu \
--to=rees@umich.edu \
--cc=bhalevy@panasas.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).