On Mon, Sep 20, 2010 at 10:24 AM, Benny Halevy <bhalevy@xxxxxxxxxxx> wrote: > On 2010-09-20 16:06, Fred Isaman wrote: >> On Mon, Sep 20, 2010 at 6:42 AM, Benny Halevy <bhalevy@xxxxxxxxxxx> wrote: >>> On 2010-09-18 05:17, Fred Isaman wrote: >>>> From: The pNFS Team <linux-nfs@xxxxxxxxxxxxxxx> >>>> >>>> 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: TBD - melding/reorganization of several patches >>>> --- >>>> fs/nfs/Makefile | 1 + >>>> fs/nfs/client.c | 4 ++ >>>> fs/nfs/pnfs.c | 78 +++++++++++++++++++++++++++++++++++++++++++++ >>>> fs/nfs/pnfs.h | 56 ++++++++++++++++++++++++++++++++ >>>> include/linux/nfs_fs.h | 1 + >>>> include/linux/nfs_fs_sb.h | 1 + >>>> 6 files changed, 141 insertions(+), 0 deletions(-) >>>> create mode 100644 fs/nfs/pnfs.c >>>> create mode 100644 fs/nfs/pnfs.h >>>> >>>> diff --git a/fs/nfs/Makefile b/fs/nfs/Makefile >>>> index da7fda6..bb9e773 100644 >>>> --- a/fs/nfs/Makefile >>>> +++ b/fs/nfs/Makefile >>>> @@ -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 >>>> diff --git a/fs/nfs/client.c b/fs/nfs/client.c >>>> index 4e7df2a..eed1212 100644 >>>> --- a/fs/nfs/client.c >>>> +++ b/fs/nfs/client.c >>>> @@ -48,6 +48,7 @@ >>>> #include "iostat.h" >>>> #include "internal.h" >>>> #include "fscache.h" >>>> +#include "pnfs.h" >>>> >>>> #define NFSDBG_FACILITY NFSDBG_CLIENT >>>> >>>> @@ -898,6 +899,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); >>>> + >>> >>> Originally (9170cf5 pnfs_submit: set and unset pnfs layoutdriver modules), >>> nfs4_init_pnfs called set_pnfs_layoutdriver under the following conditions: >>> >>> if (nfs4_has_session(clp) && >>> (clp->cl_exchange_flags & EXCHGID4_FLAG_USE_PNFS_MDS)) >>> set_pnfs_layoutdriver(server, fsinfo->layouttype); >>> >>> So in the DS only case we don't want to set server->pnfs_curr_ld. >>> did you test your code with a standalone DS to make there are no >>> ill side effects in this case? >>> >> >> This is called from the mount code. It is never called for a DS >> (unless the DS is also a MDS, in which case it will be called in the >> MDS role). > > So at least let's add a BUG_ON and a comment since we're relying on > side effects of code implemented elsewhere. > OK. > Benny > > P.S. I wonder what happens if you try to explicitly mount a DS > (which is not an MDS). > > Note there are two possibilities here, DS only, or DS and normal NFS server (but not a MDS). In the second case, the mount should work, and it does. In the first, the client should abort when it sees the EXCHID flags (which it doesn't...this needs to be fixed) or when the server sends NFS4ERR_NOTSUPP to the PUTROOTFH, which it MUST do. Fred -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
