LU-4118 kernel: kernel update [RHEL6.4 2.6.32-358.23.2.el6]

[fs/lustre-release.git] / lustre / quota / qsd_request.c

diff --git a/lustre/quota/qsd_request.c b/lustre/quota/qsd_request.c
index 66fa4b8..e4851e1 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>
@@ -260,8 +256,8 @@ int qsd_intent_lock(const struct lu_env *env, struct obd_export *exp,
                break;
        case IT_QUOTA_DQACQ:
                /* build resource name associated for per-ID quota lock */
-               fid_build_quota_resid(&qbody->qb_fid, &qbody->qb_id,
-                                     &qti->qti_resid);
+               fid_build_quota_res_name(&qbody->qb_fid, &qbody->qb_id,
+                                        &qti->qti_resid);
 
                /* copy einfo template and fill ei_cbdata with lqe pointer */
                memcpy(&qti->qti_einfo, &qsd_id_einfo, sizeof(qti->qti_einfo));
@@ -285,6 +281,7 @@ int qsd_intent_lock(const struct lu_env *env, struct obd_export *exp,
        case IT_QUOTA_CONN:
                /* grab reference on qqi for new lock */
 #ifdef USE_LU_REF
+       {
                struct ldlm_lock        *lock;
 
                lock = ldlm_handle2lock(&qti->qti_lockh);
@@ -294,6 +291,7 @@ int qsd_intent_lock(const struct lu_env *env, struct obd_export *exp,
                }
                lu_ref_add(&qqi->qqi_reference, "glb_lock", lock);
                LDLM_LOCK_PUT(lock);
+       }
 #endif
                qqi_getref(qqi);
                break;
@@ -350,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;
@@ -383,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);