NFS: set layout driver
Put in the infrastructure that uses information returned from the server at mount to select a layout driver module. In this patch, a stub is used that always returns "no driver found". Signed-off-by: Ricardo Labiaga <Ricardo.Labiaga@netapp.com> Signed-off-by: Dean Hildebrand <dhildebz@umich.edu> Signed-off-by: Marc Eshel <eshel@almaden.ibm.com> Signed-off-by: Andy Adamson <andros@netapp.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: Fred Isaman <iisaman@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Родитель
504913fbc8
Коммит
85e174ba6b
|
@ -15,5 +15,6 @@ nfs-$(CONFIG_NFS_V4) += nfs4proc.o nfs4xdr.o nfs4state.o nfs4renewd.o \
|
|||
delegation.o idmap.o \
|
||||
callback.o callback_xdr.o callback_proc.o \
|
||||
nfs4namespace.o
|
||||
nfs-$(CONFIG_NFS_V4_1) += pnfs.o
|
||||
nfs-$(CONFIG_SYSCTL) += sysctl.o
|
||||
nfs-$(CONFIG_NFS_FSCACHE) += fscache.o fscache-index.o
|
||||
|
|
|
@ -48,6 +48,7 @@
|
|||
#include "iostat.h"
|
||||
#include "internal.h"
|
||||
#include "fscache.h"
|
||||
#include "pnfs.h"
|
||||
|
||||
#define NFSDBG_FACILITY NFSDBG_CLIENT
|
||||
|
||||
|
@ -900,6 +901,8 @@ 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);
|
||||
|
||||
server->wtmult = nfs_block_bits(fsinfo->wtmult, NULL);
|
||||
|
||||
server->dtsize = nfs_block_size(fsinfo->dtpref, NULL);
|
||||
|
@ -939,6 +942,7 @@ static int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *mntfh, str
|
|||
}
|
||||
|
||||
fsinfo.fattr = fattr;
|
||||
fsinfo.layouttype = 0;
|
||||
error = clp->rpc_ops->fsinfo(server, mntfh, &fsinfo);
|
||||
if (error < 0)
|
||||
goto out_error;
|
||||
|
@ -1021,6 +1025,7 @@ void nfs_free_server(struct nfs_server *server)
|
|||
{
|
||||
dprintk("--> nfs_free_server()\n");
|
||||
|
||||
unset_pnfs_layoutdriver(server);
|
||||
spin_lock(&nfs_client_lock);
|
||||
list_del(&server->client_link);
|
||||
list_del(&server->master_link);
|
||||
|
|
|
@ -0,0 +1,84 @@
|
|||
/*
|
||||
* pNFS functions to call and manage layout drivers.
|
||||
*
|
||||
* Copyright (c) 2002 [year of first publication]
|
||||
* The Regents of the University of Michigan
|
||||
* All Rights Reserved
|
||||
*
|
||||
* Dean Hildebrand <dhildebz@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 or warranty
|
||||
* of any kind either express or implied, including without limitation
|
||||
* the implied warranties of merchantability, fitness for a particular
|
||||
* purpose, or noninfringement. 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 of 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 <linux/nfs_fs.h>
|
||||
#include "pnfs.h"
|
||||
|
||||
#define NFSDBG_FACILITY NFSDBG_PNFS
|
||||
|
||||
/* STUB that returns the equivalent of "no module found" */
|
||||
static struct pnfs_layoutdriver_type *
|
||||
find_pnfs_driver(u32 id)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void
|
||||
unset_pnfs_layoutdriver(struct nfs_server *nfss)
|
||||
{
|
||||
nfss->pnfs_curr_ld = NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* Try to set the server's pnfs module to the pnfs layout type specified by id.
|
||||
* Currently only one pNFS layout driver per filesystem is supported.
|
||||
*
|
||||
* @id layout type. Zero (illegal layout type) indicates pNFS not in use.
|
||||
*/
|
||||
void
|
||||
set_pnfs_layoutdriver(struct nfs_server *server, u32 id)
|
||||
{
|
||||
struct pnfs_layoutdriver_type *ld_type = NULL;
|
||||
|
||||
if (id == 0)
|
||||
goto out_no_driver;
|
||||
if (!(server->nfs_client->cl_exchange_flags &
|
||||
(EXCHGID4_FLAG_USE_NON_PNFS | EXCHGID4_FLAG_USE_PNFS_MDS))) {
|
||||
printk(KERN_ERR "%s: id %u cl_exchange_flags 0x%x\n", __func__,
|
||||
id, server->nfs_client->cl_exchange_flags);
|
||||
goto out_no_driver;
|
||||
}
|
||||
ld_type = find_pnfs_driver(id);
|
||||
if (!ld_type) {
|
||||
request_module("%s-%u", LAYOUT_NFSV4_1_MODULE_PREFIX, id);
|
||||
ld_type = find_pnfs_driver(id);
|
||||
if (!ld_type) {
|
||||
dprintk("%s: No pNFS module found for %u.\n",
|
||||
__func__, id);
|
||||
goto out_no_driver;
|
||||
}
|
||||
}
|
||||
server->pnfs_curr_ld = ld_type;
|
||||
dprintk("%s: pNFS module for %u set\n", __func__, id);
|
||||
return;
|
||||
|
||||
out_no_driver:
|
||||
dprintk("%s: Using NFSv4 I/O\n", __func__);
|
||||
server->pnfs_curr_ld = NULL;
|
||||
}
|
|
@ -0,0 +1,56 @@
|
|||
/*
|
||||
* pNFS client data structures.
|
||||
*
|
||||
* Copyright (c) 2002
|
||||
* The Regents of the University of Michigan
|
||||
* All Rights Reserved
|
||||
*
|
||||
* Dean Hildebrand <dhildebz@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 or warranty
|
||||
* of any kind either express or implied, including without limitation
|
||||
* the implied warranties of merchantability, fitness for a particular
|
||||
* purpose, or noninfringement. 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 of or in connection with the use of the software,
|
||||
* even if it has been or is hereafter advised of the possibility of
|
||||
* such damages.
|
||||
*/
|
||||
|
||||
#ifndef FS_NFS_PNFS_H
|
||||
#define FS_NFS_PNFS_H
|
||||
|
||||
#ifdef CONFIG_NFS_V4_1
|
||||
|
||||
#define LAYOUT_NFSV4_1_MODULE_PREFIX "nfs-layouttype4"
|
||||
|
||||
/* Per-layout driver specific registration structure */
|
||||
struct pnfs_layoutdriver_type {
|
||||
};
|
||||
|
||||
void set_pnfs_layoutdriver(struct nfs_server *, u32 id);
|
||||
void unset_pnfs_layoutdriver(struct nfs_server *);
|
||||
|
||||
#else /* CONFIG_NFS_V4_1 */
|
||||
|
||||
static inline void set_pnfs_layoutdriver(struct nfs_server *s, u32 id)
|
||||
{
|
||||
}
|
||||
|
||||
static inline void unset_pnfs_layoutdriver(struct nfs_server *s)
|
||||
{
|
||||
}
|
||||
|
||||
#endif /* CONFIG_NFS_V4_1 */
|
||||
|
||||
#endif /* FS_NFS_PNFS_H */
|
|
@ -615,6 +615,7 @@ nfs_fileid_to_ino_t(u64 fileid)
|
|||
#define NFSDBG_CLIENT 0x0200
|
||||
#define NFSDBG_MOUNT 0x0400
|
||||
#define NFSDBG_FSCACHE 0x0800
|
||||
#define NFSDBG_PNFS 0x1000
|
||||
#define NFSDBG_ALL 0xFFFF
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
|
|
@ -145,6 +145,7 @@ struct nfs_server {
|
|||
u32 acl_bitmask; /* V4 bitmask representing the ACEs
|
||||
that are supported on this
|
||||
filesystem */
|
||||
struct pnfs_layoutdriver_type *pnfs_curr_ld; /* Active layout driver */
|
||||
#endif
|
||||
void (*destroy)(struct nfs_server *);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче