From 2353db439e3844c757adca4c7e6a2b2d4c050ccb Mon Sep 17 00:00:00 2001
From: Pawel Dziepak <pdziepak@quarnos.org>
Date: Wed, 4 Jul 2012 20:52:36 +0200
Subject: [PATCH] nfs4: Fix error checking after read_port()

---
 src/add-ons/kernel/file_systems/nfs4/IdMap.cpp             | 4 ++--
 src/add-ons/kernel/file_systems/nfs4/idmapper/IdMapper.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/add-ons/kernel/file_systems/nfs4/IdMap.cpp b/src/add-ons/kernel/file_systems/nfs4/IdMap.cpp
index 36920c010a..b53cbe9787 100644
--- a/src/add-ons/kernel/file_systems/nfs4/IdMap.cpp
+++ b/src/add-ons/kernel/file_systems/nfs4/IdMap.cpp
@@ -118,8 +118,8 @@ IdMap::_GetBuffer(T value, int32 code)
 		if (buffer == NULL)
 			return NULL;
 
-		result = read_port(fReplyPort, &code, buffer, size);
-		if (result < B_OK) {
+		size = read_port(fReplyPort, &code, buffer, size);
+		if (size < B_OK) {
 			free(buffer);
 
 			if (_Repair() != B_OK)
diff --git a/src/add-ons/kernel/file_systems/nfs4/idmapper/IdMapper.cpp b/src/add-ons/kernel/file_systems/nfs4/idmapper/IdMapper.cpp
index 5c8d2a9905..2622663a9f 100644
--- a/src/add-ons/kernel/file_systems/nfs4/idmapper/IdMapper.cpp
+++ b/src/add-ons/kernel/file_systems/nfs4/idmapper/IdMapper.cpp
@@ -198,13 +198,13 @@ MainLoop()
 			return B_NO_MEMORY;
 
 		int32 code;
-		status_t result = read_port(gRequestPort, &code, buffer, size);
+		size = read_port(gRequestPort, &code, buffer, size);
 		if (size < B_OK) {
 			free(buffer);
 			return 0;
 		}
 
-		result = ParseRequest(code, buffer);
+		status_t result = ParseRequest(code, buffer);
 		free(buffer);
 
 		if (result != B_OK)