From patchwork Tue Nov 12 20:42:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 3175781 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 D64B5C045B for ; Tue, 12 Nov 2013 20:50:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E4EEB20591 for ; Tue, 12 Nov 2013 20:50:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E5C5205DD for ; Tue, 12 Nov 2013 20:50:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756604Ab3KLUuL (ORCPT ); Tue, 12 Nov 2013 15:50:11 -0500 Received: from mail-yh0-f41.google.com ([209.85.213.41]:35569 "EHLO mail-yh0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757289Ab3KLUuB (ORCPT ); Tue, 12 Nov 2013 15:50:01 -0500 Received: by mail-yh0-f41.google.com with SMTP id f11so849343yha.0 for ; Tue, 12 Nov 2013 12:49:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=+l6S1S1Z5AzO910PVmj1P4OJEWKkYLFgnwtEcu99JAU=; b=u4jU4BL7mp2LHTLFKOKW+zcss7V5DSlnq4xUv90Z9HRQ1CIBT/IVo8uSSP5MRLSDF8 VxcrUFdxaWAmXD2aDpyMEtRk1feaKHbt5YlthhBE9iLu3uwPdM+Lb8ZTAzf6Lwfs19yc tqyeLsqLaP7dnovZU0uOI3xNfBL99J4/kb2nHYkCXn4zbj2//C9qz+LK3INrKmgL5I69 5VdTr5aCx8YG59fB34ZCsBqUzw55ltLKh27aZbglJo+kJI8A4YscFnn2ONmmSzZUIGR1 0yJvk12DZW2HuojEMQl8035e6iDdTqHINoYnGmyiwG+IviaVYt/kpytt/E0KChMmeK3a UtaQ== X-Received: by 10.236.42.10 with SMTP id i10mr149245yhb.130.1384288929817; Tue, 12 Nov 2013 12:42:09 -0800 (PST) Received: from davros.ocarinaproject (c-68-32-80-121.hsd1.mi.comcast.net. [68.32.80.121]) by mx.google.com with ESMTPSA id v45sm50858357yha.2.2013.11.12.12.42.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Nov 2013 12:42:08 -0800 (PST) Message-ID: <5282929E.60207@gmail.com> Date: Tue, 12 Nov 2013 15:42:06 -0500 From: Anna Schumaker User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: Anna Schumaker , bfields@fieldses.org, linux-nfs@vger.kernel.org Subject: [PATCH v2 1/3] NFSD: Update error codes References: <1384283048-7699-1-git-send-email-bjschuma@netapp.com> In-Reply-To: <1384283048-7699-1-git-send-email-bjschuma@netapp.com> 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.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 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,