LU-4069 build: cleanup from GOTO(label, -ERRNO)

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

diff --git a/lustre/quota/qsd_request.c b/lustre/quota/qsd_request.c
index f05a356..ee8380a 100644 (file)
--- a/lustre/quota/qsd_request.c
+++ b/lustre/quota/qsd_request.c
@@ -21,17 +21,13 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  * Use is subject to license terms.
  *
  * Author: Johann Lombardi <johann.lombardi@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>
@@ -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,15 +281,17 @@ 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);
                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);
+       }
 #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;
@@ -374,7 +372,7 @@ int qsd_fetch_index(const struct lu_env *env, struct obd_export *exp,
        ptlrpc_at_set_req_timeout(req);
 
        /* allocate bulk descriptor */
-       desc = ptlrpc_prep_bulk_imp(req, npages, BULK_PUT_SINK,
+       desc = ptlrpc_prep_bulk_imp(req, npages, 1, BULK_PUT_SINK,
                                    MDS_BULK_PORTAL);
        if (desc == NULL) {
                ptlrpc_request_free(req);
@@ -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);
@@ -400,7 +398,10 @@ int qsd_fetch_index(const struct lu_env *env, struct obd_export *exp,
                                          req->rq_bulk->bd_nob_transferred);
        if (rc < 0)
                GOTO(out, rc);
-       rc = 0;
+       else
+               /* sptlrpc_cli_unwrap_bulk_read() returns the number of bytes
+                * transferred*/
+               rc = 0;
 
        req_ii = req_capsule_server_get(&req->rq_pill, &RMF_IDX_INFO);
        *ii = *req_ii;