From patchwork Thu Feb 24 10:11:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 590701 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1PHvZoM032186 for ; Fri, 25 Feb 2011 17:57:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753474Ab1BYR5c (ORCPT ); Fri, 25 Feb 2011 12:57:32 -0500 Received: from mx2.netapp.com ([216.240.18.37]:1368 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751325Ab1BYR5c (ORCPT ); Fri, 25 Feb 2011 12:57:32 -0500 X-IronPort-AV: E=Sophos;i="4.62,226,1297065600"; d="scan'208";a="523227600" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 25 Feb 2011 09:57:17 -0800 Received: from netapp17.cthon.org ([10.58.63.12]) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id p1PHuvhM003854; Fri, 25 Feb 2011 09:57:01 -0800 (PST) From: andros@netapp.com To: iisaman@netapp.com Cc: linux-nfs@vger.kernel.org, Andy Adamson Subject: [PATCH 1/4] NFS remove duplicate clientid in nfs_client Date: Thu, 24 Feb 2011 05:11:06 -0500 Message-Id: <1298542269-2477-1-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.7.4 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 25 Feb 2011 17:57:36 +0000 (UTC) diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index c35880c..0f2dcfb 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -1664,7 +1664,7 @@ static void encode_create_session(struct xdr_stream *xdr, p = reserve_space(xdr, 20 + 2*28 + 20 + len + 12); *p++ = cpu_to_be32(OP_CREATE_SESSION); - p = xdr_encode_hyper(p, clp->cl_ex_clid); + p = xdr_encode_hyper(p, clp->cl_clientid); *p++ = cpu_to_be32(clp->cl_seqid); /*Sequence id */ *p++ = cpu_to_be32(args->flags); /*flags */ @@ -4699,7 +4699,7 @@ static int decode_exchange_id(struct xdr_stream *xdr, p = xdr_inline_decode(xdr, 8); if (unlikely(!p)) goto out_overflow; - xdr_decode_hyper(p, &clp->cl_ex_clid); + xdr_decode_hyper(p, &clp->cl_clientid); p = xdr_inline_decode(xdr, 12); if (unlikely(!p)) goto out_overflow; diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h index 7f71698..e52f010 100644 --- a/include/linux/nfs_fs_sb.h +++ b/include/linux/nfs_fs_sb.h @@ -73,8 +73,6 @@ struct nfs_client { #endif /* CONFIG_NFS_V4 */ #ifdef CONFIG_NFS_V4_1 - /* clientid returned from EXCHANGE_ID, used by session operations */ - u64 cl_ex_clid; /* The sequence id to use for the next CREATE_SESSION */ u32 cl_seqid; /* The flags used for obtaining the clientid during EXCHANGE_ID */