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-3467 target: generic hpreq handler in target
[fs/lustre-release.git]
/
lustre
/
quota
/
qsd_request.c
diff --git
a/lustre/quota/qsd_request.c
b/lustre/quota/qsd_request.c
index
df128b3
..
ee8380a
100644
(file)
--- a/
lustre/quota/qsd_request.c
+++ b/
lustre/quota/qsd_request.c
@@
-28,10
+28,6
@@
* Author: Niu Yawei <yawei.niu@intel.com>
*/
* Author: Niu Yawei <yawei.niu@intel.com>
*/
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
#define DEBUG_SUBSYSTEM S_LQUOTA
#include <lustre_net.h>
#define DEBUG_SUBSYSTEM S_LQUOTA
#include <lustre_net.h>
@@
-291,7
+287,7
@@
int qsd_intent_lock(const struct lu_env *env, struct obd_export *exp,
lock = ldlm_handle2lock(&qti->qti_lockh);
if (lock == NULL) {
ptlrpc_req_finished(req);
lock = ldlm_handle2lock(&qti->qti_lockh);
if (lock == NULL) {
ptlrpc_req_finished(req);
- GOTO(out, -ENOLCK);
+ GOTO(out,
rc =
-ENOLCK);
}
lu_ref_add(&qqi->qqi_reference, "glb_lock", lock);
LDLM_LOCK_PUT(lock);
}
lu_ref_add(&qqi->qqi_reference, "glb_lock", lock);
LDLM_LOCK_PUT(lock);
@@
-352,7
+348,7
@@
out:
*/
int qsd_fetch_index(const struct lu_env *env, struct obd_export *exp,
struct idx_info *ii, unsigned int npages,
*/
int qsd_fetch_index(const struct lu_env *env, struct obd_export *exp,
struct idx_info *ii, unsigned int npages,
-
cfs_page_t
**pages, bool *need_swab)
+
struct page
**pages, bool *need_swab)
{
struct ptlrpc_request *req;
struct idx_info *req_ii;
{
struct ptlrpc_request *req;
struct idx_info *req_ii;
@@
-385,7
+381,7
@@
int qsd_fetch_index(const struct lu_env *env, struct obd_export *exp,
/* req now owns desc and will free it when it gets freed */
for (i = 0; i < npages; i++)
/* req now owns desc and will free it when it gets freed */
for (i = 0; i < npages; i++)
- ptlrpc_prep_bulk_page_pin(desc, pages[i], 0,
CFS_PAG
E_SIZE);
+ ptlrpc_prep_bulk_page_pin(desc, pages[i], 0,
PAGE_CACH
E_SIZE);
/* pack index information in request */
req_ii = req_capsule_client_get(&req->rq_pill, &RMF_IDX_INFO);
/* pack index information in request */
req_ii = req_capsule_client_get(&req->rq_pill, &RMF_IDX_INFO);