From: Bobi Jam <bobijam.xu@intel.com>
Date: Fri, 15 Nov 2013 10:21:40 +0000 (+0800)
Subject: LU-4245 ldlm: do not fill empty lvbo buffer
X-Git-Tag: 2.5.52~24
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=bcbc62ea3e957f80238f326543eb46df857529ef

LU-4245 ldlm: do not fill empty lvbo buffer

Don't fill empty lvbo buffer if server does not prepare it.

Signed-off-by: Bobi Jam <bobijam.xu@intel.com>
Change-Id: I22a2ddd016dcc43c00b2b3d6be5d18921bf26d67
Reviewed-on: http://review.whamcloud.com/8285
Tested-by: Jenkins
Reviewed-by: Jinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 084e3e3..5d55852 100644
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -1400,7 +1400,7 @@ existing_lock:
 					 req, lock);
 				buflen = req_capsule_get_size(&req->rq_pill,
 						&RMF_DLM_LVB, RCL_SERVER);
-				if (buflen >= 0) {
+				if (buflen > 0) {
 					buflen = ldlm_lvbo_fill(lock, buf,
 								buflen);
 					if (buflen >= 0)
@@ -1410,9 +1410,9 @@ existing_lock:
 							buflen, RCL_SERVER);
 					else
 						rc = buflen;
-				}
-				else
+				} else {
 					rc = buflen;
+				}
 			}
                 } else {
                         lock_res_and_lock(lock);