2010-10-06 15:56:30

by Fred Isaman

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

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

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

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

2010-10-06 16:02:16

by Benny Halevy

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

On 2010-10-06 11:56, Fred Isaman wrote:
> Signed-off-by: Fred Isaman <[email protected]>
> ---
> fs/nfs/pnfs.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
> index 7013916..64baf20 100644
> --- a/fs/nfs/pnfs.c
> +++ b/fs/nfs/pnfs.c
> @@ -141,7 +141,9 @@ set_pnfs_layoutdriver(struct nfs_server *server, u32 id)
>
> if (id == 0)
> goto out_no_driver;
> - if (!(server->nfs_client->cl_exchange_flags &
> + if ((server->nfs_client->rpc_ops->version == 4) &&
> + (server->nfs_client->cl_minorversion == 1) &&
> + !(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);

Actually, it'd better to disable just the warning printout in this case,
not the entire block.

Benny

2010-10-06 16:10:47

by Fred Isaman

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

On Oct 6, 2010, at 12:02 PM, Benny Halevy wrote:

> On 2010-10-06 11:56, Fred Isaman wrote:
>> Signed-off-by: Fred Isaman <[email protected]>
>> ---
>> fs/nfs/pnfs.c | 4 +++-
>> 1 files changed, 3 insertions(+), 1 deletions(-)
>>
>> diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
>> index 7013916..64baf20 100644
>> --- a/fs/nfs/pnfs.c
>> +++ b/fs/nfs/pnfs.c
>> @@ -141,7 +141,9 @@ set_pnfs_layoutdriver(struct nfs_server *server, u32 id)
>>
>> if (id == 0)
>> goto out_no_driver;
>> - if (!(server->nfs_client->cl_exchange_flags &
>> + if ((server->nfs_client->rpc_ops->version == 4) &&
>> + (server->nfs_client->cl_minorversion == 1) &&
>> + !(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);
>
> Actually, it'd better to disable just the warning printout in this case,
> not the entire block.
>
> Benny

Bah. I sent out the wrong version. See next email.

Fred