Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-13134 llite: fix to free cl_dio_aio properly
[fs/lustre-release.git]
/
lustre
/
llite
/
xattr_cache.c
diff --git
a/lustre/llite/xattr_cache.c
b/lustre/llite/xattr_cache.c
index
18a289b
..
f1022b0
100644
(file)
--- a/
lustre/llite/xattr_cache.c
+++ b/
lustre/llite/xattr_cache.c
@@
-24,7
+24,7
@@
/*
* Copyright 2012 Xyratex Technology Limited
*
/*
* Copyright 2012 Xyratex Technology Limited
*
- * Copyright (c) 2013, 201
6
, Intel Corporation.
+ * Copyright (c) 2013, 201
7
, Intel Corporation.
*
* Author: Andrew Perepechko <Andrew_Perepechko@xyratex.com>
*
*
* Author: Andrew Perepechko <Andrew_Perepechko@xyratex.com>
*
@@
-37,7
+37,6
@@
#include <linux/mm.h>
#include <obd_support.h>
#include <lustre_dlm.h>
#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
#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);
if (unlikely(req == NULL)) {
CDEBUG(D_CACHE, "cancelled by a parallel getxattr\n");
ll_intent_drop_lock(&oit);
- GOTO(err_unlock, rc = -E
IO
);
+ GOTO(err_unlock, rc = -E
AGAIN
);
}
body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
}
body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
@@
-483,7
+482,7
@@
err_req:
rc = -EAGAIN;
ptlrpc_req_finished(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);
out:
up_read(&lli->lli_xattrs_list_rwsem);
-
return rc
;
+
RETURN(rc)
;
}
}