Merge tag 'libnfs-1.9.6' of https://github.com/sahlberg/libnfs into upstream

[deb_libnfs.git] / nfs / nfs.c

diff --git a/nfs/nfs.c b/nfs/nfs.c
index a97d40ab7d543e6d8a37ce97b7a5d5665a3dd852..335c67bf395f709f7f197b016cd55aa86c91a048 100644 (file)
--- a/nfs/nfs.c
+++ b/nfs/nfs.c
@@ -86,7 +86,7 @@ int nfsstat3_to_errno(int error)
        case NFS3ERR_ROFS:        return -EROFS; break;
        case NFS3ERR_MLINK:       return -EMLINK; break;
        case NFS3ERR_NAMETOOLONG: return -ENAMETOOLONG; break;
-       case NFS3ERR_NOTEMPTY:    return -EEXIST; break;
+       case NFS3ERR_NOTEMPTY:    return -ENOTEMPTY; break;
        case NFS3ERR_DQUOT:       return -ERANGE; break;
        case NFS3ERR_STALE:       return -EIO; break;
        case NFS3ERR_REMOTE:      return -EIO; break;
@@ -697,7 +697,7 @@ int rpc_nfs_readdirplus_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3
        args.cookie = cookie;
        memcpy(&args.cookieverf, cookieverf, sizeof(cookieverf3)); 
        args.dircount = count;
-       args.maxcount = count;
+       args.maxcount = count * 8;
 
        return rpc_nfs3_readdirplus_async(rpc, cb, &args, private_data);
 }