From: Fred Isaman Subject: [PATCH 1/1] Don't check exchange flags unless using v4.1 Date: Wed, 6 Oct 2010 11:56:12 -0400 Message-ID: <1286380572-4558-1-git-send-email-iisaman@netapp.com> To: linux-nfs@vger.kernel.org Return-path: Received: from mx2.netapp.com ([216.240.18.37]:53367 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757155Ab0JFP4a (ORCPT ); Wed, 6 Oct 2010 11:56:30 -0400 Received: from localhost.localdomain (sanjayk3-lxp.hq.netapp.com [10.58.62.92] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id o96FuEwV001399 for ; Wed, 6 Oct 2010 08:56:14 -0700 (PDT) Sender: linux-nfs-owner@vger.kernel.org List-ID: Signed-off-by: Fred Isaman --- 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