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 06/26] pnfs: add set-clear layoutdriver interface
Date: Sat, 30 Jul 2011 20:52:36 -0400 [thread overview]
Message-ID: <1312073576-11024-7-git-send-email-rees@umich.edu> (raw)
In-Reply-To: <1312073576-11024-1-git-send-email-rees@umich.edu>
From: Benny Halevy <bhalevy@panasas.com>
To allow layout driver to issue getdevicelist at mount time, and clean up
at umount time.
[fixup non NFS_V4_1 set_pnfs_layoutdriver definition]
[pnfs: pass mntfh down the init_pnfs path]
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/client.c | 8 +++++---
fs/nfs/pnfs.c | 15 +++++++++++++--
fs/nfs/pnfs.h | 8 ++++++--
3 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 19ea7d9..a9b1848 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -904,7 +904,9 @@ error:
/*
* Load up the server record from information gained in an fsinfo record
*/
-static void nfs_server_set_fsinfo(struct nfs_server *server, struct nfs_fsinfo *fsinfo)
+static void nfs_server_set_fsinfo(struct nfs_server *server,
+ struct nfs_fh *mntfh,
+ struct nfs_fsinfo *fsinfo)
{
unsigned long max_rpc_payload;
@@ -934,7 +936,7 @@ static void nfs_server_set_fsinfo(struct nfs_server *server, struct nfs_fsinfo *
if (server->wsize > NFS_MAX_FILE_IO_SIZE)
server->wsize = NFS_MAX_FILE_IO_SIZE;
server->wpages = (server->wsize + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
- set_pnfs_layoutdriver(server, fsinfo->layouttype);
+ set_pnfs_layoutdriver(server, mntfh, fsinfo->layouttype);
server->wtmult = nfs_block_bits(fsinfo->wtmult, NULL);
@@ -980,7 +982,7 @@ static int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *mntfh, str
if (error < 0)
goto out_error;
- nfs_server_set_fsinfo(server, &fsinfo);
+ nfs_server_set_fsinfo(server, mntfh, &fsinfo);
/* Get some general file system info */
if (server->namelen == 0) {
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index a7e5f17..3a47f7c 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -76,8 +76,11 @@ find_pnfs_driver(u32 id)
void
unset_pnfs_layoutdriver(struct nfs_server *nfss)
{
- if (nfss->pnfs_curr_ld)
+ if (nfss->pnfs_curr_ld) {
+ if (nfss->pnfs_curr_ld->clear_layoutdriver)
+ nfss->pnfs_curr_ld->clear_layoutdriver(nfss);
module_put(nfss->pnfs_curr_ld->owner);
+ }
nfss->pnfs_curr_ld = NULL;
}
@@ -88,7 +91,8 @@ unset_pnfs_layoutdriver(struct nfs_server *nfss)
* @id layout type. Zero (illegal layout type) indicates pNFS not in use.
*/
void
-set_pnfs_layoutdriver(struct nfs_server *server, u32 id)
+set_pnfs_layoutdriver(struct nfs_server *server, const struct nfs_fh *mntfh,
+ u32 id)
{
struct pnfs_layoutdriver_type *ld_type = NULL;
@@ -115,6 +119,13 @@ set_pnfs_layoutdriver(struct nfs_server *server, u32 id)
goto out_no_driver;
}
server->pnfs_curr_ld = ld_type;
+ if (ld_type->set_layoutdriver
+ && ld_type->set_layoutdriver(server, mntfh)) {
+ printk(KERN_ERR "%s: Error initializing pNFS layout driver %u.\n",
+ __func__, id);
+ module_put(ld_type->owner);
+ goto out_no_driver;
+ }
dprintk("%s: pNFS module for %u set\n", __func__, id);
return;
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 7074394..bddd8b9 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -80,6 +80,9 @@ struct pnfs_layoutdriver_type {
struct module *owner;
unsigned flags;
+ int (*set_layoutdriver) (struct nfs_server *, const struct nfs_fh *);
+ int (*clear_layoutdriver) (struct nfs_server *);
+
struct pnfs_layout_hdr * (*alloc_layout_hdr) (struct inode *inode, gfp_t gfp_flags);
void (*free_layout_hdr) (struct pnfs_layout_hdr *);
@@ -167,7 +170,7 @@ void put_lseg(struct pnfs_layout_segment *lseg);
bool pnfs_pageio_init_read(struct nfs_pageio_descriptor *, struct inode *);
bool pnfs_pageio_init_write(struct nfs_pageio_descriptor *, struct inode *, int);
-void set_pnfs_layoutdriver(struct nfs_server *, u32 id);
+void set_pnfs_layoutdriver(struct nfs_server *, const struct nfs_fh *, u32);
void unset_pnfs_layoutdriver(struct nfs_server *);
void pnfs_generic_pg_init_read(struct nfs_pageio_descriptor *, struct nfs_page *);
int pnfs_generic_pg_readpages(struct nfs_pageio_descriptor *desc);
@@ -374,7 +377,8 @@ pnfs_roc_drain(struct inode *ino, u32 *barrier)
return false;
}
-static inline void set_pnfs_layoutdriver(struct nfs_server *s, u32 id)
+static inline void set_pnfs_layoutdriver(struct nfs_server *s,
+ const struct nfs_fh *mntfh, u32 id);
{
}
--
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 ` Jim Rees [this message]
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 ` [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-7-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).