LU-6027 osd-zfs: Preserve lu_buf when listing EAs

[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..83f2528 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>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
 #define DEBUG_SUBSYSTEM S_LQUOTA
 
 #include <lustre_net.h>
@@ -268,7 +264,7 @@ int qsd_intent_lock(const struct lu_env *env, struct obd_export *exp,
                qti->qti_einfo.ei_cbdata = arg;
                break;
        default:
-               LASSERTF(0, "invalid it_op %d", it_op);
+               LASSERTF(0, "invalid it_op %d\n", it_op);
        }
 
        /* build lock enqueue request */
@@ -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);
-                       GOTO(out, -ENOLCK);
+                       GOTO(out, rc = -ENOLCK);
                }
                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,
-                   cfs_page_t **pages, bool *need_swab)
+                   struct page **pages, bool *need_swab)
 {
        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++)
-               ptlrpc_prep_bulk_page_pin(desc, pages[i], 0, CFS_PAGE_SIZE);
+               ptlrpc_prep_bulk_page_pin(desc, pages[i], 0, PAGE_CACHE_SIZE);
 
        /* pack index information in request */
        req_ii = req_capsule_client_get(&req->rq_pill, &RMF_IDX_INFO);