Merge with rsync://fileserver/linux

Update to Linus latest

1 files changed, 1 insertions, 0 deletions

diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
index 757f9d208034..0aa1b9603d7f 100644
--- a/fs/nfsd/nfsproc.c
+++ b/fs/nfsd/nfsproc.c
@@ -591,6 +591,7 @@ nfserrno (int errno)
                 { nfserr_dropit, -ENOMEM },
                 { nfserr_badname, -ESRCH },
                 { nfserr_io, -ETXTBSY },
+                { nfserr_notsupp, -EOPNOTSUPP },
                 { -1, -EIO }
         };
         int     i;