X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fxattr_cache.c;h=f1022b0296f4744937582715ad225b276d376f32;hb=ef9718e8e9cf8fb7f7dedf2ab7ee3f6ba1646108;hp=fca7ab0cf84560c50dddd57a1ed0bc4625ea97d4;hpb=6712478e79588e73e28c7ccac3afc7ac2368a4f3;p=fs%2Flustre-release.git

diff --git a/lustre/llite/xattr_cache.c b/lustre/llite/xattr_cache.c
index fca7ab0..f1022b0 100644
--- a/lustre/llite/xattr_cache.c
+++ b/lustre/llite/xattr_cache.c
@@ -24,7 +24,7 @@
 /*
  * Copyright 2012 Xyratex Technology Limited
  *
- * Copyright (c) 2013, 2016, Intel Corporation.
+ * Copyright (c) 2013, 2017, Intel Corporation.
  *
  * Author: Andrew Perepechko <Andrew_Perepechko@xyratex.com>
  *
@@ -401,7 +401,7 @@ static int ll_xattr_cache_refill(struct inode *inode)
 	if (unlikely(req == NULL)) {
 		CDEBUG(D_CACHE, "cancelled by a parallel getxattr\n");
 		ll_intent_drop_lock(&oit);
-		GOTO(err_unlock, rc = -EIO);
+		GOTO(err_unlock, rc = -EAGAIN);
 	}
 
 	body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
@@ -482,7 +482,7 @@ err_req:
 		rc = -EAGAIN;
 
 	ptlrpc_req_finished(req);
-	return rc;
+	RETURN(rc);
 }
 
 /**
@@ -547,6 +547,6 @@ int ll_xattr_cache_get(struct inode *inode,
 out:
 	up_read(&lli->lli_xattrs_list_rwsem);
 
-	return rc;
+	RETURN(rc);
 }