From patchwork Wed Jan 5 01:57:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 452641 X-Patchwork-Delegate: Trond.Myklebust@netapp.com 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 p051vx6I027810 for ; Wed, 5 Jan 2011 01:58:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751226Ab1AEB6B (ORCPT ); Tue, 4 Jan 2011 20:58:01 -0500 Received: from mx2.netapp.com ([216.240.18.37]:43304 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751010Ab1AEB6B (ORCPT ); Tue, 4 Jan 2011 20:58:01 -0500 X-IronPort-AV: E=Sophos;i="4.60,275,1291622400"; d="scan'208";a="501764962" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 04 Jan 2011 17:58:00 -0800 Received: from heimdal.trondhjem.org.com (bigbear-pc.hq.netapp.com [10.58.52.79] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id p051vuCQ001243; Tue, 4 Jan 2011 17:57:59 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v4 4/5] NFSv4: Propagate the error NFS4ERR_BADOWNER to nfs4_do_setattr Date: Tue, 4 Jan 2011 20:57:50 -0500 Message-Id: <1294192671-18864-5-git-send-email-Trond.Myklebust@netapp.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1294192671-18864-4-git-send-email-Trond.Myklebust@netapp.com> References: <1294192671-18864-1-git-send-email-Trond.Myklebust@netapp.com> <1294192671-18864-2-git-send-email-Trond.Myklebust@netapp.com> <1294192671-18864-3-git-send-email-Trond.Myklebust@netapp.com> <1294192671-18864-4-git-send-email-Trond.Myklebust@netapp.com> 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.3 (demeter1.kernel.org [140.211.167.41]); Wed, 05 Jan 2011 01:58:03 +0000 (UTC) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 2aede9c..39a2e3c 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -84,6 +84,9 @@ static int nfs4_map_errors(int err) switch (err) { case -NFS4ERR_RESOURCE: return -EREMOTEIO; + case -NFS4ERR_BADOWNER: + case -NFS4ERR_NAME: + return -EINVAL; default: dprintk("%s could not handle NFSv4 error %d\n", __func__, -err); diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index bc205ab..1de6b22 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -6174,8 +6174,6 @@ static struct { { NFS4ERR_DQUOT, -EDQUOT }, { NFS4ERR_STALE, -ESTALE }, { NFS4ERR_BADHANDLE, -EBADHANDLE }, - { NFS4ERR_BADOWNER, -EINVAL }, - { NFS4ERR_BADNAME, -EINVAL }, { NFS4ERR_BAD_COOKIE, -EBADCOOKIE }, { NFS4ERR_NOTSUPP, -ENOTSUPP }, { NFS4ERR_TOOSMALL, -ETOOSMALL },