linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/1] Don't check exchange flags unless using v4.1 try 2
@ 2010-10-06 16:09 Fred Isaman
  2010-10-06 18:53 ` Benny Halevy
  0 siblings, 1 reply; 2+ messages in thread
From: Fred Isaman @ 2010-10-06 16:09 UTC (permalink / raw)
  To: linux-nfs

Signed-off-by: Fred Isaman <iisaman@netapp.com>
---
 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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/1] Don't check exchange flags unless using v4.1 try 2
  2010-10-06 16:09 [PATCH 1/1] Don't check exchange flags unless using v4.1 try 2 Fred Isaman
@ 2010-10-06 18:53 ` Benny Halevy
  0 siblings, 0 replies; 2+ messages in thread
From: Benny Halevy @ 2010-10-06 18:53 UTC (permalink / raw)
  To: Fred Isaman; +Cc: linux-nfs

On 2010-10-06 12:09, Fred Isaman wrote:
> Signed-off-by: Fred Isaman <iisaman@netapp.com>

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__,

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-10-06 18:53 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-06 16:09 [PATCH 1/1] Don't check exchange flags unless using v4.1 try 2 Fred Isaman
2010-10-06 18:53 ` Benny Halevy

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).