From patchwork Tue Nov 12 22:44:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Eshel X-Patchwork-Id: 3176451 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0FEC5C045B for ; Tue, 12 Nov 2013 22:44:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4357B205B1 for ; Tue, 12 Nov 2013 22:44:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A685205AD for ; Tue, 12 Nov 2013 22:44:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753735Ab3KLWo1 (ORCPT ); Tue, 12 Nov 2013 17:44:27 -0500 Received: from e39.co.us.ibm.com ([32.97.110.160]:36850 "EHLO e39.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756722Ab3KLWo0 (ORCPT ); Tue, 12 Nov 2013 17:44:26 -0500 Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 12 Nov 2013 15:44:26 -0700 Received: from d01dlp02.pok.ibm.com (9.56.250.167) by e39.co.us.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 12 Nov 2013 15:44:24 -0700 Received: from b01cxnp22033.gho.pok.ibm.com (b01cxnp22033.gho.pok.ibm.com [9.57.198.23]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 6CBB86E803C; Tue, 12 Nov 2013 17:44:21 -0500 (EST) Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by b01cxnp22033.gho.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rACMiNfk55378116; Tue, 12 Nov 2013 22:44:23 GMT Received: from d01av02.pok.ibm.com (localhost [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rACMiMNP012730; Tue, 12 Nov 2013 17:44:23 -0500 Received: from d01ml604.pok.ibm.com (d01ml604.pok.ibm.com [9.63.8.151]) by d01av02.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id rACMiM4J012727; Tue, 12 Nov 2013 17:44:22 -0500 In-Reply-To: <5282929E.60207@gmail.com> References: <1384283048-7699-1-git-send-email-bjschuma@netapp.com> <5282929E.60207@gmail.com> To: Anna Schumaker Cc: bfields@fieldses.org, Anna Schumaker , linux-nfs@vger.kernel.org, linux-nfs-owner@vger.kernel.org MIME-Version: 1.0 Subject: Re: [PATCH v2 1/3] NFSD: Update error codes X-KeepSent: 7E555129:8213C5FE-88257C21:007BF318; type=4; name=$KeepSent X-Mailer: Lotus Notes Release 8.5.3 September 15, 2011 From: Marc Eshel Message-ID: Date: Tue, 12 Nov 2013 14:44:21 -0800 X-MIMETrack: Serialize by Router on D01ML604/01/M/IBM(Release 9.0IF2 |July 03, 2013) at 11/12/2013 17:44:22, Serialize complete at 11/12/2013 17:44:22 X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13111222-9332-0000-0000-00000220FB60 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP where do you see this change?, the last version 20 don't show it. Thanks, Marc. From: Anna Schumaker To: Anna Schumaker , bfields@fieldses.org, linux-nfs@vger.kernel.org, Date: 11/12/2013 12:50 PM Subject: [PATCH v2 1/3] NFSD: Update error codes Sent by: linux-nfs-owner@vger.kernel.org Recent NFS v4.2 drafts have removed NFS4ERR_METADATA_NOTSUPP and reassigned the error code to NFS4ERR_UNION_NOTSUPP. Signed-off-by: Anna Schumaker --- fs/nfsd/nfsd.h | 2 +- include/linux/nfs4.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h index 30f34ab..4fe49e9 100644 --- a/fs/nfsd/nfsd.h +++ b/fs/nfsd/nfsd.h @@ -244,7 +244,7 @@ void nfsd_lockd_shutdown(void); #define nfserr_deleg_revoked cpu_to_be32(NFS4ERR_DELEG_REVOKED) #define nfserr_partner_notsupp cpu_to_be32(NFS4ERR_PARTNER_NOTSUPP) #define nfserr_partner_no_auth cpu_to_be32(NFS4ERR_PARTNER_NO_AUTH) -#define nfserr_metadata_notsupp cpu_to_be32(NFS4ERR_METADATA_NOTSUPP) +#define nfserr_union_notsupp cpu_to_be32(NFS4ERR_UNION_NOTSUPP) #define nfserr_offload_denied cpu_to_be32(NFS4ERR_OFFLOAD_DENIED) #define nfserr_wrong_lfs cpu_to_be32(NFS4ERR_WRONG_LFS) #define nfserr_badlabel cpu_to_be32(NFS4ERR_BADLABEL) diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h index 9577769..6d79deb 100644 --- a/include/linux/nfs4.h +++ b/include/linux/nfs4.h @@ -235,7 +235,7 @@ enum nfsstat4 { /* nfs42 */ NFS4ERR_PARTNER_NOTSUPP = 10088, NFS4ERR_PARTNER_NO_AUTH = 10089, - NFS4ERR_METADATA_NOTSUPP = 10090, + NFS4ERR_UNION_NOTSUPP = 10090, NFS4ERR_OFFLOAD_DENIED = 10091, NFS4ERR_WRONG_LFS = 10092, NFS4ERR_BADLABEL = 10093,