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

diff --git a/lustre/llite/xattr_cache.c b/lustre/llite/xattr_cache.c
index 18a289b..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>
  *
@@ -37,7 +37,6 @@
 #include <linux/mm.h>
 #include <obd_support.h>
 #include <lustre_dlm.h>
-#include <lustre_ver.h>
 #include "llite_internal.h"
 
 /* If we ever have hundreds of extended attributes, we might want to consider
@@ -402,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);
@@ -483,7 +482,7 @@ err_req:
 		rc = -EAGAIN;
 
 	ptlrpc_req_finished(req);
-	return rc;
+	RETURN(rc);
 }
 
 /**
@@ -548,6 +547,6 @@ int ll_xattr_cache_get(struct inode *inode,
 out:
 	up_read(&lli->lli_xattrs_list_rwsem);
 
-	return rc;
+	RETURN(rc);
 }