2010-10-06 16:09:24

by Fred Isaman

Subject: [PATCH 1/1] Don't check exchange flags unless using v4.1 try 2

Signed-off-by: Fred Isaman <[email protected]>
---
fs/nfs/pnfs.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 7013916..4b33cde 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -141,6 +141,9 @@ set_pnfs_layoutdriver(struct nfs_server *server, u32 id)

if (id == 0)
goto out_no_driver;
+ if ((server->nfs_client->rpc_ops->version != 4) ||
+ (server->nfs_client->cl_minorversion != 1))
+ 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__,
--
1.7.2.1

2010-10-06 18:53:42

by Benny Halevy

Subject: Re: [PATCH 1/1] Don't check exchange flags unless using v4.1 try 2

On 2010-10-06 12:09, Fred Isaman wrote:
> Signed-off-by: Fred Isaman <[email protected]>

Merged into the bakeathon temporary tree (for now). Thanks!

Benny

> ---
> fs/nfs/pnfs.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
> index 7013916..4b33cde 100644
> --- a/fs/nfs/pnfs.c
> +++ b/fs/nfs/pnfs.c
> @@ -141,6 +141,9 @@ set_pnfs_layoutdriver(struct nfs_server *server, u32 id)
>
> if (id == 0)
> goto out_no_driver;
> + if ((server->nfs_client->rpc_ops->version != 4) ||
> + (server->nfs_client->cl_minorversion != 1))
> + 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__,