Branch b1_4

This merges a change from b1_4_quota that was never landed on b1_4, which
removes some extraneous quota-induced overhead in the llap structs, growing
the size of each one noticably (and there are a lot of them, one per page).
It also removes an extra set of upcalls per page.
b=6929
r=niu

diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c
index 7104aa9..3297a86 100644 (file)
--- a/lustre/lov/lov_obd.c
+++ b/lustre/lov/lov_obd.c
@@ -1339,19 +1339,11 @@ static void lov_ap_completion(void *data, int cmd, struct obdo *oa, int rc)
         lap->lap_caller_ops->ap_completion(lap->lap_caller_data, cmd, oa, rc);
 }
 
-static void lov_ap_get_ucred(void *data, struct lvfs_ucred *ouc)
-{
-        struct lov_async_page *lap = LAP_FROM_COOKIE(data);
-
-        lap->lap_caller_ops->ap_get_ucred(lap->lap_caller_data, ouc);
-}
-
 static struct obd_async_page_ops lov_async_page_ops = {
         .ap_make_ready =        lov_ap_make_ready,
         .ap_refresh_count =     lov_ap_refresh_count,
         .ap_fill_obdo =         lov_ap_fill_obdo,
         .ap_completion =        lov_ap_completion,
-        .ap_get_ucred =         lov_ap_get_ucred,
 };
 
 int lov_prep_async_page(struct obd_export *exp, struct lov_stripe_md *lsm,

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 15cfbb0..7ee7a60 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -1427,18 +1427,6 @@ static struct ptlrpc_request *osc_build_req(struct client_obd *cli,
         LASSERT(ops != NULL);
         ops->ap_fill_obdo(caller_data, cmd, oa);
 
-        /* To enforce quota on oss, we need pass the client's user credit
-         * information to ost. We chose to store the fsuid and fsgid in
-         * oa->o_uid and oa->o_gid since the two fields haven't been used
-         * at present. And we chose one page's user credit information as
-         * the whole rpc's credit information. FIXME */
-        if (cmd == OBD_BRW_WRITE) {
-                struct lvfs_ucred ouc;
-                ops->ap_get_ucred(caller_data, &ouc);
-                oa->o_uid = ouc.luc_fsuid;
-                oa->o_gid = ouc.luc_fsgid;
-        }
-
         sort_brw_pages(pga, page_count);
         rc = osc_brw_prep_request(cmd, cli->cl_import, oa, NULL, page_count,
                                   pga, &requested_nob, &nio_count, &req);