X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Flibnfs.c;h=7946f2ffca1a317a0a468cf5fa7835f0b5bb93ff;hb=9a9566a3eea08ffe89423e1196f9c7de50892cfb;hp=cfddf2998fbafc16668ad7f8e1d855ed0b4ce75f;hpb=479302f72943be9f45d6b18c82c5502be12efa5a;p=deb_libnfs.git

diff --git a/lib/libnfs.c b/lib/libnfs.c
index cfddf29..7946f2f 100644
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -2732,14 +2732,15 @@ static void nfs_opendir3_cb(struct rpc_context *rpc, int status, void *command_d
 	rdpe_cb_data->getattrcount--;
 
 	if (status == RPC_STATUS_ERROR) {
+		rpc_set_error(nfs->rpc, "LOOKUP during READDIRPLUS emulation "
+			      "failed with RPC_STATUS_ERROR");
 		rdpe_cb_data->status = RPC_STATUS_ERROR;
 	}
 	if (status == RPC_STATUS_CANCEL) {
+		rpc_set_error(nfs->rpc, "LOOKUP during READDIRPLUS emulation "
+			      "failed with RPC_STATUS_CANCEL");
 		rdpe_cb_data->status = RPC_STATUS_CANCEL;
 	}
-	if (status == RPC_STATUS_SUCCESS && res->status != NFS3_OK) {
-		rdpe_cb_data->status = RPC_STATUS_ERROR;
-	}
 	if (status == RPC_STATUS_SUCCESS && res->status == NFS3_OK) {
 		if (res->LOOKUP3res_u.resok.obj_attributes.attributes_follow) {
 			fattr3 *attributes = &res->LOOKUP3res_u.resok.obj_attributes.post_op_attr_u.attributes;
@@ -2761,7 +2762,10 @@ static void nfs_opendir3_cb(struct rpc_context *rpc, int status, void *command_d
 
 	if (rdpe_cb_data->getattrcount == 0) {
 		if (rdpe_cb_data->status != RPC_STATUS_SUCCESS) {
-			data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
+			rpc_set_error(nfs->rpc, "READDIRPLUS emulation "
+			      "failed: %s", rpc_get_error(rpc));
+			data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc),
+				data->private_data);
 			nfs_free_nfsdir(nfsdir);
 		} else {
 			data->cb(0, nfs, nfsdir, data->private_data);