On Mon, Mar 30, 2009 at 10:59:23PM +0300, Benny Halevy wrote: > On Mar. 30, 2009, 21:16 +0300, "J. Bruce Fields" <bfields@xxxxxxxxxxxx> wrote: > > On Sat, Mar 28, 2009 at 11:31:15AM +0300, Benny Halevy wrote: > >> From: Marc Eshel <eshel@xxxxxxxxxxxxxxx> > >> > >> Define all error code present in > >> http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-29. > >> > >> Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx> > >> [nfsd41: clean up error code definitions] > >> Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx> > >> --- > >> include/linux/nfs.h | 2 -- > >> include/linux/nfsd/nfsd.h | 43 ++++++++++++++++++++++++++++++++++++++++++- > >> 2 files changed, 42 insertions(+), 3 deletions(-) > >> > >> diff --git a/include/linux/nfs.h b/include/linux/nfs.h > >> index 1510a64..214d499 100644 > >> --- a/include/linux/nfs.h > >> +++ b/include/linux/nfs.h > >> @@ -109,8 +109,6 @@ > >> NFSERR_FILE_OPEN = 10046, /* v4 */ > >> NFSERR_ADMIN_REVOKED = 10047, /* v4 */ > >> NFSERR_CB_PATH_DOWN = 10048, /* v4 */ > >> - > >> - NFSERR_REPLAY_ME = 11001, /* linux internal */ > > > > This renders "[PATCH v2 05/47] nfsd41: change NFSERR_REPLAY_ME" moot; > > just drop that previous patch. > > I see you already pulled the former patch into for-2.6.30... Yes. Should be fixed now, though. --b. -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html