Return-Path: <SES+Ng-0=HI=cse.unsw.edu.au=neilb@cse.unsw.edu.au>
Received: from localhost (bix [127.0.0.1])
	by localhost.localdomain (8.12.10/8.12.10) with ESMTP id j2867l9M019037
	for <akpm@localhost>; Mon, 7 Mar 2005 22:07:49 -0800
Received: from bix [127.0.0.1]
	by localhost with POP3 (fetchmail-6.2.0)
	for akpm@localhost (single-drop); Mon, 07 Mar 2005 22:07:49 -0800 (PST)
Received: from smtp.osdl.org (fire.osdl.org [65.172.181.4])
	by shell0.pdx.osdl.net (8.13.1/8.11.6) with ESMTP id j2866iLv023086
	for <akpm@mail.gateway.osdl.net>; Mon, 7 Mar 2005 22:06:44 -0800
Received: from note.orchestra.cse.unsw.EDU.AU (root@note.orchestra.cse.unsw.EDU.AU [129.94.242.24])
	by smtp.osdl.org (8.12.8/8.12.8) with ESMTP id j2866fqh000524
	for <akpm@osdl.org>; Mon, 7 Mar 2005 22:06:42 -0800
Received: From notabene.cse.unsw.edu.au ([129.94.172.124]) (auth-user neilb) By note
	With Smtp ; Tue, 8 Mar 2005 17:06:39 +1100 
Received: from neilb by notabene.cse.unsw.edu.au with local (Exim 4.50)
	id 1D8Xre-00016r-DV; Tue, 08 Mar 2005 17:06:42 +1100
From: NeilBrown <neilb@cse.unsw.edu.au>
To: Andrew Morton <akpm@osdl.org>
Date: Tue, 08 Mar 2005 17:06:42 +1100
X-face: [Gw_3E*Gng}4rRrKRYotwlE?.2|**#s9D<ml'fY1Vw+@XfR[fRCsUoP?K6bt3YD\ui5Fh?f
	LONpR';(ql)VM_TQ/<l_^D3~B:z$\YC7gUCuC=sYm/80G=$tt"98mr8(l))QzVKCk$6~gldn~*FK9x
	8`;pM{3S8679sP+MbP,72<3_PIH-$I&iaiIb|hV1d%cYg))BmI)AZ
Cc: nfs@lists.sourceforge.net
Subject: [PATCH kNFSd 1 of 54] Fix error reported by nfsd which it gets ETXTBSY
References: <20050308165419.3842.patches@notabene>
Message-Id: <E1D8Xre-00016r-DV@notabene.cse.unsw.edu.au>
Received-SPF: pass (domain of ses+ng-0=hi=cse.unsw.edu.au=neilb@cse.unsw.edu.au designates 129.94.242.24 as permitted sender)
X-MIMEDefang-Filter: osdl$Revision: 1.104 $
X-Scanned-By: MIMEDefang 2.36
X-Spam-Status: No, score=-0.7 required=2.0 tests=AWL autolearn=ham 
	version=3.0.2
X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on bix
X-Spam-Level: 


ETXTBSY doesn't have a direct anaolog in NFS, so just map it
to nfserr_io.
As this is the default error code this does not change the 
operation of nfsd.  It only reduces logging.

From: "G. Allen Morris III" <gam3@gam3.net>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>

### Diffstat output
 ./fs/nfsd/nfsproc.c |    1 +
 1 files changed, 1 insertion(+)

diff ./fs/nfsd/nfsproc.c~current~ ./fs/nfsd/nfsproc.c
--- ./fs/nfsd/nfsproc.c~current~	2005-03-07 11:32:36.000000000 +1100
+++ ./fs/nfsd/nfsproc.c	2005-03-07 11:32:36.000000000 +1100
@@ -590,6 +590,7 @@ nfserrno (int errno)
 		{ nfserr_dropit, -EAGAIN },
 		{ nfserr_dropit, -ENOMEM },
 		{ nfserr_badname, -ESRCH },
+		{ nfserr_io, -ETXTBSY },
 		{ nfserr_notsupp, -EOPNOTSUPP },
 		{ -1, -EIO }
 	};